open-weather-api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49dda5814718454abaf2b857407b17e071a19f6d
-  data.tar.gz: b3037f267453d565228cf4357fcb01923b31f359
+  metadata.gz: 65b0e18d84c87ea5d6bc9709a9a816e8d3255f95
+  data.tar.gz: e875db9ab10e3106fdebfc71c167e5c59e9fb783
 SHA512:
-  metadata.gz: 1e980c13e0c064cc4861093438275f131abc1a30ad591f687ab272fef2a6d26d14a7bebc8aeebfb55b38a77b70bdb4f499c182e1ff6275742b8856a3c4ca0ddb
-  data.tar.gz: c3b5a7c89c8cbc4dd052fbb5e46627c841e9b87d66e5e0b214302c7f3048b57e2e7cc1aeb8b90c88123dd27df320ddab1a77f58c3a860c6753cd94f9550c8741
+  metadata.gz: 3a4b690505ec259f619696b0bbe217fcab3acb5972c9683fb101154aa248a5a75912b5be20828aff24c2d9f33cfd6fea12cf458597793235973dbcb84ad5d4eb
+  data.tar.gz: c60e78f5eddd4aae49efe20392035c728de3731cb9d56f27d36982c08cc6caaafa9afbf1fab55fa3c3b0f1d15d48b716358a86949ca9dfa33be89edad287fa1b

data/README.md

@@ -96,17 +96,27 @@ json = open_weather_api.current circle: { lat: -16.3319, lon: 28.5046 }, cities_
 You can also use ruby blocks to handle the response:
 
 ````ruby
-open_weather_api.current city: 'Santa Cruz de Tenerife', country_code: 'es' do |json|
+json = open_weather_api.current city: 'Santa Cruz de Tenerife', country_code: 'es' do |json|
   puts JSON.pretty_generate(json)
 end
 ````
 
-For more information about the API, visit (http://openweathermap.org/current)[http://openweathermap.org/current].
+For more information about the API, visit [http://openweathermap.org/current](http://openweathermap.org/current).
 
 ### Forecast
 
 TODO.
 
+### Other
+
+Retrieve icon url:
+
+````ruby
+api.current city: 'Santa Cruz de Tenerife', country_code: 'es' do |json|
+  puts "Icon url: #{api.icon_url json['weather'].first['icon']}"
+end
+````
+
 ## Authors ##
 
 This project has been developed by:
@@ -117,7 +127,7 @@ This project has been developed by:
 
 ## Contributing
 
-1. Fork it ( http://github.com/wikiti/open-weather-api/fork )
+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'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/open-weather-api.rb

@@ -6,6 +6,8 @@ require 'rest-client'
 require 'json'
 
 # Main files
-require 'open-weather-api/resources/base_resource'
+require 'open-weather-api/resources/base'
 require 'open-weather-api/resources/current'
+require 'open-weather-api/resources/handlers/base'
+require 'open-weather-api/resources/handlers/current'
 require 'open-weather-api/api'

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

@@ -1,157 +1,45 @@
 module OpenWeatherAPI
   module Resources
-    class Current < Base    
-      private
-      
+    class Current < Base
+
       def base_url
-        return super + 'group'    if is_multiple_city_id?
-        return super + 'weather'  if is_city? || is_city_id? || is_geolocation? || is_zipcode?
-        return super + 'box/city' if is_bbox?
-        return super + 'find'     if is_circle?
+        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 build_for_city || build_for_multiple || build_for_city_id || build_for_geolocation || build_for_zipcode || build_for_bbox || build_for_circle
-      end
-
-      # Basic city
-      # ------------------
-      
-      # For city
-      def is_city?
-        city != nil
+        super [city, city_id, geolocation, zipcode, bbox, circle].each{ |h| break h.handle if h.can? }
       end
 
+      # Simple handlers
       def city
-        @parameters[:city]
+        City.new @parameters
       end
 
-      def country_code
-        @parameters[:country_code] || @api_obj.default_country_code
-      end
-
-      def build_for_city
-        return { q: [city, country_code].compact.flatten.join(',') } if is_city?
-      end
-
-      # For city id
-      def is_city_id?
-        city_id != nil
-      end
-      
-      def is_multiple_city_id?
-        city_id.is_a? Array
-      end
-      
       def city_id
-        @parameters[:id] || @parameters[:city_id]
-      end
-
-      def build_for_city_id
-        return { id: city_id } if is_city_id?
-      end
-
-      def build_for_multiple
-        return { id: city_id.compact.join(',') } if is_multiple_city_id?
-      end
-      
-      # For geolocation
-      def is_geolocation?
-        geolocation[:lat] != nil && geolocation[:lon] != nil
+        CityID.new @parameters
       end
 
       def geolocation
-        {
-          lat: latitude,
-          lon: longitude
-        }
-      end
-
-      def latitude
-        @parameters[:latitude] || @parameters[:lat]
-      end
-
-      def longitude
-        @parameters[:longitude] || @parameters[:lon]
-      end
-
-      def build_for_geolocation
-        return geolocation if is_geolocation?
-      end
-
-      # For zip code
-      def is_zipcode?
-        zipcode != nil
+        Geolocation.new @parameters
       end
 
       def zipcode
-        @parameters[:zipcode] || @parameters[:zip]
-      end
-
-      def build_for_zipcode
-        return { zip: [zipcode, country_code].compact.flatten.join(',') } if is_zipcode?
+        Zipcode.new @parameters
       end
 
-      # Multiples cities
+      # Other handlers
       # ------------------
-
-      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
-
-      # Bounding box
-      def is_bbox?
-        bbox != nil
-      end
-
-      def bbox_top
-        [ bbox[:topleft][:lat], bbox[:topleft][:lon] ].join(',')
-      end
-
-      def bbox_bottom
-        [ bbox[:bottomright][:lat], bbox[:bottomright][:lon] ].join(',')
-      end
-
-      def bbox_zoom
-        bbox[:zoom] || bbox[:map_zoom] || 10
-      end
-
       def bbox
-        @parameters[:box] || @parameters[:box] || @parameters[:rect] || @parameters[:rectangle]
-      end
-
-      def build_for_bbox
-        if is_bbox?
-          hash = { bbox: [bbox_top, bbox_bottom, bbox_zoom].join(',') }
-          hash[:cnt] = cities_count if cities_count
-          hash[:cluster] = cluster if cluster
-
-          hash
-        end
+        BoundingBox.new @parameters
       end
-
-      # Circle
-      def is_circle?
-        circle != nil
-      end
-
+      
       def circle
-        @parameters[:circle]
+        Circle.new @parameters
       end
 
-      def build_for_circle
-        if is_circle?
-          hash = { lat: circle[:lat], lon: circle[:lon]}
-          hash[:cnt] = cities_count if cities_count
-          hash[:cluster] = cluster if cluster
-
-          hash
-        end
-      end
     end
   end
 end

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

@@ -0,0 +1,48 @@
+module OpenWeatherAPI
+  module Resources
+
+     class QueryHandler
+      def initialize(parameters = {})
+        @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] || @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
+  end
+end

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

@@ -0,0 +1,104 @@
+module OpenWeatherAPI
+  module Resources
+
+    class Current
+      private
+
+      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
+          { q: [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
+
+      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/version.rb

@@ -1,3 +1,3 @@
 module OpenWeatherApi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-weather-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Wikiti
@@ -38,8 +38,10 @@ files:
 - doc/icon.png
 - lib/open-weather-api.rb
 - lib/open-weather-api/api.rb
-- lib/open-weather-api/resources/base_resource.rb
+- lib/open-weather-api/resources/base.rb
 - lib/open-weather-api/resources/current.rb
+- lib/open-weather-api/resources/handlers/base.rb
+- lib/open-weather-api/resources/handlers/current.rb
 - lib/open-weather-api/version.rb
 - open-weather-api.gemspec
 homepage: https://gitlab.com/wikiti-random-stuff/open-weather-api