open_weather 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1327553a2fbe1bca7dd99c412460c8fa4b7845
-  data.tar.gz: 113644f7a050013f6665ec37bc1719d8cc3a6a2a
+  metadata.gz: 001deca9d50d6b07ab8284a3ec5c038ee5143fcc
+  data.tar.gz: 2a18341ff8cf95e807ddad88d9cfe48bb9b712cf
 SHA512:
-  metadata.gz: 0373959b51de904817bae07728a8274cdd4223747869eab547cd381e8c45b5f9a4e8b6d680a006723934e74e138a6bf55749fd638a6056d60127e9c28cfaaad1
-  data.tar.gz: fb43d1d32607256a4feeffc4f782bcc7a4467add7d88f871bcf8b0b99d4b984182998e450d5a069f71192b3536c7cf9cecb59c6134fe6a637edafc687ef72bc3
+  metadata.gz: 36d5b56d5402bd32130489c3e7792a62a865b13c9ba253cddaf09514aadf5376be52e120754fb829fd99897108bff7110bacc95fbd4ecf92cce55b698efd9e11
+  data.tar.gz: 10170e99eb833b90d8521dbf66d84d6eb7cd035ad9446bbaa6f5111144cc2e00d7e87385c6192b76453c93000f964cd943b3c9d47a38aaac9390de4c0d5ed909

data/lib/open_weather.rb

@@ -6,5 +6,23 @@ require "open_weather/version"
 require "open_weather/client"
 
 module OpenWeather
-  # Your code goes here...
+  def self.current(*location)
+    client.weather(*location)
+  end
+
+  def self.forecast(*location)
+    client.forecast(*location)
+  end
+
+  def self.daily(*location)
+    client.daily_forecast(*location)
+  end
+
+  def self.find(*location)
+    client.find(*location)
+  end
+
+  def self.client
+    Client.new
+  end
 end

data/lib/open_weather/client.rb

@@ -1,3 +1,5 @@
+require 'open_weather/query_builder'
+
 module OpenWeather
   class Client
     include HTTParty
@@ -6,16 +8,24 @@ module OpenWeather
 
     format :json
 
-    def weather(lat, lon)
-      get('/weather', lat: lat, lon: lon )
+    def weather(*args)
+      get '/weather', build_query(args)
+    end
+
+    def daily_forecast(*args)
+      get '/forecast/daily', build_query(args)
+    end
+
+    def forecast(*args)
+      get '/forecast', build_query(args)
     end
 
-    def forecast(lat, lon)
-      get('/forecast', lat: lat, lon: lon )
+    def find(*args)
+      get '/find', build_query(args, false)
     end
 
-    def find(lat, lon)
-      get('/find', lat: lat, lon: lon )
+    def build_query(args, use_id=true)
+      QueryBuilder.new(args, use_id).build
     end
 
     def get(path, query)

data/lib/open_weather/query_builder.rb

@@ -0,0 +1,92 @@
+module OpenWeather
+  class QueryError < StandardError
+  end
+
+  class QueryBuilder
+
+    attr_reader :arguments, :query_options
+
+    def initialize(args, use_id=true)
+      clean_args = Array(args)
+      @query_options = clean_args.extract_options!
+      @arguments = clean_args
+    end
+
+    def build
+      query = _from_array(arguments)
+      query.merge(query_options)
+    end
+
+    private
+
+    def _from_array(args)
+      query_keys = [:lat, :lon]
+      args.size > 1 ? Hash[query_keys.zip(args)] : _from_object(args[0])
+    end
+
+    def _from_string(str)
+      key = str =~ /\A\d+\Z/ ? :id : :q
+      { key => str }
+    end
+
+    def _from_object(obj)
+      case obj
+      when NilClass
+        raise QueryError, 'you should provide at least one location'
+      when Array
+        _from_array(obj)
+      when Hash
+        _from_methods(OpenStruct.new(obj))
+      when String
+        _from_string(obj)
+      when Integer
+        { id: obj }
+      else
+        _from_methods(obj)
+      end
+    end
+
+    def _get_lat(obj)
+      _fetch_value(obj, :lat) ||
+        _fetch_value(obj, :latitude)
+    end
+
+    def _get_lon(obj)
+      _fetch_value(obj, :lon) ||
+        _fetch_value(obj, :lng) ||
+        _fetch_value(obj, :latitude)
+    end
+
+    def _from_lat_lon(obj)
+      lat, lon = _get_lat(obj), _get_lon(obj)
+      (lat && lon) ? _from_array([ lat, lon ]) : nil
+    end
+
+    def _from_coordinates(obj)
+      _from_array(obj.to_coordinates) if obj.respond_to?(:to_coordinates)
+    end
+
+    def _from_other(obj)
+      _fetch_array(obj, :location) ||
+        _fetch_array(obj, :address) ||
+        _fetch_array(obj, :region) ||
+        _fetch_array(obj, :city) ||
+        _fetch_array(obj, :attributes)
+    end
+
+    def _fetch_value(obj, meth)
+      obj.send(meth) if obj.respond_to?(meth)
+    end
+
+    def _fetch_array(obj, meth)
+      _from_array(Array(obj.send(meth))) if obj.respond_to?(meth)
+    end
+
+    def _from_methods(obj)
+      _from_lat_lon(obj) ||
+        _from_coordinates(obj) ||
+        _from_other(obj) ||
+        raise(QueryError, "Don't know how to obtain weather from #{obj.class.name}")
+    end
+  end
+end

data/lib/open_weather/version.rb

@@ -1,3 +1,3 @@
 module OpenWeather
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/open_weather/query_builder_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+module OpenWeather
+  describe QueryBuilder do
+
+    def build_query(*args)
+      options = args.extract_options!
+      use_id = options.delete(:use_id) || true
+      args << options
+      QueryBuilder.new(args, use_id).build
+    end
+
+    it "generates a coordinates query when lat and lng are given" do
+      build_query(1, 2).should == { lat: 1, lon: 2 }
+    end
+
+    it "generates a coordinates query when object with to_coordinates method is given" do
+      waypoint = OpenStruct.new(to_coordinates: [1, 2])
+      build_query(waypoint).should == { lat: 1, lon: 2 }
+    end
+
+    it "generates a coordinates query when object with :lat, :lng method available" do
+      waypoint = OpenStruct.new(lat: 1, lon: 2)
+      build_query(waypoint).should == { lat: 1, lon: 2 }
+    end
+
+    it "generates a city query when an string is given" do
+      build_query("Madrid").should == { q: "Madrid" }
+    end
+
+    it "generates an id query when a numeric string is given" do
+      build_query("123").should == { id: "123" }
+    end
+
+    it "generates an id query when a numeric id is given" do
+      build_query(123).should == { id: 123 }
+    end
+
+    it "parses internal attributes" do
+      team = OpenStruct.new(location: "Madrid")
+      build_query(team).should == { q: "Madrid" }
+    end
+
+    it "raise query error if location is nil" do
+      team = OpenStruct.new(location: nil)
+      expect {
+        build_query(team)
+      }.to raise_error(QueryError, 'you should provide at least one location')
+    end
+
+    it { build_query({lat: 1, lng: 2}, use_id: true).should == { lat: 1, lon: 2 } }
+    it { build_query([1, 2]).should == { lat: 1, lon: 2 } }
+    it { build_query([1, 2, 3]).should == { lat: 1, lon: 2 } }
+    it { build_query(1, 2, 3).should == { lat: 1, lon: 2 } }
+
+    it "raise query error if no arguments are given" do
+      expect {
+        build_query
+      }.to raise_error(OpenWeather::QueryError, 'you should provide at least one location')
+    end
+
+    it "raise query error if can't figure out the query" do
+      ::School = Class.new
+      expect {
+        build_query(School.new)
+      }.to raise_error(QueryError, "Don't know how to obtain weather from School")
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_weather
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jorge Calás Lozano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -112,8 +112,10 @@ files:
 - bin/open_weather
 - lib/open_weather.rb
 - lib/open_weather/client.rb
+- lib/open_weather/query_builder.rb
 - lib/open_weather/version.rb
 - open_weather.gemspec
+- spec/open_weather/query_builder_spec.rb
 - spec/open_weather_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -141,6 +143,7 @@ signing_key:
 specification_version: 4
 summary: Ruby client for the Open Weather Map API
 test_files:
+- spec/open_weather/query_builder_spec.rb
 - spec/open_weather_spec.rb
 - spec/spec_helper.rb
 has_rdoc: