muck-raker 0.2.6 → 0.2.7

data/Rakefile

@@ -64,6 +64,7 @@ begin
     gemspec.add_dependency "httparty"
     gemspec.add_dependency "nokogiri"
     gemspec.add_dependency "muck-feedbag"
+    gemspec.add_dependency "river"
     gemspec.add_dependency "feedzirra"
     gemspec.add_dependency "muck-engine"
     gemspec.add_dependency "muck-users"

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/app/models/service.rb

@@ -99,6 +99,12 @@ class Service < ActiveRecord::Base
     end
   end
   
+  # Requires settings in global_config.yml
+  # For example:
+  # amazon_access_key_id: 'some key from your account'
+  # amazon_secret_access_key: 'the secret from your account'
+  # amazon_associate_tag: 'optional'
+  # ecs_to_rss_wishlist: "http://www.example.com/ecs_to_rss-wishlist.xslt"
   def generate_uris(username = '', password = '', uri = '')
     if self.name == 'Facebook'
       # Facebook can't just use feeds like everyone else.
@@ -116,7 +122,7 @@ class Service < ActiveRecord::Base
     elsif self.name == 'Amazon'
       return [] if username.blank?
       # Have to build and sign Amazon wishlist rss feeds
-      am = AmazonRequest.new(GlobalConfig.amazon_access_key_id, GlobalConfig.amazon_secret_access_key, GlobalConfig.amazon_associate_tag)
+      am = AmazonRequest.new(GlobalConfig.amazon_access_key_id, GlobalConfig.amazon_secret_access_key, GlobalConfig.ecs_to_rss_wishlist, GlobalConfig.amazon_associate_tag)
       results = am.get_amazon_feeds(username) # username needs to be the user's Amazon email
       results.collect { |result| OpenStruct.new(:url => result, :title => 'Amazon Wishlist') }
     elsif !self.uri_data_template.blank? && !username.blank?

data/muck-raker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-raker}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin Justin Ball"]
@@ -40,8 +40,6 @@ Gem::Specification.new do |s|
      "app/helpers/muck_raker_services_helper.rb",
      "app/models/aggregation.rb",
      "app/models/aggregation_feed.rb",
-     "app/models/amazon.rb",
-     "app/models/amazon_request.rb",
      "app/models/attention.rb",
      "app/models/click.rb",
      "app/models/entry.rb",
@@ -474,7 +472,6 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "muck-raker.gemspec",
-     "public/ecs_to_rss-wishlist.xslt",
      "public/images/service_icons/16/amazon.png",
      "public/images/service_icons/16/ask.png",
      "public/images/service_icons/16/bibsonomy.png",
@@ -887,7 +884,6 @@ Gem::Specification.new do |s|
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/aggregation_feed_test.rb",
      "test/rails_root/test/unit/aggregation_test.rb",
-     "test/rails_root/test/unit/amazon_request_test.rb",
      "test/rails_root/test/unit/comment_test.rb",
      "test/rails_root/test/unit/entry_test.rb",
      "test/rails_root/test/unit/feed_parent_test.rb",
@@ -919,6 +915,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<muck-feedbag>, [">= 0"])
+      s.add_runtime_dependency(%q<river>, [">= 0"])
       s.add_runtime_dependency(%q<feedzirra>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
       s.add_runtime_dependency(%q<muck-users>, [">= 0"])
@@ -930,6 +927,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<muck-feedbag>, [">= 0"])
+      s.add_dependency(%q<river>, [">= 0"])
       s.add_dependency(%q<feedzirra>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
       s.add_dependency(%q<muck-users>, [">= 0"])
@@ -942,6 +940,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<muck-feedbag>, [">= 0"])
+    s.add_dependency(%q<river>, [">= 0"])
     s.add_dependency(%q<feedzirra>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])
     s.add_dependency(%q<muck-users>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-raker
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Joel Duffin Justin Ball
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: river
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: feedzirra
   type: :runtime
@@ -145,8 +155,6 @@ files:
 - app/helpers/muck_raker_services_helper.rb
 - app/models/aggregation.rb
 - app/models/aggregation_feed.rb
-- app/models/amazon.rb
-- app/models/amazon_request.rb
 - app/models/attention.rb
 - app/models/click.rb
 - app/models/entry.rb
@@ -579,7 +587,6 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-raker.gemspec
-- public/ecs_to_rss-wishlist.xslt
 - public/images/service_icons/16/amazon.png
 - public/images/service_icons/16/ask.png
 - public/images/service_icons/16/bibsonomy.png
@@ -1013,7 +1020,6 @@ test_files:
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/aggregation_feed_test.rb
 - test/rails_root/test/unit/aggregation_test.rb
-- test/rails_root/test/unit/amazon_request_test.rb
 - test/rails_root/test/unit/comment_test.rb
 - test/rails_root/test/unit/entry_test.rb
 - test/rails_root/test/unit/feed_parent_test.rb

data/app/models/amazon.rb

@@ -1,59 +0,0 @@
-require 'openssl'
-
-class Amazon
-  
-  # Do we have support for the SHA-256 Secure Hash Algorithm?
-  # Note that Module#constants returns Strings in Ruby 1.8 and Symbols in 1.9.
-  DIGEST_SUPPORT = OpenSSL::Digest.constants.include?('SHA256') || OpenSSL::Digest.constants.include?(:SHA256)
-
-  # Requests are authenticated using the SHA-256 Secure Hash Algorithm.
-  DIGEST = OpenSSL::Digest::Digest.new('sha256') if DIGEST_SUPPORT
-    
-  AMAZON_SITES = {
-    :ca => 'http://ecs.amazonaws.ca/onca/xml',
-    :de => 'http://ecs.amazonaws.de/onca/xml',
-    :fr => 'http://ecs.amazonaws.fr/onca/xml',
-    :jp => 'http://ecs.amazonaws.jp/onca/xml',
-    :uk => 'http://ecs.amazonaws.co.uk/onca/xml',
-    :us => 'http://ecs.amazonaws.com/onca/xml'
-  }
-
-  AMAZON_XSLT_SITES = {
-    :ca => 'http://xml-ca.amznxslt.com/onca/xml',
-    :de => 'http://xml-de.amznxslt.com/onca/xml',
-    :fr => 'http://xml-fr.amznxslt.com/onca/xml',
-    :jp => 'http://xml-jp.amznxslt.com/onca/xml',
-    :uk => 'http://xml-uk.amznxslt.com/onca/xml',
-    :us => 'http://xml-us.amznxslt.com/onca/xml'
-  }
-  
-  class AmazonResultError < StandardError; end
-  
-  # Sign an amazon query
-  # Requires openssl and that GlobalConfig.amazon_secret_access_key be defined.
-  # Based on ruby-aaws and documentation here
-  # http://www.caliban.org/ruby/ruby-aws/
-  # http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html?RequestAuthenticationArticle.html
-  # Parameters
-  # query:    The query to be signed
-  def self.sign_query(uri, query, amazon_secret_access_key)
-    raise 'SHA-256 not available in this version of openssl.  Cannot sign Amazon requests.' unless DIGEST_SUPPORT
-    query << "&Timestamp=#{Time.now.utc.strftime('%Y-%m-%dT%H:%M:%SZ')}"
-    new_query = query.split('&').collect{|param| "#{param.split('=')[0]}=#{url_encode(param.split('=')[1])}"}.sort.join('&')
-    to_sign = "GET\n%s\n%s\n%s" % [uri.host, uri.path, new_query]
-    hmac = OpenSSL::HMAC.digest(DIGEST, amazon_secret_access_key, to_sign)
-    base64_hmac = [hmac].pack('m').chomp
-    signature = url_encode(base64_hmac)
-    new_query << "&Signature=#{signature}"
-  end
-  
-  # Encode a string, such that it is suitable for HTTP transmission.
-  def self.url_encode(string)
-    return '' if string.nil?
-    # Shamelessly plagiarised from Wakou Aoyama's cgi.rb, but then altered slightly to please AWS.
-    string.gsub( /([^a-zA-Z0-9_.~-]+)/ ) do
-      '%' + $1.unpack( 'H2' * $1.bytesize ).join( '%' ).upcase
-    end
-  end
-  
-end

data/app/models/amazon_request.rb

@@ -1,110 +0,0 @@
-class AmazonRequest
-  include HTTParty
-  format :xml
-  
-  # Initialize Amazon Request.  Obtain valid Amazon credentials from your developer account
-  # Parameters:
-  # amazon_access_key_id:     Valid Amazon access key
-  # amazon_secret_access_key: Valid Amazon secret access key
-  # amazon_associate_tag:     Valid Amazon associates tag (optional)
-  # locale:                   Locale for the specific amazon site to use valid values are :ca, :de, :fr, :jp, :uk, :us (optional, default is us)
-  def initialize(amazon_access_key_id, amazon_secret_access_key, amazon_associate_tag = nil, locale = :us)
-    @amazon_access_key_id = amazon_access_key_id
-    @amazon_secret_access_key = amazon_secret_access_key
-    @amazon_associate_tag = amazon_associate_tag
-    @locale = locale
-  end
-  
-  # Generate rss feeds for the give email
-  # Parameters:
-  # email:    email for which to find feeds.
-  def get_amazon_feeds(email)
-    wishlists = get_customer_wishlists(email)
-    if !wishlists.blank?
-      wishlists = [wishlists] unless wishlists.is_a?(Array)
-      wishlist_ids = wishlists.collect{|list| list['ListId']}
-      generate_wishlist_rss(wishlist_ids)
-    end
-  end
-  
-  # Get matching id for the given email
-  # Parameters:
-  # email:  customer's email.
-  def get_customer_id(email)
-    query = "Operation=CustomerContentSearch&Email=#{email}"
-    result = make_request(query)
-    if result['CustomerContentSearchResponse']['Customers']['TotalResults'].to_i > 0
-      result['CustomerContentSearchResponse']['Customers']['Customer'][0]
-    end
-  end
-  
-  # Get information for the given customer id
-  def get_customer_information(customer_id)
-    query = "Operation=CustomerContentLookup&ResponseGroup=CustomerLists&CustomerId=#{customer_id}"
-    make_request(query)
-  end
-
-  # Get customer's wishlist ids
-  def get_customer_wishlists(email)
-    query = "Operation=ListSearch&ListType=WishList&Email=#{email}"
-    result = make_request(query)
-    check_errors(result)
-    result['ListSearchResponse']['Lists']['List']
-  end
-  
-  # For this method to work
-  # ecs_to_rss_wishlist must be set in global_config.yml
-  # For example:
-  # ecs_to_rss_wishlist: "http://www.example.com/ecs_to_rss-wishlist.xslt"
-  def generate_wishlist_rss(wishlist_ids)
-    feeds = []
-    wishlist_ids.each do |wishlist_id|
-      query = "Operation=ListLookup&ListType=WishList&ListId=#{wishlist_id}&ResponseGroup=ItemAttributes,ListItems,ListInfo,Offers&Sort=DateAdded&Style=#{GlobalConfig.ecs_to_rss_wishlist}"
-      feeds << make_xslt_request(query)
-    end
-    feeds
-  end
-  
-  protected
-    
-    def check_errors(result)
-      result.each_pair do |key, value|
-        if key == 'Errors'
-          if value['Error'].is_a?(Array)
-            raise Amazon::AmazonResultError, value['Error'].collect{|error| error['Message']}.join(' ')
-          else
-            raise Amazon::AmazonResultError, value['Error']['Message']
-          end
-        elsif value.is_a?(Hash)
-          check_errors(value)
-        elsif value.is_a?(Array)
-          value.each do |item|
-            if item.is_a?(Hash)
-              check_errors(item)
-            end
-          end
-        end
-      end
-    end
-    
-    def make_request(query)
-      add_required_params(query)
-      uri = Amazon::AMAZON_SITES[@locale]
-      signed_query = Amazon.sign_query(URI.parse(uri), query, @amazon_secret_access_key)
-      AmazonRequest.get(uri, :query => signed_query)
-    end
-    
-    def make_xslt_request(query)
-      add_required_params(query)
-      uri = Amazon::AMAZON_XSLT_SITES[@locale]
-      signed_query = Amazon.sign_query(URI.parse(uri), query, @amazon_secret_access_key)
-      "#{uri}?#{signed_query}"
-    end
-    
-    def add_required_params(query)
-      query << "&Service=AWSECommerceService"
-      query << "&AWSAccessKeyId=#{@amazon_access_key_id}"
-      query << "&AssociateTag=#{@amazon_associate_tag}" if @amazon_associate_tag
-      query << "&Version=2009-07-01"
-    end
-end

data/public/ecs_to_rss-wishlist.xslt

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aws="http://webservices.amazon.com/AWSECommerceService/2009-07-01">
-  
-  <xsl:output method="xml"/>
-  
-  <xsl:template match="/">
-    <rss version="2.0">
-      <channel>
-        <xsl:apply-templates select="aws:ListLookupResponse/aws:Lists/aws:List" />
-      </channel>
-    </rss>
-  </xsl:template>
-  
-  <xsl:template match="aws:List">
-    <title>WishList for <xsl:value-of select="aws:CustomerName" /></title>
-    <link><xsl:value-of select="aws:ListURL"/></link>
-    <xsl:apply-templates select="aws:ListItem"/>
-  </xsl:template>
-  
-  <xsl:template match="aws:ListItem">
-      <item>
-        <title><xsl:value-of select="aws:Item/aws:ItemAttributes/aws:Title" /></title>
-        <link><xsl:value-of select="aws:Item/aws:DetailPageURL" /></link>
-        <description>
-          <p>Author: <xsl:value-of select="aws:Item/aws:ItemAttributes/aws:Author" /></p>
-          <p>ISBN: <xsl:value-of select="aws:Item/aws:ItemAttributes/aws:ISBN" /></p>
-          <p>List Price: <xsl:value-of select="aws:Item/aws:ItemAttributes/aws:ListPrice/aws:FormattedPrice" /></p>
-          <p>Price: <xsl:value-of select="aws:Item/aws:OfferSummary/aws:LowestNewPrice/aws:FormattedPrice"/></p>
-          <xsl:apply-templates select="aws:Item/aws:ItemLinks/aws:ItemLink"/>
-        </description>
-        <guid><xsl:value-of select="aws:Item/aws:DetailPageURL" /></guid>
-      </item>
-  </xsl:template>
-  
-  <xsl:template match="aws:ItemLink">
-    <a href="{aws:URL}"><xsl:value-of select="aws:Description" /></a>
-  </xsl:template>
-  
-</xsl:stylesheet>

data/test/rails_root/test/unit/amazon_request_test.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class AmazonRequestTest < ActiveSupport::TestCase
-  
-  context "amazon wish list" do
-    setup do
-      @email = 'justinball@gmail.com'
-    end
-    should "get wishlist" do
-      # result = AmazonRequest.get_amazon_feeds(@email)
-      #       assert result.length > 0
-    end
-  end
-  
-end