open-weather-api 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a5a0437a5df3681e01d999042349f65a262edd
-  data.tar.gz: 58658dab6c7aae11b3946d73de3f61aabf3c32e0
+  metadata.gz: 436fa2c7c481014d726c6b5fbe94b0cbc77cf507
+  data.tar.gz: e2708147d1b78d1cea762a791b4fef81444dfd3b
 SHA512:
-  metadata.gz: 81e3fcf7f66b33d7b64af4ba6d3ddab30b80c63cdfa37c31150b2bbff313c3c9aea6071ddb728ab09592acebb4da15db9346fd8283d9791717216b2a28de8a4c
-  data.tar.gz: d64654935917d1ef3342685b77edf356d14ea6f490e8a1da4e983736fe595cad4a9a26840b01fa7ef2948f6be66f40fb20b186b859e3ad665d4aecdd7060b1d1
+  metadata.gz: 9201525c0082f3923197a37d7d865904dcd02e14e2140a23b3ddbd638e77ecd65abc44829917458559f6725db900b6537382a8fdd8857bd979b9c948db568306
+  data.tar.gz: 8e657d1ec3e72cf57bec4a0c8dad89b34d1a7a756e2b4663fe66c21691fd3f78a85412ac1e542ea1fd8d54769a9d0470187c0e7f5c2e1255d5729a78e28b18e1

data/.rspec

@@ -1,2 +1,2 @@
---color
+--color
 --format Fuubar

data/CONTRIBUTING.md

@@ -1,9 +1,9 @@
-# Contributing
-
-1. Fork it ( [https://gitlab.com/wikiti-random-stuff/open-weather-api/fork/new](https://gitlab.com/wikiti-random-stuff/open-weather-api/fork/new) )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-	- Feel free to add yourself to *README.md*'s authors :smile:. 
-4. Run tests (`rake test`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Merge Request
+# Contributing
+
+1. Fork it ( [https://gitlab.com/wikiti-random-stuff/open-weather-api/fork/new](https://gitlab.com/wikiti-random-stuff/open-weather-api/fork/new) )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+	- Feel free to add yourself to *README.md*'s authors :smile:. 
+4. Run tests (`rake test`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Merge Request

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
-
+source "http://rubygems.org"
+
 gemspec

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

@@ -1,57 +1,57 @@
-module OpenWeatherAPI
-  class API
-
-    VERSION = "2.5"
-
-    attr_accessor :api_key, :default_language, :default_country_code, :default_units
-
-    def initialize(options = {})
-      @api_key = options[:api_key] || options['api_key']
-      @default_language = options[:default_language] || options['default_language'] || 'en'
-      @default_country_code = options[:default_country_code] || options['default_country_code']
-      @default_units =  options[:default_units] || options['default_units'] || 'metric'
-    end
-
-    def current(**args, &block)
-      fetch_current.execute(**args, &block)
-    end
-
-    def forecast(type = :hourly, **args, &block)
-      raise "Invalid '#type' forecast type" unless valid_forecast_type?(type)
-
-      self.send("fetch_forecast_#{type}").execute(**args, &block)
-    end
-
-    def raw(path = "/", **args, &block)
-      fetch_raw.execute(path, **args, &block)
-    end
-
-    def icon_url(icon_code)
-      "http://openweathermap.org/img/w/#{icon_code}.png"
-    end
-
-    private
-
-    VALID_FORECAST_TYPES = [:hourly, :daily]
-
-    def valid_forecast_type?(type)
-      VALID_FORECAST_TYPES.include? type.to_sym
-    end
-
-    def fetch_raw
-      @current ||= Resources::Raw.new self
-    end
-
-    def fetch_current
-      @current ||= Resources::Current.new self
-    end
-
-    def fetch_forecast_hourly
-      @forecast_hourly ||= Resources::ForecastHourly.new self
-    end
-
-    def fetch_forecast_daily
-      @forecast_daily ||= Resources::ForecastHourly.new self
-    end
-  end
+module OpenWeatherAPI
+  class API
+
+    VERSION = "2.5"
+
+    attr_accessor :api_key, :default_language, :default_country_code, :default_units
+
+    def initialize(options = {})
+      @api_key = options[:api_key] || options['api_key']
+      @default_language = options[:default_language] || options['default_language'] || 'en'
+      @default_country_code = options[:default_country_code] || options['default_country_code']
+      @default_units =  options[:default_units] || options['default_units'] || 'metric'
+    end
+
+    def current(**args, &block)
+      fetch_current.execute(**args, &block)
+    end
+
+    def forecast(type = :hourly, **args, &block)
+      raise "Invalid '#type' forecast type" unless valid_forecast_type?(type)
+
+      self.send("fetch_forecast_#{type}").execute(**args, &block)
+    end
+
+    def raw(path = "/", **args, &block)
+      fetch_raw.execute(path, **args, &block)
+    end
+
+    def icon_url(icon_code)
+      "http://openweathermap.org/img/w/#{icon_code}.png"
+    end
+
+    private
+
+    VALID_FORECAST_TYPES = [:hourly, :daily]
+
+    def valid_forecast_type?(type)
+      VALID_FORECAST_TYPES.include? type.to_sym
+    end
+
+    def fetch_raw
+      @current ||= Resources::Raw.new self
+    end
+
+    def fetch_current
+      @current ||= Resources::Current.new self
+    end
+
+    def fetch_forecast_hourly
+      @forecast_hourly ||= Resources::ForecastHourly.new self
+    end
+
+    def fetch_forecast_daily
+      @forecast_daily ||= Resources::ForecastHourly.new self
+    end
+  end
 end

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

@@ -1,9 +1,9 @@
-module OpenWeatherAPI
-  def self.configure(&block)
-    raise ArgumentError, 'No block was given.' unless block
-
-    api = Rails.configuration.open_weather_api = OpenWeatherAPI::API.new
-    block.call(api)
-    api
-  end
+module OpenWeatherAPI
+  def self.configure(&block)
+    raise ArgumentError, 'No block was given.' unless block
+
+    api = Rails.configuration.open_weather_api = OpenWeatherAPI::API.new
+    block.call(api)
+    api
+  end
 end

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

@@ -1,67 +1,67 @@
-module OpenWeatherAPI
-  module Resources
-    class Base
-
-      attr_reader :api_obj
-
-      def initialize(api_obj)
-        @api_obj = api_obj
-      end
-
-      def execute(**hash, &block)
-        @parameters = hash
-        setup_indifferent_access(@parameters)
-
-        # Let's use json
-        response = RestClient.send :get, base_url, params: build_params(@parameters)
-        raise "Invalid response." unless response.code == 200
-
-        # Handle the response format 
-        response = self.send "handle_response_#{mode}", response
-
-        # Handle the block
-        return block.call(response) if block_given?
-        response
-      end
-
-      private
-
-      def mode
-        (@parameters[:mode] || :json).to_s.to_sym
-      end
-
-      def handle_response_raw(response)
-        response
-      end
-
-      def handle_response_json(response)
-        json = JSON.parse(response.body)
-        setup_indifferent_access(json)
-      end
-
-      def handle_response_xml(response)
-        response.body
-      end
-
-      def handle_response_html(response)
-        response.body
-      end
-
-      def base_url
-        "http://api.openweathermap.org/data/#{API::VERSION || '2.5'}/"
-      end
-
-      def setup_indifferent_access(sub_hash)
-        sub_hash.default_proc = proc{|h, k| h.key?(k.to_s) ? h[k.to_s] : nil}
-        sub_hash.each { |k, v| setup_indifferent_access(v) if v.is_a?(Hash) }
-      end
-
-      def build_params(parameters = {})
-        {
-          APPID: @api_obj.api_key,
-          lang:  @api_obj.default_language
-        }.merge(parameters)
-      end
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    class Base
+
+      attr_reader :api_obj
+
+      def initialize(api_obj)
+        @api_obj = api_obj
+      end
+
+      def execute(**hash, &block)
+        @parameters = hash
+        setup_indifferent_access(@parameters)
+
+        # Let's use json
+        response = RestClient.send :get, base_url, params: build_params(@parameters)
+        raise "Invalid response." unless response.code == 200
+
+        # Handle the response format 
+        response = self.send "handle_response_#{mode}", response
+
+        # Handle the block
+        return block.call(response) if block_given?
+        response
+      end
+
+      private
+
+      def mode
+        (@parameters[:mode] || :json).to_s.to_sym
+      end
+
+      def handle_response_raw(response)
+        response
+      end
+
+      def handle_response_json(response)
+        json = JSON.parse(response.body)
+        setup_indifferent_access(json)
+      end
+
+      def handle_response_xml(response)
+        response.body
+      end
+
+      def handle_response_html(response)
+        response.body
+      end
+
+      def base_url
+        "http://api.openweathermap.org/data/#{API::VERSION || '2.5'}/"
+      end
+
+      def setup_indifferent_access(sub_hash)
+        sub_hash.default_proc = proc{|h, k| h.key?(k.to_s) ? h[k.to_s] : nil}
+        sub_hash.each { |k, v| setup_indifferent_access(v) if v.is_a?(Hash) }
+      end
+
+      def build_params(parameters = {})
+        {
+          APPID: @api_obj.api_key,
+          lang:  @api_obj.default_language
+        }.merge(parameters)
+      end
+    end
+  end
 end

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

@@ -1,45 +1,45 @@
-module OpenWeatherAPI
-  module Resources
-    class Current < Base
-
-      def base_url
-        return super + 'group/'    if city_id.multiple?
-        return super + 'weather/'  if [city, city_id, geolocation, zipcode].any? { |h| h.can? }
-        return super + 'box/city/' if bbox.can?
-        return super + 'find/'     if circle.can?
-      end
-
-      def build_params(parameters = {})
-        super [city, city_id, geolocation, zipcode, bbox, circle].each{ |h| break h.handle if h.can? }
-      end
-
-      # Simple handlers
-      def city
-        Handlers::City.new @api_obj, @parameters
-      end
-
-      def city_id
-        Handlers::CityID.new @api_obj, @parameters
-      end
-
-      def geolocation
-        Handlers::Geolocation.new @api_obj, @parameters
-      end
-
-      def zipcode
-        Handlers::Zipcode.new @api_obj, @parameters
-      end
-
-      # Other handlers
-      # ------------------
-      def bbox
-        Handlers::BoundingBox.new @api_obj, @parameters
-      end
-      
-      def circle
-        Handlers::Circle.new @api_obj, @parameters
-      end
-
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    class Current < Base
+
+      def base_url
+        return super + 'group/'    if city_id.multiple?
+        return super + 'weather/'  if [city, city_id, geolocation, zipcode].any? { |h| h.can? }
+        return super + 'box/city/' if bbox.can?
+        return super + 'find/'     if circle.can?
+      end
+
+      def build_params(parameters = {})
+        super [city, city_id, geolocation, zipcode, bbox, circle].each{ |h| break h.handle if h.can? }
+      end
+
+      # Simple handlers
+      def city
+        Handlers::City.new @api_obj, @parameters
+      end
+
+      def city_id
+        Handlers::CityID.new @api_obj, @parameters
+      end
+
+      def geolocation
+        Handlers::Geolocation.new @api_obj, @parameters
+      end
+
+      def zipcode
+        Handlers::Zipcode.new @api_obj, @parameters
+      end
+
+      # Other handlers
+      # ------------------
+      def bbox
+        Handlers::BoundingBox.new @api_obj, @parameters
+      end
+      
+      def circle
+        Handlers::Circle.new @api_obj, @parameters
+      end
+
+    end
+  end
 end

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

@@ -1,19 +1,19 @@
-module OpenWeatherAPI
-  module Resources
-    class ForecastDaily < ForecastHourly
-
-      def base_url
-        return super + 'daily/'
-      end
-
-      def build_params(parameters = {})
-        parameters.merge!(cnt: days)
-        super(parameters)
-      end
-
-      def days
-        @parameters[:days] || @parameters[:n_days] || @parameters[:cnt]  || @parameters[:count]
-      end
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    class ForecastDaily < ForecastHourly
+
+      def base_url
+        return super + 'daily/'
+      end
+
+      def build_params(parameters = {})
+        parameters.merge!(cnt: days)
+        super(parameters)
+      end
+
+      def days
+        @parameters[:days] || @parameters[:n_days] || @parameters[:cnt]  || @parameters[:count]
+      end
+    end
+  end
 end

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

@@ -1,28 +1,28 @@
-module OpenWeatherAPI
-  module Resources
-    class ForecastHourly < Base
-
-      def base_url
-        return super + 'forecast/'
-      end
-
-      def build_params(parameters = {})
-        super [city, city_id, geolocation].each{ |h| break h.handle if h.can? }
-      end
-
-      # Simple handlers
-      def city
-        Handlers::City.new @api_obj, @parameters
-      end
-
-      def city_id
-        Handlers::CityID.new @api_obj, @parameters
-      end
-
-      def geolocation
-        Handlers::Geolocation.new @api_obj, @parameters
-      end
-
-    end
-  end
+module OpenWeatherAPI
+  module Resources
+    class ForecastHourly < Base
+
+      def base_url
+        return super + 'forecast/'
+      end
+
+      def build_params(parameters = {})
+        super [city, city_id, geolocation].each{ |h| break h.handle if h.can? }
+      end
+
+      # Simple handlers
+      def city
+        Handlers::City.new @api_obj, @parameters
+      end
+
+      def city_id
+        Handlers::CityID.new @api_obj, @parameters
+      end
+
+      def geolocation
+        Handlers::Geolocation.new @api_obj, @parameters
+      end
+
+    end
+  end
 end