fletcher 0.6.1 → 0.6.2

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm: # list all the Rubies you want to test against
-  - 1.8.7
+  #- 1.8.7
   #- 1.9.2
   - 1.9.3
   #- jruby
-  - ree
+  #- ree
 script: "bundle exec rspec spec" # your test command goes here

data/Gemfile

@@ -9,7 +9,6 @@ group :development do
   gem "shoulda", ">= 0"
   gem "bundler"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
   gem "rspec"
   gem "factory_girl"
   gem "i18n"

data/Gemfile.lock

@@ -1,39 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.2)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
+    factory_girl (4.1.0)
+      activesupport (>= 3.0.0)
     fakeweb (1.3.0)
     git (1.2.5)
     hashie (1.2.0)
-    i18n (0.6.0)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.4)
-    money (4.0.1)
-      i18n (~> 0.4)
-      json
-    multi_json (1.1.0)
-    nokogiri (1.5.0)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    shoulda (2.11.3)
+    money (5.1.0)
+      i18n (~> 0.6.0)
+    multi_json (1.3.7)
+    nokogiri (1.5.5)
+    rake (10.0.1)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.1)
+    shoulda-matchers (1.4.1)
+      activesupport (>= 3.0.0)
     thor (0.16.0)
-    vcr (2.2.5)
+    vcr (2.3.0)
 
 PLATFORMS
   ruby
@@ -47,7 +49,6 @@ DEPENDENCIES
   jeweler (~> 1.6.4)
   money
   nokogiri
-  rcov
   rspec
   shoulda
   thor

data/README.md

@@ -16,6 +16,7 @@ Fletcher is a cross-website product information fetcher. Just give fletcher a pr
 * [Etsy](http://www.etsy.com) 
 * [game.co.uk](http://www.game.co.uk)
 * [Google Shopping](http://www.google.com/products/)
+* [Newegg](http://www.newegg.com)
 * [play.com](http://www.play.com)
 * [Steam](http://store.steampowered.com)
 * [ThinkGeek](http://www.thinkgeek.com)

data/Rakefile

@@ -33,22 +33,22 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
+# require 'rcov/rcovtask'
+# Rcov::RcovTask.new do |test|
+#   test.libs << 'test'
+#   test.pattern = 'test/**/test_*.rb'
+#   test.verbose = true
+#   test.rcov_opts << '--exclude "gems/*"'
+# end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+# require 'rake/rdoctask'
+# Rake::RDocTask.new do |rdoc|
+#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fletcher #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+#   rdoc.rdoc_dir = 'rdoc'
+#   rdoc.title = "fletcher #{version}"
+#   rdoc.rdoc_files.include('README*')
+#   rdoc.rdoc_files.include('lib/**/*.rb')
+# end

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/fletcher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fletcher"
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Hulihan", "Hulihan Applications"]
-  s.date = "2012-11-06"
+  s.date = "2012-11-16"
   s.description = "Easily fetch product/model information from third party websites such as Amazon, eBay, etc."
   s.email = "dave@hulihanapplications.com"
   s.executables = ["fletcher"]
@@ -32,12 +32,14 @@ Gem::Specification.new do |s|
     "lib/fletcher.rb",
     "lib/fletcher/cli/utility.rb",
     "lib/fletcher/data.rb",
+    "lib/fletcher/model.rb",
     "lib/fletcher/models/amazon.rb",
     "lib/fletcher/models/base.rb",
     "lib/fletcher/models/ebay.rb",
     "lib/fletcher/models/etsy.rb",
     "lib/fletcher/models/gamecouk.rb",
     "lib/fletcher/models/googleshopping.rb",
+    "lib/fletcher/models/newegg.rb",
     "lib/fletcher/models/playcom.rb",
     "lib/fletcher/models/steam.rb",
     "lib/fletcher/models/thinkgeek.rb",
@@ -46,16 +48,19 @@ Gem::Specification.new do |s|
     "spec/bin/fletcher_spec.rb",
     "spec/factories/models.rb",
     "spec/lib/fletcher/data_spec.rb",
+    "spec/lib/fletcher/model_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/gamecouk_spec.rb",
     "spec/lib/fletcher/models/googleshopping_spec.rb",
+    "spec/lib/fletcher/models/newegg_spec.rb",
     "spec/lib/fletcher/models/playcom_spec.rb",
     "spec/lib/fletcher/models/steam_spec.rb",
     "spec/lib/fletcher/models/thinkgeek_spec.rb",
     "spec/lib/fletcher/nokogiri_spec.rb",
+    "spec/lib/fletcher/string_spec.rb",
     "spec/lib/fletcher_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/benchmark.rb",
@@ -82,7 +87,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<factory_girl>, [">= 0"])
       s.add_development_dependency(%q<i18n>, [">= 0"])
@@ -96,7 +100,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<factory_girl>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
@@ -111,7 +114,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<factory_girl>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])

data/lib/fletcher.rb

@@ -3,53 +3,30 @@
 require "uri"
 
 require File.expand_path("fletcher/data", File.dirname(__FILE__))
+require File.expand_path("fletcher/model", File.dirname(__FILE__))
 require File.expand_path("fletcher/string", File.dirname(__FILE__))
 require File.expand_path("fletcher/nokogiri", File.dirname(__FILE__))
 
 module Fletcher  
   # Module Methods
-  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::Etsy.regexp
-          model = :etsy          
-        elsif host =~ Fletcher::Model::Gamecouk.regexp
-          model = :gamecouk
-        elsif host =~ Fletcher::Model::Googleshopping.regexp
-          model = :googleshopping          
-        elsif host =~ Fletcher::Model::Playcom.regexp
-          model = :playcom
-        elsif host =~ Fletcher::Model::Thinkgeek.regexp          
-          model = :thinkgeek
-        elsif host =~ Fletcher::Model::Steam.regexp          
-          model = :steam
-        else 
-          model = :unknown 
-          raise ArgumentError, "Fletcher doesn't support #{host} yet."
-        end
-      else 
-        raise ArgumentError, "not a url"
-      end
-    end
-    
+  class << self    
     # Fetch information based on url
     def fetch(url) 
-      model = identify_model(url)
+      # Look for model based on url
+      model_class = Fletcher::Model.identify(url)
+
+      # Use Base class for fallback
+      model_class = Fletcher::Model::Base unless model_class
+      
       data = Fletcher::Data.read(url)
-      model = Fletcher::Model::Base.generate(model, data)
-      # Store url
-      model.url = url
+
+      product = model_class.new
+      product.parse(data)
+
+      # Save url
+      product.url = url
       
-      model.parse(data)
-      return model   
+      return product
     end  
     
     # Get gem version
@@ -62,6 +39,7 @@ module Fletcher
       File.expand_path("../..", __FILE__)
     end
 
+    # get array of models syms
     def models
       models = Array.new
       Dir[File.join(File.dirname(__FILE__), "fletcher", "models", "*.rb")].each do |f|
@@ -70,6 +48,17 @@ module Fletcher
       end 
       return models
     end 
+
+    # get array of model classes
+    #   Fletcher.model_classes = [Amazon, Ebay, ThinkGeek]
+    def model_classes
+      models = Array.new
+      Dir[File.join(File.dirname(__FILE__), "fletcher", "models", "*.rb")].each do |f|
+        filename = File.basename(f, ".rb")
+        models << ["Fletcher", "Model", filename.camelize].join("::").constantize unless filename == "base"
+      end 
+      return models
+    end 
   end
 
   LIBRARY_PATH       = File.join(File.dirname(__FILE__), 'fletcher')
@@ -85,7 +74,7 @@ module Fletcher
   module Model
     autoload :Base, File.join(MODEL_PATH, "base")
     for model in Fletcher.models
-      autoload model.to_s.capitalize.to_sym, File.join(MODEL_PATH, model.to_s)
+      autoload model.to_s.camelize.to_sym, File.join(MODEL_PATH, model.to_s)
     end
   end     
 end

data/lib/fletcher/model.rb

@@ -0,0 +1,23 @@
+module Fletcher  
+  module Model
+    class << self    
+      # Detect model by url
+      #   Fletcher::Model.identify("http://www.amazon.com/whatever") # => Flether::Models::Amazon
+      def identify(url)
+        if url =~ ::URI::regexp
+          uri = ::URI::parse(url)
+          host = uri.host
+          matched_model = nil
+          for model in Fletcher.model_classes
+            #model_class =            
+            matched_model = model if host =~ model.regexp 
+          end 
+          # raise ArgumentError, "Fletcher doesn't support #{host} yet." unless matched_model_class
+          return matched_model
+        else 
+          raise ArgumentError, "not a url"
+        end
+      end
+    end
+  end
+end

data/lib/fletcher/models/base.rb

@@ -4,37 +4,14 @@ require "money"
 module Fletcher
   module Model
     class Base < ::Hashie::Mash         
-      # Create a product object based on service
-      #   Fletcher::Model::Base.generate(:amazon, "<html>...") # => #<Fletcher::Model::Amazon:0x...> 
-      def self.generate(service = nil, data = nil)
-        case service
-        when :amazon
-          model = Fletcher::Model::Amazon.new
-        when :ebay
-          model = Fletcher::Model::Ebay.new
-        when :thinkgeek
-          model = Fletcher::Model::Thinkgeek.new
-        when :etsy
-          model = Fletcher::Model::Etsy.new
-        when :googleshopping
-          model = Fletcher::Model::Googleshopping.new
-        when :gamecouk
-          model = Fletcher::Model::Gamecouk.new
-        when :steam
-          model = Fletcher::Model::Steam.new
-        when :playcom
-          model = Fletcher::Model::Playcom.new          
-        end
-        
-        model.parse(data)
-        return model 
-      end
-
       # Parse data and set object attributes    
       def parse(data)
         self.doc = data # save data for if user wants to access it later      
+
+        # Get page title as name
+        self.name = doc.css("head > title").first_string
       end      
-      
+
       # Parse a raw price string to get usable data
       #   model.parse_price("$5.00") # => #<Money cents:500 currency:USD>
       #   model.price.to_f # => 5.0

data/lib/fletcher/models/googleshopping.rb

@@ -12,7 +12,8 @@ module Fletcher
         case doc
         when Nokogiri::HTML::Document
           # Get Name
-          self.name = doc.css('h1#product-name span.main-title').first_string
+          name = doc.css('h1#product-name span.main-title').first_string
+          self.name = name if name
 
           # Get Description
           self.description = doc.css("div.product-desc-cont div.product-desc").first_string   

data/lib/fletcher/models/newegg.rb

@@ -0,0 +1,31 @@
+module Fletcher
+  module Model
+    class Newegg < Fletcher::Model::Base
+      # A regular expression for determining if a url comes from a specific service/website
+      def self.regexp
+        /newegg\.com/
+      end
+        
+      # Parse data and look for object attributes to give to object    
+      def parse(data)
+        super(data)
+        case doc
+        when Nokogiri::HTML::Document
+          # Get Name          
+          self.name = doc.css("#synopsis .grpDesc .wrapper h1 > span").first_string
+          #self.name = doc.css("#synopsis .grpDesc .wrapper > .span").first_string
+
+          #  Description
+          self.description = doc.css("#fullInfo .itmDesc > p").first_string
+
+          # Get Price (currently disabled because price is displayed after page load)
+          #parse_price doc.css("li.price-current").attribute("content").content
+                          
+          # # Get Images
+          self.images = [{:src => doc.css('.mainSlide > img').attribute("src").content}]
+          self.image = images.first
+        end
+      end
+    end
+  end
+end

data/lib/fletcher/models/thinkgeek.rb

@@ -14,7 +14,7 @@ module Fletcher
         when Nokogiri::HTML::Document
           # Get Name
           self.name = doc.xpath("//meta[@property='og:title']/@content").first_string
-          
+
           # Get Description
           self.description = doc.xpath("//meta[@property='og:description']/@content").first_string
   

data/lib/fletcher/string.rb

@@ -1,10 +1,32 @@
-
 module Fletcher
   # This class extends string functions
   module String
     def sanitize
       self.strip
     end
+
+    def camelize(first_letter_in_uppercase = true)
+      lower_case_and_underscored_word = self.dup.underscore
+      if first_letter_in_uppercase
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+      else
+        lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
+      end
+    end
+
+    def constantize
+      self.split("::").inject(Module) {|acc, val| acc.const_get(val)}
+    end
+
+    def underscore
+      word = self.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
   end
 end
 

data/spec/factories/models.rb

@@ -22,6 +22,10 @@ FactoryGirl.define do
     images_xpath "//table[@class='productImageGrid']//img"
   end
 
+  factory :unsupported, :parent => :base do 
+    url "http://www.tigerdirect.com"
+  end
+
   factory :amazon, :parent => :base do
     url "http://www.amazon.com/gp/product/B004HZYA6E/"
   end
@@ -31,6 +35,10 @@ FactoryGirl.define do
     url "http://www.ebay.com/itm/Franklin-Library-3V-ESSAYS-MONTAIGNE-Leather-Great-Books-1979-Donald-Frame-/190654183378"
   end
 
+  factory :newegg, :parent => :base do
+    url "http://www.newegg.com/Product/Product.aspx?Item=9SIA03E0004DP7"
+  end
+
   factory :thinkgeek, :parent => :base do
     url "http://www.thinkgeek.com/geektoys/plush/e7f8/"
   end

data/spec/lib/fletcher/data_spec.rb

@@ -9,7 +9,7 @@ describe Fletcher::Data do
   
   describe "read" do 
     it "should return a valid document", :vcr do 
-      doc = Fletcher::Data.read(Factory(:valid).url)
+      doc = Fletcher::Data.read(FactoryGirl.build(:valid).url)
     end
     
     # This is just a rough indicator of how long a data should take to download

data/spec/lib/fletcher/model_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Fletcher::Model do
+  describe "identify" do
+    it "should return the model when a valid url is used" do 
+      described_class.identify(FactoryGirl.build(:amazon).url).should == Fletcher::Model::Amazon
+    end 
+
+    it "should return nil when using an unsupported domain" do 
+      described_class.identify(FactoryGirl.build(:invalid).url).should be_nil
+    end
+
+    # for model in Fletcher.model_classes
+    #   it "should return #{model} sym when using a #{model} domain" do
+    #     described_class.identify(FactoryGirl.build(model).url).should == model
+    #   end 
+    # end     
+  end
+end  

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should fetch amazon product" do
-      item = described_class.fetch(Factory(:amazon).url)
+      item = described_class.fetch(FactoryGirl.build(:amazon).url)
       item.should_not be_nil
       item.name.should_not be_nil       
       item.description.should_not be_nil 
@@ -16,7 +16,7 @@ describe Fletcher::Model::Amazon 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.parse Fletcher::Data.read(FactoryGirl.build(:amazon).url)    
         model.name.should_not be_nil
         model.description.should_not be_nil
         model.price.should_not be_nil        

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

@@ -1,5 +1,16 @@
 require 'spec_helper'
 
+describe Fletcher, :vcr do
+  describe :fetch, :vcr do
+    context "when using an unsupported website" do 
+      it "should return meta title as name" do
+        item = described_class.fetch(FactoryGirl.build(:unsupported).url)
+        item.name.should_not be_nil
+      end 
+    end
+  end
+end 
+
 describe Fletcher::Model::Base do
   describe "generate" do     
   end
@@ -11,7 +22,7 @@ describe Fletcher::Model::Base do
 
   describe "parse_price", :vcr do 
     it "should return a price float and currency" do
-      model = Factory.build(:sample)
+      model = FactoryGirl.build(:sample)
       model.parse_price(model.raw_price)
       model.price.is_a?(Money).should == true
       model.price.currency.should_not be_nil

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

@@ -4,7 +4,7 @@ describe Fletcher, :vcr do
   describe :fetch, :vcr do
     # Force use of ebay cassette since auctions always end
     it "should fetch ebay product", :vcr => { :cassette_name => "ebay_fetch" } do
-      item = described_class.fetch(Factory(:ebay).url)
+      item = described_class.fetch(FactoryGirl.build(:ebay).url)
       item.should_not be_nil
       item.name.should_not be_nil       
     end   
@@ -17,7 +17,7 @@ describe Fletcher::Model::Ebay, :vcr => { :cassette_name => "ebay_model" }  do
       # Diable Realtime Test, too inconsistent
       it "should return correct model info" do 
         model = described_class.new
-        model.parse Fletcher::Data.read(Factory(:ebay).url)
+        model.parse Fletcher::Data.read(FactoryGirl.build(:ebay).url)
         model.name.should_not be_nil
         model.price.should_not be_nil        
         model.image.should_not be_nil        

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should fetch etsy product" do
-      item = described_class.fetch(Factory(:etsy).url)
+      item = described_class.fetch(FactoryGirl.build(:etsy).url)
       item.should_not be_nil
       item.name.should_not be_nil       
       item.description.should_not be_nil 
@@ -17,7 +17,7 @@ describe Fletcher::Model::Etsy, :vcr 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.parse Fletcher::Data.read(FactoryGirl.build(:etsy).url)    
         model.name.should_not be_nil
         model.description.should_not be_nil
         model.price.should_not be_nil        

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should fetch gamecouk product" do
-      item = described_class.fetch(Factory(:gamecouk).url)
+      item = described_class.fetch(FactoryGirl.build(:gamecouk).url)
       item.should_not be_nil
       item.name.should_not be_nil       
       item.description.should_not be_nil 
@@ -16,7 +16,7 @@ describe Fletcher::Model::Gamecouk, :vcr do
     context "with valid data" do
       it "should return correct model info" do 
         model = described_class.new
-        model.parse Fletcher::Data.read(Factory(:gamecouk).url)    
+        model.parse Fletcher::Data.read(FactoryGirl.build(:gamecouk).url)    
         model.name.should_not be_nil
         model.description.should_not be_nil
         model.price.should_not be_nil        

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should fetch googleshopping product" do
-      item = described_class.fetch(Factory(:googleshopping).url)
+      item = described_class.fetch(FactoryGirl.build(:googleshopping).url)
       item.should_not be_nil
       item.name.should_not be_nil       
       item.description.should_not be_nil
@@ -16,7 +16,7 @@ describe Fletcher::Model::Googleshopping, :vcr do
     context "with valid data" do
       it "should return correct model info" do 
         model = described_class.new
-        model.parse Fletcher::Data.read(Factory(:googleshopping).url)    
+        model.parse Fletcher::Data.read(FactoryGirl.build(:googleshopping).url)    
         model.name.should_not be_nil
         model.description.should_not be_nil
         model.price.should_not be_nil        

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

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Fletcher, :vcr do
+  describe :fetch, :vcr do
+    it "should return correct product info" do
+      product = Fletcher.fetch FactoryGirl.build(:newegg).url
+    end
+  end 
+end 
+
+describe Fletcher::Model::Newegg, :vcr do
+  describe "parse", :vcr do
+    context "with valid data" do
+      it "should return correct product info" do
+        product = described_class.new
+        product.parse Fletcher::Data.read(FactoryGirl.build(:newegg).url)
+        product.name.should_not be_nil
+        product.description.should_not be_nil
+        #product.price.should_not be_nil
+        product.images.should_not be_empty
+        product.image.should_not be_nil
+        product.image.src.should_not be_nil
+      end       
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should fetch playcom product" do
-      item = described_class.fetch(Factory(:playcom).url)
+      item = described_class.fetch(FactoryGirl.build(:playcom).url)
       item.should_not be_nil
       item.name.should_not be_nil       
       item.description.should_not be_nil 
@@ -16,7 +16,7 @@ describe Fletcher::Model::Playcom, :vcr do
     context "with valid data" do
       it "should return correct model info" do 
         model = described_class.new
-        model.parse Fletcher::Data.read(Factory(:playcom).url)
+        model.parse Fletcher::Data.read(FactoryGirl.build(:playcom).url)
         model.doc = nil
         model.name.should_not be_nil
         model.description.should_not be_nil

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

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should return correct model info" do
-      product = Fletcher.fetch Factory(:steam).url
-      puts product.image.inspect
+      product = Fletcher.fetch FactoryGirl.build(:steam).url
     end
   end 
 end 
@@ -14,7 +13,7 @@ describe Fletcher::Model::Steam, :vcr do
     context "with valid data" do
       it "should return correct model info" do
         model = described_class.new
-        model.parse Fletcher::Data.read(Factory(:steam).url)
+        model.parse Fletcher::Data.read(FactoryGirl.build(:steam).url)
         model.doc = nil
         model.description = ''
         model.name.should_not be_nil

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

@@ -9,7 +9,7 @@ end
 describe Fletcher, :vcr do
   describe :fetch, :vcr do
     it "should fetch a thinkgeek product's information" do
-      item = Fletcher.fetch(Factory(:thinkgeek).url)
+      item = Fletcher.fetch(FactoryGirl.build(:thinkgeek).url)
       item.should_not be_nil
       item.image.should_not be_nil
       item.name.should_not be_nil       
@@ -17,7 +17,7 @@ describe Fletcher, :vcr do
     end   
 
     it "should fetch a thinkgeek product with price range" do
-      item = Fletcher.fetch(Factory(:thinkgeek_with_price_range).url)
+      item = Fletcher.fetch(FactoryGirl.build(:thinkgeek_with_price_range).url)
       item.should_not be_nil
       item.image.should_not be_nil
       item.name.should_not be_nil       
@@ -31,7 +31,7 @@ describe Fletcher::Model::Thinkgeek, :vcr 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.parse Fletcher::Data.read(FactoryGirl.build(:thinkgeek).url)  
         model.name.should_not be_nil
         model.price.should_not be_nil                
         model.image.should_not be_nil        

data/spec/lib/fletcher/nokogiri_spec.rb

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

data/spec/lib/fletcher/string_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Fletcher::String do
+end  

data/spec/lib/fletcher_spec.rb

@@ -8,19 +8,15 @@ describe Fletcher, :vcr do
     end
   end
 
-  context :models do 
-    describe :identify_model, :vcr 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 
+  describe :model_classes do 
+    it "should return an array of classes" do
+     models = described_class.model_classes
+     models.is_a?(Array).should == true
+     models.first.class.should == Class
+    end
+  end
 
+  context :models do 
     describe :fetch, :vcr do
       # for model in Fletcher.models
       #   it "should return valid data for #{model} model" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fletcher
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -124,22 +124,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -244,12 +228,14 @@ files:
 - lib/fletcher.rb
 - lib/fletcher/cli/utility.rb
 - lib/fletcher/data.rb
+- lib/fletcher/model.rb
 - lib/fletcher/models/amazon.rb
 - lib/fletcher/models/base.rb
 - lib/fletcher/models/ebay.rb
 - lib/fletcher/models/etsy.rb
 - lib/fletcher/models/gamecouk.rb
 - lib/fletcher/models/googleshopping.rb
+- lib/fletcher/models/newegg.rb
 - lib/fletcher/models/playcom.rb
 - lib/fletcher/models/steam.rb
 - lib/fletcher/models/thinkgeek.rb
@@ -258,16 +244,19 @@ files:
 - spec/bin/fletcher_spec.rb
 - spec/factories/models.rb
 - spec/lib/fletcher/data_spec.rb
+- spec/lib/fletcher/model_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/gamecouk_spec.rb
 - spec/lib/fletcher/models/googleshopping_spec.rb
+- spec/lib/fletcher/models/newegg_spec.rb
 - spec/lib/fletcher/models/playcom_spec.rb
 - spec/lib/fletcher/models/steam_spec.rb
 - spec/lib/fletcher/models/thinkgeek_spec.rb
 - spec/lib/fletcher/nokogiri_spec.rb
+- spec/lib/fletcher/string_spec.rb
 - spec/lib/fletcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/benchmark.rb
@@ -291,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1525293915751678679
+      hash: -4007123474311124799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: