updates from Production

app/models/channel.rb

@@ -90,6 +90,11 @@ class Channel < ActiveRecord::Base
   cattr_reader :per_page
   @@per_page = 15
 
+  # replace channel values: %%channel_1417_field_1%% is replaced with appropriate value
+  def self.replace_values(input, user)
+    return input.gsub(/%%channel_\d+_field_\d+%%/) { |string| Channel.value_from_string(string, user) }
+  end
+
   # access a last value by string: channel_1417_field_1
   def self.value_from_string(channel_string, user)
     # remove % from the string and create the array

config/locales/en.yml

@@ -420,7 +420,7 @@ en:
   help_apps_talkback: "Allow devices to execute queued commands."
   help_apps_thinghttp: "Create custom POSTs or GETs to other webservices and retrieve the data."
   help_apps_thingtweet: "Link your Twitter account to ThingSpeak and send Twitter messages using our simple API."
-  help_apps_timecontrol: "Automatically perform ThingHTTP requests at predetermined times."
+  help_apps_timecontrol: "Automatically perform ThingHTTP or ThingTweet requests at predetermined times."
   help_apps_tweetcontrol: "Listen to commands from Twitter and then perform an action."
   help_apps_react: "Perform actions when conditions are met by your data in your channels."
   help_channel: "Create a channel -- it can be for a device, app, or anything that can send data to ThingSpeak."
@@ -459,7 +459,7 @@ en:
   help_thinghttp_example: "This will send your HTTP GET request to Google Finance and parse the response for an element having an ID of ref_626307_c, which corresponds to the S&P 500 current price change for the day."
   help_thinghttp_show: "You can now send your ThingHTTP request and view the response using the following URL:"
   help_thingtweet: "ThingTweet acts as a proxy to Twitter so that your devices can update Twitter statuses without having to implement Open Authentication (OAuth)."
-  help_timecontrol_index: "Create a TimeControl to automatically execute ThingHTTP requests at predetermined times."
+  help_timecontrol_index: "Create a TimeControl to automatically execute ThingHTTP or ThingTweet requests at predetermined times."
   help_timecontrol_show: "Your TimeControl will be automatically executed at the indicated time."
   help_tweetcontrol: "Use TweetControl to listen to specific trigger words from Twitter, and then process a ThingHTTP request."
   help_tweetcontrol_edit: "Select Anonymous TweetControl to allow anyone to trigger your TweetControl or fill in a specfic Twitter Account (don't include the '@' sign)."

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140930202952) do
+ActiveRecord::Schema.define(version: 20141007195311) do
 
   create_table "active_admin_comments", force: true do |t|
     t.string   "namespace"
@@ -324,11 +324,11 @@ ActiveRecord::Schema.define(version: 20140930202952) do
   create_table "timecontrols", force: true do |t|
     t.integer  "user_id"
     t.integer  "schedulable_id"
-    t.string   "schedulable_type", limit: 50
-    t.string   "frequency",        limit: 20
-    t.integer  "day",              limit: 1
-    t.integer  "hour",             limit: 1
-    t.integer  "minute",           limit: 1
+    t.string   "schedulable_type",  limit: 50
+    t.string   "frequency",         limit: 20
+    t.integer  "day",               limit: 1
+    t.integer  "hour",              limit: 1
+    t.integer  "minute",            limit: 1
     t.integer  "parent_id"
     t.datetime "last_event_at"
     t.text     "last_response"
@@ -336,7 +336,8 @@ ActiveRecord::Schema.define(version: 20140930202952) do
     t.datetime "updated_at"
     t.string   "name"
     t.datetime "run_at"
-    t.integer  "fuzzy_seconds",               default: 0
+    t.integer  "fuzzy_seconds",                default: 0
+    t.string   "schedulable_value"
   end
 
   add_index "timecontrols", ["frequency", "minute", "hour", "day"], name: "index_timecontrols_on_frequency_and_minute_and_hour_and_day", using: :btree

spec/models/feed_spec.rb

@@ -1,3 +1,27 @@
+# == Schema Information
+#
+# Table name: feeds
+#
+#  id         :integer          not null, primary key
+#  channel_id :integer
+#  field1     :string(255)
+#  field2     :string(255)
+#  field3     :string(255)
+#  field4     :string(255)
+#  field5     :string(255)
+#  field6     :string(255)
+#  field7     :string(255)
+#  field8     :string(255)
+#  created_at :datetime
+#  updated_at :datetime
+#  entry_id   :integer
+#  status     :string(255)
+#  latitude   :decimal(15, 10)
+#  longitude  :decimal(15, 10)
+#  elevation  :string(255)
+#  location   :string(255)
+#
+
 require 'spec_helper'
 
 describe Feed do

test/models/admin_user_test.rb

@@ -1,3 +1,22 @@
+# == Schema Information
+#
+# Table name: admin_users
+#
+#  id                     :integer          not null, primary key
+#  email                  :string(255)      default(""), not null
+#  encrypted_password     :string(255)      default(""), not null
+#  reset_password_token   :string(255)
+#  reset_password_sent_at :datetime
+#  remember_created_at    :datetime
+#  sign_in_count          :integer          default(0), not null
+#  current_sign_in_at     :datetime
+#  last_sign_in_at        :datetime
+#  current_sign_in_ip     :string(255)
+#  last_sign_in_ip        :string(255)
+#  created_at             :datetime
+#  updated_at             :datetime
+#
+
 require 'test_helper'
 
 class AdminUserTest < ActiveSupport::TestCase