plus_codes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7430998fc47b7df06e1254f74ca980b1c33fbd12
-  data.tar.gz: f503a83dd1b483d57d2dc917b3abe5d95dc22ee0
+  metadata.gz: 1da7f815765ecb2206cb0649c9aa38dd3fa74f02
+  data.tar.gz: 31e1d4218ecd47d5430e73b47760ae8acda9d163
 SHA512:
-  metadata.gz: 114f48473a81ead5f78179d0293892ff4c7f43b891b5c4cb9f4d4524806a80bacaf8242e042ee1f866c665f025f7381fc2a568b33b83bbe544b605e81a7519ab
-  data.tar.gz: c289c5db96763ff688bc8d6ed77d26b9442e1f248a29b0bd92099ecb659192239f4ec825a9780e240cb08b6a8cf019a08a6c186dfb005a1217d0122079e7843d
+  metadata.gz: dde33abf4454355f14b1497c82266e97c2e8cfe5b7a6cf0a8567f133ed0d5d225c433cd8a87029a5c8aab87f10f524095254b08f00e035f97c4224c4f92bb192
+  data.tar.gz: 6e01e7ed5b9bfe233a819a6195122e7d5b0af0f7ef53ae3c5f5d962b9d9d8c67e4165c10e1e201a7fdd4cc48851dbc0aa1c057246d3671646d7e93934049f214

data/lib/plus_codes.rb

@@ -1,4 +1,5 @@
 # Plus+Codes is a Ruby implementation of Google Open Location Code(Plus+Codes).
+# 
 # @author We-Ming Wu
 module PlusCodes
 

data/lib/plus_codes/code_area.rb

@@ -12,6 +12,7 @@ module PlusCodes
   #   latitude_center: The latitude of the center in degrees.
   #   longitude_center: The longitude of the center in degrees.
   #   code_length: The number of significant characters that were in the code.
+  #   
   # @author We-Ming Wu
   class CodeArea
     attr_accessor :latitude_lo, :longitude_lo, :latitude_hi, :longitude_hi,

data/lib/plus_codes/open_location_code.rb

@@ -4,6 +4,7 @@ require 'plus_codes/code_area'
 module PlusCodes
 
   # [OpenLocationCode] implements the Google Open Location Code(Plus+Codes) algorithm.
+  #
   # @author We-Ming Wu
   class OpenLocationCode
 
@@ -19,22 +20,22 @@ module PlusCodes
       return false if separator_index.nil? ||
         separator_index != code.rindex(SEPARATOR) ||
         separator_index > SEPARATOR_POSITION ||
-        separator_index % 2 == 1
+        separator_index.odd?
 
       # We can have an even number of padding characters before the separator,
       # but then it must be the final character.
       if code.include?(PADDING)
         # Not allowed to start with them!
-        return false if code.index(PADDING) == 0
+        return false if code.start_with?(PADDING)
 
         # There can only be one group and it must have even length.
         pad_match = /(#{PADDING}+)/.match(code).to_a
         return false if pad_match.length != 2
         match = pad_match[1]
-        return false if match.length % 2 == 1 || match.length > SEPARATOR_POSITION - 2
+        return false if match.length.odd? || match.length > SEPARATOR_POSITION - 2
 
         # If the code is long enough to end with a separator, make sure it does.
-        return false if code[code.length - 1] != SEPARATOR
+        return false if code[-1] != SEPARATOR
       end
 
       # If there are characters after the separator, make sure there isn't just
@@ -43,7 +44,7 @@ module PlusCodes
 
       # Check code contains only valid characters.
       code.chars.each do |ch|
-        return false if ch.ord > DECODE.length || DECODE[ch.ord] < -1
+        return false if ch.ord >= DECODE.length || DECODE[ch.ord] < -1
       end
       true
     end
@@ -87,8 +88,7 @@ module PlusCodes
     # @param code_length [Integer] the number of characters in the code, this excludes the separator
     # @return [String] a plus+codes
     def encode(latitude, longitude, code_length = PAIR_CODE_LENGTH)
-      if code_length < 2 ||
-          (code_length < SEPARATOR_POSITION && code_length % 2 == 1)
+      if code_length < 2 || (code_length < SEPARATOR_POSITION && code_length.odd?)
         raise ArgumentError, "Invalid Open Location Code length: #{code_length}"
       end
 
@@ -96,11 +96,12 @@ module PlusCodes
       longitude = normalize_longitude(longitude)
       if latitude == 90
         latitude = latitude - compute_latitude_precision(code_length).to_f
-        p latitude
       end
       code = encode_pairs(latitude, longitude, [code_length, PAIR_CODE_LENGTH].min)
       # If the requested length indicates we want grid refined codes.
-      code += encode_grid(latitude, longitude, code_length - PAIR_CODE_LENGTH) if code_length > PAIR_CODE_LENGTH
+      if code_length > PAIR_CODE_LENGTH
+        code += encode_grid(latitude, longitude, code_length - PAIR_CODE_LENGTH)
+      end
       code
     end
 
@@ -142,7 +143,7 @@ module PlusCodes
         if full?(short_code)
           return short_code
         else
-          raise ArgumentError, 'ValueError: Passed short code is not valid: ' + short_code
+          raise ArgumentError, "ValueError: Passed short code is not valid: #{short_code}"
         end
       end
 

data/lib/plus_codes/version.rb

@@ -1,3 +1,3 @@
 module PlusCodes
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

data/test/plus_codes_test.rb

@@ -64,6 +64,16 @@ class PlusCodesTest < Test::Unit::TestCase
     end
   end
 
+  def test_exceptions
+    assert_raise ArgumentError do
+      @olc.encode(20, 30, 1)
+    end
+    assert_raise ArgumentError do
+      @olc.recover_nearest('9C3W9QCJ-2VX', 51.3708675, -1.217765625)
+    end
+    @olc.recover_nearest('9C3W9QCJ+2VX', 51.3708675, -1.217765625)
+  end
+
   def read_csv_lines(csv_file)
     f = File.open(File.join(@test_data_folder_path, csv_file), 'r')
     f.each_line.lazy.select { |line| line !~ /^\s*#/ }.map { |line| line.chop }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plus_codes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Wei-Ming Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler