amazon-associates 0.6.3 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.7.0 pending
+----------------
+* Update to ruby 1.9 compatibility
+* Update to rspec 2
+* Make Item an ActiveModel object
+
 0.6.3 2010-08-16
 ----------------
 * Update gem dependencies

data/Rakefile

@@ -8,12 +8,14 @@ Jeweler::Tasks.new do |s|
   s.homepage = "http://github.com/Empact/amazon-associates"
   s.description = "amazon-associates offers object-oriented access to the Amazon Associates API, built on ROXML"
   s.authors = ["Ben Woosley", "Dan Pickett", "Herryanto Siatono"]
-  s.add_runtime_dependency("roxml", ">= 3.1.3")
+  s.add_runtime_dependency("roxml", ">= 3.1.6")
+  s.add_runtime_dependency("activemodel", ">= 3.0.0")
   s.add_runtime_dependency("activesupport", ">= 2.3.4")
   s.add_runtime_dependency("ruby-hmac")
   s.add_runtime_dependency("will_paginate")
   s.add_development_dependency("thoughtbot-shoulda")
   s.add_development_dependency("mocha")
+  s.add_development_dependency("rspec", ">= 2.0.0")
 
   # s.require_path = "lib"
   # s.autorequire = "amazon-associates"
@@ -39,16 +41,17 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib' << 'spec'
-  t.spec_opts << '--format profile --backtrace'
-  t.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.ruby_opts = '-Ilib -Ispec'
+  t.rspec_opts = '--backtrace'
+  # t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.libs << 'lib' << 'spec'
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.ruby_opts = '-Ilib -Ispec'
+  t.rspec_opts = '--backtrace'
+  # t.spec_files = FileList['spec/**/*_spec.rb']
   t.rcov = true
 end
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
+:minor: 7
+:patch: 0
 :build: 
-:minor: 6
-:patch: 3

data/amazon-associates.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-associates}
-  s.version = "0.6.3"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Woosley", "Dan Pickett", "Herryanto Siatono"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-11-03}
   s.description = %q{amazon-associates offers object-oriented access to the Amazon Associates API, built on ROXML}
   s.email = %q{ben.woosley@gmail.com}
   s.extra_rdoc_files = [
@@ -92,27 +92,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<roxml>, [">= 3.1.3"])
+      s.add_runtime_dependency(%q<roxml>, [">= 3.1.6"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<roxml>, [">= 3.1.3"])
+      s.add_dependency(%q<roxml>, [">= 3.1.6"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<ruby-hmac>, [">= 0"])
       s.add_dependency(%q<will_paginate>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<roxml>, [">= 3.1.3"])
+    s.add_dependency(%q<roxml>, [">= 3.1.6"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])
     s.add_dependency(%q<will_paginate>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
   end
 end
 

data/lib/amazon-associates/extensions/core.rb

@@ -1,5 +1,7 @@
-require 'rubygems'
 require 'active_support'
+require 'active_support/core_ext/enumerable'
+
+require 'active_model'
 
 class Object # http://whytheluckystiff.net/articles/seeingMetaclassesClearly.html
   def meta_def name, &blk
@@ -8,12 +10,11 @@ class Object # http://whytheluckystiff.net/articles/seeingMetaclassesClearly.htm
 end
 
 class OpenHash < Hash
-  def method_missing_with_attributes_query(meth, *args)
+  def method_missing(meth, *args)
     fetch(meth) do
-      method_missing_without_attributes_query(meth)
+      super
     end
   end
-  alias_method_chain :method_missing, :attributes_query  
 end
 
 class Float

data/lib/amazon-associates/request.rb

@@ -37,7 +37,7 @@ module Amazon
       request_url = prepare_url(opts)
       response = nil
 
-      if cacheable?(opts['Operation'])
+      if cache_it = cacheable?(opts[:operation])
         FilesystemCache.sweep
 
         response = FilesystemCache.get(request_url)
@@ -50,10 +50,10 @@ module Amazon
         unless response.kind_of? Net::HTTPSuccess
           raise RequestError, "HTTP Response: #{response.inspect}"
         end
-        cache_response(request_url, response) if cacheable?(opts['Operation'])
+        cache_response(request_url, response) if cache_it
       end
 
-      doc = ROXML::XML::Parser.parse(response.body).root
+      doc = ROXML::XML::Node.from(response.body)
       eval(doc.name).from_xml(doc, request_url)
     end
 
@@ -108,12 +108,10 @@ module Amazon
       raise opts.inspect if opts.has_key?(:cart)
       opts.assert_valid_keys(*valid_arguments(opts[:operation]))
 
-      params = opts.each_pair do |k, v|
-        opts.delete(k)
+      params = Hash[opts.map do |(k, v)|
         v *= ',' if v.is_a? Array
-        opts[k.to_s.camelize] = v.to_s
-        params
-      end
+        [k.to_s.camelize, v.to_s]
+      end]
 
       params.merge!(
         'Service' => 'AWSECommerceService',
@@ -122,7 +120,7 @@ module Amazon
         'SignatureMethod' => "HmacSHA256"
       )
 
-      unsigned_uri = URI.parse("http://webservices.amazon.#{tld(opts.delete("Country"))}/onca/xml?#{params.sort { |a, b| a[0] <=> b[0] }.map { |key, val| "#{key}=#{CGI::escape(val).gsub('+', '%20')}" }.join("&")}")
+      unsigned_uri = URI.parse("http://ecs.amazonaws.#{tld(opts.delete("Country"))}/onca/xml?#{params.sort { |a, b| a[0] <=> b[0] }.map { |key, val| "#{key}=#{CGI::escape(val).gsub('+', '%20')}" }.join("&")}")
       hmac = HMAC::SHA256.new(ENV['AMAZON_SECRET_ACCESS_KEY'])
       hmac.update("GET\n#{unsigned_uri.host}\n#{unsigned_uri.path}\n#{unsigned_uri.query}")
       "#{unsigned_uri}&Signature=#{CGI::escape(Base64.encode64(hmac.digest).chomp)}"

data/lib/amazon-associates/types/item.rb

@@ -6,7 +6,7 @@ module Amazon
       xml_name 'Item'
 
       xml_reader :asin, :from => 'ASIN'
-      xml_reader :detail_page_url
+      xml_reader :detail_page_url, :from => 'DetailPageURL'
       xml_reader :list_price, :as => Price, :in => 'xmlns:ItemAttributes'
       xml_reader :attributes, :as => {:key => :name,
                                       :value => :content}, :in => 'xmlns:ItemAttributes'
@@ -31,7 +31,22 @@ module Amazon
       xml_reader :publisher, :studio, :batteries_included?, :label, :brand, :in => 'xmlns:ItemAttributes'
 
       xml_reader :editorial_reviews, :as => [EditorialReview]
-      xml_reader :customer_reviews, :as => [CustomerReview]
+      xml_reader :customer_reviews, :as => [CustomerReview], :in => 'xmlns:CustomerReviews'
+      xml_reader :features, :as => [], :in => 'xmlns:ItemAttributes'
+
+      alias_method :id, :asin
+
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
+      include ActiveModel::Validations
+
+      def persisted?
+        true
+      end
+
+      def amazon_product_description
+        editorial_reviews.detect {|r| r.source == 'Amazon.com Product Description' }.try(:content)
+      end
 
       def ==(other)
         asin == other.asin
@@ -45,8 +60,6 @@ module Amazon
         authors.only
       end
 
-      alias_method :offer_price, :lowest_new_price
-
       def title
         root_title || attr_title
       end
@@ -139,11 +152,12 @@ module Amazon
       DEFAULT_RESPONSE_GROUPS = SMALL_RESPONSE_GROUPS + %w{Offers VariationSummary BrowseNodes}
 
       def self.prep_responses(opts)
-        opts[:response_group] ||= []
-        unless opts[:response_group].is_a? Array
-          raise ArgumentError, "Response groups are required to be in array form"
+        opts[:response_group]
+        if opts[:response_group]
+          Array.wrap(opts[:response_group])
+        else
+          DEFAULT_RESPONSE_GROUPS
         end
-        opts[:response_group] += DEFAULT_RESPONSE_GROUPS
       end
     end
 

data/lib/amazon-associates/types/measurement.rb

@@ -18,7 +18,7 @@ module Amazon
         units = @value == 1 ? @units.singularize : @units
         [value, units].join(' ')
       end
-      alias_attribute :inspect, :to_s
+      alias :inspect :to_s
 
       def to_i
         @value.round

data/lib/amazon-associates/types/ordinal.rb

@@ -14,7 +14,7 @@ module Amazon
       def to_s
         @value.ordinalize
       end
-      alias_attribute :inspect, :to_s
+      alias :inspect :to_s
 
       def ==(other)
         @value == other

data/lib/amazon-associates/types/price.rb

@@ -10,7 +10,7 @@ module Amazon
 
       def initialize(str = nil, cents = nil, currency = nil)
         @to_s = str.to_s
-        @cents = Integer(cents)
+        @cents = cents ? Integer(cents) : 0
         @currency = currency.to_s
       end
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require "lib/amazon-associates"
+require File.join(File.dirname(__FILE__), "../lib/amazon-associates")
 
-describe "Amazon Associates response", :shared => true do
+shared_examples_for "Amazon Associates response" do
   describe "request" do
     subject { @response.request }
     it { should be_valid }

data/spec/types/cart_spec.rb

@@ -12,7 +12,7 @@ module Amazon
         @existing_cart = Cart.create(@potter => 1, @batman => 3)
       end
 
-      describe "a cart", :shared => true do
+      shared_examples_for "a cart" do
         it "should have a valid purchase_url" do
           @cart.purchase_url.should_not be_blank
         end
@@ -33,7 +33,7 @@ module Amazon
         end
       end
 
-      describe "a valid cart", :shared => true do
+      shared_examples_for "a valid cart" do
         it_should_behave_like "a cart"
 
         it "should be in a valid state" do
@@ -41,7 +41,7 @@ module Amazon
         end
       end
 
-      describe "a modified cart", :shared => true do
+      shared_examples_for "a modified cart" do
         it_should_behave_like "a cart"
 
         it "should be in a valid state" do
@@ -121,7 +121,7 @@ module Amazon
       end
 
       describe ".get" do
-        describe "gotten cart", :shared => true do
+        shared_examples_for "gotten cart" do
           subject { @cart }
 
           it { should == @existing_cart }
@@ -203,7 +203,7 @@ module Amazon
           end
         end
 
-        context "adding an existing item", :shared => true do
+        shared_examples_for "adding an existing item" do
           context "before save" do
             it_should_behave_like "a modified cart"
 

data/spec/types/item_spec.rb

@@ -12,14 +12,14 @@ module Amazon
         @item.should == Struct.new(:asin).new(asin)
       end
 
-      describe "query for items", :shared => true do
+      shared_examples_for "query for items" do
         it "should return a list of items" do
           @result.should have_at_least(10).items
           @result.each {|item| item.should be_an_instance_of(Item) }
         end
       end
 
-      describe "query for related items", :shared => true do
+      shared_examples_for "query for related items" do
         it_should_behave_like "query for items"
         it "should not include the item related to the result" do
           @result.should_not include(@item)

data/spec/types/measurement_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "measurement object", :shared => true do
+shared_examples_for "measurement object" do
   it "should take a quantity and units" do
     m = measurement_with(:value => 11.3, :units => 'inches')
     m.value.should == 11.3

data/test/amazon/browse_node_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require_relative "./../test_helper"
 
 class Amazon::Associates::BrowseNodeLookupTest < Test::Unit::TestCase
   include FilesystemTestHelper

data/test/amazon/cache_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../test_helper"
+require_relative "./../test_helper"
 
 module Amazon
   module Associates

data/test/amazon/caching/filesystem_cache_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../test_helper"
+require_relative "./../../test_helper"
 
 module Amazon
   module Associates
@@ -84,7 +84,7 @@ class FilesystemCacheTest < Test::Unit::TestCase
     should "create a file in the cache path with the response inside it" do
       open(File.join(CACHE_TEST_PATH + @filename[0..2], @filename)) do |f|
         response = Marshal.load(f)
-        equivalent = eval(ROXML::XML::Parser.parse(response.body).root.name).from_xml(response.body, @resp.url)
+        equivalent = eval(ROXML::XML::Node.from(response.body).name).from_xml(response.body, @resp.url)
 
         assert_equal @resp, equivalent
       end

data/test/amazon/item_test.rb

@@ -1,7 +1,16 @@
-require File.join(File.dirname(__FILE__), '../test_helper')
+# encoding: utf-8
+require_relative '../test_helper'
 
 module Amazon
   module Associates
+    class ItemActiveModelTest < Test::Unit::TestCase
+      include ActiveModel::Lint::Tests
+
+      def setup
+        @model = Amazon::Associates.item_search('ruby').items.first
+      end
+    end
+    
     class ItemTest < Test::Unit::TestCase
       include FilesystemTestHelper
       
@@ -32,7 +41,7 @@ module Amazon
       def test_item_search_with_paging
         resp = Amazon::Associates.item_search('ruby', :item_page => 2)
         assert resp.request.valid?
-        assert 2, resp.current_page
+        assert_equal 2, resp.current_page
       end
 
       def test_item_search_with_response_group_array
@@ -173,7 +182,7 @@ module Amazon
 
         assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", item.attributes['Title']
         assert item.authors.is_a?(Array)
-        assert 3, item.authors.size
+        assert_equal 3, item.authors.size
         assert_equal "Dave Thomas", item.authors.first
       end
     end
@@ -197,7 +206,7 @@ module Amazon
       def test_item_search_with_paging
         resp = Amazon::Associates.item_search("ruby", :item_page => 2)
         assert resp.request.valid?, resp.inspect
-        assert 2, resp.current_page
+        assert_equal 2, resp.current_page
       end
 
       def test_item_search_with_no_result
@@ -261,7 +270,7 @@ module Amazon
 
         assert_equal "Programming Ruby: The Pragmatic Programmers' Guide, Second Edition", title
         assert authors.is_a?(Array)
-        assert 3, authors.size
+        assert_equal 3, authors.size
         assert_equal "Dave Thomas", authors.first
       end
     end

data/test/utilities/filesystem_test_helper.rb

@@ -32,4 +32,4 @@ protected
     #remove all the cache files
     FileUtils.rm_rf(@path)
   end
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-associates
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 3
-  version: 0.6.3
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ben Woosley
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,86 +27,110 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         - 1
-        - 3
-        version: 3.1.3
+        - 6
+        version: 3.1.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 3
         - 4
         version: 2.3.4
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id008
 description: amazon-associates offers object-oriented access to the Amazon Associates API, built on ROXML
 email: ben.woosley@gmail.com
 executables: []
@@ -181,7 +204,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -190,7 +212,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"