yahoo-geoplanet 0.1.0 → 0.2.1

data/{README.txt → README}

@@ -69,7 +69,7 @@ Additionally, yahoo-geoplanet has the following gem dependencies:
 
 (The MIT License)
 
-Copyright (c) 2008 Mattt Thompson
+Copyright (c) 2010 Mattt Thompson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/yahoo-geoplanet/base.rb

@@ -16,8 +16,15 @@ module Yahoo
         end
         
         def api_path(resource, id, collection, *args)
+          args = args.extract_options!
+          count = args.delete(:count)
+          start = args.delete(:start)
+          collection += ";count=#{count}" if count
+          collection += ";start=#{start}" if start
+          
           parameters = [resource, id, collection, *args].compact
-          return parameters.collect!{|param| CGI::escape(param.to_s).downcase}.join('/')
+          # return parameters.collect!{|param| CGI::escape(param.to_s).downcase}.join('/')
+          return parameters.collect!{|param| param.to_s.downcase}.join('/')
         end
       end
             

data/lib/yahoo-geoplanet/place.rb

@@ -15,7 +15,9 @@ module Yahoo
         
         ["admin1", "admin2", "admin3", "locality1", "locality2", "postal"].each do |optional|
           begin
-            element = xml.at(optional)          
+            element = xml.at(optional)
+            next if element.empty?
+            
             type  = element.attributes["type"].downcase.gsub(/\s+/, '_')
             value = element.inner_text
           
@@ -39,8 +41,8 @@ module Yahoo
       
       # Association Collections
       ["parent", "ancestors", "belongtos", "neighbors", "siblings", "children"].each do |association|
-        define_method(association.to_sym) do
-          xml = self.class.fetch_and_parse(self.class.api_path(self.class.name, @woe_id, association), :select => :long)
+        define_method(association.to_sym) do |*options|
+          xml = self.class.fetch_and_parse(self.class.api_path(self.class.name, @woe_id, association, *options), :select => :long)
           value = xml.search(self.class.name.downcase).collect{|elem| self.class.new(elem)}
           return association.singularize == association ? value.first : value
         end
@@ -70,4 +72,4 @@ module Yahoo
       end
     end
   end
-end
+end

data/lib/yahoo-geoplanet/version.rb

@@ -2,8 +2,8 @@ module Yahoo
   module GeoPlanet
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 1
-      TINY  = 0
+      MINOR = 2
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/yahoo-geoplanet.gemspec

@@ -0,0 +1,27 @@
+Gem::Specification.new do |s|
+  s.name     = "yahoo-geoplanet"
+  s.version  = "0.2.1"
+  s.date     = "2010-03-25"
+  s.summary  = "A Ruby wrapper for the Yahoo! GeoPlanet API."
+  s.email    = "m@mattt.me"
+  s.homepage = "http://github.com/mattt/yahoo-geoplanet/"
+  s.description = "A Ruby wrapper for the Yahoo! GeoPlanet API.
+                   See http://developer.yahoo.com/geo/ for more information about the API."
+  s.authors  = ["Mattt Thompson"]
+  
+  s.files    = [
+    "README", 
+    "yahoo-geoplanet.gemspec", 
+    "lib/yahoo-geoplanet.rb",
+    "lib/rest.rb",
+    "lib/yahoo-geoplanet/base.rb",
+    "lib/yahoo-geoplanet/place.rb",
+    "lib/yahoo-geoplanet/version.rb"
+  ]
+  
+  s.add_dependency("hpricot",       ["> 0.6"])
+  s.add_dependency("activesupport", ["> 2.1.0"])
+  
+  s.has_rdoc = false
+  s.rdoc_options = ["--main", "README"]
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: yahoo-geoplanet
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Mattt Thompson
@@ -9,80 +14,84 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -04:00
+date: 2010-03-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: hpricot
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: 1.7.0
-    version: 
-description: yahoo-geoplanet is a wrapper to the Y! GeoPlanet REST APIs
-email: 
-- mail@matttthompson.com
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :runtime
+  version_requirements: *id002
+description: |-
+  A Ruby wrapper for the Yahoo! GeoPlanet API.
+                     See http://developer.yahoo.com/geo/ for more information about the API.
+email: m@mattt.me
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- Rakefile
-- config/hoe.rb
-- config/requirements.rb
-- lib/rest.rb
+- README
+- yahoo-geoplanet.gemspec
 - lib/yahoo-geoplanet.rb
+- lib/rest.rb
 - lib/yahoo-geoplanet/base.rb
 - lib/yahoo-geoplanet/place.rb
 - lib/yahoo-geoplanet/version.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
 has_rdoc: true
-homepage: http://yahoo-geoplanet.rubyforge.org
-post_install_message: ""
+homepage: http://github.com/mattt/yahoo-geoplanet/
+licenses: []
+
+post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: yahoo-geoplanet
-rubygems_version: 1.2.0
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
-summary: yahoo-geoplanet is a wrapper to the Y! GeoPlanet REST APIs
+specification_version: 3
+summary: A Ruby wrapper for the Yahoo! GeoPlanet API.
 test_files: []
 

data/History.txt

@@ -1,3 +0,0 @@
-== 0.1.0 2008-10-08
-
-* Initial release

data/License.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008 Mattt Thompson
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-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.

data/Manifest.txt

@@ -1,21 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-PostInstall.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/rest.rb
-lib/yahoo-geoplanet.rb
-lib/yahoo-geoplanet/base.rb
-lib/yahoo-geoplanet/place.rb
-lib/yahoo-geoplanet/version.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake

data/Rakefile

@@ -1,4 +0,0 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }

data/config/hoe.rb

@@ -1,75 +0,0 @@
-require 'yahoo-geoplanet/version'
-
-AUTHOR = "Mattt Thompson"
-EMAIL = "mail@matttthompson.com"
-DESCRIPTION = "yahoo-geoplanet is a wrapper to the Y! GeoPlanet REST APIs"
-GEM_NAME = 'yahoo-geoplanet' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'yahoo-geoplanet' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
- ['hpricot',        '>= 0.6'],
- ['activesupport',  '>= 2.1.0'],
- ['flexmock',       '>= 0.8.2']
-] # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "mattt"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = Yahoo::GeoPlanet::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'yahoo-geoplanet documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -1,15 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/yahoo-music.rb'}"
-puts "Loading yahoo-music gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-GEM_NAME = 'yahoo-music' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'yahoo-music'
-
-require 'rubygems'
-begin
-  require 'newgem'
-  require 'rubyforge'
-rescue LoadError
-  puts "\n\nGenerating the website requires the newgem RubyGem"
-  puts "Install: gem install newgem\n\n"
-  exit(1)
-end
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require File.dirname(__FILE__) + "/../lib/#{GEM_NAME}/version.rb"
-
-version  = Yahoo::Music::VERSION::STRING
-download = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-def rubyforge_project_id
-  RubyForge.new.autoconfig["group_ids"][RUBYFORGE_PROJECT]
-end
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text_template = fsrc.read
-  body_text = ERB.new(body_text_template).result(binding)
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)