openweather2 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c172988c1e35afbb0b9c3a5e9ab01715d7a608fb
-  data.tar.gz: 955de0972fa726dfa9e4b6114a7ee26909c5dadb
+  metadata.gz: 2fddd1332e7154c5d5eda95b5bc712175097bb8f
+  data.tar.gz: af6e98be9abdb10d3d5b4eb515a262a0face63ee
 SHA512:
-  metadata.gz: 2e88b7cc5a3df935288d8b88e663fecb34df9241dac2d016999a805d157ef5789c9fb7f6569cb5f15d4136fe7dc1c10a6689726fff82b56ff4b5466af048104e
-  data.tar.gz: 789ac67f13d85e979894cbb1e9489af65bfd62d031f3e5d23fc1a770ed5bbbe4a12c081e1e4ab3cd9eea3961c98172d761340c2d116ed95c12d71784daad5833
+  metadata.gz: 9a49c9b561ddf976f44e84a3242c9b026fd6764116a0a4e771de7316c1e92fc494973ddbfb3809b98bbb4f515e865a6f7429147eec81d17913fe031420332fa1
+  data.tar.gz: e000004b3301cb9d93fc876e6f8c5db7db1ea387186de9bae43ad50970790b459b135c076573518df0a6467a21de4c67048576f1f519f9d86fb1ff2b0eca9fc0

data/README.md

@@ -41,6 +41,11 @@ Or install it yourself as:
 
 Usage:
 
+You can search the current weather on a location providing a hash with the following parameters:
+* city
+* lat, lon
+* zip
+
 ```ruby
 require "openweather2"
 
@@ -49,31 +54,35 @@ Openweather2.configure do |config|
   config.apikey = YOUR APP ID
 end
 
-Openweather2.weather('london')
-
-```
+#Search by city
+Openweather2.get_weather(city: 'london')
 
-Also you can provide a second parameter for the units to convert the temperature to 'metric' or 'imperial'
-
-```ruby
+#Search by coordinates
+Openweather2.get_weather(lat: 35, lon: 139)
 
-Openweather2.weather('london', 'metric')
-Openweather2.weather('london', 'imperial')
+#Search by ZIP code
+Openweather2.get_weather(zip: 94040)
 
 ```
 
+Also you can provide a parameter for the units to convert the temperature to 'metric' or 'imperial'
 
-## Development
+```ruby
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Openweather2.get_weather(city: 'london', units: 'metric')
+Openweather2.get_weather(city: 'london', units: 'imperial')
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```
 
 ## Contributing
 
-Be free to report and send your pull request.
+1. Fork it ( https://github.com/lucasocon/openweather )
+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`)
+5. Create a new Pull Request
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/lucasocon/openweather.
+Be free to report and send your pull request.
 
 Contributors:
 * Lucas Ocon (lucasocon)

data/lib/openweather2/client.rb

@@ -9,8 +9,7 @@ module Openweather2
   end
 
   class Configuration
-    attr_accessor :endpoint
-    attr_accessor :apikey
+    attr_accessor :endpoint, :apikey
   end
 
   class UnprocessableError < RuntimeError; end
@@ -24,15 +23,14 @@ module Openweather2
     yield(configuration)
   end
 
-  def weather(city, units = nil)
+  def get_weather(options={})
     check_configuration!
-    uri      = set_request_params(city, units)
+    uri = set_params(options)
     response = send_request(uri)
     parse_json(response)
   end
 
   private
-
   def parse_json(response)
     case response
     when Net::HTTPSuccess
@@ -44,15 +42,26 @@ module Openweather2
     end
   end
 
+  def check_response(response)
+    json = JSON.parse(response.body)
+    if json['cod'] == 200
+      Openweather2::Weather.new(json)
+    else
+      nil
+    end
+  end
+
   def send_request(uri)
     req = Net::HTTP::Get.new(uri.request_uri)
     http_params = [uri.hostname, uri.port, use_ssl: uri.scheme == 'https']
     Net::HTTP.start(*http_params) {|http| http.request(req)}
   end
 
-  def set_request_params(city, units)
+  def set_params(options)
     uri = URI(Openweather2.configuration.endpoint)
-    uri.query = URI.encode_www_form(default_params.merge(q: city, units: units))
+    uri.query = URI.encode_www_form(default_params.merge(lat: options[:lat], lon: options[:lon], units: options[:units])) if options[:lat] && options[:lon]
+    uri.query = URI.encode_www_form(default_params.merge(zip: options[:zip], units: options[:units])) if options[:zip]
+    uri.query = URI.encode_www_form(default_params.merge(q: options[:city], units: options[:units])) if options[:city]
     uri
   end
 
@@ -62,17 +71,7 @@ module Openweather2
     end
   end
 
-  def check_response(response)
-    json = JSON.parse(response.body)
-    if json['cod'] == 200
-      Openweather2::Weather.new(json)
-    else
-      nil
-    end
-  end
-  
   def default_params
     {APPID: Openweather2.configuration.apikey}
   end
-
 end

data/lib/openweather2/version.rb

@@ -1,3 +1,3 @@
 module Openweather2
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/openweather2/weather.rb

@@ -2,7 +2,7 @@ module Openweather2
   class Weather
 
     attr_reader :city, :longitude, :latitude, :pressure, :humidity, :clouds,
-      :temperature, :min_temperature, :max_temperature, :wind_speed, :wind_angle, :sunrise, :sunset
+      :temperature, :min_temperature, :max_temperature, :wind_speed, :wind_angle
 
     def initialize(json)
       @city = json['name']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openweather2
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Lucas Ocon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest