twofishes 2.1.0.pre.rc.1 → 2.1.0.pre.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60346193a88118337642826f79fb68b87373fda3
-  data.tar.gz: 1ca46ac922435ce41af3d5e46725689acf20ddc2
+  metadata.gz: 4c736e4fa16a0dd414258b492bf9e28216159529
+  data.tar.gz: 51098838583a9781a6e8993008ae11051cf49ec1
 SHA512:
-  metadata.gz: 74f76b892901bfb33ec5aa15cb913a74c28216a70d922647bc0793bd922d00864a8f07d6fe1d470ba6cc2a99316b14e1aed3af482929fdad79e541e09e62638e
-  data.tar.gz: 1ffe49e7909c92ee1bb6a7a2735973b86363444598d6075c61fae209d582179a8817825f130cdad180f9abe23a41540e77e6374cb506cbff2028359baf730e9e
+  metadata.gz: 372613ddb1f2c0aa1c7a475fdf4179a5b36bd309ce55b456110625a367e3ed4517328913e21be545870c80caa8c17470ad0cc0cd328539b7512c6c38f62a5a7d
+  data.tar.gz: e9c771da55db7ae6ded344382a4289243316357d68f608a6bc8c19f7b9e8a33f1eef0f19ec1088882b223bc7ee23425604f0aa78add64bcef64477bf00bbab7d

data/lib/twofishes/geocode_request.rb

@@ -13,11 +13,11 @@ module Twofishes
       case ll
       when String
         lat, lng = ll.split(/\s*,\s*/)
-        GeocodePoint.new(lat: lat.to_f, lng: lng.to_f)
+        new_point(lat, lng)
       when Array
-        GeocodePoint.new(lat: ll[0].to_f, lng: ll[1].to_f)
+        new_point(ll[0], ll[1])
       when Hash
-        GeocodePoint.new(lat: ll[:lat].to_f, lng: ll[:lng].to_f)
+        new_point(ll[:lat], ll[:lng])
       else
         ll
       end
@@ -27,42 +27,37 @@ module Twofishes
       case bounds
       when String
         ne_lat, ne_lng, sw_lat, sw_lng = bounds.split(/\s*,\s*/)
-        ne = GeocodePoint.new(lat: ne_lat.to_f, lng: ne_lng.to_f)
-        sw = GeocodePoint.new(lat: sw_lat.to_f, lng: sw_lng.to_f)
-        GeocodeBoundingBox.new(ne: ne, sw: sw)
+        new_bounding_box(ne_lat, ne_lng, sw_lat, sw_lng)
       when Array
-        ne = GeocodePoint.new(lat: bounds[0].to_f, lng: bounds[1].to_f)
-        sw = GeocodePoint.new(lat: bounds[2].to_f, lng: bounds[3].to_f)
-        GeocodeBoundingBox.new(ne: ne, sw: sw)
+        new_bounding_box(bounds[0], bounds[1], bounds[2], bounds[3])
       when Hash
-        ne = GeocodePoint.new(lat: bounds[:ne_lat].to_f, lng: bounds[:ne_lng].to_f)
-        sw = GeocodePoint.new(lat: bounds[:sw_lat].to_f, lng: bounds[:sw_lng].to_f)
-        GeocodeBoundingBox.new(ne: ne, sw: sw)
+        new_bounding_box(bounds[:ne_lat], bounds[:ne_lng], bounds[:sw_lat], bounds[:sw_lng])
       else
         bounds
       end
     end
 
     def substitute_aliases(options)
-      options = options.dup
+      options = Hash[options.map{|k,v| [k.to_s.camelize(:lower).to_sym,v] } ]
 
-      options[:maxInterpretations] ||= options.delete(:max_interpretations) || options.delete(:max)
-      options[:allowedSources] ||= options.delete(:allowed_sources) || options.delete(:sources)
-      options[:responseIncludes] ||= options.delete(:response_includes) || options.delete(:includes)
-      options[:woeHint] ||= options.delete(:woe_hint)
-      options[:woeRestrict] ||= options.delete(:woe_restrict)
-      options[:autocompleteBias] ||= options.delete(:autocomplete_bias) || options.delete(:bias)
+      options[:maxInterpretations] ||= options.delete(:max)
+      options[:allowedSources] ||= options.delete(:sources)
+      options[:responseIncludes] ||= options.delete(:includes)
+      options[:autocompleteBias] ||= options.delete(:bias)
 
-      if options[:ll].kind_of? Hash
-        options[:ll][:lng] = options[:ll][:lon] if options[:ll][:lon]
-      end
+      options
+    end
 
-      if options[:bounds].kind_of? Hash
-        options[:bounds][:ne_lng] = options[:bounds][:ne_lon] if options[:bounds] and options[:bounds][:ne_lon]
-        options[:bounds][:sw_lng] = options[:bounds][:sw_lon] if options[:bounds] and options[:bounds][:sw_lon]
-      end
+    private
 
-      options
+    def new_bounding_box(ne_lat, ne_lng, sw_lat, sw_lng)
+      ne = GeocodePoint.new(lat: ne_lat.to_f, lng: ne_lng.to_f)
+      sw = GeocodePoint.new(lat: sw_lat.to_f, lng: sw_lng.to_f)
+      GeocodeBoundingBox.new(ne: ne, sw: sw)
+    end
+
+    def new_point(lat, lng)
+      GeocodePoint.new(lat: lat.to_f, lng: lng.to_f)
     end
   end
 end

data/lib/twofishes/version.rb

@@ -1,3 +1,3 @@
 module Twofishes
-  VERSION = "2.1.0.pre.rc.1"
+  VERSION = "2.1.0.pre.rc.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twofishes
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.rc.1
+  version: 2.1.0.pre.rc.2
 platform: ruby
 authors:
 - Christian Felder