geokit-nominatim 1.0.0 → 1.0.1

data/.gitignore

@@ -0,0 +1,7 @@
+coverage
+rdoc
+doc
+.bundle
+pkg
+.DS_Store
+Gemfile.lock

data/Gemfile

@@ -11,6 +11,4 @@ gem 'geokit'
 group :development do
   gem "rspec" #, "~> 2.3.0"
   gem "bundler" #, "~> 1.0.0"
-  gem "jeweler" #, "~> 1.6.2"
-  gem "rcov", ">= 0"
 end

data/HISTORY.txt

@@ -0,0 +1,9 @@
+v1.0.1 2012/05/24
+
+- Merge pull request #2 from ya-jeks/master 
+- Merge pull request #1 from inossidabile/master 
+- got rid of jeweler, added VERSION constant to NominatimGeocoder class
+
+v1.0.0 2011/06/24
+
+- initial version

data/Rakefile

@@ -2,48 +2,9 @@
 
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "geokit-nominatim"
-  gem.homepage = "http://github.com/sobakasu/geokit-nominatim"
-  gem.license = "MIT"
-  gem.summary = %Q{Nominatim geocoding provider for geokit}
-  gem.description = %Q{Nominatim geocoding provider for geokit}
-  gem.email = "sobakasu@gmail.com"
-  gem.authors = ["Andrew Williams"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "geokit-nominatim #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'spec/*_spec.rb'
 end

data/geokit-nominatim.gemspec

@@ -1,66 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'geokit-nominatim'
 
 Gem::Specification.new do |s|
-  s.name = %q{geokit-nominatim}
-  s.version = "1.0.0"
+  s.name        = "geokit-nominatim"
+  s.version     = Geokit::Geocoders::NominatimGeocoder::VERSION
+  s.authors     = ["Andrew Williams"]
+  s.email       = ["sobakasu@gmail.com"]
+  s.homepage    = "http://github.com/sobakasu/geokit-nominatim"
+  s.summary     = %Q{Nominatim geocoding provider for geokit}
+  s.description = %Q{Nominatim geocoding provider for geokit}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrew Williams"]
-  s.date = %q{2011-06-25}
-  s.description = %q{Nominatim geocoding provider for geokit}
-  s.email = %q{sobakasu@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "geokit-nominatim.gemspec",
-    "lib/geokit-nominatim.rb",
-    "lib/geokit/geocoders/nominatim_geocoder.rb",
-    "spec/nominatim_geocoder_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/sobakasu/geokit-nominatim}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Nominatim geocoding provider for geokit}
+  s.rubyforge_project = "geokit-nominatim"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files | grep -v pkg`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib", "app"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
-      s.add_runtime_dependency(%q<geokit>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<geokit>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<geokit>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  # Gem dependencies
+  s.add_dependency("json_pure",  "~> 1.7")
+  s.add_dependency("geokit",     "~> 1.6")
 end
-

data/lib/geokit/geocoders/nominatim_geocoder.rb

@@ -1,5 +1,6 @@
 class Geokit::Geocoders::NominatimGeocoder < Geokit::Geocoders::Geocoder
 
+  VERSION = "1.0.1"
   PLACE_KEYS = %W{city state postcode country country_code house_number house
                   hamlet}
   PROVIDER = 'nominatim'
@@ -23,7 +24,7 @@ class Geokit::Geocoders::NominatimGeocoder < Geokit::Geocoders::Geocoder
     opts = options.merge(:q => address_str, :limit => 1,
                          :format => :xml, :addressdetails => 1)
     opts.delete(:server)
-    params = opts.collect { |k,v| "#{k}=#{escape(v)}" }.join("&")
+    params = opts.collect { |k,v| "#{k}=#{URI.escape(v.to_s)}" }.join("&")
 
     # send query
     url = "#{server}?#{params}"
@@ -32,6 +33,7 @@ class Geokit::Geocoders::NominatimGeocoder < Geokit::Geocoders::Geocoder
 
     # parse response
     xml = server_res.body
+    xml = xml.force_encoding('utf-8') if xml.respond_to?(:force_encoding)
     logger.debug "nominatim geocoding. Address: #{address}. Result: #{xml}"
     self.parse_response(xml, res)
     res

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geokit-nominatim
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,112 +9,73 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000 +09:30
-default_executable: 
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2152833080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2152833080
-- !ruby/object:Gem::Dependency
-  name: geokit
-  requirement: &2152832100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152832100
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2152831220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2152831220
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2152830320 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2152830320
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2152829580 !ruby/object:Gem::Requirement
+  name: geokit
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.6'
+  type: :runtime
   prerelease: false
-  version_requirements: *2152829580
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2152828720 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2152828720
+        version: '1.6'
 description: Nominatim geocoding provider for geokit
-email: sobakasu@gmail.com
+email:
+- sobakasu@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
+- HISTORY.txt
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - geokit-nominatim.gemspec
 - lib/geokit-nominatim.rb
 - lib/geokit/geocoders/nominatim_geocoder.rb
 - spec/nominatim_geocoder_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/sobakasu/geokit-nominatim
-licenses:
-- MIT
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
+- app
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2076618883302095355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,9 +83,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.6.2
+rubyforge_project: geokit-nominatim
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Nominatim geocoding provider for geokit
-test_files: []
+test_files:
+- spec/nominatim_geocoder_spec.rb
+- spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.0