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

updates from Production

This commit is contained in:
Lee Lawlor 2015-03-23 10:37:17 -04:00
parent bf1fc08978
commit a5871fabf6
8 changed files with 82 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/channels_controller.rb
View File

@ -369,7 +369,6 @@ class ChannelsController < ApplicationController
feed.longitude = params[:long] if params[:long]
feed.longitude = params[:longitude] if params[:longitude]
feed.elevation = params[:elevation] if params[:elevation]
feed.location = params[:location] if params[:location]
# if the saves were successful
if channel.save && feed.save

117
app/controllers/windows_controller.rb
View File

@ -1,6 +1,7 @@
class WindowsController < ApplicationController
before_filter :require_user, :except => [:index, :html, :iframe]
# hides a window, returns the window id if successful or '-1' if failure
def hide
window = Window.find(params[:id])
window.show_flag = false
@ -11,60 +12,36 @@ class WindowsController < ApplicationController
end
end
# Call WindowsController.display when we want to display a window on the dashboard
# params[:visibility_flag] is whether it is the private or public dashboard
# params[:plugin] is for displaying a plugin, instead of a window
# params[:id] is the window ID for conventional windows, but the plugin_id for plugins
# params[:channel_id] is the channel_id
# displays a window on the dashboard
def display
@visibility = params[:visibility_flag]
window = Window.find(params[:id])
window = Window.new if window.nil?
window.show_flag = true
#Just save this change, then modify the object before rendering the JSON
savedWindow = window.save
# save this change
saved_window = window.save
config_window window
# modify the object before rendering the JSON
window.set_title_for_display!
window.set_html_for_display!
@mychannel = current_user && current_user.id == window.channel.user_id
if savedWindow
# if the window was saved successfully
if saved_window
render :json => window.to_json
else
render :json => 'An error occurred'.to_json
end
end
def config_window(window)
if window.window_type == "plugin"
pluginName = Plugin.find(window.content_id).name
window.title = t(window.title, {:name => pluginName})
elsif window.window_type == "chart"
window.title = t(window.title, {:field_number => window.content_id})
options = window.options if !window.nil?
options ||= ""
window.html["::OPTIONS::"] = options unless window.html.nil? || window.html.index("::OPTIONS::").nil?
else
window.title = t(window.title)
end
end
def html
window = Window.find(params[:id])
options = window.options unless window.nil? || window.window_type != "chart"
window.html["::OPTIONS::"] = options unless window.html.nil? || window.html.index("::OPTIONS::").nil?
html = window.html
render :text => html
window.set_html_for_display!
render :text => window.html
end
def iframe
window = Window.find(params[:id])
options = window.options unless window.nil? || window.window_type != "chart"
window.html["::OPTIONS::"] = options unless window.html.nil? || window.html.index("::OPTIONS::").nil?
window.set_html_for_display!
iframe_html = window.html
# set the domain correctly
iframe_html = iframe_html.gsub(/src=\"[\/.]/, 'src="' + api_domain);
render :text => iframe_html
end
@ -73,26 +50,16 @@ class WindowsController < ApplicationController
channel = Channel.find(params[:channel_id])
windows = channel.public_windows(true).order(:position) unless params[:channel_id].nil?
if channel.recent_statuses.nil? || channel.recent_statuses.size <= 0
if channel.recent_statuses.blank?
@windows = windows.delete_if { |w| w.window_type == "status" }
else
@windows = windows
end
@windows.each do |window|
if window.window_type == "plugin"
pluginName = Plugin.find(window.content_id).name
window.title = t(window.title, {:name => pluginName})
elsif window.window_type == "chart"
window.title = t(window.title, {:field_number => window.content_id})
options = window.options if !window.nil?
options ||= ""
window.html["::OPTIONS::"] = options unless window.html.nil? || window.html.index("::OPTIONS::").nil?
else
window.title = t(window.title)
end
# modify the object before rendering the JSON
window.set_title_for_display!
window.set_html_for_display!
end
respond_to do |format|
@ -108,21 +75,15 @@ class WindowsController < ApplicationController
channel = Channel.find(params[:channel_id])
if @visibility == "private"
@windows = channel.private_windows(false) unless channel.nil?
@windows = channel.private_windows(false)
else
@windows = channel.public_windows(false) unless channel.nil?
@windows = channel.public_windows(false)
end
@windows.reject! { |window| window.window_type == "plugin" }
@windows.each do |window|
if window.window_type == "plugin"
elsif window.window_type == "chart"
window.title = t(window.title, {:field_number => window.content_id})
options = window.options unless window.nil?
options ||= ""
window.html["::OPTIONS::"] = options unless window.html.nil? || window.html.index("::OPTIONS::").nil?
else
window.title = t(window.title)
end
# modify the object before rendering the JSON
window.set_title_for_display!
window.set_html_for_display!
end
respond_to do |format|
@ -133,26 +94,18 @@ class WindowsController < ApplicationController
def private_windows
channel = Channel.find(params[:channel_id])
windows = channel.private_windows(true).order(:position) unless params[:channel_id].nil?
windows = channel.private_windows(true).order(:position)
if channel.recent_statuses.nil? || channel.recent_statuses.size <= 0
if channel.recent_statuses.blank?
@windows = windows.delete_if { |w| w.window_type == "status" }
else
@windows = windows
end
@windows.each do |window|
if window.window_type == "plugin"
pluginName = Plugin.find(window.content_id).name
window.title = t(window.title, {:name => pluginName})
elsif window.window_type == "chart"
window.title = t(window.title, {:field_number => window.content_id})
options = window.options unless window.nil?
options ||= ""
window.html["::OPTIONS::"] = options unless window.html.nil? || window.html.index("::OPTIONS::").nil?
else
window.title = t(window.title)
end
# modify the object before rendering the JSON
window.set_title_for_display!
window.set_html_for_display!
end
respond_to do |format|
@ -163,7 +116,6 @@ class WindowsController < ApplicationController
def update
logger.info "We're trying to update the windows with " + params.to_s
#params for this put are going to look like
# page"=>"{\"col\":0,\"positions\":[1,2,3]}"
#So.. the position values are Windows.id They should get updated with the ordinal value based
@ -177,21 +129,20 @@ class WindowsController < ApplicationController
values = JSON(params[:page])
# .. then find each window and update with new ordinal position and col.
logger.info "Channel id = " + params[:channel_id].to_s
@channel = current_user.channels.find(params[:channel_id])
col = values["col"]
saved = true
values["positions"].each_with_index do |p,i|
windows = @channel.windows.where({:id => p}) unless p.nil?
unless windows.nil? || windows.empty?
w = windows[0]
w.position = i
w.col = col
if !w.save
values["positions"].each_with_index do |p, index|
window = @channel.windows.where({:id => p}).first unless p.nil?
if window.present?
window.position = index
window.col = col
if !window.save
saved = false
end
end
end
# if the windows were saved successfully
if saved
render :text => '0'
else

3
app/models/feed.rb
View File

@ -48,7 +48,7 @@ class Feed < ActiveRecord::Base
# for to_xml, return only the public attributes
def self.public_options
{
:except => [:id, :updated_at]
:except => [:id, :updated_at, :location]
}
end
@ -70,7 +70,6 @@ class Feed < ActiveRecord::Base
only += [:latitude]
only += [:longitude]
only += [:elevation]
only += [:location]
end
# add status if necessary

24
app/models/window.rb
View File

@ -43,5 +43,29 @@ class Window < ActiveRecord::Base
window if window.save
end
# set the title for display to user; don't save after calling this method
def set_title_for_display!
# if this is a plugin
if window_type == "plugin"
plugin_name = Plugin.find(content_id).name
self.title = I18n.t(title, {:name => plugin_name})
# else if this is a chart
elsif window_type == "chart"
self.title = I18n.t(title, {:field_number => content_id})
# else set title for other window types, for example: I18n.t('window_map') = 'Channel Location'
else
self.title = I18n.t(title)
end
end
# set the html for display to user; don't save after calling this method
def set_html_for_display!
if window_type == "chart"
html_options = options || ''
# replace '::OPTIONS::' if present
self.html['::OPTIONS::'] = html_options if html.present? && html.index("::OPTIONS::").present?
end
end
end

4
app/views/docs/channels/_update_feed.html.erb
View File

@ -64,8 +64,7 @@ POST <span class="str"><%= @ssl_api_domain %>update<span class="format format-js
"status": null,
"latitude": null,
"longitude": null,
"elevation": null,
"location":null
"elevation": null
}
</pre>
@ -92,7 +91,6 @@ POST <span class="str"><%= @ssl_api_domain %>update<span class="format format-js
&lt;latitude type="decimal" nil="true"/>
&lt;longitude type="decimal" nil="true"/>
&lt;elevation nil="true"/>
&lt;location nil="true"/>
&lt;/feed>
</pre>

18
app/views/docs/tutorials.html.erb
View File

@ -12,7 +12,7 @@
<br>
<h3>Getting Started with ThingSpeak</h3>
<h3>Getting Started with ThingSpeak</h3>
<ul>
<li><a title="Introduction to the Internet of Things and ThingSpeak" href="http://community.thingspeak.com/tutorials/introduction-to-the-%E2%80%9Cinternet-of-things%E2%80%9D-and-thingspeak/">Introduction to the “Internet of Things” and ThingSpeak</a> </li>
<li><a title="Video tutorial on creating ThingSpeak Channels" href="http://community.thingspeak.com/tutorials/thingspeak-channels/">ThingSpeak Channels</a>&nbsp;</li>
@ -26,6 +26,7 @@
<li><a title="CheerLights with Arduino and the FastLED Library" href="http://community.thingspeak.com/tutorials/arduino/cheerlights-with-arduino-and-the-fastled-library/" target="_blank">CheerLights with Arduino and the FastLED Library</a></li>
<li><a title="RESTduino to ThingSpeak via Python" href="https://github.com/sirleech/RestduinoThingspeak" target="_blank">RESTduino to ThingSpeak via Python</a> [external]</li>
<li><a title="Arduino ThingSpeak Example Source Code is on GitHub" href="https://github.com/iobridge/ThingSpeak-Arduino-Examples" target="_blank">Arduino Examples for ThingSpeak on GitHub</a> [external]</li>
<li><a title="Freetronics Eleven Review and ThingSpeak Project" href="http://community.thingspeak.com/tutorials/freetronics/freetronics-eleven-review-and-thingspeak-project/">Freetronics Eleven Arduino Review and ThingSpeak Project</a></li>
</ul>
<h3>C</h3>
<ul>
@ -42,10 +43,6 @@
<li><a title="Battery-powered Temperature Logger with ThingSpeak + Electric Imp" href="http://www.slickstreamer.info/2014/01/simpel-electric-imp-temperature-logger.html">Battery-powered Temperature Logger with ThingSpeak + Electric Imp</a>&nbsp;[external]</li>
<li><a title="Solar-powered Temperature Logger with Electric Imp and ThingSpeak" href="https://gist.github.com/evilmachina/6402955">Solar-powered Temperature Logger with Electric Imp and ThingSpeak</a> [external]</li>
</ul>
<h3>Freetronics</h3>
<ul>
<li><a title="Freetronics Eleven Review and ThingSpeak Project" href="http://community.thingspeak.com/tutorials/freetronics/freetronics-eleven-review-and-thingspeak-project/">Freetronics Eleven Review and ThingSpeak Project</a></li>
</ul>
<h3>Google</h3>
<ul>
<li><a title="Google Gauge Visualization for a ThingSpeak Channel" href="http://community.thingspeak.com/google/display-a-google-gauge-visualization-using-thingspeak-plugins/">Display a Google Gauge Visualization using ThingSpeak Plugins</a></li>
@ -107,6 +104,10 @@
<li><a title="Using Arduino and Python to Update a ThingSpeak Channel" href="http://vimeo.com/19064691" target="_blank">Using Arduino and Python to Update a ThingSpeak Channel</a> </li>
<li><a title="Connecting Arduino to Thingspeak using python as an middle ware" href="http://tenettech.com/blogspot/?p=918" target="_blank">Connecting Arduino to ThingSpeak using Python as Middle-ware</a>&nbsp;[external]</li>
</ul>
<h3>Raspberry Pi</h3>
<ul>
<li><a title="ThingSpeak Temperature with Raspberry Pi" href="http://www.dexterindustries.com/BrickPi/projects/thingspeak-temperature-log/" target="_blank">ThingSpeak Temperature with Raspberry Pi and BrickPi</a> [external]</li>
</ul>
<h3>Ruby</h3>
<ul>
<li><a title="ThingSpeak Ruby Gem" href="http://community.thingspeak.com/tutorials/ruby/thingspeak-api-ruby-gem/" target="_blank">ThingSpeak API Ruby Gem</a></li>
@ -117,7 +118,8 @@
</ul>
<h3>Spark Core</h3>
<ul>
<li><a title="Spark Core Interface for ThingSpeak" href="https://community.spark.io/t/interface-for-thingspeak/2329">Spark Core Interface for ThingSpeak</a>&nbsp;[external [beta]</li>
<li><a title="Control, monitor, and log a Spark Core with ThingSpeak" href="http://community.spark.io/t/control-monitor-and-log-a-spark-core-with-thingspeak/10543">Control and Monitor a Spark Core with ThingSpeak</a>&nbsp;[external] [beta]</li>
<li><a title="Spark Core Interface for ThingSpeak" href="https://community.spark.io/t/interface-for-thingspeak/2329">Spark Core Interface for ThingSpeak</a>&nbsp;[external] [beta]</li>
</ul>
<h3>Twine</h3>
<ul>
@ -136,6 +138,10 @@
<ul>
<li><a title="How to Embed a ThingSpeak Chart on your WordPress Blog" href="http://community.thingspeak.com/wordpress/how-to-embed-a-thingspeak-chart-on-your-wordpress-blog/">How to Embed a ThingSpeak Chart on your WordPress Blog</a></li>
</ul>
<h3>Windows PowerShell</h3>
<ul>
<li><a title="Send data to ThingSpeak from a Windows PowerShell Script" href="https://github.com/nothans/ThingSpeak-PowerShell">Send Data to ThingSpeak from a Windows PowerShell Script</a></li>
</ul>
<h3>Wireless</h3>
<ul>
<li><a title="Connecting XBee Wireless Networks to ThingSpeak via the ConnectPort X2 running XIG" href="http://community.thingspeak.com/tutorials/wireless/connecting-xbee-wireless-networks-to-thingspeak-via-the-connectport-x2-running-xig/">Connecting XBee Wireless Networks to ThingSpeak via the ConnectPort X2 running XIG</a></li>

13
app/views/windows/_hidden_windows.html.erb
View File

@ -15,16 +15,13 @@
// add click handler
$(document).on('click', '.ioplugin', function() {
var plugins = $(".plugin");
var addPlugin = $(this);
var ids = addPlugin.attr('id').split("-");
var channelId = <%= params[:channel_id] %>;
var windowId =ids[1];
//Need to add data to this request to identify it as a plugin request
var data = {plugin:true, visibility_flag:"<%= @visibility %>"};
$.update("/channels/" + channelId + "/windows/"+ windowId + "/display" , data,
function(response) {
var channelId = <%= params[:channel_id] %>;
var windowId = ids[1];
$.update("/channels/" + channelId + "/windows/"+ windowId + "/display", {}, function(response) {
var window = response.window;
var window_type = window.window_type;
@ -79,7 +76,7 @@
<div id="tabs">
<ul>
<li><a href="#tabs-1">Windows</a></li>
<% if @visibility =="private" %>
<% if @visibility == "private" %>
<li><a href="/plugins/private_plugins?channel_id=<%= params[:channel_id] %>">Plugins</a></li>
<% else %>
<li><a href="/plugins/public_plugins?channel_id=<%= params[:channel_id] %>">Plugins</a></li>

5
spec/models/feed_spec.rb
View File

@ -26,6 +26,11 @@ require 'spec_helper'
describe Feed do
it "should not include location in feed.to_json" do
feed = Feed.new
JSON.parse(feed.to_json).keys.include?('location').should eq(false)
end
it "should close the connection when an exception is raised" do
# use a single connection for both queries
connection = ActiveRecord::Base.connection