where 0.0.1 → 0.0.2

data/.gitignore

@@ -1,4 +1,17 @@
 .DS_Store
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
 coverage
-rdoc
+doc/
+lib/bundler/man
 pkg
+rdoc
+spec/reports
+tmp
+/bin

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in where.gemspec
+gemspec

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright (c) 2009 Matt Venables
+Copyright (c) 2013 Matt Venables
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,54 @@
+Where
+=====
+
+A basic geolocation library for Ruby.
+
+Installation
+------------
+
+Add this line to your application's Gemfile:
+
+    gem 'where'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install where
+
+Usage
+-----
+
+Search by Address:
+
+    result = Where.is '4 yawkey way boston ma'
+    if result.success?
+      puts "Address: #{result.address}"
+      puts "Street Number: #{result.street_number}"
+      puts "Street: #{result.street}"
+      puts "City: #{result.city}"
+      puts "State: #{result.state}"
+      puts "Zip: #{result.postal_code}"
+      puts "Country: #{result.country}"
+      puts "Lat: #{result.lat}"
+      puts "Lng: #{result.lng}"
+    end
+
+Or, by IP-Address:
+
+    result = Where.is "173.194.33.104"
+    ...
+
+Testing
+-------
+
+Run the spec suite by running:
+
+    rspec
+
+Copyright
+---------
+
+Copyright (c) 2013 Matt Venables. See LICENSE.txt for details.

data/Rakefile

@@ -1,53 +1 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "where"
-    gem.summary = %Q{A simple geolocation library.}
-    gem.description = %Q{A very simple geolocation library for searching based on postal address or ip address.}
-    gem.email = "matt@veg.etabl.es"
-    gem.homepage = "http://github.com/vegetables/where"
-    gem.authors = ["Matt Venables"]
-    gem.add_development_dependency "shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "where #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/lib/where.rb

@@ -1,14 +1,14 @@
+require "where/version"
 require 'where/base'
 require 'where/address'
 require 'where/ip_address'
 
-module Where  
-  def self.is(address = "")
-    address ||= ""
-    if address.match(/^(\d{1,3}\.){3}\d{1,3}$/)
-      Where::IpAddress.geocode address
+module Where
+  def self.is(address = "", opts={})
+    if address.to_s.match(/^(\d{1,3}\.){3}\d{1,3}$/)
+      Where::IpAddress.geocode(address, opts)
     else
-      Where::Address.geocode address
-    end    
+      Where::Address.geocode(address, opts)
+    end
   end
-end
+end

data/lib/where/address.rb

@@ -1,43 +1,42 @@
 module Where
-  class Address < Where::Base    
-    class << self
-      GEOCODER_URL = 'http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address='
-      
-      def geocode(address, api_url=nil)
-        super(address, api_url || GEOCODER_URL)
-      end
+  class Address < Where::Base
+    GEOCODER_URL = 'http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address='
+
+    def self.geocode(address, opts={})
+      super(address, GEOCODER_URL)
     end
-    
-    def results=(results_array = [])
-      results_array.each { |result| self.new_attributes = result }
+
+    def results=(results_array=[])
+      results_array.each { |result| self.attributes = result }
     end
-    
-    def types=(val = [])
+
+    def types=(val=[])
       @accuracy = determine_type(val)
     end
-    
+
     def formatted_address=(val)
       @address = val
     end
-    
-    def address_components=(components = [])
+
+    def address_components=(components=[])
       components.each do |component|
-        type = determine_type component['types']
+        type = determine_type(component['types'])
         next if type.empty?
-        if %w(region country).include? type
-          self.send "#{type}_code=", component['short_name']
-          self.send "#{type}_name=", component['long_name']
+
+        if %w(region country).include?(type)
+          send("#{type}_code=", component['short_name'])
+          send("#{type}_name=", component['long_name'])
         else
-          self.send "#{type}=", component['long_name']
+          send("#{type}=", component['long_name'])
         end
       end
     end
-    
-    def geometry=(val = {})
-      self.new_attributes = val['location']
+
+    def geometry=(val={})
+      self.attributes = val['location']
     end
-     
-  private
+
+    private
 
     def determine_type(val = [])
       { 'street_address'              => 'street_address',
@@ -49,10 +48,10 @@ module Where
         'postal_code'                 => 'postal_code',
         'country'                     => 'country'
       }.each do |k, v|
-        return v if val.include? k
+        return v if val.include?(k)
       end
       ""
     end
-      
+
   end
 end

data/lib/where/base.rb

@@ -4,36 +4,32 @@ require 'active_support'
 
 module Where
   class Base
-    attr_accessor :street_number, :street, :city, :neighborhood, :postal_code, 
-                  :region_code, :region_name, :accuracy,
-                  :country_code, :country_name, :lat, :lng
-    
-    class << self
-      def geocode(address, api_url = '')
-        begin
-          url = api_url + URI.escape(address)
-          response = Net::HTTP.get_response(URI.parse(url))
-          self.new response.body
-        rescue
-          self.new
-        end
-      end
+    attr_accessor :street_number, :street, :city, :neighborhood, :postal_code,
+                  :region_code, :region_name, :accuracy, :country_code,
+                  :country_name, :lat, :lng
+
+    def self.geocode(address, api_url='')
+      url = api_url + URI.escape(address)
+      response = Net::HTTP.get_response(URI.parse(url))
+      new(response.body)
+    rescue
+      new
     end
-    
-    def initialize(data = "")
-      opts = ActiveSupport::JSON.decode(data)
-      return if opts.empty?
-      self.new_attributes = opts
+
+    def initialize(data='')
+      json = ActiveSupport::JSON.decode(data)
+      return if json.nil? || json.empty?
+      self.attributes = json
       self
     end
-    
-    def new_attributes=(opts = {})
+
+    def attributes=(opts={})
       opts.each do |k,v|
         var_name = ActiveSupport::Inflector.underscore(k)
         if self.respond_to?("#{var_name}=")
           self.send "#{var_name}=", v
         else
-          self.instance_variable_set("@#{var_name}", v) 
+          self.instance_variable_set("@#{var_name}", v)
         end
       end
     end
@@ -42,29 +38,30 @@ module Where
     def success?
       @status == 'OK' || !@region_code.nil?
     end
-    
+
     def street_address
       arr = [street_number, street].compact
       arr.empty? ? nil : arr.join(" ")
     end
 
     def address
-      arr = [street_address, city, region(true), postal_code, country(true)].compact
+      arr = [street_address, city, region(true), postal_code, country(true)]
+      arr.compact!
       arr.empty? ? nil : arr.join(", ")
     end
-    
-    def city(use_neighborhood = false)
+
+    def city(use_neighborhood=false)
       @neighborhood && use_neighborhood ? @neighborhood : @city
     end
-    
-    def country(short_version = false)
+
+    def country(short_version=false)
       short_version ? @country_code : @country_name
     end
 
-    def region(short_version = false)
+    def region(short_version=false)
       short_version ? @region_code : @region_name
     end
 
   end
 
-end
+end

data/lib/where/ip_address.rb

@@ -1,33 +1,38 @@
 module Where
   class IpAddress < Where::Base
-    class << self
-      GEOCODER_URL = 'http://www.geoplugin.net/json.gp?ip='
-      
-      def geocode(address, api_url=nil)
-        super(address, api_url || GEOCODER_URL)
-      end
+    GEOPLUGIN_URL = 'http://www.geoplugin.net/json.gp?ip='
+    FREEGEOIP_URL = 'http://freegeoip.net/json/'
+
+    def self.geocode(address, opts={})
+      api_url = opts[:geocoder] == 'geoplugin' ? GEOPLUGIN_URL : FREEGEOIP_URL
+      super(address, api_url)
     end
-    
-    def initialize(body="")
-      data = body[10..-2] || ""
-      super(data.empty? ? data : data.gsub('geoplugin_', ''))
+
+    def initialize(data='')
+      super(data.to_s.gsub('geoplugin_', ''))
     end
-            
+
     def latitude=(val)
       @lat = val
     end
-    
+
     def longitude=(val)
       @lng = val
     end
-  
+
     def accuracy
-      return 'street_address' unless street.nil?
-      return 'city' unless city.nil?
-      return 'region' unless region.nil?
-      return 'country' unless country.nil?
-      ""
+      if street
+        'street_address'
+      elsif city
+        'city'
+      elsif region
+        'region'
+      elsif country
+        'country'
+      else
+        ''
+      end
     end
-    
+
   end
 end

data/lib/where/version.rb

@@ -0,0 +1,3 @@
+module Where
+  VERSION = "0.0.2"
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'where'

data/spec/where_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+describe Where do
+  describe '.is' do
+    context 'given nil' do
+      it 'returns an empty object' do
+        result = Where.is(nil)
+        result.accuracy.should be_nil
+        result.address.should be_nil
+        result.street_number.should be_nil
+        result.street.should be_nil
+        result.city.should be_nil
+        result.region.should be_nil
+        result.postal_code.should be_nil
+        result.country.should be_nil
+        result.lat.should be_nil
+        result.lng.should be_nil
+      end
+    end
+
+    context 'given an empty string' do
+      it 'returns an empty object' do
+        result = Where.is('')
+        result.accuracy.should be_nil
+        result.address.should be_nil
+        result.street_number.should be_nil
+        result.street.should be_nil
+        result.city.should be_nil
+        result.region.should be_nil
+        result.postal_code.should be_nil
+        result.country.should be_nil
+        result.lat.should be_nil
+        result.lng.should be_nil
+      end
+    end
+
+    context 'given an IP address' do
+      context 'using the default geocoder (freegeoip.net)' do
+        it 'returns a valid geolocation object' do
+          result = Where.is("173.194.33.104")
+          result.accuracy.should == 'city'
+          result.address.should_not be_nil
+          result.street_number.should be_nil
+          result.street.should be_nil
+          result.city.should == 'Mountain View'
+          result.city(true).should == 'Mountain View'
+          result.region.should == 'California'
+          result.region(true).should == 'CA'
+          result.postal_code.should be_nil
+          result.country.should == 'United States'
+          result.country(true).should == 'US'
+          result.lat.should_not be_nil
+          result.lng.should_not be_nil
+        end
+      end
+
+      context 'using geoplugin.net as the geocoder' do
+        it 'returns a valid geolocation object' do
+          result = Where.is("173.194.33.104", geocoder: 'geoplugin')
+          result.accuracy.should == 'city'
+          result.address.should_not be_nil
+          result.street_number.should be_nil
+          result.street.should be_nil
+          result.city.should == 'Mountain View'
+          result.city(true).should == 'Mountain View'
+          result.region.should == 'California'
+          result.region(true).should == 'CA'
+          result.postal_code.should be_nil
+          result.country.should == 'United States'
+          result.country(true).should == 'US'
+          result.lat.should_not be_nil
+          result.lng.should_not be_nil
+        end
+      end
+    end
+
+    context 'given a specific physical address' do
+      it 'returns a valid geolocation object' do
+        result = Where.is("4 yawkey way boston ma")
+        result.accuracy.should == 'street_address'
+        result.address.should_not be_nil
+        result.street_number.should == '4'
+        result.street.should == 'Yawkey Way'
+        result.city.should == 'Boston'
+        result.city(true).should == 'West Fens'
+        result.region.should == 'Massachusetts'
+        result.region(true).should == 'MA'
+        result.postal_code.should == '02215'
+        result.country.should == 'United States'
+        result.country(true).should == 'US'
+        result.lat.should_not be_nil
+        result.lng.should_not be_nil
+      end
+    end
+
+    context 'given a neighborhood physical address' do
+      it 'returns a valid geolocation object' do
+        result = Where.is("North End Boston MA")
+        result.accuracy.should == 'neighborhood'
+        result.address.should_not be_nil
+        result.street_number.should be_nil
+        result.street.should be_nil
+        result.city.should == 'Boston'
+        result.city(true).should == 'North End'
+        result.region.should == 'Massachusetts'
+        result.region(true).should == 'MA'
+        result.postal_code.should be_nil
+        result.country.should == 'United States'
+        result.country(true).should == 'US'
+        result.lat.should_not be_nil
+        result.lng.should_not be_nil
+      end
+    end
+  end
+end

data/where.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'where/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "where"
+  gem.version       = Where::VERSION
+  gem.authors       = ["Matt Venables"]
+  gem.email         = ["mattvenables@gmail.com"]
+  gem.description   = %q{A very simple geolocation library for searching based on postal address or ip address.}
+  gem.summary       = %q{A simple geolocation library.}
+  gem.homepage      = "http://github.com/venables/where"
+  gem.license       = "MIT"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency "activesupport"
+  gem.add_development_dependency "pry"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec"
+end

metadata

@@ -1,90 +1,133 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: where
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  prerelease: 
+  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Matt Venables
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-03 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shoulda
+date: 2013-02-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activesupport
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  version_requirements: *id001
-description: A very simple geolocation library for searching based on postal address or ip address.
-email: matt@veg.etabl.es
+  prerelease: false
+  name: pry
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A very simple geolocation library for searching based on postal address
+  or ip address.
+email:
+- mattvenables@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
+extra_rdoc_files: []
+files:
 - .gitignore
-- LICENSE
-- README.rdoc
+- .rspec
+- Gemfile
+- LICENSE.txt
+- README.md
 - Rakefile
-- VERSION
-- Where.gemspec
 - lib/where.rb
 - lib/where/address.rb
 - lib/where/base.rb
 - lib/where/ip_address.rb
-- test/helper.rb
-- test/test_where.rb
-has_rdoc: true
-homepage: http://github.com/vegetables/where
-licenses: []
-
+- lib/where/version.rb
+- spec/spec_helper.rb
+- spec/where_spec.rb
+- where.gemspec
+homepage: http://github.com/venables/where
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1629129296734922149
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
+      hash: 1629129296734922149
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple geolocation library.
-test_files: 
-- test/helper.rb
-- test/test_where.rb
+test_files:
+- spec/spec_helper.rb
+- spec/where_spec.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/README.rdoc

@@ -1,33 +0,0 @@
-= Where
-
-A basic geolocation library for Ruby.
-
-== Installation
-
-  gem install 'where'
-
-== Usage
-
-Search by Address:
-
-  result = Where.is '4 yawkey way boston ma'
-  if result.success?
-    puts "Address: #{result.address}"
-    puts "Street Number: #{result.street_number}"
-    puts "Street: #{result.street}"
-    puts "City: #{result.city}"
-    puts "State: #{result.state}"
-    puts "Zip: #{result.postal_code}"
-    puts "Country: #{result.country}"
-    puts "Lat: #{result.lat}"
-    puts "Lng: #{result.lng}"
-  end
-  
-Or, by IP-Address:
-
-  result = Where.is "173.194.33.104"
-  ...
-
-== Copyright
-
-Copyright (c) 2010 Matt Venables. See LICENSE for details.

data/VERSION

@@ -1 +0,0 @@
-0.0.1

data/Where.gemspec

@@ -1,57 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{where}
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matt Venables"]
-  s.date = %q{2010-10-03}
-  s.description = %q{A very simple geolocation library for searching based on postal address or ip address.}
-  s.email = %q{matt@veg.etabl.es}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "Where.gemspec",
-     "lib/where.rb",
-     "lib/where/address.rb",
-     "lib/where/base.rb",
-     "lib/where/ip_address.rb",
-     "test/helper.rb",
-     "test/test_where.rb"
-  ]
-  s.homepage = %q{http://github.com/vegetables/where}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A simple geolocation library.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_where.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-  end
-end
-

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'where'
-
-class Test::Unit::TestCase
-end

data/test/test_where.rb

@@ -1,86 +0,0 @@
-require 'helper'
-
-class TestWhere < Test::Unit::TestCase
-    
-  should "build an empty object when given a nil address" do
-    result = Where.is(nil)
-    assert result.accuracy.nil?
-    assert result.address.nil?
-    assert result.street_number.nil?
-    assert result.street.nil?
-    assert result.city.nil?
-    assert result.region.nil?
-    assert result.postal_code.nil?
-    assert result.country.nil?
-    assert result.lat.nil?
-    assert result.lng.nil?
-  end
-  
-  should "build an empty object when given an empty address" do
-    result = Where.is("")
-    assert result.accuracy.nil?
-    assert result.address.nil?
-    assert result.street_number.nil?
-    assert result.street.nil?
-    assert result.city.nil?
-    assert result.region.nil?
-    assert result.postal_code.nil?
-    assert result.country.nil?
-    assert result.lat.nil?
-    assert result.lng.nil?
-  end
-
-  should "build a valid geolocation object when given a street address" do
-    result = Where.is("4 yawkey way boston ma")
-    assert result.accuracy == 'street_address'
-    assert !result.address.nil?
-    assert result.street_number == '4'
-    assert result.street == 'Yawkey Way'
-    assert result.city == 'Boston'
-    assert result.city(true) == 'Boston'
-    assert result.region == 'Massachusetts'
-    assert result.region(true) == 'MA'
-    assert result.postal_code == '02215'
-    assert result.country == 'United States'
-    assert result.country(true) == 'US'
-    assert !result.lat.nil?
-    assert !result.lng.nil?
-  end
-  
-  should "build a valid geolocation object when given an address in a neighborhood" do
-    result = Where.is("brighton ma")
-    assert result.accuracy == 'neighborhood'
-    assert !result.address.nil?
-    assert result.street_number.nil?
-    assert result.street.nil?
-    assert result.city == 'Boston'
-    assert result.city(true) == 'Brighton'
-    assert result.region == 'Massachusetts'
-    assert result.region(true) == 'MA'
-    assert result.postal_code.nil?
-    assert result.country == 'United States'
-    assert result.country(true) == 'US'
-    assert !result.lat.nil?
-    assert !result.lng.nil?
-  end
-  
-  
-  should "build a valid geolocation object when given an ip address" do
-    result = Where.is("173.194.33.104")
-    assert result.accuracy == 'city'
-    assert !result.address.nil?
-    assert result.street_number.nil?
-    assert result.street.nil?
-    assert result.city == 'Mountain View'
-    assert result.city(true) == 'Mountain View'
-    assert result.region == 'California'
-    assert result.region(true) == 'CA'
-    assert result.postal_code.nil?
-    assert result.country == 'United States'
-    assert result.country(true) == 'US'
-    assert !result.lat.nil?
-    assert !result.lng.nil?
-  end
-  
-  
-end