fletcher 0.3.0 → 0.4.0

data/README.md

@@ -2,7 +2,7 @@
 [![Build Status](http://travis-ci.org/hulihanapplications/fletcher.png)](http://travis-ci.org/hulihanapplications/fletcher)
  
 
-Fletcher is a cross-website product/item information fetcher. Give fletcher a product url and you'll get back a nice, simple object that's easy to work with.
+Fletcher is a cross-website product/model information fetcher. Give fletcher a product url and you'll get back a nice, simple object that's easy to work with.
 
 ## Features 
 
@@ -12,9 +12,9 @@ Fletcher is a cross-website product/item information fetcher. Give fletcher a pr
 ## Supported Websites
 
 * [Amazon](http://www.amazon.com) (name, description, price, images)
-* [eBay](http://www.ebay.com) (name, images)
-* [ThinkGeek](http://www.thinkgeek.com) (name, description, images)
-* [Etsy](http://www.etsy.com) (name, description, images)
+* [eBay](http://www.ebay.com) (name, price, images)
+* [ThinkGeek](http://www.thinkgeek.com) (name, description, price, images)
+* [Etsy](http://www.etsy.com) (name, description, price, images)
 
 ## Installation
 
@@ -22,37 +22,37 @@ Fletcher is a cross-website product/item information fetcher. Give fletcher a pr
 gem install fletcher
 ```
 
-## Examples
+## Usage
 
 ```ruby
 require "fletcher"
 
-item = Fletcher.fetch # => "http://www.amazon.com/Avenir-Deluxe-Unicycle-20-Inch-Wheel/dp/B00165Q9F8"
+model = Fletcher.fetch "http://www.amazon.com/Avenir-Deluxe-Unicycle-20-Inch-Wheel/dp/B00165Q9F8"
 
-item.name # => "Avenir Deluxe Unicycle (20-Inch Wheel)"
+model.name # => "Avenir Deluxe Unicycle (20-Inch Wheel)"
 
-item.description # => "A wonderful unicycle"
+model.description # => "A wonderful unicycle"
 
-item.image # => {:url => "http://ecx.images-amazon.com/images/I/41b3TNb3uCL._SL500_AA300_.jpg", :alt => "Picture of Unicycle"}
+model.image # => {:url => "http://ecx.images-amazon.com/images/I/41b3TNb3uCL._SL500_AA300_.jpg", :alt => "Picture of Unicycle"}
 
-item.image.url # => "http://ecx.images-amazon.com/images/I/41b3TNb3uCL._SL500_AA300_.jpg"
+model.image.url # => "http://ecx.images-amazon.com/images/I/41b3TNb3uCL._SL500_AA300_.jpg"
 
-item.price # => #<Money cents:500 currency:USD>
-item.price.to_f # => 5.0
-item.price.format # => "$5.00"  
-item.price.currency.symbol # => "$"
+model.price # => #<Money cents:500 currency:USD>
+model.price.to_f # => 5.0
+model.price.format # => "$5.00"  
+model.price.currency.symbol # => "$"
 
 # Get Raw Nokogiri Document
-item.doc.class.name # => Nokogiri::HTML::Document
+model.doc.class.name # => Nokogiri::HTML::Document
 ```
 
 ## Attributes
 
-The following attributes are available from items:
+The following attributes are available from models:
 
-* title - (String) The name of the item/product
-* description - (String) The item/product description
-* price - (Money) A [Money](https://github.com/RubyMoney/money) object representing the item price. This makes exchange rates and math functionality easy to use.
-* image - (Hash) The main image of the item
-* images - (Array) Any available images of the item
+* title - (String) The name of the model/product
+* description - (String) The model/product description
+* price - (Money) A [Money](https://github.com/RubyMoney/money) object representing the model price. This makes exchange rates and math functionality easy to use.
+* image - (Hash) The main image of the model
+* images - (Array) Any available images of the model
 

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "fletcher"
   gem.homepage = "http://github.com/hulihanapplications/fletcher"
   gem.license = "MIT"
-  gem.summary = %Q{A cross-website product/item information fetcher.}
-  gem.description = %Q{Easily fetch product/item information from third party websites such as Amazon, eBay, etc.}
+  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.email = "dave@hulihanapplications.com"
   gem.authors = ["Dave Hulihan", "Hulihan Applications"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/fletcher.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fletcher}
-  s.version = "0.3.0"
+  s.name = "fletcher"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Hulihan", "Hulihan Applications"]
-  s.date = %q{2012-01-01}
-  s.description = %q{Easily fetch product/item information from third party websites such as Amazon, eBay, etc.}
-  s.email = %q{dave@hulihanapplications.com}
+  s.date = "2012-03-18"
+  s.description = "Easily fetch product/model information from third party websites such as Amazon, eBay, etc."
+  s.email = "dave@hulihanapplications.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -28,21 +28,20 @@ Gem::Specification.new do |s|
     "fletcher.gemspec",
     "lib/fletcher.rb",
     "lib/fletcher/data.rb",
-    "lib/fletcher/item/amazon.rb",
-    "lib/fletcher/item/base.rb",
-    "lib/fletcher/item/ebay.rb",
-    "lib/fletcher/item/etsy.rb",
-    "lib/fletcher/item/image.rb",
-    "lib/fletcher/item/thinkgeek.rb",
+    "lib/fletcher/models/amazon.rb",
+    "lib/fletcher/models/base.rb",
+    "lib/fletcher/models/ebay.rb",
+    "lib/fletcher/models/etsy.rb",
+    "lib/fletcher/models/thinkgeek.rb",
     "lib/fletcher/nokogiri.rb",
     "lib/fletcher/string.rb",
-    "spec/factories/item.rb",
+    "spec/factories/models.rb",
     "spec/lib/fletcher/data_spec.rb",
-    "spec/lib/fletcher/item/amazon_spec.rb",
-    "spec/lib/fletcher/item/base_spec.rb",
-    "spec/lib/fletcher/item/ebay_spec.rb",
-    "spec/lib/fletcher/item/etsy_spec.rb",
-    "spec/lib/fletcher/item/thinkgeek_spec.rb",
+    "spec/lib/fletcher/models/amazon_spec.rb",
+    "spec/lib/fletcher/models/base_spec.rb",
+    "spec/lib/fletcher/models/ebay_spec.rb",
+    "spec/lib/fletcher/models/etsy_spec.rb",
+    "spec/lib/fletcher/models/thinkgeek_spec.rb",
     "spec/lib/fletcher/nokogiri_spec.rb",
     "spec/lib/fletcher_spec.rb",
     "spec/spec_helper.rb",
@@ -50,11 +49,11 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_fletcher.rb"
   ]
-  s.homepage = %q{http://github.com/hulihanapplications/fletcher}
+  s.homepage = "http://github.com/hulihanapplications/fletcher"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{A cross-website product/item information fetcher.}
+  s.rubygems_version = "1.8.15"
+  s.summary = "A cross-website product/model information fetcher."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fletcher.rb

@@ -5,64 +5,72 @@ require "fletcher/data"
 require "fletcher/string"
 require "fletcher/nokogiri"
 
-module Fletcher
-  #autoload :Data, 'fletcher/data'
-  #autoload :Nokogiri, 'fletcher/nokogiri'
-  
-  module Item
-    dir = 'fletcher/item'
-    Dir[File.join(dir, "*.rb")].each do |f|
-       #autoload f      
-    end 
-    autoload :Base, 'fletcher/item/base'
-    autoload :Amazon, 'fletcher/item/amazon'
-    autoload :Ebay, 'fletcher/item/ebay'
-    autoload :Thinkgeek, 'fletcher/item/thinkgeek'
-    autoload :Etsy, 'fletcher/item/etsy'
-  end 
-  
-  # Detect service by url
-  #   Fletcher.identify_service("http://www.amazon.com/whatever") => :amazon
-  def self.identify_service(url)
-    if url =~ ::URI::regexp
-      uri = ::URI::parse(url)
-      host = uri.host
-      if host =~ Fletcher::Item::Amazon.regexp
-        service = :amazon
-      elsif host =~ Fletcher::Item::Ebay.regexp
-        service = :ebay        
-      elsif host =~ Fletcher::Item::Thinkgeek.regexp
-        service = :thinkgeek
-      elsif host =~ Fletcher::Item::Etsy.regexp
-        service = :etsy
+module Fletcher  
+  class << self
+    # Detect model by url
+    #   Fletcher.identify_model("http://www.amazon.com/whatever") => :amazon
+    def identify_model(url)
+      if url =~ ::URI::regexp
+        uri = ::URI::parse(url)
+        host = uri.host
+        if host =~ Fletcher::Model::Amazon.regexp
+          model = :amazon
+        elsif host =~ Fletcher::Model::Ebay.regexp
+          model = :ebay        
+        elsif host =~ Fletcher::Model::Thinkgeek.regexp
+          model = :thinkgeek
+        elsif host =~ Fletcher::Model::Etsy.regexp
+          model = :etsy
+        else 
+          model = :unknown 
+          raise ArgumentError, "Fletcher doesn't support #{host} yet."
+        end
       else 
-        service = :unknown 
-        raise ArgumentError, "Fletcher doesn't support #{host} yet."
+        raise ArgumentError, "not a url"
       end
-    else 
-      raise ArgumentError, "not a url"
     end
-  end
-  
-  # Fetch information based on url
-  def self.fetch(url) 
-    service = identify_service(url)
-    data = Fletcher::Data.read(url)
-    item = Fletcher::Item::Base.generate(service, data)
-    # Store url
-    item.url = url
     
-    item.parse(data)
-    return item   
-  end  
-  
-  # Get gem version
-  def self.version
-    File.read(File.join(root, "VERSION"))
+    # Fetch information based on url
+    def fetch(url) 
+      model = identify_model(url)
+      data = Fletcher::Data.read(url)
+      model = Fletcher::Model::Base.generate(model, data)
+      # Store url
+      model.url = url
+      
+      model.parse(data)
+      return model   
+    end  
+    
+    # Get gem version
+    def version
+      File.read(File.join(root, "VERSION"))
+    end
+    
+    # Get gem root directory
+    def root
+      File.expand_path("../..", __FILE__)
+    end
+
+    # Create mattrs
+    attr_accessor :models
   end
   
-  # Get gem root directory
-  def self.root
-    File.expand_path("../..", __FILE__)
-  end
+  # Initialize models mattr & Load models array from dir
+  @models = Array.new 
+  Dir[File.join(File.dirname(__FILE__), "fletcher", "models", "*.rb")].each do |f|
+    model = File.basename(f, ".rb").to_sym
+    @models << model unless model == :base
+  end 
+
+  # Load Models/Models
+  module Model
+    # Dir[File.join(dir, "*.rb")].each do |f|
+    #   autoload f      
+    # end 
+    autoload :Base, 'fletcher/models/base'
+    for model in Fletcher.models
+      autoload model.capitalize, "fletcher/models/#{model}"
+    end
+  end 
 end

data/lib/fletcher/data.rb

@@ -5,13 +5,19 @@ module Fletcher
   # This class is responsible for fetching and parsing data.
   class Data
     # Get read url and get data object
-    def self.read(url)
-      remote_file = open(url).read
-      doc = ::Nokogiri::HTML(remote_file)
+    def self.read(url, options = {})
+      # Set Defaults
+      options[:user_agent] ||= "Ruby/#{RUBY_VERSION}"
+
+      response = open(url, "User-Agent" => options[:user_agent])
+      doc = ::Nokogiri::HTML(response.read)
       
-      # Save contents of URL/Remote File
-      #last_url_file = File.expand_path(File.join("..", "..", "remote_file"), File.dirname(__FILE__))        
-      #File.new(last_url_file, "w+").write(remote_file.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
 end

data/lib/fletcher/{item → models}/amazon.rb

@@ -1,6 +1,6 @@
 module Fletcher
-  module Item
-    class Amazon < Fletcher::Item::Base
+  module Model
+    class Amazon < Fletcher::Model::Base
       # A regular expression for determining if a url comes from a specific service/website
       def self.regexp
         /amazon\.com/
@@ -8,8 +8,7 @@ module Fletcher
         
       # Parse data and look for object attributes to give to object    
       def parse(data)
-        # Store raw document object 
-        self.doc = data 
+        super(data)
         
         case doc
         when Nokogiri::HTML::Document

data/lib/fletcher/{item → models}/base.rb

@@ -2,24 +2,24 @@ require "hashie"
 require "money"
 
 module Fletcher
-  module Item
+  module Model
     class Base < ::Hashie::Mash         
       # Create a product object based on service
-      #   Fletcher::Item::Base.generate(:amazon, "<html>...") # => #<Fletcher::Item::Amazon:0x...> 
+      #   Fletcher::Model::Base.generate(:amazon, "<html>...") # => #<Fletcher::Model::Amazon:0x...> 
       def self.generate(service = nil, data = nil)
         case service
         when :amazon
-          item = Fletcher::Item::Amazon.new
+          model = Fletcher::Model::Amazon.new
         when :ebay
-          item = Fletcher::Item::Ebay.new
+          model = Fletcher::Model::Ebay.new
         when :thinkgeek
-          item = Fletcher::Item::Thinkgeek.new
+          model = Fletcher::Model::Thinkgeek.new
         when :etsy
-          item = Fletcher::Item::Etsy.new
+          model = Fletcher::Model::Etsy.new
         end
         
-        item.parse(data)
-        return item 
+        model.parse(data)
+        return model 
       end
 
       # Parse data and set object attributes    
@@ -28,13 +28,13 @@ module Fletcher
       end      
       
       # Parse a raw price string to get usable data
-      #   item.parse_price("$5.00") # => #<Money cents:500 currency:USD>
-      #   item.price.to_f # => 5.0
-      #   item.price.currency.symbol # => '$'
+      #   model.parse_price("$5.00") # => #<Money cents:500 currency:USD>
+      #   model.price.to_f # => 5.0
+      #   model.price.currency.symbol # => '$'
       def parse_price(raw_price = nil)
         return if raw_price.nil?
         self.price = ::Money.parse(raw_price)
       end
     end # Base
-  end # Item
+  end # Model
 end # Fletcher

data/lib/fletcher/{item → models}/ebay.rb

@@ -1,6 +1,6 @@
 module Fletcher
-  module Item
-    class Ebay < Fletcher::Item::Base
+  module Model
+    class Ebay < Fletcher::Model::Base
       # A regular expression for determining if a url comes from a specific service/website
       def self.regexp
         /ebay\.com/
@@ -8,9 +8,8 @@ module Fletcher
         
       # Parse data and look for object attributes to give to object    
       def parse(data)
-        # Store raw document object 
-        self.doc = data 
-        
+        super(data)
+
         case doc
         when Nokogiri::HTML::Document
           # Get Name
@@ -20,7 +19,8 @@ module Fletcher
           # OMITTED: This is tough to get because ebay item descriptions are custom html/content created by sellers
 
           # Get Price
-          parse_price(doc.xpath("//span[@itemprop='price']").first_string.gsub(/US/, ""))
+          raw_price = doc.xpath("//span[@itemprop='price']").first_string
+          parse_price(raw_price.gsub(/US/, "")) if raw_price
           
           # Get Image
           self.images = [{:url => doc.xpath("//span[@itemprop='image']/img").first_string}]

data/lib/fletcher/{item → models}/etsy.rb

@@ -1,6 +1,6 @@
 module Fletcher
-  module Item
-    class Etsy < Fletcher::Item::Base
+  module Model
+    class Etsy < Fletcher::Model::Base
       # A regular expression for determining if a url comes from a specific service/website
       def self.regexp
         /etsy\.com/
@@ -8,8 +8,7 @@ module Fletcher
         
       # Parse data and look for object attributes to give to object    
       def parse(data)
-        # Store raw document object 
-        self.doc = data 
+        super(data)
         
         case doc
         when Nokogiri::HTML::Document

data/lib/fletcher/{item → models}/thinkgeek.rb

@@ -1,6 +1,6 @@
 module Fletcher
-  module Item
-    class Thinkgeek < Fletcher::Item::Base
+  module Model
+    class Thinkgeek < Fletcher::Model::Base
       # A regular expression for determining if a url comes from a specific service/website
       def self.regexp
         /thinkgeek\.com/
@@ -8,8 +8,7 @@ module Fletcher
         
       # Parse data and look for object attributes to give to object    
       def parse(data)
-        # Store raw document object 
-        self.doc = data 
+        super(data)
         
         case doc
         when Nokogiri::HTML::Document

data/lib/fletcher/nokogiri.rb

@@ -11,7 +11,7 @@ module Fletcher
     
     module XML
       module NodeSet
-        # get string from first nodeset item
+        # get string from first nodeset model
         def first_string
           node = first
           case node
@@ -24,7 +24,7 @@ module Fletcher
           end
         end          
         
-        # convert nodeset items to an array of hashes
+        # convert nodeset models to an array of hashes
         #   @doc.xpath("//img")).attribute_array # => [{:element => "img", :src => ".../someimage.png"}]
         def attribute_array
           a = Array.new

data/spec/factories/models.rb

@@ -0,0 +1,39 @@
+require "hashie"
+
+Factory.define :base, :class => Fletcher::Model::Base  do |o|
+  o.url "http://www.example.com"  
+end
+
+Factory.define :sample, :parent => :base  do |o|
+  o.url "http://www.example.com"
+  o.name "Sample Model"
+  o.description "This is a sample description."
+  o.raw_price "$5.00"   
+end
+
+Factory.define :invalid, :parent => :base do |o|
+  o.url "http://invalid"
+end  
+
+Factory.define :valid, :parent => :base do |o|
+  o.url "http://www.amazon.com/Kindle-Fire-Amazon-Tablet/dp/B0051VVOB2"
+  o.title_xpath "//h1[@class='parseasinTitle']"
+  o.images_xpath "//table[@class='productImageGrid']//img"
+end
+
+Factory.define :amazon, :parent => :base do |o|
+  o.url "http://www.amazon.com/Kindle-Fire-Amazon-Tablet/dp/B0051VVOB2"
+end
+
+# This may need to be updated if the item is expired/deleted
+Factory.define :ebay, :parent => :base do |o|
+  o.url "http://www.ebay.com/itm/Franklin-Library-3V-ESSAYS-MONTAIGNE-Leather-Great-Books-1979-Donald-Frame-/190654183378"
+end
+
+Factory.define :thinkgeek, :parent => :base do |o|
+  o.url "http://www.thinkgeek.com/geektoys/plush/e7f8/"
+end
+
+Factory.define :etsy, :parent => :base do |o|
+  o.url "http://www.etsy.com/listing/78608690/farm-fresh-125-x-19-in-pick-your-color"
+end

data/spec/lib/fletcher/data_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe Fletcher::Data do
   describe "open-uri" do
     it "tells me how long it taks to open an uri file" do 
-      #puts benchmark{ file = open(Factory(:valid_item).url)}.to_s  
+      #puts benchmark{ file = open(Factory(:valid_model).url)}.to_s  
     end 
   end
   
   describe "read" do 
     it "should return a valid document" do 
-      doc = Fletcher::Data.read(Factory(:valid_item).url)
+      doc = Fletcher::Data.read(Factory(:valid).url)
     end
     
     # This is just a rough indicator of how long a data should take to download
     it "shouldn't take too long" do 
-      # benchmark{ doc = Fletcher::Data.read(Factory(:valid_item).url)}.should_not be_slower_than(5.0)
+      # benchmark{ doc = Fletcher::Data.read(Factory(:valid_model).url)}.should_not be_slower_than(5.0)
     end    
   end
 end  

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Fletcher::Model::Amazon do
+  describe "parse" do     
+    context "with valid data" do
+      it "should return correct model info" do 
+        model = described_class.new
+        model.parse Fletcher::Data.read(Factory(:amazon).url)    
+        model.name.should_not be_nil
+        model.description.should_not be_nil
+        model.price.should_not be_nil        
+        model.image.should_not be_nil        
+      end       
+    end
+  end
+end  

data/spec/lib/fletcher/{item → models}/base_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Fletcher::Item::Base do
+describe Fletcher::Model::Base do
   describe "generate" do     
   end
   
@@ -11,10 +11,10 @@ describe Fletcher::Item::Base do
 
   describe "parse_price" do 
     it "should return a price float and currency" do
-      item = Factory.build(:sample_item)
-      item.parse_price(item.raw_price)
-      item.price.is_a?(Money).should == true
-      item.price.currency.should_not be_nil
+      model = Factory.build(:sample)
+      model.parse_price(model.raw_price)
+      model.price.is_a?(Money).should == true
+      model.price.currency.should_not be_nil
     end
   end
 end  

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

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Fletcher::Model::Ebay do
+  describe "parse" do     
+    context "with valid data" do
+      it "should return correct model info" do 
+        model = described_class.new
+        model.parse Fletcher::Data.read(Factory(:ebay).url)
+        model.name.should_not be_nil
+        model.price.should_not be_nil        
+        model.image.should_not be_nil        
+      end       
+    end
+  end
+end  

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Fletcher::Model::Etsy do
+  describe "parse" do     
+    context "with valid data" do
+      it "should return correct model info" do 
+        model = described_class.new
+        model.parse Fletcher::Data.read(Factory(:etsy).url)    
+        model.name.should_not be_nil
+        model.description.should_not be_nil
+        model.price.should_not be_nil        
+        model.image.should_not be_nil        
+      end       
+    end
+  end
+end  

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

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Fletcher::Model::Thinkgeek do
+  describe "parse" do     
+    context "with valid data" do
+      it "should return correct model info" do 
+        model = described_class.new
+        model.parse Fletcher::Data.read(Factory(:thinkgeek).url)  
+        model.name.should_not be_nil
+        model.price.should_not be_nil                
+        model.image.should_not be_nil        
+      end       
+    end
+  end
+end  

data/spec/lib/fletcher/nokogiri_spec.rb

@@ -6,12 +6,12 @@ end
 
 describe Fletcher::Nokogiri::XML::NodeSet do
   before :each do 
-    @doc = Fletcher::Data.read(Factory(:valid_item).url)
+    @doc = Fletcher::Data.read(Factory(:valid).url)
   end  
    
   describe "first_string" do
     it "should return a valid string" do
-      nodeset = @doc.xpath(Factory(:valid_item).title_xpath)
+      nodeset = @doc.xpath(Factory(:valid).title_xpath)
       string = nodeset.first_string
       string.should_not be_nil 
     end   
@@ -19,7 +19,7 @@ describe Fletcher::Nokogiri::XML::NodeSet do
   
   describe "attribute_array" do
     it "should return an array of attribute hashes" do
-      nodeset = @doc.xpath(Factory(:valid_item).images_xpath)
+      nodeset = @doc.xpath(Factory(:valid).images_xpath)
       attribute_array = nodeset.attribute_array 
       attribute_array.class.should == Array
     end       

data/spec/lib/fletcher_spec.rb

@@ -1,53 +1,29 @@
 require 'spec_helper'
 
 describe Fletcher do
-  describe :service do
-    it "should raise an error when using an unsupported domain" do 
-      lambda{described_class.identify_service(Factory(:item).url)}.should raise_error 
-    end
-    
-    it "should return :amazon when using an amazon domain" do 
-      described_class.identify_service(Factory(:amazon_item).url).should == :amazon
-    end    
-    
-    it "should return :ebay when using an ebay domain" do 
-      described_class.identify_service(Factory(:ebay_item).url).should == :ebay
-    end        
-  end
-  
-  describe :fetch do 
-    context :amazon do 
-      it "should fetch amazon item info successfully" do 
-        item = described_class.fetch(Factory(:amazon_item).url)
-        item.should_not be_nil
-        item.name.should_not be_nil
-        item.description.should_not be_nil
-      end      
-    end
-    
-    context :ebay do 
-      it "should fetch item info successfully" do 
-        item = described_class.fetch(Factory(:ebay_item).url)
-        item.should_not be_nil
-        item.name.should_not be_nil
-      end      
-    end    
+  context :models do 
+    describe :itendify_model do
+      it "should raise an error when using an unsupported domain" do 
+        lambda{described_class.identify_model(Factory(:invalid).url)}.should raise_error 
+      end
+
+      for model in Fletcher.models
+        it "should return #{model} sym when using a #{model} domain" do
+          described_class.identify_model(Factory(model).url).should == model
+        end 
+      end   
+    end 
 
-    context :thinkgeek do 
-      it "should fetch item info successfully" do 
-        item = described_class.fetch(Factory(:thinkgeek_item).url)
-        item.should_not be_nil
-        item.name.should_not be_nil
-      end      
+    describe :fetch do
+      for model in [Fletcher.models[2]]
+        it "should return valid data for #{model} model" do
+          item = described_class.fetch(Factory(model).url)
+          item.should_not be_nil
+          item.name.should_not be_nil       
+          item.description.should_not be_nil if model == :amazon
+        end 
+      end   
     end    
-    
-    context :etsy do 
-      it "should fetch item info successfully" do 
-        item = described_class.fetch(Factory(:etsy_item).url)
-        item.should_not be_nil
-        item.name.should_not be_nil
-      end      
-    end        
   end
   
   describe :version do
@@ -55,4 +31,13 @@ describe Fletcher do
       described_class.version.should_not be_nil
     end
   end
+
+  describe :models do
+    it "should return an array of models" do
+      described_class.models.should_not be_nil
+      # Test append
+      described_class.models << :somemodel
+      described_class.models.include?(:somemodel).should == true
+    end 
+  end
 end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fletcher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-01 00:00:00.000000000Z
+date: 2012-03-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &71525050 !ruby/object:Gem::Requirement
+  requirement: &13008300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71525050
+  version_requirements: *13008300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &71524600 !ruby/object:Gem::Requirement
+  requirement: &13007540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71524600
+  version_requirements: *13007540
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &71524080 !ruby/object:Gem::Requirement
+  requirement: &13006520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71524080
+  version_requirements: *13006520
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &71523400 !ruby/object:Gem::Requirement
+  requirement: &12980420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71523400
+  version_requirements: *12980420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &71522560 !ruby/object:Gem::Requirement
+  requirement: &12979040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *71522560
+  version_requirements: *12979040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &71521590 !ruby/object:Gem::Requirement
+  requirement: &12978400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *71521590
+  version_requirements: *12978400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &71520830 !ruby/object:Gem::Requirement
+  requirement: &12976820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71520830
+  version_requirements: *12976820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71519900 !ruby/object:Gem::Requirement
+  requirement: &12975180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71519900
+  version_requirements: *12975180
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &71519240 !ruby/object:Gem::Requirement
+  requirement: &12973720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71519240
+  version_requirements: *12973720
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &71518690 !ruby/object:Gem::Requirement
+  requirement: &12972540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,8 +121,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71518690
-description: Easily fetch product/item information from third party websites such
+  version_requirements: *12972540
+description: Easily fetch product/model information from third party websites such
   as Amazon, eBay, etc.
 email: dave@hulihanapplications.com
 executables: []
@@ -142,21 +142,20 @@ files:
 - fletcher.gemspec
 - lib/fletcher.rb
 - lib/fletcher/data.rb
-- lib/fletcher/item/amazon.rb
-- lib/fletcher/item/base.rb
-- lib/fletcher/item/ebay.rb
-- lib/fletcher/item/etsy.rb
-- lib/fletcher/item/image.rb
-- lib/fletcher/item/thinkgeek.rb
+- lib/fletcher/models/amazon.rb
+- lib/fletcher/models/base.rb
+- lib/fletcher/models/ebay.rb
+- lib/fletcher/models/etsy.rb
+- lib/fletcher/models/thinkgeek.rb
 - lib/fletcher/nokogiri.rb
 - lib/fletcher/string.rb
-- spec/factories/item.rb
+- spec/factories/models.rb
 - spec/lib/fletcher/data_spec.rb
-- spec/lib/fletcher/item/amazon_spec.rb
-- spec/lib/fletcher/item/base_spec.rb
-- spec/lib/fletcher/item/ebay_spec.rb
-- spec/lib/fletcher/item/etsy_spec.rb
-- spec/lib/fletcher/item/thinkgeek_spec.rb
+- spec/lib/fletcher/models/amazon_spec.rb
+- spec/lib/fletcher/models/base_spec.rb
+- spec/lib/fletcher/models/ebay_spec.rb
+- spec/lib/fletcher/models/etsy_spec.rb
+- spec/lib/fletcher/models/thinkgeek_spec.rb
 - spec/lib/fletcher/nokogiri_spec.rb
 - spec/lib/fletcher_spec.rb
 - spec/spec_helper.rb
@@ -178,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -857180173
+      hash: -4046280218337247213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,8 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: A cross-website product/item information fetcher.
+summary: A cross-website product/model information fetcher.
 test_files: []

data/lib/fletcher/item/image.rb

@@ -1,8 +0,0 @@
-require "hashie"
-
-module Fletcher
-  module Item
-    class Image < ::Hashie::Mash           
-    end # Image
-  end # Item
-end # Fletcher

data/spec/factories/item.rb

@@ -1,37 +0,0 @@
-require "hashie"
-
-Factory.define :item, :class => Fletcher::Item::Base  do |o|
-  o.url "http://www.example.com"  
-end
-
-Factory.define :sample_item, :parent => :item  do |o|
-  o.url "http://www.example.com"
-  o.name "Sample Item"
-  o.description "This is a sample description."
-  o.raw_price "$5.00"   
-end
-
-Factory.define :invalid_item, :parent => :item do |o|
-end  
-
-Factory.define :valid_item, :parent => :item do |o|
-  o.url "http://www.amazon.com/Kindle-Fire-Amazon-Tablet/dp/B0051VVOB2"
-  o.title_xpath "//h1[@class='parseasinTitle']"
-  o.images_xpath "//table[@class='productImageGrid']//img"
-end
-
-Factory.define :amazon_item, :parent => :item do |o|
-  o.url "http://www.amazon.com/Kindle-Fire-Amazon-Tablet/dp/B0051VVOB2"
-end
-
-Factory.define :ebay_item, :parent => :item do |o|
-  o.url "http://www.ebay.com/itm/24-Wheel-Leakproof-Butyl-Tire-Adjustable-Unicycle-Free-Stand-Cycling-Bike-Green-/370564417915"
-end
-
-Factory.define :thinkgeek_item, :parent => :item do |o|
-  o.url "http://www.thinkgeek.com/geektoys/plush/e7f8/"
-end
-
-Factory.define :etsy_item, :parent => :item do |o|
-  o.url "http://www.etsy.com/listing/78608690/farm-fresh-125-x-19-in-pick-your-color"
-end

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

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Fletcher::Item::Amazon do
-  describe "parse" do     
-    context "with valid data" do
-      it "should return correct item info" do 
-        item = described_class.new
-        item.parse Fletcher::Data.read(Factory(:amazon_item).url)    
-        item.name.should_not be_nil
-        item.description.should_not be_nil
-        item.price.should_not be_nil        
-        item.image.should_not be_nil        
-      end       
-    end
-  end
-end  

data/spec/lib/fletcher/item/ebay_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Fletcher::Item::Ebay do
-  describe "parse" do     
-    context "with valid data" do
-      it "should return correct item info" do 
-        item = described_class.new
-        item.parse Fletcher::Data.read(Factory(:ebay_item).url)
-        item.name.should_not be_nil
-        item.price.should_not be_nil        
-        item.image.should_not be_nil        
-      end       
-    end
-  end
-end  

data/spec/lib/fletcher/item/etsy_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Fletcher::Item::Etsy do
-  describe "parse" do     
-    context "with valid data" do
-      it "should return correct item info" do 
-        item = described_class.new
-        item.parse Fletcher::Data.read(Factory(:etsy_item).url)    
-        item.name.should_not be_nil
-        item.description.should_not be_nil
-        item.price.should_not be_nil        
-        item.image.should_not be_nil        
-      end       
-    end
-  end
-end  

data/spec/lib/fletcher/item/thinkgeek_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe Fletcher::Item::Thinkgeek do
-  describe "parse" do     
-    context "with valid data" do
-      it "should return correct item info" do 
-        item = described_class.new
-        item.parse Fletcher::Data.read(Factory(:thinkgeek_item).url)  
-        item.name.should_not be_nil
-        item.price.should_not be_nil                
-        item.image.should_not be_nil        
-      end       
-    end
-  end
-end