machiawase 0.1.1 → 0.2.0

data/README.md

@@ -35,3 +35,5 @@ or
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+[![endorse](http://api.coderwall.com/zakuni/endorsecount.png)](http://coderwall.com/zakuni)

data/lib/machiawase.rb

@@ -7,76 +7,85 @@ require 'nokogiri'
 require 'open-uri'
 
 class Machiawase 
-  class Coordinates
-    attr :x, :y
+  attr :lat, :lon, :address, :near_station
 
-    def initialize(x, y)
-      @x = x 
-      @y = y 
+  def initialize(*places)
+    @places = places
+  end
+
+  class Place
+    attr :lat, :lon
+
+    def initialize(lat, lon)
+      @lat = lat 
+      @lon = lon 
+      @doc = 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_json
+      JSON.pretty_generate({
+                             "latitude" => @lat,
+                             "longtitude" => @lon,
+                             "address" => address,
+                             "near_station" => near_station
+                           })
     end
   end
 
   def middle_of(*spots)
-    @spots_coordinates = Hash.new
-    @coordinates = Array.new
+    places = Array.new
     
     spots.each do |spot|
-      lat_lng = geocode(spot)
-      @spots_coordinates.store(spot, lat_lng)
-      @coordinates.push(Coordinates.new(lat_lng[0], lat_lng[1]))
+      coordinates = Place.geocode(spot)
+      places.push(Place.new(coordinates["lat"], coordinates["lon"]))
     end
 
-    lat_lon = centroid(*@coordinates)
-    result = Hash.new
-    @spots_coordinates.each do |spot, coordinates|
-      result.store(spot, 
-                   {"latitude" => coordinates[0],
-                     "longtitude" => coordinates[1],
-                     "address" => place_name(coordinates[0], coordinates[1])
-                   })
-    end
-    result.store("result", 
-                 {"latitude" => lat_lon[0],
-                   "longtitude" => lat_lon[1],
-                   "address" => place_name(lat_lon[0], lat_lon[1])
-                 })
-    JSON.pretty_generate(result)
+    c = centroid(*places)
+    return Place.new(c[0], c[1])
   end
 
-
   private
 
-  def 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']
-    lng = status['results'][0]['geometry']['location']['lng']
-    [lat, lng]
-  end
-
   def centroid(*coordinates)
     @x_sum = 0
     @y_sum = 0
 
     coordinates.each do |c|
-      @x_sum += c.x
-      @y_sum += c.y
+      @x_sum += c.lat
+      @y_sum += c.lon
     end
 
     [@x_sum/coordinates.length.to_f, @y_sum/coordinates.length.to_f]
   end
 
-  def place_name(lat, lon)
-    begin
-      doc = Nokogiri::HTML(open("http://nishioka.sakura.ne.jp/google/ws.php?lat=#{lat}&lon=#{lon}&format=simple"))
-      address = doc.xpath('//address')[0].content
-    rescue
-      address = "Service Temporary Unavailable"
-    end
-  end
-
 end

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
 class Machiawase
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/machiawase_spec.rb

@@ -2,15 +2,43 @@
 # -*- coding: utf-8 -*-
 require 'machiawase'
 
+
+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 ("関内駅")
+      end
+    end
+  end
+end
+
 describe Machiawase do
   before do
     @machiawase = Machiawase.new
   end
 
-  describe ":geocode" do
-    context '横浜' do
-      it 'should be 35.4437978, 139.6380256' do
-        @machiawase.send(:geocode, "横浜").should eq([35.4437078, 139.6380256])
+  describe 'middle_of' do
+    context '横浜, 東京' do
+      it 'should be Place' do
+        m = @machiawase.middle_of("横浜", "東京")
+        @machiawase.middle_of("横浜", "東京").class.should eq(Machiawase::Place)
       end
     end
   end
@@ -18,42 +46,26 @@ describe Machiawase do
   describe ":centroid" do
     context '(0, 0), (1, 1)' do
       it 'should be (0.5, 0.5)' do
-        coordinates_a = Machiawase::Coordinates.new(0, 0)
-        coordinates_b = Machiawase::Coordinates.new(1, 1)
-        @machiawase.send(:centroid, *[coordinates_a, coordinates_b]).should eq([0.5, 0.5])
+        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])
       end
     end
     context '(0, 0), (1, 1), (2, 2)' do
       it 'should be (1, 1)' do
-        coordinates_a = Machiawase::Coordinates.new(0, 0)
-        coordinates_b = Machiawase::Coordinates.new(1, 1)
-        coordinates_c = Machiawase::Coordinates.new(2, 2)
-        @machiawase.send(:centroid, *[coordinates_a, coordinates_b, coordinates_c]).should eq([1, 1])
+        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])
       end
     end
     context '(0, 0), (2, 0), (2, 2), (0, 2)' do
       it 'should be (1, 1)' do
-        coordinates_a = Machiawase::Coordinates.new(0, 0)
-        coordinates_b = Machiawase::Coordinates.new(2, 0)
-        coordinates_c = Machiawase::Coordinates.new(2, 2)
-        coordinates_d = Machiawase::Coordinates.new(0, 2)
-        @machiawase.send(:centroid, *[coordinates_a, coordinates_b, coordinates_c, coordinates_d]).should eq([1, 1])
-      end
-    end
-  end
-
-  describe ':place_name' do
-    context '35.4437078, 139.6380256' do
-      it 'should be 神奈川県横浜市中区真砂町一丁目1' do
-        @machiawase.send(:place_name, 35.4437078, 139.6380256).should eq ("神奈川県横浜市中区真砂町一丁目1")
-      end
-    end
-  end
-
-  describe 'middle_of' do
-    context '横浜, 東京' do
-      it 'should be middle' do
-        @machiawase.middle_of("横浜", "東京")
+        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])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-21 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70304349754040 !ruby/object:Gem::Requirement
+  requirement: &70306408836240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70304349754040
+  version_requirements: *70306408836240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70304349753620 !ruby/object:Gem::Requirement
+  requirement: &70306408830820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304349753620
+  version_requirements: *70306408830820
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70304349753200 !ruby/object:Gem::Requirement
+  requirement: &70306408824860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304349753200
+  version_requirements: *70306408824860
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70304349752780 !ruby/object:Gem::Requirement
+  requirement: &70306408816260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304349752780
+  version_requirements: *70306408816260
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70304349752360 !ruby/object:Gem::Requirement
+  requirement: &70306408807040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70304349752360
+  version_requirements: *70306408807040
 description: provides command line usage and library to get a middle point of plural
   points
 email: