open-weather-api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c205d1489bacdd708f89abdb8ab9dcd5aa028b81
-  data.tar.gz: ffb9d41f9c4cf01aceef87625b88c95570b9e565
+  metadata.gz: 82b4f646f8ec4c9b78170ef8ae612323828e46a4
+  data.tar.gz: 63205323ef368b5682d0222c1827bb7d308e3422
 SHA512:
-  metadata.gz: 79e8f94c2eff7064a2bbcea6958a313c6e9c652622782b0511ce4570894c1e5a236176aaeb7d5dc2dc42601f1cbcccf62681641110bc1151d803bac4e5f88983
-  data.tar.gz: 28475feb664172eee48796822d784879f822387df0c93fdda30933ea27f5516a8c81e8606ca6dfe51a4050bbc87cb3b6457a9b065eb634f793d78f8751a662cc
+  metadata.gz: 1c7cfb721767d05e059e40282982579f637829e7d78607b577a630f28889fd91551ba89933f52b9cf49b824354807f43a9681f56ee2eb9c4e17066610a941e5f
+  data.tar.gz: fa98ab5bd8d849332a1e0b6f3c0b831fdb52ac5ee5b8f6118624ff10567026d0c52e3503293d80124e0b7023882ebdc705456a8aa31bbbacdcea26b8b4e5b972

data/.rspec

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

data/Gemfile

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

data/README.md

@@ -52,7 +52,7 @@ Rails.configuration.open_weather_api
 ### Other
 
 ```ruby
-open_weather_api = OpenWeatherAPI::API.new api_key: ENV['OPEN_WEATHER_API_KEY'], default_language: 'es', default_units: 'metric', default_country_code: 'es'
+open_weather_api = OpenWeatherAPI::API.new api_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", default_language: 'es', default_units: 'metric', default_country_code: 'es'
 # ...
 ```
 

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

@@ -12,21 +12,23 @@ module OpenWeatherAPI
         @parameters = hash
         setup_indifferent_access(@parameters)
 
-        response = request
+        # Let's use json
+        execute_json **hash, &block
+      end
+
+      private
+
+      def execute_json(**hash, &block)
+        response = RestClient.send :get, base_url, params: build_params(@parameters), accept: :json
         raise "Invalid response." unless response.code == 200
 
         json = JSON.parse(response.body)
+        setup_indifferent_access(json)
 
         return block.call(json) if block_given?
         json
       end
 
-      private
-
-      def request(type = :get)
-        RestClient.send type, base_url, params: build_params(@parameters), accept: :json
-      end
-
       def base_url
         'http://api.openweathermap.org/data/2.5/'
       end

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

@@ -15,29 +15,29 @@ module OpenWeatherAPI
 
       # Simple handlers
       def city
-        City.new @parameters
+        City.new @api_obj, @parameters
       end
 
       def city_id
-        CityID.new @parameters
+        CityID.new @api_obj, @parameters
       end
 
       def geolocation
-        Geolocation.new @parameters
+        Geolocation.new @api_obj, @parameters
       end
 
       def zipcode
-        Zipcode.new @parameters
+        Zipcode.new @api_obj, @parameters
       end
 
       # Other handlers
       # ------------------
       def bbox
-        BoundingBox.new @parameters
+        BoundingBox.new @api_obj, @parameters
       end
       
       def circle
-        Circle.new @parameters
+        Circle.new @api_obj, @parameters
       end
 
     end

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

@@ -2,7 +2,8 @@ module OpenWeatherAPI
   module Resources
 
      class QueryHandler
-      def initialize(parameters = {})
+      def initialize(api_obj, parameters = {})
+        @api_obj = api_obj
         @parameters = parameters
       end
 
@@ -25,7 +26,7 @@ module OpenWeatherAPI
       end
 
       def country_code
-        @parameters[:country_code] || @api_obj.default_country_code
+        @parameters[:country_code] || @parameters[:cc] || @api_obj.default_country_code
       end
 
       def cities_count

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

@@ -24,7 +24,7 @@ module OpenWeatherAPI
         private
 
         def build
-          { q: [value].flatten.compact.join(',') }
+          { id: [value].flatten.compact.join(',') }
         end
 
         def value

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

@@ -1,3 +1,3 @@
-module OpenWeatherApi
-  VERSION = '0.0.3'
+module OpenWeatherAPI
+  VERSION = '0.0.4'
 end

data/open-weather-api.gemspec

@@ -5,7 +5,7 @@ require 'open-weather-api/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "open-weather-api"
-  spec.version       = OpenWeatherApi::VERSION
+  spec.version       = OpenWeatherAPI::VERSION
   spec.authors       = ["Wikiti"]
   spec.email         = ["wikiti.doghound@gmail.com"]
   spec.summary       = %q{Simple wrapper for Open Weather Map API}
@@ -19,4 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rest-client", "~> 1.8"
+
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "fuubar"
 end

data/rakefile

@@ -0,0 +1,28 @@
+# 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

data/spec/current_weather_spec.rb

@@ -0,0 +1,43 @@
+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
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'bundler/setup'
+Bundler.setup
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'open-weather-api'
+
+RSpec.configure do |config|
+  # some (optional) config here
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open-weather-api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Wikiti
@@ -24,6 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Simple wrapper for Open Weather Map API. The API description may be
   found here: http://openweathermap.org/api'
 email:
@@ -33,6 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- Gemfile
 - LICENSE.txt
 - README.md
 - doc/icon.png
@@ -45,6 +75,9 @@ files:
 - lib/open-weather-api/resources/handlers/current.rb
 - lib/open-weather-api/version.rb
 - open-weather-api.gemspec
+- rakefile
+- spec/current_weather_spec.rb
+- spec/spec_helper.rb
 homepage: https://gitlab.com/wikiti-random-stuff/open-weather-api
 licenses:
 - MIT
@@ -69,5 +102,7 @@ rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple wrapper for Open Weather Map API
-test_files: []
+test_files:
+- spec/current_weather_spec.rb
+- spec/spec_helper.rb
 has_rdoc: