thirst 0.0.1 → 0.0.2

data/README.md

@@ -18,12 +18,21 @@ and if you want the pub closest to where your IP is thought to be you can
 
     Pub.find
 
+furthermore an options hash can give you the closest pub to an address of a point:
+
+    oliver = Pub.find :address => "Repslagargatan 6, Stockholm"
+    oliver.name.should == 'Oliver Twist'
+
+    amsterdam = Pub.find :point => [57.71, 11.98]
+    amsterdam.name.should == 'Het Amsterdammertje'
+
 Each pub has a name, a latitude and a longitude. More will come later.
 
 
 limitations
 ===========
 
-The gem is backed up with pubs in Sweden from the list maintained by Svenska Ölfrämjandet. If you feel you need this for your own country go ahead and contribute.
+The gem is backed up with pubs in Sweden from the list maintained by Svenska Ölfrämjandet. This data is released under a creative commons license as detailed below. You can not use this gem commercially without a specific deal with Svenska Ölfrämjandet. If you feel you need this for your own country go ahead and contribute.
 
+<div xmlns:cc="http://creativecommons.org/ns#" xmlns:dct="http://purl.org/dc/terms/" about="http://www.svenskaolframjandet.se/pubs_for_gps"><span property="dct:title">Svenska Ölfrämjandets pubdatabas</span> (<a rel="cc:attributionURL" property="cc:attributionName" href="http://www.svenskaolframjandet.se">Svenska Ölfrämjandet</a>) / <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.5/se/">CC BY-NC-SA 2.5</a></div> 
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/thirst/thirst_quencher.rb

@@ -12,25 +12,46 @@ class Pub
     [latitude, longitude]
   end
 
-  def Pub::find
-    agent = Mechanize.new
-    page = agent.get 'http://freegeoip.net/json/'
-    my_location = JSON.parse page.body
-    my_latitude  = my_location['latitude'] 
-    my_longitude = my_location['longitude']
-    my_location = [my_latitude,my_longitude]
-    sorted_pubs = Pub::all.sort do |one, other|
-      distance_to_one =   distance_between my_location, one.location
-      distance_to_other = distance_between my_location, other.location
+  def Pub::find options = {}
+    if options[:address]
+      location = Pub::location_from_address options[:address]
+    elsif options[:point]
+      location = options[:point]
+    else
+      location = Pub::location_from_current_ip
+    end
+    sorted_pubs = Pub::find_near location
+    count = options[:count] || 1
+    count == 1 ? sorted_pubs.first : sorted_pubs[0...count]
+  end
+
+  def Pub::find_near location
+    Pub::all.sort do |one, other|
+      distance_to_one   = distance_between location, one.location
+      distance_to_other = distance_between location, other.location
       distance_to_one <=> distance_to_other
     end
-    sorted_pubs.first
   end
 
   def Pub::all
     Pub::get_me_them_pubs
   end
 
+  def Pub::location_from_current_ip
+    agent = Mechanize.new
+    page = agent.get 'http://freegeoip.net/json/'
+    location = JSON.parse page.body
+    [location['latitude'], location['longitude']]
+  end
+
+  def Pub::location_from_address address
+    point = Geocoder.search( address ).first.data['geometry']['location']
+    [point['lat'], point['lng']]
+  end
+
+  :private
+
+
   def Pub::get_me_them_pubs
     unless defined? @@pubs
       @@pubs = load_pub_list

data/spec/thirst_quencher_spec.rb

@@ -28,4 +28,19 @@ describe Pub do
     nearest_pub.latitude .should_not be_nil
     nearest_pub.longitude.should_not be_nil
   end
+
+  it "should find oliver twist" do
+    oliver = Pub.find :address => "Repslagargatan 6, Stockholm"
+    oliver.name.should == 'Oliver Twist'
+  end
+
+  it "should find relative a point" do
+    amsterdam = Pub.find :point => [57.71, 11.98]
+    amsterdam.name.should == 'Het Amsterdammertje'
+  end
+
+  it "should find any number of pubs" do
+    pubs = Pub.find :count => 5
+    pubs.size.should == 5
+  end
 end

data/thirst.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "thirst"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fredrik Rubensson"]
-  s.date = "2012-08-19"
+  s.date = "2012-09-10"
   s.description = "Pub.find if user.in_sweden?"
   s.email = "fredrik@eldfluga.se"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thirst
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &2157550900 !ruby/object:Gem::Requirement
+  requirement: &2155716060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157550900
+  version_requirements: *2155716060
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &2157550420 !ruby/object:Gem::Requirement
+  requirement: &2155715520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157550420
+  version_requirements: *2155715520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157549920 !ruby/object:Gem::Requirement
+  requirement: &2155715000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157549920
+  version_requirements: *2155715000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157549400 !ruby/object:Gem::Requirement
+  requirement: &2155714500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157549400
+  version_requirements: *2155714500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157548880 !ruby/object:Gem::Requirement
+  requirement: &2155714000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157548880
+  version_requirements: *2155714000
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2157548360 !ruby/object:Gem::Requirement
+  requirement: &2155713480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157548360
+  version_requirements: *2155713480
 description: Pub.find if user.in_sweden?
 email: fredrik@eldfluga.se
 executables: []
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1786957553276533335
+      hash: -144350713092483912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: