geohashr 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWM2NmFjNjM4Njg5Mzk0NTI5ODc1NDdkMjdjZDQyZWEyOGJhMzNhMg==
-  data.tar.gz: !binary |-
-    NDI5YmY3Yjg1YTlkY2M2MmMwZjVlOWQxYmRkNjYxZTkxNzEyZDE2Yw==
+SHA1:
+  metadata.gz: c33c4aef0a581de54764ca0e1ffe3faa26007224
+  data.tar.gz: 2b24273afc4923d3e761ce43352618527866de80
 SHA512:
-  metadata.gz: !binary |-
-    ZTY0ZWMzNjYxZmY1MzA1MWU0OTIzMzY1NGM2OWRiNTM3MzIzOTBlNGJjOTQy
-    ZjJlNmU2YTgyYmNjZmM5NDRkYWM1ZWVjYjYyOWUxMDQwZDM2YzEwMmFkNjgy
-    ZWIxMmExMGMyMzU0ZmY5ZmFhMjdmMTU1MzgzYmU4YzEwMTBjYjY=
-  data.tar.gz: !binary |-
-    MjkxYTAwNTNjYmEwNDQ5MmUwMTJkNjRjNjg3ZTk5MmFhMDYzNDdjYWZlNjZh
-    YjI2MGM5MDE3YzMxZTljMDQ2NTE3ZjYxMjczYzQ4NTViZWI4YmY1MzEzNTQ0
-    YTcxODEwZWI5MDdhM2ZkNjY0MWM3NDc5NWNmODg0N2VhYWQ1NGU=
+  metadata.gz: ba972d4b877bb934bb0e386637d3ab827cff7d12a5713ae01e3f41e994d1d78606a1964216b5f85b7976d3e2d1be003a7c63c536a8df5825efdfa3b0020e7461
+  data.tar.gz: 8ae51afa357ac619b36d267cf5ff94b1bcd3209659f580db68ac5c71921495e90f15f4855e78ebd9b0c9ecac37a10da69148a1f7e53289bce48599d74ed484a6

data/.travis.yml

@@ -2,3 +2,5 @@
 language: ruby
 rvm:
   - 1.9.3
+
+gemfile: Gemfile.ci

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 0.2.0 / 2014-11-08
+
+* 4 unknowns:
+
+  * Add Coveralls badge
+  * Add Gemfile.ci for travis
+  * Adds tests for x,y
+  * Remove rack/test
+
+
 ### 0.1.0 / 2014-02-14
 
 * 1 major enhancement

data/Gemfile.ci

@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gem 'rake'
+gem 'hoe'
+gem 'minitest'
+gem 'coveralls',      :require => false

data/Manifest.txt

@@ -3,6 +3,7 @@
 .travis.yml
 CHANGELOG.md
 CONTRIBUTING.md
+Gemfile.ci
 LICENSE.txt
 Manifest.txt
 README.md

data/README.md

@@ -1,6 +1,7 @@
 # Geohashr
 [![Version][Version image]][Version]
 [![Build][Build image]][Build]
+[![Coverage][Coverage image]][Coverage]
 
 Geohash is a latitude/longitude geocoding system. It is a hierarchical
 spatial data structure which subdivides space into buckets of grid shape.

data/geohashr.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: geohashr 0.1.0.20140214080544 ruby lib
+# stub: geohashr 0.2.0.20141108200404 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "geohashr"
-  s.version = "0.1.0.20140214080544"
+  s.version = "0.2.0.20141108200404"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["JohnnyT"]
-  s.date = "2014-02-14"
+  s.date = "2014-11-09"
   s.description = "GeoHash - encode, decode, neighbors"
   s.email = ["ubergeek3141@gmail.com"]
   s.extra_rdoc_files = ["CHANGELOG.md", "CONTRIBUTING.md", "LICENSE.txt", "Manifest.txt", "README.md"]
@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/johnnyt/geohashr"
   s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.md"]
-  s.rubyforge_project = "geohashr"
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.4.0"
   s.summary = "GeoHash - encode, decode, neighbors"
   s.test_files = ["test/test_geohashr.rb"]
 
@@ -27,15 +26,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, ["~> 5.2"])
       s.add_development_dependency(%q<coveralls>, ["~> 1.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.8"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.12"])
     else
       s.add_dependency(%q<minitest>, ["~> 5.2"])
       s.add_dependency(%q<coveralls>, ["~> 1.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.8"])
+      s.add_dependency(%q<hoe>, ["~> 3.12"])
     end
   else
     s.add_dependency(%q<minitest>, ["~> 5.2"])
     s.add_dependency(%q<coveralls>, ["~> 1.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.8"])
+    s.add_dependency(%q<hoe>, ["~> 3.12"])
   end
 end

data/lib/geohashr/geohash.rb

@@ -24,8 +24,8 @@ module GeoHashr
           is_lng ^= 1
         end
       end
-      @x = positions.first.to_i(2)
-      @y = positions.last.to_i(2)
+      @x = positions.last.to_i(2)
+      @y = positions.first.to_i(2)
       @box = box.transpose
     end
 

data/lib/geohashr/version.rb

@@ -1,3 +1,3 @@
 module Geohashr
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/test/helper.rb

@@ -12,7 +12,6 @@ end
 require 'minitest'
 require 'minitest/autorun'
 require 'minitest/pride'
-require 'rack/test'
 
 Dir[File.expand_path('../support/*.rb', __FILE__)].each { |file| require file }
 require File.expand_path '../../lib/geohashr', __FILE__

data/test/test_geohashr.rb

@@ -16,6 +16,49 @@ class TestGeohashr < Minitest::Test
     end
   end
 
+  # bcfguvyz   prxz
+  # 89destwx   nqwy
+  # 2367kmqr   jmtv
+  # 0145hjnp   hksu
+  #            57eg
+  #            46df
+  #            139c
+  #            028b
+
+  def test_x_y
+    {
+      '0' => [0,0],
+      '1' => [1,0],
+      '2' => [0,1],
+      'x' => [7,2],
+      'y' => [6,3],
+      'z' => [7,3],
+
+      '00' => [0,0],
+      '01' => [0,1],
+      '02' => [1,0],
+      '0x' => [2,7],
+      '0y' => [3,6],
+      '0z' => [3,7],
+
+      'zz' => [31,31],
+      'zzz' => [255, 127],
+      'zzzz' => [1023,1023],
+      'zzzzz' => [8191,4095],
+      'zzzzzz' => [32767,32767],
+      'zzzzzzz' => [262143,131071],
+      'zzzzzzzz' => [1048575,1048575],
+      'zzzzzzzzz' => [8388607,4194303],
+      'zzzzzzzzzz' => [33554431,33554431],
+      'zzzzzzzzzzz' => [268435455,134217727],
+      'zzzzzzzzzzzz' => [1073741823,1073741823]
+
+    }.each do |hash, coord|
+      gh = GeoHashr::GeoHash.new(hash)
+      assert_equal [gh.x, gh.y], coord
+    end
+  end
+
   #def test_encode
   #  {
   #    [ 45.37,      -121.7      ] => 'c216ne',

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: geohashr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - JohnnyT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.12'
 description: GeoHash - encode, decode, neighbors
 email:
 - ubergeek3141@gmail.com
@@ -64,12 +64,13 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- .coveralls.yml
-- .gemtest
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gemtest"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Gemfile.ci
 - LICENSE.txt
 - Manifest.txt
 - README.md
@@ -87,23 +88,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: geohashr
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: GeoHash - encode, decode, neighbors