google_timezone 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7922f88d3b6882b797df4a60ed586c5b84b3bb
-  data.tar.gz: e629e85380e69c9d6e1a6fbeb19be2f9b974cc3e
+  metadata.gz: dea49ca959de6ba6012065a8aeff097548ac5b90
+  data.tar.gz: 5daf4c90ce40c1babbc0daa07810b51adb9b423d
 SHA512:
-  metadata.gz: bba8f7376e924527ae559ff0f9b28b8569be50ec271229e13225e87885a9085e4d8d3981ab169ceb46a5e1be2ea0f2ad46a84de8da33d4ef2d481dc84e9eee49
-  data.tar.gz: d46c902fade66c349023ea5df5993c93846b46292c9d79e6ec901168267355128098b408f0c157223b422cd4eade19e48fe3f8ece594f0e82e58ed72528bcc25
+  metadata.gz: f067c96016a48390ed2904fa607e29a8a725e44184a923371cbc461a76c75e23ab43138e027bba52c02154e55aa1b44b2083b7253cace049a782cb742290fa92
+  data.tar.gz: 8af5396dcb560ea1d5a5c37375f96ecfe5c597c6e8d824c67eaff3ac0d7a485271787de9cd137f020e85d1a29ce64383a2f52751b348879b9db2002c083dc6d6

data/README.md

@@ -36,7 +36,7 @@ It will get `GoogleTimezone::Result` object which maps major google api responce
 More information [here](https://developers.google.com/maps/documentation/timezone/)
 Also there is `GoogleTimezone::Result#success?` method. It returns true if responce was successful.
 
-The bang version `fetch!` raises an error if google responce is not ok.
+The bang version `fetch!` raises an `GoogleTimezone::Error` exception with error message if response from Google wasn't success.
 
 
 ## Contributing

data/lib/google_timezone.rb

@@ -5,11 +5,11 @@ require 'google_timezone/result'
 module GoogleTimezone
   class << self
     def fetch(*args)
-      Base.new(args).fetch
+      Base.new(*args).fetch
     end
 
     def fetch!(*args)
-      Base.new(args).fetch!
+      Base.new(*args).fetch!
     end
   end
 end

data/lib/google_timezone/base.rb

@@ -6,7 +6,7 @@ module GoogleTimezone
   class Error < StandardError; end
 
   class Base
-    @allowed_params = [:language, :sensor, :timestamp, :client, :signature, :key]
+    ALLOWED_PARAMS = [:language, :sensor, :timestamp, :client, :signature, :key]
 
     def initialize(*args)
       @lat, @lon = if args.first.is_a? Array
@@ -14,8 +14,9 @@ module GoogleTimezone
                    else
                      args[0..1]
                    end
+
       @options = extract_options!(args)
-      @options.reject! { |key, value| !@allowed_params.include? key }
+      @options.reject! { |key, _| !ALLOWED_PARAMS.include?(key) }
     end
 
     def fetch
@@ -32,23 +33,21 @@ module GoogleTimezone
     end
 
     private
+
     def hash_to_query(hash)
-      require 'cgi' unless defined?(CGI) && defined?(CGI.escape)
-      hash.collect{ |p|
-        p[1].nil? ? nil : p.map{ |i| CGI.escape i.to_s } * '='
-      }.compact.sort * '&'
+      hash.collect { |key, val| "#{key}=#{val}" }.join('&')
     end
 
     def url(params)
       "https://maps.googleapis.com/maps/api/timezone/json?#{hash_to_query(params)}"
     end
 
-    def extract_options!(*args)
-      args.last.is_a?(::Hash) ? pop : {}
+    def extract_options!(args)
+      args.last.is_a?(::Hash) ? args.pop : {}
     end
 
     def get_result(params)
       open(url(params)) { |r| JSON.parse(r.read) }
     end
   end
-end
+end

data/lib/google_timezone/version.rb

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

data/spec/google_timezone_result_spec.rb

@@ -3,11 +3,11 @@ require 'google_timezone/result'
 describe GoogleTimezone::Result do
   it 'should be success' do
     result = GoogleTimezone::Result.new({ 'status' => 'OK' })
-    result.should be_success
+    expect(result).to be_success
   end
 
   it 'should not be succsess' do
     result = GoogleTimezone::Result.new({ 'status' => 'ZERO_RESULTS' })
-    result.should_not be_success
+    expect(result).to_not be_success
   end
-end
+end

data/spec/google_timezone_spec.rb

@@ -1,30 +1,82 @@
 require 'google_timezone'
 
 describe GoogleTimezone do
-  describe 'initialize' do
-    before { GoogleTimezone::Base.any_instance.should_receive(:fetch).with(no_args).and_return(GoogleTimezone::Result.new(0)) }
+  describe '.fetch' do
+    context 'without any optional parameters' do
+      let(:base_instance) { spy }
+      let(:result) { GoogleTimezone::Result.new({}) }
+
+      before do
+        allow_any_instance_of(GoogleTimezone::Base).to(
+          receive(:new).with(any_args)
+                       .and_return(base_instance)
+        )
+
+        allow(base_instance).to(
+          receive(:fetch).with(no_args)
+                         .and_return(result)
+        )
+      end
 
-    it 'correct with separate lat and lon' do
-      g = GoogleTimezone.fetch(0,0)
-      g.should be_an_instance_of(GoogleTimezone::Result)
+      it 'should accept separate lat/long paramenters' do
+        g = GoogleTimezone.fetch(0, 0)
+        expect(g).to be_an_instance_of(GoogleTimezone::Result)
+      end
+
+      it 'should accept a single lat/long array parameter' do
+        g = GoogleTimezone.fetch([0, 0])
+        expect(g).to be_an_instance_of(GoogleTimezone::Result)
+      end
     end
 
-    it 'correct with array lat and lon' do
-      g = GoogleTimezone.fetch([0,0])
-      g.should be_an_instance_of(GoogleTimezone::Result)
+    context 'with optional parameters' do
+      let(:base_instance) { spy }
+      let(:result) { GoogleTimezone::Result.new(0) }
+      let(:valid_params)   { { timestamp: 1331161200,
+                               key: 'A24br8v2w' } }
+      let(:invalid_params) { { timestamp: 1331161200,
+                               key: 'A24br8v2w',
+                               unallowed_param: true } }
+
+      before(:each) do
+        allow_any_instance_of(GoogleTimezone::Base).to(
+          receive(:new).with(0, 0, valid_params)
+                       .and_return(base_instance)
+        )
+
+        allow(base_instance).to(
+          receive(:fetch).with(no_args)
+                         .and_return(result)
+        )
+      end
+
+      it 'should pass allowed parameters on to the query' do
+        g = GoogleTimezone.fetch(0, 0, valid_params)
+        expect(g).to be_an_instance_of(GoogleTimezone::Result)
+      end
+
+      it 'should reject unallowed parameters' do
+        g = GoogleTimezone.fetch(0, 0, invalid_params)
+        expect(g).to be_an_instance_of(GoogleTimezone::Result)
+      end
     end
   end
 
-  describe '#fetch!' do
-    describe 'if result is not success' do
+  describe '.fetch!' do
+    describe 'if result is not successful' do
       let(:result) { GoogleTimezone::Result.new({}) }
+      let(:error)  { GoogleTimezone::Error }
 
-      before { result.stub!(:success?) { false } }
-      before { result.stub!(:result) { 'error message' } }
-      before { GoogleTimezone::Base.any_instance.stub(:fetch) { result } }
+      before { allow(result).to receive(:success?).and_return(false) }
+      before { allow(result).to receive(:result).and_return('error message') }
+      before {
+        allow_any_instance_of(GoogleTimezone::Base).to(
+          receive(:fetch).and_return(result)
+        )
+      }
 
-      it 'should raise error' do
-        expect { GoogleTimezone.fetch!(0,0) }.to raise_error(GoogleTimezone::Error)
+      it 'should raise an error' do
+        expect { GoogleTimezone.fetch!(0,0) }.to raise_error(error)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_timezone
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - sck-v
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec