machiawase 0.2.1 → 0.3.0

data/bin/machiawase

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-
 require 'rubygems'
 require 'machiawase'
 
-machiawase = Machiawase.new
-puts machiawase.middle_of(ARGV[0], ARGV[1]).address
+puts Machiawase.where?(ARGV).address

data/lib/machiawase/place.rb

@@ -0,0 +1,71 @@
+class Machiawase
+  class Place
+    attr_reader :address, :near_station
+    attr_accessor :lat, :lon
+
+    def initialize(lat, lon)
+      @lat          = lat 
+      @lon          = lon 
+      @doc          = nil
+      @address      = nil
+      @near_station = nil
+    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
+
+    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))
+      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 address
+      begin
+        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}"))
+        @address ||= @doc.xpath('//address')[0].content
+      rescue
+        "Service Temporary Unavailable"
+      end
+    end
+
+    def near_station
+      begin
+        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}"))
+        @near_station ||= @doc.xpath('//station1')[0].content
+      rescue
+        "Service Temporary Unavailable"
+      end
+    end
+
+    def to_h
+      {
+        "latitude"     => @lat,
+        "longtitude"   => @lon,
+        "address"      => address,
+        "near_station" => near_station
+      }
+    end
+
+    def to_json
+      JSON.pretty_generate(to_h)
+    end
+  end
+end

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
 class Machiawase
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/machiawase.rb

@@ -1,91 +1,84 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'machiawase/version'
 require 'net/http'
 require 'json'
 require 'nokogiri'
 require 'open-uri'
+require 'machiawase/place'
+require 'machiawase/version'
 
 class Machiawase 
-  attr :lat, :lon, :address, :near_station
+  attr_reader :place, :places, :lat, :lon, :address, :near_station
 
   def initialize(*places)
+    @place  = nil
     @places = places
   end
 
-  class Place
-    attr :lat, :lon
-
-    def initialize(lat, lon)
-      @lat = lat 
-      @lon = lon 
-      @doc = nil
+  def self.where?(*addresses)
+    places = Array.new
+    addresses.each do |address|
+      g = Place.geocode(address)
+      places << Place.new(g['lat'], g['lon'])
     end
+    m = Machiawase.new(*places)
+    m.place
+  end
 
-    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))
-      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 place
+    @place ||= middle_of(*@places)
+  end
 
-    def address
-      begin
-        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}"))
-        @address ||= @doc.xpath('//address')[0].content
-      rescue
-        "Service Temporary Unavailable"
-      end
-    end
+  def lat
+    @place ||= middle_of(*@places)
+    @place.lat
+  end
 
-    def near_station
-      begin
-        @doc ||= Nokogiri::HTML(open("http://geocode.didit.jp/reverse/?lat=#{@lat}&lon=#{@lon}"))
-        @near_station ||= @doc.xpath('//station1')[0].content
-      rescue
-        "Service Temporary Unavailable"
-      end
-    end
+  def lon
+    @place ||= middle_of(*@places)
+    @place.lon
+  end
 
-    def to_json
-      JSON.pretty_generate({
-                             "latitude" => @lat,
-                             "longtitude" => @lon,
-                             "address" => address,
-                             "near_station" => near_station
-                           })
-    end
+  def address
+    @place ||= middle_of(*@places)
+    @place.address
   end
 
-  def middle_of(*spots)
-    places = Array.new
-    
-    spots.each do |spot|
-      coordinates = Place.geocode(spot)
-      places.push(Place.new(coordinates["lat"], coordinates["lon"]))
+  def near_station
+    @place ||= middle_of(*@places)
+    @place.address
+  end
+
+  def to_h
+    h = Hash.new
+    @places.each_with_index do |place, i|
+      h.store("place#{i}", place.to_h)        
     end
 
-    c = centroid(*places)
-    return Place.new(c[0], c[1])
+    @place ||= middle_of(*@places)
+    h.store("machiawase", @place.to_h)
+  end
+
+  def to_json
+    JSON.pretty_generate(to_h)
   end
 
   private
 
-  def centroid(*coordinates)
-    @x_sum = 0
-    @y_sum = 0
+  def middle_of(*places)
+    c = centroid(*places)
+    @place = Place.new(c[0], c[1])
+  end
 
-    coordinates.each do |c|
-      @x_sum += c.lat
-      @y_sum += c.lon
+  def centroid(*places)
+    x_sum = 0
+    y_sum = 0
+
+    places.each do |p|
+      x_sum += p.lat
+      y_sum += p.lon
     end
 
-    [@x_sum/coordinates.length.to_f, @y_sum/coordinates.length.to_f]
+    [x_sum/places.length.to_f, y_sum/places.length.to_f]
   end
-
 end

data/spec/machiawase_spec.rb

@@ -34,11 +34,10 @@ describe Machiawase do
     @machiawase = Machiawase.new
   end
 
-  describe 'middle_of' do
+  describe 'where?' do
     context '横浜, 東京' do
       it 'should be Place' do
-        m = @machiawase.middle_of("横浜", "東京")
-        @machiawase.middle_of("横浜", "東京").class.should eq(Machiawase::Place)
+        Machiawase.where?("横浜", "東京").class.should eq(Machiawase::Place)
       end
     end
   end
@@ -69,4 +68,18 @@ describe Machiawase do
       end
     end
   end
+
+  describe ':middle_of' do
+    context '横浜, 東京' 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.should eq(Machiawase::Place)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70176653981060 !ruby/object:Gem::Requirement
+  requirement: &70116961429540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176653981060
+  version_requirements: *70116961429540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70176653980640 !ruby/object:Gem::Requirement
+  requirement: &70116960320860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176653980640
+  version_requirements: *70116960320860
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70176653980220 !ruby/object:Gem::Requirement
+  requirement: &70116960319460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176653980220
+  version_requirements: *70116960319460
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70176653979800 !ruby/object:Gem::Requirement
+  requirement: &70116960318060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176653979800
+  version_requirements: *70116960318060
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70176653979380 !ruby/object:Gem::Requirement
+  requirement: &70116960316440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176653979380
+  version_requirements: *70116960316440
 description: provides command line usage and library to get a middle point of plural
   points
 email:
@@ -85,6 +85,7 @@ files:
 - autotest/discover.rb
 - bin/machiawase
 - lib/machiawase.rb
+- lib/machiawase/place.rb
 - lib/machiawase/version.rb
 - machiawase.gemspec
 - spec/machiawase_spec.rb