fletcher 0.6.5 → 0.6.6

data/README.md

@@ -115,4 +115,4 @@ If you make any changes to fletcher, be sure to run the test suite before creati
 
 * Troubleshooting
 
-	* fletcher uses [vcr](https://github.com/vcr/vcr) to save http requests for faster testing. To pull real-time http data, clear the vcr cache with `rm -rf spec/vcr`.
+	* fletcher uses [vcr](https://github.com/vcr/vcr) to save http requests for faster testing. To pull real-time http data, clear the vcr cache with `rm -rf spec/vcr`. Please clear this cache before making a pull request.

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/hulihanapplications/fletcher"
   gem.license = "MIT"
   gem.summary = %Q{A cross-website product/model information fetcher.}
-  gem.description = %Q{Easily fetch product/model information from third party websites such as Amazon, eBay, etc.}
+  gem.description = %Q{Easily fetch product information from third party websites such as Amazon, Steam, eBay, etc.}
   gem.email = "dave@hulihanapplications.com"
   gem.authors = ["Dave Hulihan", "Hulihan Applications"]
   gem.executables = ["fletcher"] 

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/fletcher.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "fletcher"
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Hulihan", "Hulihan Applications"]
-  s.date = "2013-11-28"
-  s.description = "Easily fetch product/model information from third party websites such as Amazon, eBay, etc."
+  s.date = "2013-12-01"
+  s.description = "Easily fetch product information from third party websites such as Amazon, Steam, eBay, etc."
   s.email = "dave@hulihanapplications.com"
   s.executables = ["fletcher"]
   s.extra_rdoc_files = [

data/lib/fletcher/cli/utility.rb

@@ -12,16 +12,6 @@ module Fletcher
       def fetch(url)
         product = Fletcher.fetch url
 
-        if options[:debug]
-          puts "=======================================\n"
-          puts "START RESPONSE"
-          puts "=======================================\n"
-          puts product.doc.to_s
-          puts "=======================================\n"
-          puts "END RESPONSE"
-          puts "=======================================\n"
-        end
-
         # Prep output
         output_hash = Hash.new
         output_hash["name"] = product.name
@@ -45,6 +35,12 @@ module Fletcher
         else 
           say output_hash.to_yaml
         end
+
+        if options[:debug]
+          say "user_agent: #{Fletcher::USER_AGENT}"
+          say "response:\n\n"
+          say product.doc.to_s
+        end        
       end
 
       desc "websites", "Get a list of supported websites"

data/lib/fletcher/models/amazon.rb

@@ -28,9 +28,23 @@ module Fletcher
           parse_price(doc.css("#priceblock_saleprice").first_string) unless self.price
           parse_price(doc.xpath("//span[contains(@id, 'price')]").first_string) unless self.price
 
+          # Get Unqualified Price 
+          parse_price(doc.xpath("//*[contains(@id, 'unqualifiedBuyBox')]//span").first_string) unless self.price
+
+          # Get Used Price 
+          parse_price(doc.xpath("//*[contains(@id, 'secondaryUsedAndNew')]//*[@class='price']").first_string) unless self.price
+
+
           # Get Images
           self.images = doc.xpath("//*[@data-action='main-image-click']//img").attribute_array
           self.images = doc.xpath("//*[@id='imageBlock']//img").attribute_array unless self.images
+
+          # Get images for in-house products (kindle, etc.)
+          self.images = doc.xpath("//*[@id='kib-ma-container-0']//img").attribute_array if self.images.empty?
+
+          # Get images for third-party sellers
+          self.images = doc.xpath("//*[@id='prodImageContainer']//img").attribute_array if self.images.empty?
+
           self.image = images.first
         end            
       end

data/lib/fletcher/models/steam.rb

@@ -12,7 +12,12 @@ module Fletcher
         case doc
         when Nokogiri::HTML::Document
           # Get Name
-          self.name = doc.css('div#main_content div.apphub_AppName').first_string
+          self.name = doc.css('#main_content .apphub_AppName').first_string
+          
+          unless self.name
+            self.name = doc.xpath("string(//title)") 
+            self.name.slice!(" on Steam")
+          end
 
           # Get Description
           self.description = doc.css("div#main_content div#game_area_description").first_string   
@@ -25,6 +30,9 @@ module Fletcher
             {:src => node.attribute("href").value}
           end 
 
+          # Get Image from Age Check
+          self.images = doc.xpath("//div[@id='agegate_box']//img").attribute_array if self.images.empty?
+
           self.image = images.first
         end
       end

data/spec/factories/models.rb

@@ -26,6 +26,7 @@ FactoryGirl.define do
     url "http://www.tigerdirect.com"
   end
 
+  # Example Model: Philips Wake-up light
   factory :amazon, :parent => :base do
     url "http://www.amazon.com/gp/product/B0093162RM/"
   end
@@ -34,6 +35,21 @@ FactoryGirl.define do
   factory :amazon2, :parent => :base do
     url "http://www.amazon.com/gp/product/B000P4W3LU/"
   end
+  
+  # Model for Kindle Fire, which has very different markup
+  factory :amazon3, :parent => :base do
+    url "http://www.amazon.com/gp/product/B00BWYQ9YE"
+  end
+
+  # Skull Replica, Yet another type of markup
+  factory :amazon4, :parent => :base do
+    url "http://www.amazon.com/Life-Size-Human-Skull-Replica-Reproduction/dp/B005DEE96E"
+  end
+
+  # A book with kindle versions
+  factory :amazon5, :parent => :base do 
+    url "http://www.amazon.com/dp/037575721X"
+  end
 
   # This may need to be updated if the item is expired/deleted
   factory :ebay, :parent => :base do
@@ -73,4 +89,8 @@ FactoryGirl.define do
     url "http://store.steampowered.com/app/212580/"
   end
 
+  # Game with Age Check
+  factory :steam_agecheck, :parent=> :base do
+    url "http://store.steampowered.com/app/214931/"
+  end
 end

data/spec/lib/fletcher/models/amazon_spec.rb

@@ -23,7 +23,7 @@ end
 describe Fletcher::Model::Amazon do
   describe "parse", :vcr do
     context "with valid data" do
-      %w{amazon amazon2}.each do |name|
+      %w{amazon amazon2 amazon3 amazon4}.each do |name|
         it "should fetch valid info for #{name}" do 
           amazon_check(FactoryGirl.build(name.to_sym).url)
         end         

data/spec/lib/fletcher/models/steam_spec.rb

@@ -8,22 +8,37 @@ describe Fletcher, :vcr do
   end 
 end 
 
+def steam_check(url)
+  model = described_class.new
+  model.parse Fletcher::Data.read(url)    
+  model.doc = nil
+  model.description = ''
+  model.name.should_not be_nil
+  model.description.should_not be_nil
+  model.description.class.should == String
+  model.price.should_not be_nil
+  model.images.should_not be_empty
+  model.image.should_not be_nil
+  model.image.src.should_not be_nil      
+end
+
 describe Fletcher::Model::Steam, :vcr do
   describe "parse" do
     context "with valid data" do
-      it "should return correct model info" do
+      %w{steam}.each do |name|
+        it "should fetch valid info for #{name}" do 
+          steam_check(FactoryGirl.build(name.to_sym).url)
+        end         
+      end     
+
+      it "should fetch valid info for game with agecheck" do
         model = described_class.new
-        model.parse Fletcher::Data.read(FactoryGirl.build(:steam).url)
-        model.doc = nil
-        model.description = ''
+        model.parse Fletcher::Data.read(FactoryGirl.build(:steam_agecheck).url)    
         model.name.should_not be_nil
-        model.description.should_not be_nil
-        model.description.class.should == String
-        model.price.should_not be_nil
         model.images.should_not be_empty
         model.image.should_not be_nil
-        model.image.src.should_not be_nil
-      end       
+        model.image.src.should_not be_nil            
+      end 
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fletcher
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -204,8 +204,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Easily fetch product/model information from third party websites such
-  as Amazon, eBay, etc.
+description: Easily fetch product information from third party websites such as Amazon,
+  Steam, eBay, etc.
 email: dave@hulihanapplications.com
 executables:
 - fletcher
@@ -280,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 454072605
+      hash: 10081167
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: