lita-forecast 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77dfaba52cdabe395bd4f60f7567b5b231dd516c
-  data.tar.gz: e22e704c6c6d0e8b3a6e3263f9b485d98d1a0a2d
+  metadata.gz: 0ca70495987b9e91016e2d017d053fc7826b46bf
+  data.tar.gz: 7012323fbbdff18f5dd4d06bb49ec2c869517745
 SHA512:
-  metadata.gz: fcfd0ca40632c9157be12976da76c38c9912a76d475a35964d60437efa4c1b617844271f26ad5b3defa16f8f405ac0e0db7714123774e3a7a6a78eb2125e0d54
-  data.tar.gz: a57c3bef445dac1ce209c571482bc0505119d5cec6a34e203a707cbf27e6088b703520efb5e3eefc53ec1a91a58910ad9226d7a15c6907dfc4d51ff921c63688
+  metadata.gz: 6c23171c3445e152ebc2c387eced2664e8df2b349714642c571dbe942417eb007e68541d15f3932348c3fb2b42fc8c954cea4c727aa766309ecb42299c229f4e
+  data.tar.gz: 873076adb7b04093a1dad99307d350f56e0adef16d52291c10f7cff7fab060a2b83db122eb235d64c83fc3e3bcb16b10ccc933011366ef93dc643e4d86d5ab9e

data/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+lita-forecast
+=============
+
+CONTRIBUTING
+------------
+Something wrong or you want to submit an improvement? Fork the repo, make your
+changes on a feature branch, write some tests, and submit a pull request. I
+only ask that the commits have useful information and use proper/complete
+sentences.

data/README.md

@@ -17,10 +17,9 @@ provided in the `LICENSE` file.
 
 CONTRIBUTING
 ------------
-Something wrong or you want to submit an improvement? Fork the repo, make your
-changes on a feature branch, write some tests, and submit a pull request. I
-only ask that the commits have useful information and use proper/complete
-sentences.
+See [CONTRIBUTION.md](https://github.com/theckman/lita-forecast/blob/master/CONTRIBUTING.md)
+for information on contributing back to this project.
+
 
 INSTALLATION
 ------------

data/lib/lita/handlers/forecast/current.rb

@@ -7,6 +7,8 @@ module LitaForecast
   class Current
     include LitaForecast::Mixins
 
+    INFO_UNAVAIL ||= 'Information unavailable. :('
+
     def initialize(forecast)
       @f = forecast
     end
@@ -56,10 +58,14 @@ module LitaForecast
 
     def next_hour
       @f['minutely']['summary']
+    rescue
+      INFO_UNAVAIL
     end
 
     def today
       @f['hourly']['summary']
+    rescue
+      INFO_UNAVAIL
     end
   end
 end

data/lib/lita/handlers/forecast/location.rb

@@ -22,10 +22,33 @@ module LitaForecast
         gl = geo_location(g)
         loc = { lat: g['geometry']['location']['lat'],
                 lng: g['geometry']['location']['lng'],
-                desc: "#{gl[:city]}, #{gl[:state]}" }
+                desc: desc(gl) }
       end
 
       loc
     end
+
+    private
+
+    def desc(loc)
+      l = ''
+      h = { c: city(loc), s: state(loc) }
+      l << h[:c]
+      l << ', ' unless h[:c].empty? || h[:s].empty?
+      l << h[:s]
+      l
+    end
+
+    def city(loc)
+      c = ''
+      c << loc[:city] if loc[:city].is_a?(String) && !loc[:city].empty?
+      c
+    end
+
+    def state(loc)
+      s = ''
+      s << loc[:state] if loc[:state].is_a?(String) && !loc[:state].empty?
+      s
+    end
   end
 end

data/lib/lita-forecast/version.rb

@@ -24,5 +24,5 @@
 # LitaForcast module, just for version handling
 #
 module LitaForecast
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lita-forecast.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |g|
   g.test_files  = %x(git ls-files spec/*).split
   g.files       = %x(git ls-files).split
 
-  g.add_development_dependency 'bundler', '~> 1.5.3'
+  g.add_development_dependency 'bundler', '~> 1.5'
   g.add_development_dependency 'rake', '~> 10.2.2'
   g.add_development_dependency 'rubocop', '~> 0.19.1'
   g.add_development_dependency 'rspec', '>= 3.0.0.beta2'

data/spec/lita/handlers/forecast/current_spec.rb

@@ -20,7 +20,25 @@ describe LitaForecast::Current do
       'flags' => { 'units' => 'us' }
     }
   end
+  let(:missing_info_forecast) do
+    {
+      'currently' => {
+        'temperature' => 100.11,
+        'apparentTemperature' => 102.11,
+        'summary' => 'weather',
+        'windBearing' => 0,
+        'windSpeed' => 5.11,
+        'humidity' => 0.10,
+        'dewPoint' => 20.11,
+        'pressure' => 1020.11,
+        'cloudCover' => 0.01
+      },
+      'flags' => { 'units' => 'us' }
+    }
+  end
   let(:current) { described_class.new(forecast) }
+  let(:current_no_summary) { described_class.new(missing_info_forecast) }
+  let(:summary_fail) { 'Information unavailable. :(' }
 
   describe '#new' do
     context 'when given more than one arg' do
@@ -50,6 +68,14 @@ describe LitaForecast::Current do
     end
   end
 
+  describe '::INFO_UNAVAIL' do
+    subject { LitaForecast::Current::INFO_UNAVAIL }
+
+    it { should be_an_instance_of String }
+
+    it { should eql 'Information unavailable. :(' }
+  end
+
   describe '.currently' do
     context 'when given one arg' do
       it 'should raise error ArgumentError' do
@@ -210,7 +236,7 @@ describe LitaForecast::Current do
       end
     end
 
-    context 'when passed no args' do
+    context 'when there is a summary' do
       subject { current.send(:next_hour) }
       let(:next_hour) { 'minutely weather' }
 
@@ -218,6 +244,14 @@ describe LitaForecast::Current do
 
       it { should eql next_hour }
     end
+
+    context 'when there is not a summary' do
+      subject { current_no_summary.send(:next_hour) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql summary_fail }
+    end
   end
 
   describe '.today' do
@@ -229,7 +263,7 @@ describe LitaForecast::Current do
       end
     end
 
-    context 'when passed no args' do
+    context 'when there is a summary' do
       subject { current.send(:today) }
       let(:today) { 'hourly weather' }
 
@@ -237,6 +271,14 @@ describe LitaForecast::Current do
 
       it { should eql today }
     end
+
+    context 'when there is not a summary' do
+      subject { current_no_summary.send(:today) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql summary_fail }
+    end
   end
 
   describe '.conditions' do

data/spec/lita/handlers/forecast/location_spec.rb

@@ -65,6 +65,141 @@ describe LitaForecast::Location do
     end
   end
 
+  describe '.city' do
+    context 'when given more than one arg' do
+      it 'should raise ArgumentError' do
+        expect do
+          @lfloc.send(:city, nil, nil)
+        end.to raise_error ArgumentError
+      end
+    end
+
+    context 'when given less than one arg' do
+      it 'should raise ArgumentError' do
+        expect do
+          @lfloc.send(:city)
+        end.to raise_error ArgumentError
+      end
+    end
+
+    context 'when given a location with a city and state' do
+      let(:location) { { city: 'San Francisco', state: 'CA' } }
+      subject { @lfloc.send(:city, location) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'San Francisco' }
+    end
+
+    context 'when given a location with a city' do
+      let(:location) { { city: 'San Francisco' } }
+      subject { @lfloc.send(:city, location) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'San Francisco' }
+    end
+
+    context 'when given a location without a city' do
+      let(:location) { { state: 'CA' } }
+      subject { @lfloc.send(:city, location) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql '' }
+    end
+  end
+
+  describe '.state' do
+    context 'when given more than one arg' do
+      it 'should raise ArgumentError' do
+        expect do
+          subject.send(:state, nil, nil)
+        end.to raise_error ArgumentError
+      end
+    end
+
+    context 'when given less than one arg' do
+      it 'should raise ArgumentError' do
+        expect do
+          subject.send(:state)
+        end.to raise_error ArgumentError
+      end
+    end
+
+    context 'when given location with a city and a state' do
+      let(:location) { { city: 'San Francisco', state: 'CA' } }
+      subject { @lfloc.send(:state, location) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'CA' }
+    end
+
+    context 'when given location with a state' do
+      let(:location) { { state: 'CA' } }
+      subject { @lfloc.send(:state, location) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'CA' }
+    end
+
+    context 'when given location with only a city' do
+      let(:location) { { city: 'San Francisco' } }
+      subject { @lfloc.send(:state, location) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql '' }
+    end
+  end
+
+  describe '.desc' do
+    context 'when given more than one arg' do
+      it 'should raise ArgumentError' do
+        expect do
+          @lfloc.send(:desc, nil, nil)
+        end.to raise_error ArgumentError
+      end
+    end
+
+    context 'when given less than one arg' do
+      it 'should raise Argument Error' do
+        expect do
+          @lfloc.send(:desc)
+        end.to raise_error ArgumentError
+      end
+    end
+
+    context 'when provided a location with a city and state' do
+      let(:loc_hash) { { city: 'San Francisco', state: 'CA' } }
+      subject { @lfloc.send(:desc, loc_hash) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'San Francisco, CA'}
+    end
+
+    context 'when provided a location with only a state' do
+      let(:loc_hash) { { state: 'CA' } }
+      subject { @lfloc.send(:desc, loc_hash) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'CA' }
+    end
+
+    context 'when provided a location with only a city' do
+      let(:loc_hash) { { city: 'San Francisco' } }
+      subject { @lfloc.send(:desc, loc_hash) }
+
+      it { should be_an_instance_of String }
+
+      it { should eql 'San Francisco' }
+    end
+  end
+
   describe '.find_location' do
     before do
       allow_any_instance_of(Geocoder).to receive(:search)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-forecast
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tim Heckman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md