concerto_weather 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acebeaff05cdbf875e90d1929ffa584a6c78ccb4
-  data.tar.gz: 04eeccba7c5329131cf40af473f310388196b0d8
+  metadata.gz: 66dbd86c1fcd551ff92a1019010cc5642e8ef628
+  data.tar.gz: d6545a3861743532e2768736799713b469de392e
 SHA512:
-  metadata.gz: af8b5789f8f210d1174f485b904145ec4a3004ef1b2485f5329d6a629e0098f7ddf5783c425197805d2eaa5af490b959993d0b7ab3687d90000a9d67f573e1fa
-  data.tar.gz: 0e0c8a9c6974c8ed2ae4bd1227bc0433bce20d25a9b5d056ed4e9b67acaa8dd7613bf97ea138de2789884bf89a2712e729be0fd9d4d674c18a7e0352f7f41074
+  metadata.gz: 5a612c4c53a755b0dc0a058e9ea9d822f8bd026e21c5557b553f21674654a29d9329c576152360bbfc1d05e92639f83b35cb25a9c93b1895f56a419e51e18d02
+  data.tar.gz: 68f382ef74de15dff7913521d3cecfc7535bff2729573a53040447b0b93f4d3d72bb2956c5dc6150384fac42bedae481aef63ef905b8b181bebff480d5e78aee

data/README.md

@@ -7,7 +7,8 @@ Concerto 2 Weather is licensed under the Apache License, Version 2.0.
 
 ## Installation 
 1. Visit the plugin management page in Concerto, select RubyGems as the source and "concerto_weather" as the gem name.
-2. For any issues displaying the custom weather icons, make sure to precompile assets using:
+2. Visit the settings page (admin category on the nav bar) and enter your [OpenWeatherMap API key](http://openweathermap.org/appid) under the "API Keys" tab. 
+3. For any issues displaying the custom weather icons, make sure to precompile assets using:
 
     (for production)
     ``` RAILS_ENV=production rake assets:precompile```

data/app/models/weather.rb

@@ -10,9 +10,9 @@ class Weather < DynamicContent
     require 'json'
     require 'net/http'
 
-    # Build request url 
+    # Build request url
     params = {
-      q: self.config['location'],
+      id: self.config['city_id'],
       units: self.config['units'],
       cnt: 1,
       mode: 'json',
@@ -24,9 +24,8 @@ class Weather < DynamicContent
     # Make request to OpenWeatherMapAPI
     response = Net::HTTP.get_response(URI.parse(url)).body
     data = JSON.parse(response)
-    
+
     # Build HTML using API data
-    #<img src='http://api.openweathermap.org/img/w/#{data['list'][0]['weather'][0]['icon']}' />
     rawhtml = "
                 <h1> Today in #{data['city']['name']} </h1>
                 <div style='float: left; width: 50%'>
@@ -45,12 +44,13 @@ class Weather < DynamicContent
     htmltext.name = "Today's weather in #{data['city']['name']}"
     htmltext.data = rawhtml
 
+    self.config["location_name"] = data["city"]["name"]
     return [htmltext]
   end
 
   # Weather needs a location.  Also allow specification of units
   def self.form_attributes
     attributes = super()
-    attributes.concat([:config => [:location, :units]])
+    attributes.concat([:config => [:city_id, :units, :location_name]])
   end
-end
+end

data/app/views/contents/weather/_form_top.html.erb

@@ -7,9 +7,9 @@
     <div class='span4'>
     <%= form.fields_for :config do |config| %>
       <div class="clearfix">
-        <%= config.label :location, "City" %>
+        <%= config.label :city_id, "City ID" %>
         <div class="input">
-          <%= config.text_field :location, placeholder: "Sydney", value: @content.config['location'] %>
+          <%= config.text_field :city_id, placeholder: "1273294", value: @content.config['city_id'] %>
         </div>
       </div>
       <div class="clearfix">

data/app/views/contents/weather/_render_default.html.erb

@@ -1,7 +1,7 @@
 <dl>
   <h1>Weather</h1>
   <dt>City</dt>
-  <dd><%= content.config['location'] %></dd>
+  <dd><%= content.config['location_name'] %></dd>
   <dt>Units</dt>
   <dd><%= Weather::UNITS[content.config['units']] %></dd>
   <dt>Last Successful Update</dt>

data/app/views/contents/weather/_render_tile.html.erb

@@ -1 +1 @@
-<h1>Weather for <%= content.config['location'] %></h1>
+<h1>Weather for <%= content.config['location_name'] %></h1>

data/lib/concerto_weather/version.rb

@@ -1,3 +1,3 @@
 module ConcertoWeather
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concerto_weather
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Michalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Weather plugin for Concerto 2.