open-weather-api 0.0.6 → 0.0.7

data/lib/open-weather-api/resources/handlers/base.rb

@@ -1,99 +1,99 @@
-module OpenWeatherAPI
-  module Resources
-    module Handlers
-
-      class QueryHandler
-        def initialize(api_obj, parameters = {})
-          @api_obj = api_obj
-          @parameters = parameters
-        end
-
-        def handle
-          build if can?
-        end
-
-        def can?
-          value != nil
-        end
-
-        private
-
-        def value
-          true
-        end
-
-        def build
-          @parameters
-        end
-
-        def country_code
-          @parameters[:country_code] || @parameters[:cc] || @api_obj.default_country_code
-        end
-
-        def cities_count
-          @parameters[:count] || @parameters[:cnt] || @parameters[:cities_count]
-        end
-
-        def cluster
-          @parameters[:cluster] if @parameters[:cluster].to_s == 'yes' || @parameters[:cluster].to_s == 'no'
-        end
-
-        def fill(hash)
-          hash[:cnt]     = cities_count if cities_count
-          hash[:cluster] = cluster if cluster
-
-          hash
-        end
-      end
-
-      class City < QueryHandler
-        private
-
-        def build
-          { q: [value, country_code].compact.flatten.join(',') }
-        end
-        
-        def value
-          @parameters[:city]
-        end
-      end
-
-      class CityID < QueryHandler
-        def multiple?
-          value.is_a? Array
-        end
-
-        private
-
-        def build
-          { id: [value].flatten.compact.join(',') }
-        end
-
-        def value
-          @parameters[:id] || @parameters[:city_id]
-        end
-      end
-
-      class Geolocation < QueryHandler
-        def can?
-          latitude != nil && longitude != nil
-        end
-
-        private
-
-        def build
-          { lat: latitude, lon: longitude }
-        end
-
-        def latitude
-          @parameters[:latitude] || @parameters[:lat]
-        end
-
-        def longitude
-          @parameters[:longitude] || @parameters[:lon]
-        end
-      end
-
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    module Handlers
+
+      class QueryHandler
+        def initialize(api_obj, parameters = {})
+          @api_obj = api_obj
+          @parameters = parameters
+        end
+
+        def handle
+          build if can?
+        end
+
+        def can?
+          value != nil
+        end
+
+        private
+
+        def value
+          true
+        end
+
+        def build
+          @parameters
+        end
+
+        def country_code
+          @parameters[:country_code] || @parameters[:cc] || @api_obj.default_country_code
+        end
+
+        def cities_count
+          @parameters[:count] || @parameters[:cnt] || @parameters[:cities_count]
+        end
+
+        def cluster
+          @parameters[:cluster] if @parameters[:cluster].to_s == 'yes' || @parameters[:cluster].to_s == 'no'
+        end
+
+        def fill(hash)
+          hash[:cnt]     = cities_count if cities_count
+          hash[:cluster] = cluster if cluster
+
+          hash
+        end
+      end
+
+      class City < QueryHandler
+        private
+
+        def build
+          { q: [value, country_code].compact.flatten.join(',') }
+        end
+        
+        def value
+          @parameters[:city]
+        end
+      end
+
+      class CityID < QueryHandler
+        def multiple?
+          value.is_a? Array
+        end
+
+        private
+
+        def build
+          { id: [value].flatten.compact.join(',') }
+        end
+
+        def value
+          @parameters[:id] || @parameters[:city_id]
+        end
+      end
+
+      class Geolocation < QueryHandler
+        def can?
+          latitude != nil && longitude != nil
+        end
+
+        private
+
+        def build
+          { lat: latitude, lon: longitude }
+        end
+
+        def latitude
+          @parameters[:latitude] || @parameters[:lat]
+        end
+
+        def longitude
+          @parameters[:longitude] || @parameters[:lon]
+        end
+      end
+
+    end
+  end
 end

data/lib/open-weather-api/resources/handlers/current.rb

@@ -1,55 +1,55 @@
-module OpenWeatherAPI
-  module Resources
-    module Handlers
-
-      class Zipcode < QueryHandler
-        private
-
-        def build
-          { zip: [value, country_code].compact.flatten.join(',') }
-        end
-        
-        def value
-          @parameters[:zipcode] || @parameters[:zip]
-        end
-      end
-      
-      class BoundingBox < QueryHandler
-        private
-        
-        def topleft
-          [ value[:topleft][:lat], value[:topleft][:lon] ].join(',')
-        end
-
-        def bottomright
-          [ value[:bottomright][:lat], value[:bottomright][:lon] ].join(',')
-        end
-
-        def zoom
-          value[:zoom] || value[:map_zoom] || 10
-        end
-
-        def value
-          @parameters[:box] || @parameters[:box] || @parameters[:rect] || @parameters[:rectangle]
-        end
-
-        def build
-          fill bbox: [topleft, bottomright, zoom].join(',')
-        end
-      end
-
-      class Circle < QueryHandler
-        private
-
-        def value
-          @parameters[:circle]
-        end
-
-        def build
-          fill lat: value[:lat], lon: value[:lon]
-        end
-      end
-
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    module Handlers
+
+      class Zipcode < QueryHandler
+        private
+
+        def build
+          { zip: [value, country_code].compact.flatten.join(',') }
+        end
+        
+        def value
+          @parameters[:zipcode] || @parameters[:zip]
+        end
+      end
+      
+      class BoundingBox < QueryHandler
+        private
+        
+        def topleft
+          [ value[:topleft][:lat], value[:topleft][:lon] ].join(',')
+        end
+
+        def bottomright
+          [ value[:bottomright][:lat], value[:bottomright][:lon] ].join(',')
+        end
+
+        def zoom
+          value[:zoom] || value[:map_zoom] || 10
+        end
+
+        def value
+          @parameters[:box] || @parameters[:box] || @parameters[:rect] || @parameters[:rectangle]
+        end
+
+        def build
+          fill bbox: [topleft, bottomright, zoom].join(',')
+        end
+      end
+
+      class Circle < QueryHandler
+        private
+
+        def value
+          @parameters[:circle]
+        end
+
+        def build
+          fill lat: value[:lat], lon: value[:lon]
+        end
+      end
+
+    end
+  end
 end

data/lib/open-weather-api/resources/raw.rb

@@ -1,15 +1,15 @@
-module OpenWeatherAPI
-  module Resources
-    class Raw < Base
-
-      def execute(resource = '/', **args, &block)
-        @resource = resource
-        super(**args, &block)
-      end
-
-      def base_url
-        return super + @resource
-      end
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    class Raw < Base
+
+      def execute(resource = '/', **args, &block)
+        @resource = resource
+        super(**args, &block)
+      end
+
+      def base_url
+        return super + @resource
+      end
+    end
+  end
 end

data/lib/open-weather-api/version.rb

@@ -1,3 +1,3 @@
 module OpenWeatherAPI
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/open-weather-api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rest-client", "~> 1.8"
+  spec.add_runtime_dependency "rest-client", "~> 2.0"
 
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "fuubar"

data/rakefile

@@ -1,28 +1,29 @@
-# Gemspec
-load 'open-weather-api.gemspec'
-
-# Dependencies
-require 'open-weather-api'
-require 'fileutils'
-
-
-# Build
-
-built_gem_file = "open-weather-api-#{OpenWeatherAPI::VERSION}.gem"
-
-task :build do
-  # Build the gem
-  sh 'gem build open-weather-api.gemspec'
-
-  # Move it to /build
-  FileUtils.mv "#{built_gem_file}", "build/#{built_gem_file}", force: true
-end
-
-task publish: [:build] do
-  sh "gem push build/#{built_gem_file}"
-end
-
-# Test
-task :test do
-  sh 'bundle exec rspec spec'
-end
+# Gemspec
+load 'open-weather-api.gemspec'
+
+# Dependencies
+require 'open-weather-api'
+require 'fileutils'
+
+
+# Build
+
+built_gem_file = "open-weather-api-#{OpenWeatherAPI::VERSION}.gem"
+
+task :build do
+  # Build the gem
+  sh 'gem build open-weather-api.gemspec'
+
+  # Move it to /build
+  FileUtils.mkdir_p "build/"
+  FileUtils.mv "#{built_gem_file}", "build/#{built_gem_file}", force: true
+end
+
+task publish: [:build] do
+  sh "gem push build/#{built_gem_file}"
+end
+
+# Test
+task :test do
+  sh 'bundle exec rspec spec'
+end

data/spec/current_weather_spec.rb

@@ -1,51 +1,51 @@
-require 'spec_helper'
-
-describe OpenWeatherAPI::API do
-  describe 'When fetching current weather' do
-    let(:api) { OpenWeatherAPI::API.new( api_key: ENV['OPEN_WEATHER_API_KEY'], default_language: 'es', default_country_code: 'es' ) }
-
-    it 'should retrieve data by city name' do
-      expect(api.current(city: 'Santa Cruz de Tenerife')[:cod].to_i).to eq(200)
-    end
-
-    it 'should retrieve data by city id' do
-      expect(api.current(id: 6360638)[:cod].to_i).to eq(200)
-    end
-
-    it 'should retrieve data by cities ids' do
-      response = api.current(id: [6360638, 2511401])
-      expect(response[:cod].to_i).not_to be >= 400
-    end
-
-    it 'should retrieve data by geolocation' do
-      expect(api.current(lon: -16.20302, lat: 28.53924)[:cod].to_i).to eq(200)
-    end
-
-    it 'should retrieve data by zipcode' do
-      expect(api.current(zipcode: 38190)[:cod].to_i).to eq(200)
-    end
-
-    it 'should retrieve data by bounding box' do
-      expect(api.current(rectangle: { topleft: { lat: -16.3319, lon: 28.5046 }, bottomright: { lat: -16.1972, lon: 28.4400}, zoom: 10 })[:cod].to_i).to eq(200)
-    end
-
-    it 'should retrieve data by circle' do
-      expect(api.current(circle: { lat: -16.3319, lon: 28.5046 }, cities_count: 2)[:cod].to_i).to eq(200)
-    end
-
-    it 'works with a given block' do
-      json1, json2 = nil
-      json1 = api.current(city: 'Santa Cruz de Tenerife') { |json| json2 = json }
-
-      expect(json1).to eq(json2)
-    end
-
-    it 'works with xml format' do
-      expect(api.current(city: 'Santa Cruz de Tenerife', mode: :xml)).not_to be_nil
-    end
-
-    it 'works with html format' do
-      expect(api.current(city: 'Santa Cruz de Tenerife', mode: :html)).not_to be_nil
-    end
-  end
+require 'spec_helper'
+
+describe OpenWeatherAPI::API do
+  describe 'When fetching current weather' do
+    let(:api) { OpenWeatherAPI::API.new( api_key: ENV['OPEN_WEATHER_API_KEY'], default_language: 'es', default_country_code: 'es' ) }
+
+    it 'should retrieve data by city name' do
+      expect(api.current(city: 'Santa Cruz de Tenerife')[:cod].to_i).to eq(200)
+    end
+
+    it 'should retrieve data by city id' do
+      expect(api.current(id: 6360638)[:cod].to_i).to eq(200)
+    end
+
+    it 'should retrieve data by cities ids' do
+      response = api.current(id: [6360638, 2511401])
+      expect(response[:cod].to_i).not_to be >= 400
+    end
+
+    it 'should retrieve data by geolocation' do
+      expect(api.current(lon: -16.20302, lat: 28.53924)[:cod].to_i).to eq(200)
+    end
+
+    it 'should retrieve data by zipcode' do
+      expect(api.current(zipcode: 38190)[:cod].to_i).to eq(200)
+    end
+
+    it 'should retrieve data by bounding box' do
+      expect(api.current(rectangle: { topleft: { lat: -16.3319, lon: 28.5046 }, bottomright: { lat: -16.1972, lon: 28.4400}, zoom: 10 })[:cod].to_i).to eq(200)
+    end
+
+    it 'should retrieve data by circle' do
+      expect(api.current(circle: { lat: -16.3319, lon: 28.5046 }, cities_count: 2)[:cod].to_i).to eq(200)
+    end
+
+    it 'works with a given block' do
+      json1, json2 = nil
+      json1 = api.current(city: 'Santa Cruz de Tenerife') { |json| json2 = json }
+
+      expect(json1).to eq(json2)
+    end
+
+    it 'works with xml format' do
+      expect(api.current(city: 'Santa Cruz de Tenerife', mode: :xml)).not_to be_nil
+    end
+
+    it 'works with html format' do
+      expect(api.current(city: 'Santa Cruz de Tenerife', mode: :html)).not_to be_nil
+    end
+  end
 end