isbndb 1.5.3 → 1.5.4

data/ACKNOWLEDGEMENTS

@@ -1 +1,3 @@
-Special thanks to Terje Tjervaag (https://github.com/terje) for giving up the gem name 'isbndb'!
+Special thanks to Terje Tjervaag (https://github.com/terje) for giving up the gem name 'isbndb'!
+
+Special thanks to Lazlo (https://github.com/lazlo) for forwarding his project here!

data/Gemfile

@@ -1,11 +1,13 @@
 source "http://rubygems.org"
 
+gem 'activesupport'
+gem 'i18n'
 gem 'libxml-ruby', '>= 1.1.4'
 
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler"
+  gem "jeweler"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,7 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.5)
     git (1.2.5)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -15,8 +17,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  activesupport
+  bundler
+  i18n
+  jeweler
   libxml-ruby (>= 1.1.4)
   rcov
   shoulda

data/Rakefile

@@ -13,7 +13,7 @@ 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 = "isbndb"
-  gem.homepage = "http://github.com/svargo/isbndb"
+  gem.homepage = "https://github.com/sethvargo/isbndb"
   gem.license = "MIT"
   gem.summary = "This gem provides an easy solution for connecting to ISBNdb.com's API"
   gem.description = "Ruby ISBNdb is a amazingly fast and accurate gem that reads ISBNdb.com's XML API and gives you incredible flexibilty with the results! The gem uses libxml-ruby, the fastest XML parser for Ruby, so you get blazing fast results every time. Additionally, the newest version of the gem also features caching, so developers minimize API-key usage."

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/isbndb.gemspec

@@ -0,0 +1,77 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{isbndb}
+  s.version = "1.5.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Seth Vargo"]
+  s.date = %q{2011-04-21}
+  s.description = %q{Ruby ISBNdb is a amazingly fast and accurate gem that reads ISBNdb.com's XML API and gives you incredible flexibilty with the results! The gem uses libxml-ruby, the fastest XML parser for Ruby, so you get blazing fast results every time. Additionally, the newest version of the gem also features caching, so developers minimize API-key usage.}
+  s.email = %q{seth.vargo@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    ".document",
+    "ACKNOWLEDGEMENTS",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "isbndb.gemspec",
+    "lib/isbndb.rb",
+    "lib/isbndb/access_key_set.rb",
+    "lib/isbndb/exceptions.rb",
+    "lib/isbndb/result.rb",
+    "lib/isbndb/result_set.rb",
+    "test/helper.rb",
+    "test/test_isbndb.rb"
+  ]
+  s.homepage = %q{https://github.com/sethvargo/isbndb}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.7.2}
+  s.summary = %q{This gem provides an easy solution for connecting to ISBNdb.com's API}
+  s.test_files = [
+    "test/helper.rb",
+    "test/test_isbndb.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.4"])
+      s.add_development_dependency(%q<shoulda>, [">= 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<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<libxml-ruby>, [">= 1.1.4"])
+      s.add_dependency(%q<shoulda>, [">= 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<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<libxml-ruby>, [">= 1.1.4"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/isbndb.rb

@@ -1,5 +1,6 @@
 # require dependencies
 require 'libxml'
+require 'active_support/inflector'
 
 # private sub-classes
 require 'isbndb/access_key_set'
@@ -62,7 +63,7 @@ module ISBNdb
       
       if m.match(/find_(.+)_by_(.+)/)
         split = m.split('_', 4)
-        collection, search_strs = pluralize(split[1].downcase), [split.last]
+        collection, search_strs = split[1].downcase.pluralize, [split.last]
         
         # check and see if we are searching multiple fields
         search_strs = search_strs.first.split('_and_') if(search_strs.first.match(/_and_/))
@@ -91,7 +92,7 @@ module ISBNdb
     def make_request(collection, results, searches)
       begin
         uri = "#{BASE_URL}/#{collection}.xml?access_key=#{@access_key_set.current_key}&results=#{results.join(',')}&#{searches.join('&')}"
-        ISBNdb::ResultSet.new(uri, singularize(collection).capitalize)
+        ISBNdb::ResultSet.new(uri, collection.singularize.capitalize)
       rescue ISBNdb::AccessKeyError
         puts "Access Key Error (#{@access_key_set.current_key}) - You probably reached your limit! Trying the next key."
         @access_key_set.next_key!
@@ -99,17 +100,17 @@ module ISBNdb
         raise ISBNdb::AccessKeyError
       end
     end
-    
-    def pluralize(str)
-      return 'categories' if str == 'category'
-      return "#{str}s" unless str.split(//).last == 's'
-      str
-    end
-    
-    def singularize(str)
-      return 'category' if str == 'categories'
-      return str[0, str.length-1] if str.split(//).last == 's'
-      str
-    end
+  end
+end
+
+
+# Add a few methods to the String class
+class String
+  def is_plural?
+    self.downcase.pluralize == self.downcase 
+  end
+  
+  def is_singular?
+    !self.is_plural?
   end
 end

data/lib/isbndb/result.rb

@@ -23,7 +23,8 @@ module ISBNdb
     # Pretty preint the Result including the number of singleton methods that exist. If
     # you want the ACTUAL singleton methods, call @result.singleton_methods.
     def to_s
-      "#<Result @singleton_methods=#{@singleton_methods.size}>"
+      @singleton_methods ||= []
+      "#<Result @num_singleton_methods=#{@singleton_methods.size}>"
     end
     
     private
@@ -32,26 +33,21 @@ module ISBNdb
     # or content's value. Not to be outdone, it recursively iterates over all children too!
     def build_result(top_node)
       top_node.attributes.each do |attribute|
-        singleton.send(:define_method, formatted_method_name(attribute.name)) { attribute.value } unless attribute.value.strip.empty?
+        singleton.send(:define_method, method_name(attribute.name)) { attribute.value } unless attribute.value.strip.empty?
       end
       
       if top_node.children?
         top_node.children.each { |child| build_result(child) }
       else
-        singleton.send(:define_method, formatted_method_name(top_node.parent.name)) { top_node.content.strip.chomp(',') } unless top_node.content.strip.empty?
+        singleton.send(:define_method, method_name(top_node.parent.name)) { top_node.content.strip.chomp(',') } unless top_node.content.strip.empty?
       end
     end
     
     # This helper function reduces code redundancy and maintains consistency by formatting
     # all method names the same. All method names are stripped of any trailing whitespaces,
     # converted from CamelCase to under_score, and converted to a symbol 
-    def formatted_method_name(name)
-      camel_to_underscore(name.strip).to_sym
-    end
-    
-    # This helper function converts CamelCase to under_score using a nice little regex :).
-    def camel_to_underscore(str)
-      str.gsub(/(.)([A-Z])/,'\1_\2').downcase
+    def method_name(name)
+      name.strip.underscore.to_sym
     end
     
     # We need a singleton reference to the current _instance_ so that we can dynamically define

data/test/test_isbndb.rb

@@ -6,58 +6,65 @@ class TestISBNdb < Test::Unit::TestCase
       @query = ISBNdb::Query.new('KXWFXJIK')
     end    
     
-    should "fetch a book by ISBN" do
-      @book = @query.find_book_by_isbn('1934356549').first
-      assert_equal '1934356549', @book.isbn
-    end
-    
-    should "fetch a book by ISBN13" do
-      @book = @query.find_book_by_isbn('9781934356548').first
-      assert_equal '9781934356548', @book.isbn13
-    end
+    # should "fetch a book by ISBN" do
+    #   @book = @query.find_book_by_isbn('1934356549').first
+    #   assert_equal '1934356549', @book.isbn
+    # end
+    #   
+    # should "fetch a book by ISBN13" do
+    #   @book = @query.find_book_by_isbn('9781934356548').first
+    #   assert_equal '9781934356548', @book.isbn13
+    # end
+    #   
+    # should 'fetch books by title' do
+    #   @books = @query.find_books_by_title('ruby')
+    #   @books.each do |book|
+    #     assert (book.title || "").downcase.include?('ruby') || (book.title_long || "").downcase.include?('ruby'), "#{book.title} did not contain 'ruby'"
+    #   end
+    # end
+    #   
+    # should 'get next_page and prev_page' do
+    #   @books = @query.find_books_by_title('ruby')
+    #   next_page = @books.next_page
+    #   assert_equal @books.first.title, next_page.prev_page.first.title, 'Failed to get next_page'
+    # end
+    #   
+    # should 'get keystats' do
+    #   assert @query.keystats.is_a?(Hash), "#{@query.keystats} was not a Hash"
+    #   assert @query.keystats[:requests] >= @query.keystats[:granted], "Number of requests (#{@query.keystats[:requests]}) was not greater than number of granted requests (#{@query.keystats[:granted]})"
+    #   assert @query.keystats[:requests] > 0 && @query.keystats[:requests] < 500, 'Requests were not between 0 and 500'
+    # end
+    #   
+    # should 'test access_key_set' do
+    #   @query = ISBNdb::Query.new(['API-KEY-1', 'API-KEY-2', 'API-KEY-3'])
+    #   @access_key_set = @query.access_key_set
+    #   assert_equal 'API-KEY-1', @access_key_set.current_key
+    #   assert_equal 'API-KEY-2', @access_key_set.next_key
+    #   @access_key_set.next_key!
+    #   assert_equal 'API-KEY-1', @access_key_set.prev_key
+    #   @access_key_set.use_key('A-NEW-KEY')
+    #   assert_equal 'A-NEW-KEY', @access_key_set.current_key
+    #   @access_key_set.use_key('API-KEY-3')
+    #   assert_equal 'API-KEY-3', @access_key_set.current_key
+    # end
+    #   
+    # should 'raise exception for an invalid access key' do
+    #   @invalid = ISBNdb::Query.new(['abc123foobar', '123anotherinvalidkey'])
+    #   assert_raise ISBNdb::AccessKeyError, "#{@invalid} did not raise AccessKeyError" do
+    #     @invalid.find_book_by_isbn('1934356549')
+    #   end
+    # end
+    #   
+    # should 'raise exception for an invalid uri' do
+    #   assert_raise ISBNdb::InvalidURIError, "@query.find_invalid_by_unknown did not raise InvalidURIError" do
+    #     @query.find_invalid_by_unknown('foobar')
+    #   end
+    # end
     
-    should 'fetch books by title' do
-      @books = @query.find_books_by_title('ruby')
+    should 'make sub-result sets' do
+      @books = @query.find(:collection => 'books', :where => { :title => 'vargo' }, :results => 'prices')
       @books.each do |book|
-        assert (book.title || "").downcase.include?('ruby') || (book.title_long || "").downcase.include?('ruby'), "#{book.title} did not contain 'ruby'"
-      end
-    end
-    
-    should 'get next_page and prev_page' do
-      @books = @query.find_books_by_title('ruby')
-      next_page = @books.next_page
-      assert_equal @books.first.title, next_page.prev_page.first.title, 'Failed to get next_page'
-    end
-    
-    should 'get keystats' do
-      assert @query.keystats.is_a?(Hash), "#{@query.keystats} was not a Hash"
-      assert @query.keystats[:requests] >= @query.keystats[:granted], "Number of requests (#{@query.keystats[:requests]}) was not greater than number of granted requests (#{@query.keystats[:granted]})"
-      assert @query.keystats[:requests] > 0 && @query.keystats[:requests] < 500, 'Requests were not between 0 and 500'
-    end
-    
-    should 'test access_key_set' do
-      @query = ISBNdb::Query.new(['API-KEY-1', 'API-KEY-2', 'API-KEY-3'])
-      @access_key_set = @query.access_key_set
-      assert_equal 'API-KEY-1', @access_key_set.current_key
-      assert_equal 'API-KEY-2', @access_key_set.next_key
-      @access_key_set.next_key!
-      assert_equal 'API-KEY-1', @access_key_set.prev_key
-      @access_key_set.use_key('A-NEW-KEY')
-      assert_equal 'A-NEW-KEY', @access_key_set.current_key
-      @access_key_set.use_key('API-KEY-3')
-      assert_equal 'API-KEY-3', @access_key_set.current_key
-    end
-    
-    should 'raise exception for an invalid access key' do
-      @invalid = ISBNdb::Query.new(['abc123foobar', '123anotherinvalidkey'])
-      assert_raise ISBNdb::AccessKeyError, "#{@invalid} did not raise AccessKeyError" do
-        @invalid.find_book_by_isbn('1934356549')
-      end
-    end
-    
-    should 'raise exception for an invalid uri' do
-      assert_raise ISBNdb::InvalidURIError, "@query.find_invalid_by_unknown did not raise InvalidURIError" do
-        @query.find_invalid_by_unknown('foobar')
+        #puts book
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: isbndb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors: 
 - Seth Vargo
@@ -10,55 +10,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -05:00
-default_executable: 
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: activesupport
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: libxml-ruby
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
+        version: 1.1.4
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: shoulda
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.2
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: bundler
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -68,6 +67,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Ruby ISBNdb is a amazingly fast and accurate gem that reads ISBNdb.com's XML API and gives you incredible flexibilty with the results! The gem uses libxml-ruby, the fastest XML parser for Ruby, so you get blazing fast results every time. Additionally, the newest version of the gem also features caching, so developers minimize API-key usage.
 email: seth.vargo@gmail.com
 executables: []
@@ -86,6 +107,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- isbndb.gemspec
 - lib/isbndb.rb
 - lib/isbndb/access_key_set.rb
 - lib/isbndb/exceptions.rb
@@ -93,8 +115,7 @@ files:
 - lib/isbndb/result_set.rb
 - test/helper.rb
 - test/test_isbndb.rb
-has_rdoc: true
-homepage: http://github.com/svargo/isbndb
+homepage: https://github.com/sethvargo/isbndb
 licenses: 
 - MIT
 post_install_message: 
@@ -107,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3720609337190641477
+      hash: 4519594731805575555
       segments: 
       - 0
       version: "0"
@@ -120,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: This gem provides an easy solution for connecting to ISBNdb.com's API