machiawase 0.3.1 → 0.3.2

data/bin/machiawase

@@ -3,4 +3,4 @@
 require 'rubygems'
 require 'machiawase'
 
-puts Machiawase.where?(ARGV).address
+puts Machiawase.where(*ARGV).address

data/lib/machiawase.rb

@@ -7,78 +7,87 @@ require 'open-uri'
 require 'machiawase/place'
 require 'machiawase/version'
 
-class Machiawase 
-  attr_reader :place, :places, :lat, :lon, :address, :near_station
+module Machiawase
 
-  def initialize(*places)
-    @place  = nil
-    @places = places
-  end
+  def self.where(*argv)
+    require 'optparse'
+    opt = OptionParser.new do |opt|
+      opt.version = VERSION
+    end
+    addresses = opt.parse(argv)
 
-  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 = Rendezvous.new(*places)
     m.place
   end
 
-  def place
-    @place ||= middle_of(*@places)
-  end
+  class Rendezvous
+    attr_reader :place, :places, :lat, :lon, :address, :near_station
 
-  def lat
-    @place ||= middle_of(*@places)
-    @place.lat
-  end
+    def initialize(*places)
+      @place  = nil
+      @places = places
+    end
 
-  def lon
-    @place ||= middle_of(*@places)
-    @place.lon
-  end
+    def place
+      @place ||= middle_of(*@places)
+    end
 
-  def address
-    @place ||= middle_of(*@places)
-    @place.address
-  end
+    def lat
+      @place ||= middle_of(*@places)
+      @place.lat
+    end
 
-  def near_station
-    @place ||= middle_of(*@places)
-    @place.near_station
-  end
+    def lon
+      @place ||= middle_of(*@places)
+      @place.lon
+    end
 
-  def to_h
-    h = Hash.new
-    @places.each_with_index do |place, i|
-      h.store("place#{i}", place.to_h)        
+    def address
+      @place ||= middle_of(*@places)
+      @place.address
     end
 
-    @place ||= middle_of(*@places)
-    h.store("machiawase", @place.to_h)
-  end
+    def near_station
+      @place ||= middle_of(*@places)
+      @place.near_station
+    end
 
-  def to_json
-    JSON.pretty_generate(to_h)
-  end
+    def to_h
+      h = Hash.new
+      @places.each_with_index do |place, i|
+        h.store("place#{i}", place.to_h)        
+      end
 
-  private
+      @place ||= middle_of(*@places)
+      h.store("machiawase", @place.to_h)
+    end
 
-  def middle_of(*places)
-    c = centroid(*places)
-    @place = Place.new(c[0], c[1])
-  end
+    def to_json
+      JSON.pretty_generate(to_h)
+    end
 
-  def centroid(*places)
-    x_sum = 0
-    y_sum = 0
+    private
 
-    places.each do |p|
-      x_sum += p.lat
-      y_sum += p.lon
+    def middle_of(*places)
+      c = centroid(*places)
+      @place = Place.new(c[0], c[1])
     end
 
-    [x_sum/places.length.to_f, y_sum/places.length.to_f]
+    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

@@ -1,4 +1,4 @@
-class Machiawase
+module Machiawase
   class Place
     attr_reader :address, :near_station
     attr_accessor :lat, :lon

data/lib/machiawase/version.rb

@@ -1,3 +1,3 @@
-class Machiawase
-  VERSION = "0.3.1"
+module Machiawase
+  VERSION = "0.3.2"
 end

data/spec/machiawase_spec.rb

@@ -2,6 +2,17 @@
 # -*- coding: utf-8 -*-
 require 'machiawase'
 
+describe Machiawase do
+
+  describe 'where' do
+    context '横浜, 東京' do
+      it 'should be Place' do
+        Machiawase.where("横浜", "東京").class.should eq(Machiawase::Place)
+      end
+    end
+  end
+
+end
 
 describe Machiawase::Place do
   describe ':address' do
@@ -29,17 +40,9 @@ describe Machiawase::Place do
   end
 end
 
-describe Machiawase do
+describe Machiawase::Rendezvous do
   before do
-    @machiawase = Machiawase.new
-  end
-
-  describe 'where?' do
-    context '横浜, 東京' do
-      it 'should be Place' do
-        Machiawase.where?("横浜", "東京").class.should eq(Machiawase::Place)
-      end
-    end
+    @machiawase = Machiawase::Rendezvous.new
   end
 
   describe ":centroid" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machiawase
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70209663995100 !ruby/object:Gem::Requirement
+  requirement: &70196166761400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209663995100
+  version_requirements: *70196166761400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209663994680 !ruby/object:Gem::Requirement
+  requirement: &70196166760980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209663994680
+  version_requirements: *70196166760980
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70209663994260 !ruby/object:Gem::Requirement
+  requirement: &70196166760560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209663994260
+  version_requirements: *70196166760560
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70209663993840 !ruby/object:Gem::Requirement
+  requirement: &70196166760140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209663993840
+  version_requirements: *70196166760140
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70209663993420 !ruby/object:Gem::Requirement
+  requirement: &70196166759720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209663993420
+  version_requirements: *70196166759720
 description: provides command line usage and library to get a middle point of plural
   points
 email: