google-maps 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e37aed73a33c0d720a2028b68da7062e844ec7
-  data.tar.gz: f9b122db7e86ffe2ec0e7fa2e0fd8416be4d5cad
+  metadata.gz: 13f8b08401429d693bf7b68fc78d5f215be09eb0
+  data.tar.gz: 001d41179c93c787757a42cfce0b1738aa267673
 SHA512:
-  metadata.gz: a3e2ba9ef478660f882dafcfb5bf875fa225fa8ff4af2c6f2af61b92aa94372d579697de7e64692b82edffceb86ed02f1f299afe6a8e56977e34597f4911a52a
-  data.tar.gz: 8306f41b80d5180a3bba0ab0b104dbf0ae74031d47e0d49af2cce94fecbdb31f814454ccb8e58fda8f65834197f3d58c3b9e9703aa22ec60a146c9a4171862dc
+  metadata.gz: 924bdce3f76819f03c4f2f51618a692874efb12cc69d77d6d2ae038d1d9b825cf1bdb53a746ed21eaca6921ca2a78d30311f64895c41461a9643f3b218acdf9e
+  data.tar.gz: 16b04aebffcac817ee1c7d298110f0433718ce0ed3c54bf43a557bb1d45352bdac83cee720b44456ea4754aa4d17ea329e747edad7dfc554560f433610c85895

data/README.mkd

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/zilverline/google-maps.svg?branch=master)](https://travis-ci.org/zilverline/google-maps)
-[![Coverage Status](https://coveralls.io/repos/zilverline/google-maps/badge.svg)](https://coveralls.io/r/zilverline/google-maps)
+[![Coverage Status](https://coveralls.io/repos/zilverline/google-maps/badge.svg?branch=master)](https://coveralls.io/r/zilverline/google-maps?branch=master)
 [![Code Climate](https://codeclimate.com/repos/55671579695680044d01e0ac/badges/8f4d88f30585847e4fcf/gpa.svg)](https://codeclimate.com/repos/55671579695680044d01e0ac/feed)
 
 Google Maps

data/lib/google-maps.rb

@@ -8,19 +8,19 @@ module Google
   module Maps
     extend Configuration
     extend Logger
-    
-    def self.route(from, to, language = self.default_language)
-      Route.new(from, to, language)
+
+    def self.route(from, to, options={})
+      Route.new(from, to, options_with_defaults(options))
     end
-    
-    def self.distance(from, to, language = self.default_language)
-      Route.new(from, to, language).distance.text
+
+    def self.distance(from, to, options={})
+      Route.new(from, to, options_with_defaults(options)).distance.text
     end
-    
-    def self.duration(from, to, language = self.default_language)
-      Route.new(from, to, language).duration.text
+
+    def self.duration(from, to, options={})
+      Route.new(from, to, options_with_defaults(options)).duration.text
     end
-    
+
     def self.places(keyword, language = self.default_language)
       Place.find(keyword, language)
     end
@@ -34,5 +34,11 @@ module Google
     rescue ZeroResultsException
       []
     end
+
+    protected
+
+    def self.options_with_defaults(options)
+      {language: self.default_language}.merge(options)
+    end
   end
 end

data/lib/google-maps/route.rb

@@ -2,12 +2,13 @@ require File.expand_path('../api', __FILE__)
 
 module Google
   module Maps
-    
+
     class Route
-      attr_accessor :from, :to, :language
-      
-      def initialize(from, to, language=:en)
-        @from, @to, @language = from, to, language
+      attr_accessor :from, :to, :options
+
+      def initialize(from, to, options={})
+        options = {language: options} unless options.is_a? Hash
+        @from, @to, @options = from, to, {language: :en}.merge(options)
       end
 
       def method_missing(name, *args, &block)
@@ -17,21 +18,21 @@ module Google
           super
         end
       end
-      
+
       def origin_latlong
         "#{self.start_location.lat},#{self.start_location.lng}"
       end
-      
+
       def destination_latlong
         "#{self.end_location.lat},#{self.end_location.lng}"
       end
-      
+
       private
       def route
         # default to the first returned route (the most efficient one)
-        @response ||= API.query(:directions_service, :origin => from, :destination => to, :language => language).routes.first
+        @response ||= API.query(:directions_service, @options.merge(origin: from, destination: to)).routes.first
       end
     end
-    
+
   end
-end
+end

data/lib/google-maps/version.rb

@@ -1,5 +1,5 @@
 module Google
   module Maps
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/spec/google-maps/route_spec.rb

@@ -6,47 +6,47 @@ describe Google::Maps::Route do
       stub_response("amsterdam-deventer-nl.json")
       @route = Google::Maps::Route.new("Science Park, Amsterdam", "Deventer", :nl)
     end
-  
+
     it "should be able to calculate a route" do
       @route.distance.text.should == "104 km"
       @route.duration.text.should == "1 uur 12 min."
       @route.distance.value.should == 103712
       @route.duration.value.should == 4337
     end
-  
+
     it "should be able to present the text in Dutch" do
-      @route.language.should == :nl
+      @route.options[:language].should == :nl
       @route.end_address.should == "Deventer, Nederland"
     end
 
     it "should be able to return the address for the origin" do
       @route.start_address.should == "Science Park, 1098 Amsterdam, Nederland"
     end
-  
+
     it "should be able to return the address for the destination" do
       @route.end_address.should == "Deventer, Nederland"
     end
-  
+
     it "should be able to return the latiude and longitude for the origin" do
       @route.start_location.lat.should == 52.35445000000001
       @route.start_location.lng.should == 4.95420
       @route.origin_latlong.should == "52.35445000000001,4.9542"
     end
-  
+
     it "should be able to return the latiude and longitude for the destination" do
       @route.end_location.lat.should == 52.25441000000001
       @route.end_location.lng.should == 6.160470
       @route.destination_latlong.should == "52.25441000000001,6.16047"
     end
   end
-  
+
   describe "english" do
     it "should be able to present the text in English" do
       stub_response("amsterdam-deventer-en.json")
       route = Google::Maps::Route.new("Science Park, Amsterdam", "Deventer", :en)
-      route.language.should == :en
+      route.options[:language].should == :en
       route.end_address.should == "Deventer, The Netherlands"
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-maps
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel van Hoesel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler