geogov 0.0.11 → 0.0.12

data/Rakefile

@@ -1,15 +1,25 @@
-require 'rake'
-require 'rake/testtask'
-require 'bundler'
+# -*- encoding: utf-8 -*-
 
-Bundler::GemHelper.install_tasks
+require "bundler/gem_tasks"
+require "rdoc/task"
+require 'rake/testtask'
 
-task :default => [:test_units]
+RDoc::Task.new do |rd|
+  rd.rdoc_files.include("lib/**/*.rb")
+  rd.rdoc_dir = "rdoc"
+end
 
-desc "Run basic tests"
-Rake::TestTask.new("test_units") { |t|
+Rake::TestTask.new("test") do |t|
+  t.ruby_opts << "-rubygems"
   t.libs << "test"
-  t.pattern = 'test/*_test.rb'
+  t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
-  t.warning = true
-}
+end
+
+require "gem_publisher"
+task :publish_gem do |t|
+  gem = GemPublisher.publish_if_updated("geogov.gemspec", :rubygems)
+  puts "Published #{gem}" if gem
+end
+
+task :default => :test

data/lib/geogov/geo_stack.rb

@@ -82,6 +82,7 @@ module Geogov
 
     def formatted_authority_name(type)
       authority = get_authority(type) or return type
+
       authority["name"].gsub(%r{
         \s*((((District|Borough|County|City)\s|)Council|Community)\s?)+ |
         \s(North|East|South|West|Central)$ |

data/lib/geogov/providers/mapit.rb

@@ -65,7 +65,8 @@ module Geogov
       results = {:point => {'lat' => lat, 'lon' => lon}}
       councils = { }
 
-      query.each do |id, area_info|
+      areas = Hash[query.select {|key, value| key =~ /^\d+$/}]
+      areas.each do |id, area_info|
         type = area_info['type'].upcase.to_sym
         level = translate_area_type_to_shortcut(area_info['type'])
 

data/lib/geogov/version.rb

@@ -0,0 +1,3 @@
+module Geogov
+  VERSION = '0.0.12'
+end

metadata

@@ -1,86 +1,110 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: geogov
-version: !ruby/object:Gem::Version
-  version: 0.0.11
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.12
 platform: ruby
-authors:
+authors: 
 - Ben Griffiths
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &15045680 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *15045680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &15045200 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *15045200
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: gem_publisher
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: *id003
 description: Geolocation and utilities for UK Government single domain
-email:
+email: 
 - ben@alphagov.co.uk
 - jystewart@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/geogov.rb
+
+files: 
 - lib/geogov/utils.rb
-- lib/geogov/fuzzy_point.rb
-- lib/geogov/providers/hostip.rb
-- lib/geogov/providers/dracos_gazetteer.rb
-- lib/geogov/providers/mapit.rb
-- lib/geogov/providers/google.rb
+- lib/geogov/version.rb
 - lib/geogov/providers/geonames.rb
+- lib/geogov/providers/google.rb
+- lib/geogov/providers/mapit.rb
 - lib/geogov/providers/open_street_map.rb
+- lib/geogov/providers/dracos_gazetteer.rb
+- lib/geogov/providers/hostip.rb
 - lib/geogov/geo_stack.rb
+- lib/geogov/fuzzy_point.rb
+- lib/geogov.rb
 - Gemfile
 - Rakefile
-- test/test_helper.rb
 - test/geogov_test.rb
+- test/test_helper.rb
 homepage: http://github.com/alphagov/geogov
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -229329892177929289
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -229329892177929289
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Geolocation and utilities for UK Government single domain
-test_files:
-- test/test_helper.rb
+test_files: 
 - test/geogov_test.rb
-has_rdoc: 
+- test/test_helper.rb