yahoo-placemaker 0.0.6 → 0.0.7

data/Gemfile

@@ -1,5 +1,2 @@
 source "http://rubygems.org"
-gemspec
-
-gem 'rake', '>= 0.8.7'
-gem 'json'
+gemspec

data/lib/yahoo/placemaker.rb

@@ -12,6 +12,8 @@ module Yahoo
 
     def self.extract (text = '', options = {})
 
+      # TODO: make sure only valid options are passed in..
+
       unless defined?(Yahoo::Placemaker::APP_ID)
         raise Yahoo::Placemaker::Exception.new("Invalid APP_ID")
       end

data/lib/yahoo/placemaker/document.rb

@@ -11,16 +11,18 @@ module Yahoo
   attr_accessor :administrative_scope, :geographic_scope, :local_scopes, :references, :extents, :places
   def initialize(json)
 
-    if json['administrativeScope']
-      @administrative_scope = json['administrativeScope']
-    end
-
     if json['geographicScope']
       @geographic_scope = Yahoo::Placemaker::GeographicScope.new(json['geographicScope'])
     end
 
+    # If Yahoo has detected a continent then it will return some REALLY annoying data. It will
+    # give us back administrativeScope hash w/ a type of "Undefined" and coordinates of 0,0.
+    # Obviously this isn't useful information so we won't set @administrative_scope in that case
+
     if json['administrativeScope']
-      @administrative_scope = Yahoo::Placemaker::AdministrativeScope.new(json['administrativeScope'])
+      unless json['administrativeScope']['type'] == 'Undefined'
+        @administrative_scope = Yahoo::Placemaker::AdministrativeScope.new(json['administrativeScope'])
+      end
     end
 
     @places = Array.new

data/lib/yahoo/placemaker/version.rb

@@ -1,5 +1,5 @@
 module Yahoo
   module Placemaker
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/yahoo_placemaker_spec.rb

@@ -37,6 +37,13 @@ describe Yahoo::Placemaker do
     end
   end
 
+  it "should not have an administrative_scope" do
+    VCR.use_cassette('africa') do
+      response = Yahoo::Placemaker::extract "Africa"
+      response.document.administrative_scope.should == nil
+    end
+  end
+
   it "doesn't return any places for 'foobar'" do
     VCR.use_cassette('foobar') do
         response = Yahoo::Placemaker.extract "foobar"

data/yahoo-placemaker.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = Yahoo::Placemaker::VERSION
   s.authors     = ["Kyle Decot"]
   s.email       = ["kyle.decot@me.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/kyledecot/yahoo-placemaker"
   s.summary     = "Easily interact w/ the Yahoo Placemaker API"
   s.description = "Easily interact w/ the Yahoo Placemaker API"
 
@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency "json"
+
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "fakeweb"
   s.add_development_dependency "vcr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yahoo-placemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,9 +11,31 @@ bindir: bin
 cert_chain: []
 date: 2012-02-27 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70178721828820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70178721828820
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70178721824120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70178721824120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70155972433600 !ruby/object:Gem::Requirement
+  requirement: &70178721822780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155972433600
+  version_requirements: *70178721822780
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70155972433000 !ruby/object:Gem::Requirement
+  requirement: &70178721821840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155972433000
+  version_requirements: *70178721821840
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70155972432000 !ruby/object:Gem::Requirement
+  requirement: &70178721821280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155972432000
+  version_requirements: *70178721821280
 description: Easily interact w/ the Yahoo Placemaker API
 email:
 - kyle.decot@me.com
@@ -51,7 +73,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
 - .gitignore
 - .rspec
 - Gemfile
@@ -78,7 +99,7 @@ files:
 - spec/spec_helper.rb
 - spec/yahoo_placemaker_spec.rb
 - yahoo-placemaker.gemspec
-homepage: ''
+homepage: http://github.com/kyledecot/yahoo-placemaker
 licenses: []
 post_install_message: 
 rdoc_options: []