c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

updates from Production version

Browse Source
This commit is contained in:
Lee Lawlor 2014-05-15 16:42:47 -04:00
parent f7b4a3fcce
commit c240b89ed0
10 changed files with 151 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -31,7 +31,8 @@ gem 'newrelic_rpm'
gem 'actionpack-xml_parser' gem 'actionpack-xml_parser'
gem 'activeadmin', github: 'gregbell/active_admin' gem 'activeadmin', github: 'gregbell/active_admin'
gem 'chronic' gem 'chronic'
gem "non-stupid-digest-assets" gem 'non-stupid-digest-assets'
gem 'em-http-request'
# to use debugger # to use debugger
# gem 'ruby-debug' # gem 'ruby-debug'

1
Gemfile.lock
View File

@ -355,6 +355,7 @@ DEPENDENCIES
database_cleaner (~> 1.2.0) database_cleaner (~> 1.2.0)
devise devise
dynamic_form dynamic_form
em-http-request
exception_notification exception_notification
factory_girl_rails factory_girl_rails
faker faker

39
app/controllers/channels_controller.rb
View File

@ -1,11 +1,19 @@
class ChannelsController < ApplicationController class ChannelsController < ApplicationController
include ChannelsHelper, ApiKeys include ChannelsHelper, ApiKeys
before_filter :require_user, :except => [ :show, :post_data, :social_show, :social_feed, :public] before_filter :require_user, :except => [:realtime, :realtime_update, :show, :post_data, :social_show, :social_feed, :public]
before_filter :set_channels_menu before_filter :set_channels_menu
layout 'application', :except => [:social_show, :social_feed] layout 'application', :except => [:social_show, :social_feed]
protect_from_forgery :except => [:post_data, :create, :destroy, :clear] protect_from_forgery :except => [:realtime, :realtime_update, :post_data, :create, :destroy, :clear]
require 'csv' require 'csv'
# get list of all realtime channels
def realtime
# error if no key
respond_with_error(:error_auth_required) and return if params[:realtime_key] != REALTIME_DAEMON_KEY
channels = Channel.where("realtime_io_serial_number IS NOT NULL")
render :json => channels.to_json(:root => false, :only => [:id, :realtime_io_serial_number])
end
# view list of watched channels # view list of watched channels
def watched def watched
@channels = current_user.watched_channels @channels = current_user.watched_channels
@ -235,6 +243,33 @@ class ChannelsController < ApplicationController
end end
end end
# post from realtime.io daemon
def realtime_update
# exit if not authenticated
respond_with_error(:error_auth_required) and return if params[:realtime_key] != REALTIME_DAEMON_KEY
# set feed and channel
feed = Feed.new
channel = Channel.find(params[:id])
# update entry_id for channel and feed
entry_id = channel.next_entry_id
channel.last_entry_id = entry_id
feed.entry_id = entry_id
# set user agent
channel.user_agent = 'realtime.io'
# set feed details
feed.channel_id = channel.id
feed.status = params[:status]
# save channel and feed
channel.save
feed.save
render :nothing => true
end
# response is '0' if failure, 'entry_id' if success # response is '0' if failure, 'entry_id' if success
def post_data def post_data

6
app/controllers/stream_controller.rb
View File

@ -54,11 +54,11 @@ class StreamController < ApplicationController
def stream_example def stream_example
# get the channel # get the channel
channel = Channel.find(params[:channel_id]) #channel = Channel.find(params[:channel_id])
# stream the response # stream the response
response.headers['Content-Type'] = 'text/csv' #response.headers['Content-Type'] = 'text/csv'
response.headers['Content-Disposition'] = 'attachment; filename=feeds.csv' #response.headers['Content-Disposition'] = 'attachment; filename=feeds.csv'
20.times { 20.times {
response.stream.write "hello world\n" response.stream.write "hello world\n"
sleep 1 sleep 1

89
app/models/channel.rb
View File

@ -2,50 +2,51 @@
# #
# Table name: channels # Table name: channels
# #
# id :integer not null, primary key # id :integer not null, primary key
# user_id :integer # user_id :integer
# name :string(255) # name :string(255)
# description :string(255) # description :string(255)
# latitude :decimal(15, 10) # latitude :decimal(15, 10)
# longitude :decimal(15, 10) # longitude :decimal(15, 10)
# field1 :string(255) # field1 :string(255)
# field2 :string(255) # field2 :string(255)
# field3 :string(255) # field3 :string(255)
# field4 :string(255) # field4 :string(255)
# field5 :string(255) # field5 :string(255)
# field6 :string(255) # field6 :string(255)
# field7 :string(255) # field7 :string(255)
# field8 :string(255) # field8 :string(255)
# scale1 :integer # scale1 :integer
# scale2 :integer # scale2 :integer
# scale3 :integer # scale3 :integer
# scale4 :integer # scale4 :integer
# scale5 :integer # scale5 :integer
# scale6 :integer # scale6 :integer
# scale7 :integer # scale7 :integer
# scale8 :integer # scale8 :integer
# created_at :datetime # created_at :datetime
# updated_at :datetime # updated_at :datetime
# elevation :string(255) # elevation :string(255)
# last_entry_id :integer # last_entry_id :integer
# public_flag :boolean default(FALSE) # public_flag :boolean default(FALSE)
# options1 :string(255) # options1 :string(255)
# options2 :string(255) # options2 :string(255)
# options3 :string(255) # options3 :string(255)
# options4 :string(255) # options4 :string(255)
# options5 :string(255) # options5 :string(255)
# options6 :string(255) # options6 :string(255)
# options7 :string(255) # options7 :string(255)
# options8 :string(255) # options8 :string(255)
# social :boolean default(FALSE) # social :boolean default(FALSE)
# slug :string(255) # slug :string(255)
# status :string(255) # status :string(255)
# url :string(255) # url :string(255)
# video_id :string(255) # video_id :string(255)
# video_type :string(255) # video_type :string(255)
# clearing :boolean default(FALSE), not null # clearing :boolean default(FALSE), not null
# ranking :integer # ranking :integer
# user_agent :string(255) # user_agent :string(255)
# realtime_io_serial_number :string(36)
# #
class Channel < ActiveRecord::Base class Channel < ActiveRecord::Base

2
app/views/docs/charts.html.erb
View File

@ -27,7 +27,7 @@
<li><b>yaxis</b> (string) Chart's y-axis label, default: field name (optional)</li> <li><b>yaxis</b> (string) Chart's y-axis label, default: field name (optional)</li>
<li><b>color</b> (string) Line color, default: red (optional)</li> <li><b>color</b> (string) Line color, default: red (optional)</li>
<li><b>bgcolor</b> (string) Background color, default: white (optional)</li> <li><b>bgcolor</b> (string) Background color, default: white (optional)</li>
<li><b>type</b> (line/bar/column) Type of chart, default: line (optional)</li> <li><b>type</b> (line/bar/column/spline) Type of chart, default: line (optional)</li>
<li><b>width</b> (integer) Chart width in pixels, iframe width will be 20px larger, default chart width: 400. Set to <i>auto</i> to automatically adjust chart size based on its parent container. (optional)</li> <li><b>width</b> (integer) Chart width in pixels, iframe width will be 20px larger, default chart width: 400. Set to <i>auto</i> to automatically adjust chart size based on its parent container. (optional)</li>
<li><b>height</b> (integer) Chart height in pixels, iframe height will be 20px larger, default chart height: 200. Set to <i>auto</i> to automatically adjust chart size based on its parent container. (optional)</li> <li><b>height</b> (integer) Chart height in pixels, iframe height will be 20px larger, default chart height: 200. Set to <i>auto</i> to automatically adjust chart size based on its parent container. (optional)</li>
<li><b>dynamic</b> (true/false) Make chart update automatically every 15 seconds, default: false (optional)</li> <li><b>dynamic</b> (true/false) Make chart update automatically every 15 seconds, default: false (optional)</li>

2
config/routes.rb
View File

@ -80,12 +80,14 @@ Thingspeak::Application.routes.draw do
collection do collection do
get :public get :public
get :watched get :watched
get :realtime
end end
member do member do
get :import get :import
post :upload post :upload
post :clear post :clear
put :watch put :watch
post :realtime_update
end end
resources :feed resources :feed

7
db/migrate/20140515161337_add_realtime_io_serial_number_to_channels.rb Normal file
View File

@ -0,0 +1,7 @@
class AddRealtimeIoSerialNumberToChannels < ActiveRecord::Migration
def change
add_column :channels, :realtime_io_serial_number, :string, :limit => 36
add_index :channels, :realtime_io_serial_number
end
end

14
db/schema.rb
View File

@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20140410174033) do ActiveRecord::Schema.define(version: 20140515161337) do
create_table "active_admin_comments", force: true do |t| create_table "active_admin_comments", force: true do |t|
t.string "namespace" t.string "namespace"
@ -63,8 +63,8 @@ ActiveRecord::Schema.define(version: 20140410174033) do
t.integer "user_id" t.integer "user_id"
t.string "name" t.string "name"
t.string "description" t.string "description"
t.decimal "latitude", precision: 15, scale: 10 t.decimal "latitude", precision: 15, scale: 10
t.decimal "longitude", precision: 15, scale: 10 t.decimal "longitude", precision: 15, scale: 10
t.string "field1" t.string "field1"
t.string "field2" t.string "field2"
t.string "field3" t.string "field3"
@ -85,7 +85,7 @@ ActiveRecord::Schema.define(version: 20140410174033) do
t.datetime "updated_at" t.datetime "updated_at"
t.string "elevation" t.string "elevation"
t.integer "last_entry_id" t.integer "last_entry_id"
t.boolean "public_flag", default: false t.boolean "public_flag", default: false
t.string "options1" t.string "options1"
t.string "options2" t.string "options2"
t.string "options3" t.string "options3"
@ -94,19 +94,21 @@ ActiveRecord::Schema.define(version: 20140410174033) do
t.string "options6" t.string "options6"
t.string "options7" t.string "options7"
t.string "options8" t.string "options8"
t.boolean "social", default: false t.boolean "social", default: false
t.string "slug" t.string "slug"
t.string "status" t.string "status"
t.string "url" t.string "url"
t.string "video_id" t.string "video_id"
t.string "video_type" t.string "video_type"
t.boolean "clearing", default: false, null: false t.boolean "clearing", default: false, null: false
t.integer "ranking" t.integer "ranking"
t.string "user_agent" t.string "user_agent"
t.string "realtime_io_serial_number", limit: 36
end end
add_index "channels", ["public_flag", "last_entry_id", "updated_at"], name: "channels_public_viewable", using: :btree add_index "channels", ["public_flag", "last_entry_id", "updated_at"], name: "channels_public_viewable", using: :btree
add_index "channels", ["ranking"], name: "index_channels_on_ranking", using: :btree add_index "channels", ["ranking"], name: "index_channels_on_ranking", using: :btree
add_index "channels", ["realtime_io_serial_number"], name: "index_channels_on_realtime_io_serial_number", using: :btree
add_index "channels", ["slug"], name: "index_channels_on_slug", using: :btree add_index "channels", ["slug"], name: "index_channels_on_slug", using: :btree
add_index "channels", ["user_id"], name: "index_channels_on_user_id", using: :btree add_index "channels", ["user_id"], name: "index_channels_on_user_id", using: :btree

89
spec/models/channel_spec.rb
View File

@ -3,50 +3,51 @@
# #
# Table name: channels # Table name: channels
# #
# id :integer not null, primary key # id :integer not null, primary key
# user_id :integer # user_id :integer
# name :string(255) # name :string(255)
# description :string(255) # description :string(255)
# latitude :decimal(15, 10) # latitude :decimal(15, 10)
# longitude :decimal(15, 10) # longitude :decimal(15, 10)
# field1 :string(255) # field1 :string(255)
# field2 :string(255) # field2 :string(255)
# field3 :string(255) # field3 :string(255)
# field4 :string(255) # field4 :string(255)
# field5 :string(255) # field5 :string(255)
# field6 :string(255) # field6 :string(255)
# field7 :string(255) # field7 :string(255)
# field8 :string(255) # field8 :string(255)
# scale1 :integer # scale1 :integer
# scale2 :integer # scale2 :integer
# scale3 :integer # scale3 :integer
# scale4 :integer # scale4 :integer
# scale5 :integer # scale5 :integer
# scale6 :integer # scale6 :integer
# scale7 :integer # scale7 :integer
# scale8 :integer # scale8 :integer
# created_at :datetime # created_at :datetime
# updated_at :datetime # updated_at :datetime
# elevation :string(255) # elevation :string(255)
# last_entry_id :integer # last_entry_id :integer
# public_flag :boolean default(FALSE) # public_flag :boolean default(FALSE)
# options1 :string(255) # options1 :string(255)
# options2 :string(255) # options2 :string(255)
# options3 :string(255) # options3 :string(255)
# options4 :string(255) # options4 :string(255)
# options5 :string(255) # options5 :string(255)
# options6 :string(255) # options6 :string(255)
# options7 :string(255) # options7 :string(255)
# options8 :string(255) # options8 :string(255)
# social :boolean default(FALSE) # social :boolean default(FALSE)
# slug :string(255) # slug :string(255)
# status :string(255) # status :string(255)
# url :string(255) # url :string(255)
# video_id :string(255) # video_id :string(255)
# video_type :string(255) # video_type :string(255)
# clearing :boolean default(FALSE), not null # clearing :boolean default(FALSE), not null
# ranking :integer # ranking :integer
# user_agent :string(255) # user_agent :string(255)
# realtime_io_serial_number :string(36)
# #
require 'spec_helper' require 'spec_helper'