machiawase 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c80bba1c3d117dacaf6bb3b8f5c42ec1f10c4cd8
-  data.tar.gz: da18b527515f2c85d687bace5718653af36942dc
+  metadata.gz: ed2fccd7823024d5276ac4e68df305077083e462
+  data.tar.gz: c1ea43631c7d0eda5bd244adf5238595be62d9ce
 SHA512:
-  metadata.gz: 96612fe73e46662259366e6e0a69821a6fbac8f914c9bbdf194a5e97bd38458b0ef89bc02d89863ff66131dbf3cfe5542cb8c4cdf6099e8d09df73c78f095a28
-  data.tar.gz: d00b71ba67afe76d802af1a3a2813f31954092a58e740be0ba03d0779d82a65914481e306cd352802917230ef17797241c22c00e01ae3b813ff94c44bf1f9ce5
+  metadata.gz: ebf3253eacfbe1a3637b23dc30384c4b879483ab6de1ed9090a9e5e49f9e0f544f7cd40d4182323808fc0e0fb84b32d98c3a1e8d1274ddb07fbb48d43f0e9aee
+  data.tar.gz: 8e210fd00ea7a0da41a4978683a9e05d0d2170057538163bad3789c671d32892aef6f1cfce0092385afaef054def54fa8b91fa0af24e03785df142a3759a1194

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2

data/README.md

@@ -2,6 +2,8 @@
 
 Provides command line usage and library to get a middle point of plural points.
 
+[![Build Status](https://travis-ci.org/zakuni/machiawase.png)](https://travis-ci.org/zakuni/machiawase)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,2 +1,9 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.pattern = "test/test_*.rb"
+end
+
+task :default => :test

data/lib/machiawase.rb

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 require 'net/http'
 require 'json'
+require 'geocoder'
 require 'msgpack'
 require 'nokogiri'
 require 'open-uri'
@@ -24,4 +25,20 @@ module Machiawase
     m = Rendezvous.new(*places)
     m.place
   end
+
+  def self.parse_proxy(proxy)
+    # http://user:pass@host:port のように書かれていることを想定
+    # パスワードに@とか入ってる場合があるので一番後ろの@でだけsplitする
+    rserver, raccount = (proxy || '').sub(/http:\/\//, '').reverse.split("@", 2)
+    server  = rserver.nil? ? "" : rserver.reverse
+    host, port = server.split(":")
+    account = raccount.nil? ? "" : raccount.reverse.split(":")
+    user, pass = account
+    
+    proxy = OpenStruct.new({      
+                             "server" => server.empty? ? nil : "http://#{server}",
+                             "user"   => user.nil? ? "" : user,
+                             "pass"   => pass.nil? ? "" : pass
+                           })
+  end  
 end

data/lib/machiawase/place.rb

@@ -3,8 +3,6 @@ module Machiawase
 
   # @!attribute [r] address
   #   @return [String] the address.
-  # @!attribute [r] near_station
-  #   @return [String] the nearest station.  
   # @!attribute [r] google_map_url
   #   @return [String] the url of Google Map.
   # @!attribute [rw] lat
@@ -12,84 +10,59 @@ module Machiawase
   # @!attribute [rw] lon
   #   @return the longitude.
   class Place
-    attr_reader :address, :near_station, :google_map_url
+    include Geocoder
+
+    attr_reader :address, :google_map_url
     attr_accessor :lat, :lon
 
     def initialize(lat, lon)
-      @lat            = lat 
-      @lon            = lon 
-      @doc            = nil
+      @lat            = lat
+      @lon            = lon
       @address        = nil
-      @near_station   = nil
       @google_map_url = "http://maps.google.co.jp/maps?q=#{@lat},#{@lon}&ll=#{@lat},#{@lon}&z=14&t=m&brcurrent=3,0x0:0x0,1"
-      @proxy          = Place.parse_proxy(ENV["http_proxy"])
+      @proxy          = Machiawase.parse_proxy(ENV["http_proxy"])
+      Place.configure
     end
 
     def lat=(val)
       @lat          = val
-      @doc          = nil
       @address      = nil
-      @near_station = nil
     end
 
     def lon=(val)
       @lon          = val
-      @doc          = nil
       @address      = nil
-      @near_station = nil
     end
 
     # @return [Hash] geocode of given address.
     def self.geocode(address)
-      baseUrl  = "http://maps.google.com/maps/api/geocode/json"
-      reqUrl   = "#{baseUrl}?address=#{URI.encode(address)}&sensor=false&language=ja"
-      proxy    = parse_proxy(ENV["http_proxy"])
-      response = open(URI.parse(reqUrl), :proxy_http_basic_authentication => [proxy.server, proxy.user, proxy.pass])
-      status   = JSON.parse(response.string)
-      lat      = status['results'][0]['geometry']['location']['lat']
-      lon      = status['results'][0]['geometry']['location']['lng']
+      Place.configure
+      lat, lon = Geocoder.coordinates(address)
       {"lat" => lat, "lon" => lon}
     rescue => exc
       p exc
     end
 
-    def self.parse_proxy(proxy)
-      # http://user:pass@host:port のように書かれていることを想定
-      # パスワードに@とか入ってる場合があるので一番後ろの@でだけsplitする
-      rserver, raccount = (proxy || '').sub(/http:\/\//, '').reverse.split("@", 2)
-      server  = rserver.nil? ? "" : rserver.reverse
-      host, port = server.split(":")
-      account = raccount.nil? ? "" : raccount.reverse.split(":")
-      user, pass = account
-      
-      proxy = OpenStruct.new({      
-                               "server" => server.empty? ? nil : "http://#{server}",
-                               "user"   => user.nil? ? "" : user,
-                               "pass"   => pass.nil? ? "" : pass
-                             })
+    def self.configure
+      Geocoder.configure(
+        :language => :ja,
+        :http_proxy => ENV["http_proxy"]
+      )
     end
 
     def address
-      @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}", :proxy_http_basic_authentication => [@proxy.server, @proxy.user, @proxy.pass]))
-      @address ||= @doc.xpath('//address')[0].content
+      Place.configure
+      @address ||= Geocoder.address([@lat, @lon])
     rescue => exc
       p exc
     end
 
-    def near_station
-      @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}", :proxy_http_basic_authentication => [@proxy.server, @proxy.user, @proxy.pass]))
-      @near_station ||= @doc.xpath('//station1')[0].content
-    rescue => exc
-      p exc
-    end
-    
     # @return [Hash] attributes with Hash format.
     def to_h
       {
         "latitude"     => @lat,
         "longitude"    => @lon,
         "address"      => address,
-        "near_station" => near_station,
         "google_map"   => @google_map_url
       }
     end

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
 module Machiawase
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/machiawase.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{provides command line usage and library to get a middle point of plural points}
   gem.summary       = %q{finds a middle point of plural points}
   gem.homepage      = "http://zakuni.github.com/machiawase/"
+  gem.licenses      =['MIT']
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,10 +16,20 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Machiawase::VERSION
 
-  gem.add_dependency "nokogiri"
-  gem.add_dependency "msgpack"
+  gem.add_dependency "geocoder", '~> 1.4'
+  gem.add_dependency "nokogiri", '~> 1.8'
+  gem.add_dependency "msgpack", '~> 1.2'
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "guard"
   gem.add_development_dependency "guard-minitest"
   gem.add_development_dependency "rb-fsevent"
   gem.add_development_dependency "minitest-reporters"
-  gem.add_development_dependency "growl"
-end
+
+  if RUBY_ENGINE == 'rbx'
+    gem.add_dependency 'racc'
+    gem.add_dependency 'rubysl', '~> 2.0'
+    gem.add_dependency 'psych'
+    gem.add_dependency 'json', '~> 1.8'
+  end
+end

data/test/test_helper.rb

@@ -1,7 +1,9 @@
+require 'rubygems'
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'minitest/pride'
 
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'machiawase'
 
-MiniTest::Reporters.use! [MiniTest::Reporters::DefaultReporter.new, MiniTest::Reporters::GuardReporter.new]
+MiniTest::Reporters.use! [MiniTest::Reporters::DefaultReporter.new]

data/test/test_machiawase.rb

@@ -1,9 +1,34 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'test_helper'
+require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestMachiawase < MiniTest::Unit::TestCase
+class TestMachiawase < MiniTest::Test
   def test_where
     assert_kind_of Machiawase::Place, Machiawase.where("横浜", "東京")
+    assert_equal "日本、〒146-0084 東京都大田区南久が原２丁目２０−１０", Machiawase.where("横浜", "東京").address
+  end
+
+  def test_parse_proxy
+    assert_respond_to Machiawase, :parse_proxy
+
+    return_with_nil = Machiawase.parse_proxy(nil)
+    assert_kind_of OpenStruct, return_with_nil
+    assert_respond_to return_with_nil, :user
+    assert_respond_to return_with_nil, :pass
+
+    assert_equal(OpenStruct.new({"server" => "http://host:port",
+                                  "user" => "user",
+                                  "pass" => "pass"}),
+                 Machiawase.parse_proxy("user:pass@host:port"))
+
+    assert_equal(OpenStruct.new({"server" => "http://host:port",
+                                  "user"   => "",
+                                  "pass"   => ""}),
+                 Machiawase.parse_proxy("host:port"))
+
+    assert_equal(OpenStruct.new({"server" => nil,
+                                  "user"   => "",
+                                  "pass"   => ""}),
+                 Machiawase.parse_proxy(nil))
   end
 end

data/test/test_place.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestPlace < MiniTest::Test
+  include Machiawase
+
+  def test_address
+    assert_equal "日本、神奈川県横浜市 横浜市庁舎横浜市役所", Place.new(35.4437078, 139.6380256).address
+    assert_nil Place.new(nil, nil).address
+  end
+
+  def test_geocode
+    assert_equal({"lat" => 35.4437078, "lon" => 139.6380256}, Place.geocode('横浜'))
+    assert_equal({"lat" => nil, "lon" => nil}, Place.geocode(''))
+    assert_equal({"lat" => nil, "lon" => nil}, Place.geocode(nil))
+  end
+
+  def test_to_h
+    assert_kind_of Hash, Place.new(0, 0).to_h
+  end
+
+  def test_to_json
+    assert_kind_of String, Place.new(0, 0).to_json
+  end
+end

data/test/{machiawase/test_rendezvous.rb → test_rendezvous.rb}

@@ -1,14 +1,22 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'test_helper'
+require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestRendezvous < MiniTest::Unit::TestCase
+class TestRendezvous < MiniTest::Test
   include Machiawase
 
   def setup
     @rendezvous = Rendezvous.new
   end
 
+  def test_places
+    assert_kind_of Array, @rendezvous.places
+  end
+
+  def test_place
+    assert_kind_of Place, @rendezvous.place
+  end
+
   def test_centroid
     place_a = Place.new(0, 0)
     place_b = Place.new(1, 1)

metadata

@@ -1,97 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: geocoder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: growl
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: provides command line usage and library to get a middle point of plural
@@ -103,7 +145,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -115,12 +158,13 @@ files:
 - lib/machiawase/rendezvous.rb
 - lib/machiawase/version.rb
 - machiawase.gemspec
-- test/machiawase/test_place.rb
-- test/machiawase/test_rendezvous.rb
 - test/test_helper.rb
 - test/test_machiawase.rb
+- test/test_place.rb
+- test/test_rendezvous.rb
 homepage: http://zakuni.github.com/machiawase/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -128,23 +172,22 @@ 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: 
-rubygems_version: 2.0.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: finds a middle point of plural points
 test_files:
-- test/machiawase/test_place.rb
-- test/machiawase/test_rendezvous.rb
 - test/test_helper.rb
 - test/test_machiawase.rb
-has_rdoc: 
+- test/test_place.rb
+- test/test_rendezvous.rb

data/test/machiawase/test_place.rb

@@ -1,43 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'test_helper'
-
-class TestPlace < MiniTest::Unit::TestCase
-  include Machiawase
-  
-  def test_address
-    assert_equal Place.new(35.4437078, 139.6380256).address, "神奈川県横浜市中区真砂町1丁目9"
-  end
-
-  def test_geocode
-    assert_equal({"lat" => 35.4437078, "lon" => 139.6380256}, Place.geocode('横浜'))
-  end
-
-  def test_near_station
-    assert_equal Place.new(35.4437978, 139.6380256).near_station, "関内駅"
-  end
-
-  def test_parse_proxy
-    assert_respond_to Place, :parse_proxy
-
-    return_with_nil = Place.parse_proxy(nil)
-    assert_kind_of OpenStruct, return_with_nil
-    assert_respond_to return_with_nil, :user
-    assert_respond_to return_with_nil, :pass
-
-    assert_equal(OpenStruct.new({"server" => "http://host:port",
-                                  "user" => "user",
-                                  "pass" => "pass"}),
-                 Place.parse_proxy("user:pass@host:port"))
-    
-    assert_equal(OpenStruct.new({"server" => "http://host:port",
-                                  "user"   => "",
-                                  "pass"   => ""}),
-                 Place.parse_proxy("host:port"))
-
-    assert_equal(OpenStruct.new({"server" => nil,
-                                  "user"   => "",
-                                  "pass"   => ""}),
-                 Place.parse_proxy(nil))
-  end
-end