machiawase 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59e3325556437023b8d609451fffc6c4ef30805
-  data.tar.gz: f7553855c8764924347e525b7a5df87a958b6dca
+  metadata.gz: c80da4652173863278773783be83df5ea717c53f
+  data.tar.gz: 51cdbb0c5f81b146ce85954ae8fb53138f6e12c1
 SHA512:
-  metadata.gz: 72e490d88ae4e99129426f33bf8c140864409b1637d1998fafe442ab9fe46c33fbbb9b204131206660bb9ab1648ac12406721d8b52efdf3444418e7a11728759
-  data.tar.gz: cb6f8069c9b808f2b80e83f829cf96ed62473358e4dcfce78d77c19887d27ee518c7eea454d980c75f067d99185b3b13257268b55ab39b6cf47b8b3b8a2cbf98
+  metadata.gz: 678b67366bc00e9e2ca369053f40a250da88035fdd541190e61532d1abbf8c78f1c2d45da8e978400051f2a0877c7c596997328e29c274385c136ba3fd50cbc6
+  data.tar.gz: fd98d9e570ddc1bc059b48f32bc9cede4b95cf036b49396c0e9ca69809ec02f1cb8eccde79345196750d43cc4d2e0f069347b3fe40d7bb579e818a53df9178e5

data/Guardfile

@@ -1,13 +1,13 @@
 guard 'minitest' do
   # with Minitest::Unit
-  # watch(%r|^test/(.*)\/?test_(.*)\.rb|)
-  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  # watch(%r|^test/test_helper\.rb|)    { "test" }
+  watch(%r|^test/(.*)\/?test_(.*)\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r|^test/test_helper\.rb|)    { "test" }
 
   # with Minitest::Spec
-  watch(%r|^spec/(.*)_spec\.rb|)
-  watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+  # watch(%r|^spec/(.*)_spec\.rb|)
+  # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 
   # Rails 3.2
   # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }

data/bin/machiawase

@@ -14,9 +14,9 @@ opt_parser = OptionParser.new do |opts|
   opts.separator ""
   opts.separator "Specific options:"
 
-  opts.on('-a', '--all', 'Show all informations of the result with JSON format') {
+  opts.on('-a', '--all', 'Show all informations of the result with JSON format') do
     options.show_all = true
-  }
+  end
 
   opts.separator ""
   opts.separator "Common options:"

data/lib/machiawase.rb

@@ -2,9 +2,12 @@
 # -*- coding: utf-8 -*-
 require 'net/http'
 require 'json'
+require 'msgpack'
 require 'nokogiri'
 require 'open-uri'
+require 'ostruct'
 require 'machiawase/place'
+require 'machiawase/rendezvous'
 require 'machiawase/version'
 
 # @author {https://github.com/zakuni zakuni}
@@ -21,79 +24,4 @@ module Machiawase
     m = Rendezvous.new(*places)
     m.place
   end
-
-  class Rendezvous
-    # @!attribute [r] place
-    #   @return [Place] the place to rendezvous.
-    # @!attribute [r] places
-    #   @return [Array<Place>] the array of given places.
-    #   @see Place
-
-    attr_reader :place, :places, :lat, :lon, :address, :near_station
-    
-    # @param places [Array<Place>] the array of places. 
-    def initialize(*places)
-      @place  = nil
-      @places = places
-    end
-
-    def place
-      @place ||= middle_of(*@places)
-    end
-
-    def lat
-      @place ||= middle_of(*@places)
-      @place.lat
-    end
-
-    def lon
-      @place ||= middle_of(*@places)
-      @place.lon
-    end
-
-    def address
-      @place ||= middle_of(*@places)
-      @place.address
-    end
-
-    def near_station
-      @place ||= middle_of(*@places)
-      @place.near_station
-    end
-
-    # @return [Hash] the attributes with Hash format.
-    def to_h
-      h = Hash.new
-      @places.each_with_index do |place, i|
-        h.store("place#{i}", place.to_h)        
-      end
-
-      @place ||= middle_of(*@places)
-      h.store("machiawase", @place.to_h)
-    end
-
-    # @return [JSON] the attributes with JSON format.
-    def to_json
-      JSON.pretty_generate(to_h)
-    end
-
-    private
-
-    def middle_of(*places)
-      c = centroid(*places)
-      @place = Place.new(c[0], c[1])
-    end
-
-    def centroid(*places)
-      x_sum = 0
-      y_sum = 0
-
-      places.each do |p|
-        x_sum += p.lat
-        y_sum += p.lon
-      end
-
-      [x_sum/places.length.to_f, y_sum/places.length.to_f]
-    end
-  end
 end

data/lib/machiawase/place.rb

@@ -41,12 +41,11 @@ module Machiawase
 
     # @return [Hash] geocode of given address.
     def self.geocode(address)
-      address  = URI.encode(address)
       baseUrl  = "http://maps.google.com/maps/api/geocode/json"
-      reqUrl   = "#{baseUrl}?address=#{address}&sensor=false&language=ja"
+      reqUrl   = "#{baseUrl}?address=#{URI.encode(address)}&sensor=false&language=ja"
       proxy    = parse_proxy(ENV["http_proxy"])
-      response = Net::HTTP::Proxy(proxy['host'], proxy['port'], proxy['user'], proxy['pass']).get_response(URI.parse(reqUrl))
-      status   = JSON.parse(response.body)
+      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']
       {"lat" => lat, "lon" => lon}
@@ -61,32 +60,25 @@ module Machiawase
       account = raccount.nil? ? "" : raccount.reverse.split(":")
       user, pass = account
       
-      # serverはNokogiri(open-uri)で使う。host, portはNet::HTTPで使う。
-      {
-        "server" => server.empty? ? nil : "http://#{server}",
-        "host"   => host,
-        "port"   => port,
-        "user"   => user.nil? ? "" : user,
-        "pass"   => pass.nil? ? "" : pass
-      }
+      proxy = OpenStruct.new({      
+                               "server" => server.empty? ? nil : "http://#{server}",
+                               "user"   => user.nil? ? "" : user,
+                               "pass"   => pass.nil? ? "" : pass
+                             })
     end
 
     def address
-      begin
-        @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
-      rescue
-        "Service Temporary Unavailable"
-      end
+      @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
+    rescue => exc
+      p exc
     end
 
     def near_station
-      begin
-        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}", :proxy => ENV['http_proxy']))
-        @near_station ||= @doc.xpath('//station1')[0].content
-      rescue
-        "Service Temporary Unavailable"
-      end
+      @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.
@@ -104,5 +96,9 @@ module Machiawase
     def to_json
       JSON.pretty_generate(to_h)
     end
+
+    def to_msgpack
+      to_h.to_msgpack
+    end
   end
 end

data/lib/machiawase/rendezvous.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+module Machiawase
+
+  class Rendezvous
+    # @!attribute [r] place
+    #   @return [Place] the place to rendezvous.
+    # @!attribute [r] places
+    #   @return [Array<Place>] the array of given places.
+    #   @see Place
+
+    attr_reader :place, :places, :lat, :lon, :address, :near_station
+    
+    # @param places [Array<Place>] the array of places. 
+    def initialize(*places)
+      @place  = nil
+      @places = places
+    end
+
+    def place
+      @place ||= middle_of(*@places)
+    end
+
+    def lat
+      @place ||= middle_of(*@places)
+      @place.lat
+    end
+
+    def lon
+      @place ||= middle_of(*@places)
+      @place.lon
+    end
+
+    def address
+      @place ||= middle_of(*@places)
+      @place.address
+    end
+
+    def near_station
+      @place ||= middle_of(*@places)
+      @place.near_station
+    end
+
+    # @return [Hash] the attributes with Hash format.
+    def to_h
+      h = Hash.new
+      @places.each_with_index do |place, i|
+        h.store("place#{i}", place.to_h)        
+      end
+
+      @place ||= middle_of(*@places)
+      h.store("machiawase", @place.to_h)
+    end
+
+    # @return [JSON] the attributes with JSON format.
+    def to_json
+      JSON.pretty_generate(to_h)
+    end
+
+    def to_msgpack
+      to_h.to_msgpack
+    end
+
+    private
+
+    def middle_of(*places)
+      c = centroid(*places)
+      @place = Place.new(c[0], c[1])
+    end
+
+    def centroid(*places)
+      x_sum = 0
+      y_sum = 0
+
+      places.each do |p|
+        x_sum += p.lat
+        y_sum += p.lon
+      end
+
+      [x_sum/places.length.to_f, y_sum/places.length.to_f]
+    end
+  end
+end

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
 module Machiawase
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/machiawase.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Machiawase::VERSION
 
   gem.add_dependency "nokogiri"
+  gem.add_dependency "msgpack"
   gem.add_development_dependency "guard-minitest"
   gem.add_development_dependency "rb-fsevent"
   gem.add_development_dependency "minitest-reporters"

data/test/machiawase/test_place.rb

@@ -0,0 +1,43 @@
+#!/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

data/test/machiawase/test_rendezvous.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'test_helper'
+
+class TestRendezvous < MiniTest::Unit::TestCase
+  include Machiawase
+
+  def setup
+    @rendezvous = Rendezvous.new
+  end
+
+  def test_centroid
+    place_a = Place.new(0, 0)
+    place_b = Place.new(1, 1)
+    assert_equal [0.5, 0.5], @rendezvous.send(:centroid, *[place_a, place_b])
+
+    place_a = Place.new(0, 0)
+    place_b = Place.new(1, 1)
+    place_c = Machiawase::Place.new(2, 2)
+    assert_equal [1, 1], @rendezvous.send(:centroid, *[place_a, place_b, place_c])
+
+    place_a = Place.new(0, 0)
+    place_b = Place.new(2, 0)
+    place_c = Place.new(2, 2)
+    place_d = Place.new(0, 2)
+    assert_equal [1, 1], @rendezvous.send(:centroid, *[place_a, place_b, place_c, place_d])
+  end
+
+  def test_middle_of
+    g1 = Place.geocode("横浜")
+    p1 = Place.new(g1['lat'], g1['lon'])
+        
+    g2 = Place.geocode("東京")
+    p2 = Place.new(g2['lat'], g2['lon'])
+    
+    assert_kind_of Place, @rendezvous.send(:middle_of, p1, p2)
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'minitest/pride'
+
+require 'machiawase'
+
+MiniTest::Reporters.use! [MiniTest::Reporters::DefaultReporter.new, MiniTest::Reporters::GuardReporter.new]

data/test/test_machiawase.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require 'test_helper'
+
+class TestMachiawase < MiniTest::Unit::TestCase
+  def test_where
+    assert_kind_of Machiawase::Place, Machiawase.where("横浜", "東京")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -98,11 +112,13 @@ files:
 - bin/machiawase
 - lib/machiawase.rb
 - lib/machiawase/place.rb
+- lib/machiawase/rendezvous.rb
 - lib/machiawase/version.rb
 - machiawase.gemspec
-- spec/machiawase/place_spec.rb
-- spec/machiawase_spec.rb
-- spec/spec_helper.rb
+- test/machiawase/test_place.rb
+- test/machiawase/test_rendezvous.rb
+- test/test_helper.rb
+- test/test_machiawase.rb
 homepage: http://zakuni.github.com/machiawase/
 licenses: []
 metadata: {}
@@ -122,11 +138,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: finds a middle point of plural points
 test_files:
-- spec/machiawase/place_spec.rb
-- spec/machiawase_spec.rb
-- spec/spec_helper.rb
+- test/machiawase/test_place.rb
+- test/machiawase/test_rendezvous.rb
+- test/test_helper.rb
+- test/test_machiawase.rb
+has_rdoc: 

data/spec/machiawase/place_spec.rb

@@ -1,86 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-
-describe Machiawase::Place do
-  describe ':address' do
-    it 'returns 神奈川県横浜市中区真砂町1丁目9 with "35.4437078, 139.6380256"' do
-      Machiawase::Place.new(35.4437078, 139.6380256).address.must_equal("神奈川県横浜市中区真砂町1丁目9")
-    end
-  end
-
-  describe 'geocode' do
-    it 'returns {lat => 35.4437978, lon => 139.6380256} with 横浜' do
-      Machiawase::Place.geocode('横浜').must_equal({"lat" => 35.4437078, "lon" => 139.6380256})
-    end
-  end
-
-  describe 'near_station' do
-    it 'returns 関内駅 with 横浜' do
-      Machiawase::Place.new(35.4437978, 139.6380256).near_station.must_equal("関内駅")
-    end
-  end
-
-  describe "parse_proxy" do
-    it 'responds' do
-      Machiawase::Place.must_respond_to("parse_proxy")
-    end
-    
-    it 'returns Hash' do
-      Machiawase::Place.parse_proxy(nil).must_be_kind_of(Hash)
-    end
-
-    it 'includes "host"' do
-      Machiawase::Place.parse_proxy(nil).must_include("host")
-    end
-
-    it 'includes "port"' do
-      Machiawase::Place.parse_proxy(nil).must_include("port")
-    end
-
-    it 'includes "user"' do
-      Machiawase::Place.parse_proxy(nil).must_include("user")
-    end
-
-    it 'includes "pass"' do
-      Machiawase::Place.parse_proxy(nil).must_include("pass")
-    end
-
-    it 'returns correct hash with "user:pass@host:port"' do
-      Machiawase::Place.parse_proxy(
-                                    "user:pass@host:port"
-                                    ).must_equal({
-                                                   "server" => "http://host:port",
-                                                   "host"   => "host",
-                                                   "port"   => "port",
-                                                   "user"   => "user",
-                                                   "pass"   => "pass"
-                                                 })
-    end
-
-    it 'returns correct hash with "host:port"' do
-      Machiawase::Place.parse_proxy(
-                                    "host:port"
-                                    ).must_equal({
-                                                   "server" => "http://host:port",
-
-                                                   "host"   => "host",
-                                                   "port"   => "port",
-                                                   "user"   => "",
-                                                   "pass"   => ""
-                                                 })
-    end
-
-    it 'returns correct hash with nil' do
-      Machiawase::Place.parse_proxy(nil).must_equal(
-                                                    {
-                                                      "server" => nil,
-                                                      "host"   => nil,
-                                                      "port"   => nil,
-                                                      "user"   => "",
-                                                      "pass"   => ""
-                                                    })
-    end
-  end
-end
-

data/spec/machiawase_spec.rb

@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-require 'spec_helper'
-
-describe Machiawase do
-  describe 'where' do
-    describe '横浜, 東京' do
-      it 'should be Place' do
-        Machiawase.where("横浜", "東京").class.must_equal(Machiawase::Place)
-      end
-    end
-  end
-end
-
-describe Machiawase::Rendezvous do
-  before do
-    @machiawase = Machiawase::Rendezvous.new
-  end
-
-  describe ":centroid" do
-    describe '(0, 0), (1, 1)' do
-      it 'should be (0.5, 0.5)' do
-        place_a = Machiawase::Place.new(0, 0)
-        place_b = Machiawase::Place.new(1, 1)
-        @machiawase.send(:centroid, *[place_a, place_b]).must_equal([0.5, 0.5])
-      end
-    end
-    describe '(0, 0), (1, 1), (2, 2)' do
-      it 'should be (1, 1)' do
-        place_a = Machiawase::Place.new(0, 0)
-        place_b = Machiawase::Place.new(1, 1)
-        place_c = Machiawase::Place.new(2, 2)
-        @machiawase.send(:centroid, *[place_a, place_b, place_c]).must_equal([1, 1])
-      end
-    end
-    describe '(0, 0), (2, 0), (2, 2), (0, 2)' do
-      it 'should be (1, 1)' do
-        place_a = Machiawase::Place.new(0, 0)
-        place_b = Machiawase::Place.new(2, 0)
-        place_c = Machiawase::Place.new(2, 2)
-        place_d = Machiawase::Place.new(0, 2)
-        @machiawase.send(:centroid, *[place_a, place_b, place_c, place_d]).must_equal([1, 1])
-      end
-    end
-  end
-
-  describe ':middle_of' do
-    describe '横浜, 東京' do
-      it 'should be Place' do
-        g1 = Machiawase::Place.geocode("横浜")
-        p1 = Machiawase::Place.new(g1['lat'], g1['lon'])
-        
-        g2 = Machiawase::Place.geocode("東京")
-        p2 = Machiawase::Place.new(g2['lat'], g2['lon'])
-        
-        @machiawase.send(:middle_of, p1, p2).class.must_equal(Machiawase::Place)
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,5 +0,0 @@
-require 'minitest/autorun'
-require 'minitest/reporters'
-
-require 'machiawase'
-MiniTest::Reporters.use! [MiniTest::Reporters::SpecReporter.new, MiniTest::Reporters::GuardReporter.new]