fletcher 0.6.4 → 0.6.5

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/fletcher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fletcher"
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   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-22"
+  s.date = "2013-11-28"
   s.description = "Easily fetch product/model information from third party websites such as Amazon, eBay, etc."
   s.email = "dave@hulihanapplications.com"
   s.executables = ["fletcher"]

data/lib/fletcher.rb

@@ -8,6 +8,12 @@ require File.expand_path("fletcher/string", File.dirname(__FILE__))
 require File.expand_path("fletcher/nokogiri", File.dirname(__FILE__))
 
 module Fletcher  
+  LIBRARY_PATH       = File.join(File.dirname(__FILE__), 'fletcher')
+  CLI_PATH           = File.join(LIBRARY_PATH, 'cli')
+  MODEL_PATH         = File.join(LIBRARY_PATH, 'models')
+  # User Agent (Chrome)
+  USER_AGENT         = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36"  
+
   # Module Methods
   class << self    
     # Fetch information based on url
@@ -61,9 +67,7 @@ module Fletcher
     end 
   end
 
-  LIBRARY_PATH       = File.join(File.dirname(__FILE__), 'fletcher')
-  CLI_PATH           = File.join(LIBRARY_PATH, 'cli')
-  MODEL_PATH         = File.join(LIBRARY_PATH, 'models')
+
 
   # Autoload CLI
   module CLI

data/lib/fletcher/data.rb

@@ -6,17 +6,13 @@ module Fletcher
   class Data
     # Get read url and get data object
     def self.read(url, options = {})
-      # Set User Agent
-      options[:user_agent] ||= "Ruby/#{RUBY_VERSION}"
-
-      response = open(url, "User-Agent" => options[:user_agent])
+      response = open(url, "User-Agent" => Fletcher::USER_AGENT)
       doc = ::Nokogiri::HTML(response.read)
       
       # Save contents of URL/Remote File for debugging
       # response.rewind
       # last_response_file = File.expand_path(File.join("..", "..", "last_response"), File.dirname(__FILE__))        
       # File.new(last_response_file, "w+").write(response.read)
-
       return doc
     end 
   end

data/lib/fletcher/models/amazon.rb

@@ -13,21 +13,24 @@ module Fletcher
         case doc
         when Nokogiri::HTML::Document
           # Get Name
-          self.name = doc.css("h1#title").first_string
+          self.name = doc.css("h1#title").first_string 
+          self.name = doc.xpath("string(//title)").split(" - ").first unless self.name
            
           # Get Description
-          self.description = doc.css("div#productDescriptionWrapper").first_string    
+          self.description = doc.css(".productDescriptionWrapper").first_string    
                 
           # Get description from meta title if not found
           self.description = doc.xpath("//meta[@name='description']/@content").first_string if description.nil?
           
           # Get Price
-          parse_price(doc.css("#priceblock_ourprice").first_string)
-                    
+          parse_price(doc.css("#actualPriceValue").first_string) 
+          parse_price(doc.css("#priceblock_ourprice").first_string) unless self.price                  
           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 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
           self.image = images.first
         end            
       end

data/spec/factories/models.rb

@@ -30,6 +30,11 @@ FactoryGirl.define do
     url "http://www.amazon.com/gp/product/B0093162RM/"
   end
 
+  # Create multiple amazon models, since markup varies greatly between products
+  factory :amazon2, :parent => :base do
+    url "http://www.amazon.com/gp/product/B000P4W3LU/"
+  end
+
   # This may need to be updated if the item is expired/deleted
   factory :ebay, :parent => :base do
     url "http://www.ebay.com/itm/Unicycle-20-Silver-Chrome-Unicycles-Wheel-Cycling-Outdoor-Sports-Fitness-New-/310729787186?pt=LH_DefaultDomain_0&hash=item4858f04732"

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fletcher
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -280,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1067783841
+      hash: 454072605
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: