machiawase 0.1.0 → 0.1.1

data/lib/machiawase.rb

@@ -3,10 +3,19 @@
 require 'machiawase/version'
 require 'net/http'
 require 'json'
-require 'hpricot'
+require 'nokogiri'
 require 'open-uri'
 
 class Machiawase 
+  class Coordinates
+    attr :x, :y
+
+    def initialize(x, y)
+      @x = x 
+      @y = y 
+    end
+  end
+
   def middle_of(*spots)
     @spots_coordinates = Hash.new
     @coordinates = Array.new
@@ -63,20 +72,11 @@ class Machiawase
 
   def place_name(lat, lon)
     begin
-      doc = Hpricot(open("http://nishioka.sakura.ne.jp/google/ws.php?lat=#{lat}&lon=#{lon}&format=simple"))
-      address = doc.at(:address).inner_text
+      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
-
-class Coordinates
-  attr :x, :y
-
-  def initialize(x, y)
-    @x = x 
-    @y = y 
-  end
-end

data/lib/machiawase/version.rb

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

data/machiawase.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Machiawase::VERSION
 
-  gem.add_dependency "hpricot"
+  gem.add_dependency "nokogiri"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "ZenTest"
   gem.add_development_dependency "autotest-fsevent"

data/spec/machiawase_spec.rb

@@ -18,25 +18,25 @@ describe Machiawase do
   describe ":centroid" do
     context '(0, 0), (1, 1)' do
       it 'should be (0.5, 0.5)' do
-        coordinates_a = Coordinates.new(0, 0)
-        coordinates_b = Coordinates.new(1, 1)
+        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])
       end
     end
     context '(0, 0), (1, 1), (2, 2)' do
       it 'should be (1, 1)' do
-        coordinates_a = Coordinates.new(0, 0)
-        coordinates_b = Coordinates.new(1, 1)
-        coordinates_c = Coordinates.new(2, 2)
+        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])
       end
     end
     context '(0, 0), (2, 0), (2, 2), (0, 2)' do
       it 'should be (1, 1)' do
-        coordinates_a = Coordinates.new(0, 0)
-        coordinates_b = Coordinates.new(2, 0)
-        coordinates_c = Coordinates.new(2, 2)
-        coordinates_d = Coordinates.new(0, 2)
+        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

metadata

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