googlestaticmap 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad36a4237b16d0a78f5275fef2732de1fa38c8d3
-  data.tar.gz: 76f929f6ea26f88b05628e85fb5059baca039a5d
+  metadata.gz: 5927d0355fe8b5d37805cdd00be4c0101d160d43
+  data.tar.gz: 7678c34e611f1515334a2fc686e8509b6fa50120
 SHA512:
-  metadata.gz: b21ce6e938e92acf3dff7bd4c481d7830aea9450eb143193356cec28964bde44e15d42295335399ca08039c00174897aacd09d0051aacb0720c4d479aaae6a98
-  data.tar.gz: 6b1304bf3165f499139823589681a35c67ef79e76a78411b7edf6551c4e3a54affa2d5e1995e9fba096588b5a36cddf4aad6491c91d4081a6dbb17048f0de0c2
+  metadata.gz: 1cea618d5b2937fe8f500c7dd88ce5814c93d10b7362cfc73999215876131f3eb959ec3e82ea863a63a86dce61fa925e9b7ea1599828d869c1502f8ae715ad86
+  data.tar.gz: 23564bec56865aedd2acbc028341389270571140054d1aea0dcf9f8966835f55bad4a81b0728fd41323e424d3b1af8f83075588557897ff290c0210612a93a52

data/History.txt

@@ -1,3 +1,6 @@
+== 1.2.4 / 2017-03-05
+* Added language option (thanks kntmrkm!)
+
 == 1.2.3 / 2017-01-12
 * Signature is now sent when using an API key (thanks mauu-alpha!)
 

data/lib/googlestaticmap.rb

@@ -75,7 +75,7 @@ class GoogleStaticMap
 
   # The private key, also known as the URL signing secret, is used to to generate the signature parameter
   # in the URL. This is required if you are using a client ID, or a premium API key, and is optional
-  # if you are using a standard API key.  See 
+  # if you are using a standard API key.  See
   # https://developers.google.com/maps/documentation/static-maps/get-api-key for more details
   attr_accessor :private_key
 
@@ -83,12 +83,16 @@ class GoogleStaticMap
   #           see https://developers.google.com/maps/documentation/business/clientside/quota for details
   attr_accessor :channel
 
+  # Language - :en, :ja
+  #           see https://developers.google.com/maps/documentation/static-maps/intro for details
+  attr_accessor :language
+
   # Takes an optional hash of attributes
   def initialize(attrs={})
     defaults = {:width => 500, :height => 350, :markers => [],
                 :sensor => false, :maptype => "roadmap", :paths => [],
                 :proxy_port => nil, :proxy_address => nil, :api_key => nil,
-                :client_id => nil, :private_key => nil}
+                :client_id => nil, :private_key => nil, :language => nil}
 
     attributes = defaults.merge(attrs)
     attributes.each {|k,v| self.send("#{k}=".to_sym,v)}
@@ -291,5 +295,3 @@ class MapPolygon < MapPath
     attrs.each {|k,v| self.send("#{k}=".to_sym,v)}
   end
 end
-
-

data/lib/googlestaticmap_helper.rb

@@ -21,8 +21,10 @@ module GoogleStaticMapHelpers #:nodoc: all
       iv_name = i.to_s[1..-1]
       unless ivs_to_exclude.include?(iv_name)
         val = object.instance_variable_get(i)
-        val = CGI.escape(val.to_s) if options.has_key?(:cgi_escape_values)
-        ivs[iv_name] = val
+        unless val.nil?
+          val = CGI.escape(val.to_s) if options.has_key?(:cgi_escape_values)
+          ivs[iv_name] = val unless val.nil?
+        end
       end
     end
     ivs

data/test/tc_google_static_map.rb

@@ -97,6 +97,15 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
     assert_no_match /^\/\/maps.googleapis.com/, f
   end
 
+  # Language is the only nullable one that goes through the normal safe instance
+  # variable pattern
+  def test_url_with_langauge
+    g = default_map
+    g.language = "jp"
+    assert g.url.include?("language=jp")
+  end
+
+
   def test_url_https
     g = default_map
     u = nil

data/test/tc_helper.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) +  '/../lib/googlestaticmap_helper'
 class GoogleStaticMapHelperTest < Test::Unit::TestCase #:nodoc: all
 
   IVS = {"@var1" => 1, "@var2" => 2, "@var3" => 3,
-         "@url" => "http://maps.google.com"}
+         "@url" => "http://maps.google.com", "@nilvar" => nil}
 
   class MockRuby18Object
     def self.instance_variables
@@ -30,14 +30,16 @@ class GoogleStaticMapHelperTest < Test::Unit::TestCase #:nodoc: all
 
   def test_safe_instance_variables_no_params
     [MockRuby18Object, MockRuby19Object].each do |o|
-      assert_equal ivs_no_at, GoogleStaticMapHelpers.safe_instance_variables(o)
+      sivs = GoogleStaticMapHelpers.safe_instance_variables(o)
+      assert_equal ivs_no_at, sivs
+      assert !sivs.has_key?("@nilvar")
     end
   end
 
   def test_safe_instance_variables_exclude
     [MockRuby18Object, MockRuby19Object].each do |o|
       sivs = GoogleStaticMapHelpers.safe_instance_variables(o, ["var2"])
-      assert_equal IVS.length-1, sivs.length
+      assert_equal IVS.length-2, sivs.length
       assert !sivs.has_key?("@var2")
     end
   end
@@ -45,7 +47,7 @@ class GoogleStaticMapHelperTest < Test::Unit::TestCase #:nodoc: all
   def test_safe_instance_variables_cgi
     [MockRuby18Object, MockRuby19Object].each do |o|
       sivs = GoogleStaticMapHelpers.safe_instance_variables(o, [], :cgi_escape_values => true)
-      assert_equal IVS.length, sivs.length
+      assert_equal IVS.length-1, sivs.length
       assert_equal CGI.escape(IVS["@url"]), sivs["url"]
     end
   end
@@ -63,7 +65,7 @@ class GoogleStaticMapHelperTest < Test::Unit::TestCase #:nodoc: all
   def ivs_no_at
     ivs = {}
     IVS.each do |k,v|
-      ivs[k[1..-1]] = v
+      ivs[k[1..-1]] = v unless v.nil?
     end
     ivs
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: googlestaticmap
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Brent Sowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,13 +92,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Class for retrieving maps from the Google Maps Static API service
 test_files:
 - test/tc_map_path_and_polygon.rb
-- test/tc_map_location.rb
-- test/tc_google_static_map.rb
 - test/tc_helper.rb
+- test/tc_google_static_map.rb
+- test/tc_map_location.rb
 - test/tc_map_marker.rb