machiawase 0.3.6 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5daaa6bc7d71d7b055b35b590e4b9590a58aa05e
+  data.tar.gz: 6e8e8e6494da115a06435ae08f86451365ca7db6
+SHA512:
+  metadata.gz: 8699b0fb6002770b15c6161601672c7b8fc54839d0a6784aa136c293c4d7cefa4ef8164a4d9add0f8b6d4efc89b6d61d2e7943370b4ee0bc23dbc4af00340a12
+  data.tar.gz: bf2a7bf5184f4c914bff6fc51c0387596e493d08a02308917f684b664f7944c372cb88e60d1d7f197461c27edf9a45ca996ad42301f7875ebb8b3fbb3edb33b6

data/Guardfile

@@ -0,0 +1,21 @@
+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" }
+
+  # 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" }
+
+  # Rails 3.2
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
+  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }  
+  
+  # Rails
+  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
+  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }  
+end

data/lib/machiawase.rb

@@ -7,8 +7,11 @@ require 'open-uri'
 require 'machiawase/place'
 require 'machiawase/version'
 
+# @author {https://github.com/zakuni zakuni}
 module Machiawase
 
+  # @param argv [Array<Place>] the array of places.
+  # @return [Place] the place to rendezvous.
   def self.where(*argv)
     require 'optparse'
     opt = OptionParser.new do |opt|
@@ -26,8 +29,15 @@ module Machiawase
   end
 
   class Rendezvous
-    attr_reader :place, :places, :lat, :lon, :address, :near_station
+    # @!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
@@ -57,6 +67,7 @@ module Machiawase
       @place.near_station
     end
 
+    # @return [Hash] the attributes with Hash format.
     def to_h
       h = Hash.new
       @places.each_with_index do |place, i|
@@ -67,6 +78,7 @@ module Machiawase
       h.store("machiawase", @place.to_h)
     end
 
+    # @return [JSON] the attributes with JSON format.
     def to_json
       JSON.pretty_generate(to_h)
     end

data/lib/machiawase/place.rb

@@ -1,4 +1,16 @@
+# -*- coding: utf-8 -*-
 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
+  #   @return the latitude.
+  # @!attribute [rw] lon
+  #   @return the longitude.
   class Place
     attr_reader :address, :near_station, :google_map_url
     attr_accessor :lat, :lon
@@ -10,6 +22,7 @@ module Machiawase
       @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"])
     end
 
     def lat=(val)
@@ -26,21 +39,41 @@ module Machiawase
       @near_station = nil
     end
 
+    # @return [Hash] geocode of given address.
     def self.geocode(address)
       address  = URI.encode(address)
-      hash     = Hash.new
       baseUrl  = "http://maps.google.com/maps/api/geocode/json"
       reqUrl   = "#{baseUrl}?address=#{address}&sensor=false&language=ja"
-      response = Net::HTTP.get_response(URI.parse(reqUrl))
+      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)
       lat      = status['results'][0]['geometry']['location']['lat']
       lon      = status['results'][0]['geometry']['location']['lng']
       {"lat" => lat, "lon" => lon}
     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
+      
+      # 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
+      }
+    end
+
     def address
       begin
-        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}"))
+        @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"
@@ -49,25 +82,25 @@ module Machiawase
 
     def near_station
       begin
-        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}"))
+        @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
     end
     
-    # Returns attributes with Hash format.
+    # @return [Hash] attributes with Hash format.
     def to_h
       {
         "latitude"     => @lat,
-        "longitude"   => @lon,
+        "longitude"    => @lon,
         "address"      => address,
         "near_station" => near_station,
         "google_map"   => @google_map_url
       }
     end
 
-    # Returns attributes with JSON format.
+    # @return [JSON] attributes with JSON format.
     def to_json
       JSON.pretty_generate(to_h)
     end

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
 module Machiawase
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/machiawase.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.version       = Machiawase::VERSION
 
   gem.add_dependency "nokogiri"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "ZenTest"
-  gem.add_development_dependency "autotest-fsevent"
-  gem.add_development_dependency "autotest-growl"
-end
+  gem.add_development_dependency "guard-minitest"
+  gem.add_development_dependency "rb-fsevent"
+  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "growl"
+end

data/spec/machiawase/place_spec.rb

@@ -0,0 +1,86 @@
+#!/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,40 +1,12 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'machiawase'
+require 'spec_helper'
 
 describe Machiawase do
-
   describe 'where' do
-    context '横浜, 東京' do
+    describe '横浜, 東京' do
       it 'should be Place' do
-        Machiawase.where("横浜", "東京").class.should eq(Machiawase::Place)
-      end
-    end
-  end
-
-end
-
-describe Machiawase::Place do
-  describe ':address' do
-    context '35.4437078, 139.6380256' do
-      it 'should be 神奈川県横浜市中区真砂町1丁目9' do
-        Machiawase::Place.new(35.4437078, 139.6380256).address.should eq("神奈川県横浜市中区真砂町1丁目9")
-      end
-    end
-  end
-
-  describe 'geocode' do
-    context '横浜' do
-      it 'should be {lat => 35.4437978, lon => 139.6380256}' do
-        Machiawase::Place.geocode('横浜').should eq ({"lat" => 35.4437078, "lon" => 139.6380256})
-      end
-    end
-  end
-
-  describe 'near_station' do
-    context '横浜' do
-      it 'should be 関内駅' do
-        Machiawase::Place.new(35.4437978, 139.6380256).near_station.should eq ("関内駅")
+        Machiawase.where("横浜", "東京").class.must_equal(Machiawase::Place)
       end
     end
   end
@@ -46,34 +18,34 @@ describe Machiawase::Rendezvous do
   end
 
   describe ":centroid" do
-    context '(0, 0), (1, 1)' 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]).should eq([0.5, 0.5])
+        @machiawase.send(:centroid, *[place_a, place_b]).must_equal([0.5, 0.5])
       end
     end
-    context '(0, 0), (1, 1), (2, 2)' do
+    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]).should eq([1, 1])
+        @machiawase.send(:centroid, *[place_a, place_b, place_c]).must_equal([1, 1])
       end
     end
-    context '(0, 0), (2, 0), (2, 2), (0, 2)' do
+    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]).should eq([1, 1])
+        @machiawase.send(:centroid, *[place_a, place_b, place_c, place_d]).must_equal([1, 1])
       end
     end
   end
 
   describe ':middle_of' do
-    context '横浜, 東京' do
+    describe '横浜, 東京' do
       it 'should be Place' do
         g1 = Machiawase::Place.geocode("横浜")
         p1 = Machiawase::Place.new(g1['lat'], g1['lon'])
@@ -81,7 +53,7 @@ describe Machiawase::Rendezvous do
         g2 = Machiawase::Place.geocode("東京")
         p2 = Machiawase::Place.new(g2['lat'], g2['lon'])
         
-        @machiawase.send(:middle_of, p1, p2).class.should eq(Machiawase::Place)
+        @machiawase.send(:middle_of, p1, p2).class.must_equal(Machiawase::Place)
       end
     end
   end

data/spec/spec_helper.rb

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

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.3.6
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - zakuni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ZenTest
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autotest-fsevent
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autotest-growl
+  name: growl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: provides command line usage and library to get a middle point of plural
@@ -103,7 +92,7 @@ files:
 - .autotest
 - .gitignore
 - Gemfile
-- Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -113,31 +102,33 @@ files:
 - lib/machiawase/place.rb
 - lib/machiawase/version.rb
 - machiawase.gemspec
+- spec/machiawase/place_spec.rb
 - spec/machiawase_spec.rb
+- spec/spec_helper.rb
 homepage: http://zakuni.github.com/machiawase/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: finds a middle point of plural points
 test_files:
+- spec/machiawase/place_spec.rb
 - spec/machiawase_spec.rb
-has_rdoc: 
+- spec/spec_helper.rb