fletcher 0.6.0 → 0.6.1

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem "hashie"
 gem "nokogiri"
 gem "money"
-gem "commander"
+gem "thor"
 
 group :development do
   gem "shoulda", ">= 0"

data/Gemfile.lock

@@ -4,15 +4,12 @@ GEM
     activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    commander (4.1.2)
-      highline (~> 1.6.11)
     diff-lcs (1.1.3)
     factory_girl (2.6.4)
       activesupport (>= 2.3.9)
     fakeweb (1.3.0)
     git (1.2.5)
     hashie (1.2.0)
-    highline (1.6.15)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -35,6 +32,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
     shoulda (2.11.3)
+    thor (0.16.0)
     vcr (2.2.5)
 
 PLATFORMS
@@ -42,7 +40,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  commander
   factory_girl
   fakeweb
   hashie
@@ -53,4 +50,5 @@ DEPENDENCIES
   rcov
   rspec
   shoulda
+  thor
   vcr

data/README.md

@@ -89,8 +89,6 @@ ThinkGeek
 
 
 
-
-
 ## Attributes
 
 The following attributes/method are available for a product:

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/bin/fletcher

@@ -1,69 +1,14 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
-require 'rubygems'
-require 'commander/import'
-require 'yaml'
-require File.expand_path("../../lib/fletcher", __FILE__)
-#require 'commander-foo'
-
-program :version, Fletcher.version #Commander-foo::VERSION
-program :description, 'A cross-website product information fetcher'
-program :help, 'Author', 'Dave Hulihan <dhulihan@gmail.com>'
-#default_command :fetch
- 
-command :fetch do |c|
-  c.syntax = 'fletcher fetch [URL]'
-  c.summary = 'Fetch product information'
-  c.description = ''
-  c.example 'Fetch an amazon product', 'fletcher "http://www.example.com/product-id"'
-  #c.option '--format [yaml|json]', String, 'The format of the product details'
-  #c.option '--timeout SECONDS', Integer, 'Timeout in seconds'
-  c.option '--only [name|description|price|image]', String, 'Fetch a single attribute from the product.'
-  c.action do |args, options|
-    # Do something or c.when_called Commander-foo::Commands::Hello
-    options.default :format => :yaml
+require "yaml"
+require "thor"
 
-    url = args.first
-    if url
-      product = Fletcher.fetch url
-
-      # Prep output
-      output_hash = Hash.new
-      output_hash["name"] = product.name
-      output_hash["description"] = product.description if product.description
-      output_hash["price"] = product.price.format if product.price
-      if product.image
-        output_hash["image"] = {
-          "src" => product.image.src
-        }
-      end 
-      output_hash["url"] = product.url
+# Load the Fletcher core library
+require File.expand_path("../../lib/fletcher", __FILE__)
 
-      # Get single attribute
-      if options.only
-        case options.only
-        when "image"
-          value = output_hash["image"]["src"]
-        else
-          value = output_hash[options.only]
-        end 
-        value ? say(value.to_s) : say("Unknown attribute: #{options.only}")
-      else 
-        say output_hash.to_yaml
-      end
-    else 
-      puts c.syntax
-    end 
-  end
-end
+# Load the Fletcher command line interface utility
+require File.expand_path("../../lib/fletcher/cli/utility", __FILE__)
 
-command :websites do |c|
-  c.syntax = 'fletcher websites'
-  c.summary = 'Get a list of supported websites'
-  c.action do |args, options|
-    say "Supported Websites:"
-    for model in Fletcher.models.sort
-      say "\t#{model.to_s.capitalize}"
-    end 
-  end
-end 
+# Initialize the Fletcher command line utility
+Fletcher::CLI::Utility.start

data/fletcher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fletcher"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Hulihan", "Hulihan Applications"]
-  s.date = "2012-10-26"
+  s.date = "2012-11-06"
   s.description = "Easily fetch product/model information from third party websites such as Amazon, eBay, etc."
   s.email = "dave@hulihanapplications.com"
   s.executables = ["fletcher"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "config/locales/fletcher.en.yml",
     "fletcher.gemspec",
     "lib/fletcher.rb",
+    "lib/fletcher/cli/utility.rb",
     "lib/fletcher/data.rb",
     "lib/fletcher/models/amazon.rb",
     "lib/fletcher/models/base.rb",
@@ -77,7 +78,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<money>, [">= 0"])
-      s.add_runtime_dependency(%q<commander>, [">= 0"])
+      s.add_runtime_dependency(%q<thor>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -91,7 +92,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<money>, [">= 0"])
-      s.add_dependency(%q<commander>, [">= 0"])
+      s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -106,7 +107,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<money>, [">= 0"])
-    s.add_dependency(%q<commander>, [">= 0"])
+    s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/fletcher.rb

@@ -1,11 +1,13 @@
 # = Fletcher
 # Author:: Dave Hulihan - 2012
 require "uri"
-require "fletcher/data"
-require "fletcher/string"
-require "fletcher/nokogiri"
+
+require File.expand_path("fletcher/data", 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
@@ -60,25 +62,30 @@ module Fletcher
       File.expand_path("../..", __FILE__)
     end
 
-    # Create mattrs
-    attr_accessor :models
+    def models
+      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 
+      return models
+    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
+    autoload :Utility, File.join(CLI_PATH, 'utility')
   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
+  # Autoload Models
   module Model
-    # Dir[File.join(dir, "*.rb")].each do |f|
-    #   autoload f      
-    # end 
-    autoload :Base, 'fletcher/models/base'
+    autoload :Base, File.join(MODEL_PATH, "base")
     for model in Fletcher.models
-      autoload model.to_s.capitalize.to_sym, "fletcher/models/#{model}"
+      autoload model.to_s.capitalize.to_sym, File.join(MODEL_PATH, model.to_s)
     end
-  end 
+  end     
 end

data/lib/fletcher/cli/utility.rb

@@ -0,0 +1,55 @@
+
+module Fletcher
+  module CLI
+    class Utility < Thor
+      include Thor::Actions
+
+      method_option :format, :type => :string, :default => :yaml, :aliases => "-f"
+      method_option :only, :type => :string, :aliases => "-o", :desc => "Fetch a single attribute [name|description|image|price]", :banner => "ATTRIBUTE"
+
+      desc 'fetch [URL]', "Fetch Product information\n\n" + 
+                          "Example:\n\s\sfletcher fetch 'http://www.amazon.com/gp/product/B004HZYA6E/'"
+      def fetch(url)
+        product = Fletcher.fetch url
+
+        # Prep output
+        output_hash = Hash.new
+        output_hash["name"] = product.name
+        output_hash["description"] = product.description if product.description
+        output_hash["price"] = product.price.format if product.price
+        if product.image
+          output_hash["image"] = Hash.new 
+          output_hash["image"]["src"] = product.image.src 
+        end 
+        output_hash["url"] = product.url
+
+        # Get single attribute
+        if options[:only]
+          case options[:only]
+          when "image"
+            value = output_hash["image"]["src"]
+          else
+            value = output_hash[options[:only]]
+          end 
+          value ? say(value.to_s) : say("Unknown attribute: #{options[:only]}")
+        else 
+          say output_hash.to_yaml
+        end
+      end
+
+      desc "websites", "Get a list of supported websites"
+      def websites
+        say "Supported Websites:"
+        for model in Fletcher.models.sort
+          say "\t#{model.to_s.capitalize}"
+        end 
+      end 
+
+      map '-v' => :version
+      desc "version", "Get VERSION"
+      def version
+        say Fletcher.version
+      end
+    end
+  end
+end

data/lib/fletcher/models/steam.rb

@@ -21,7 +21,10 @@ module Fletcher
           parse_price( doc.css('div.leftcol.game_description_column div.game_purchase_price.price').first_string )
                           
           # Get Images
-          self.images = doc.css('div.screenshot_holder a[@href]').attribute_array.collect{|img| img[:href] }
+          self.images = doc.css('div.screenshot_holder > a').collect do |node| 
+            {:src => node.attribute("href").value}
+          end 
+
           self.image = images.first
         end
       end

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

@@ -2,7 +2,10 @@ 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
+    end
   end 
 end 
 
@@ -18,8 +21,9 @@ describe Fletcher::Model::Steam, :vcr do
         model.description.should_not be_nil
         model.description.class.should == String
         model.price.should_not be_nil
-        model.image.should_not be_nil
         model.images.should_not be_empty
+        model.image.should_not be_nil
+        model.image.src.should_not be_nil
       end       
     end
   end

data/spec/lib/fletcher_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe Fletcher, :vcr do
+  describe :models do 
+    it "should return an array of symbols" do
+     models = described_class.models
+     models.is_a?(Array).should == true
+    end
+  end
+
   context :models do 
     describe :identify_model, :vcr do
       it "should raise an error when using an unsupported domain" do 
@@ -31,13 +38,4 @@ describe Fletcher, :vcr 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.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -61,7 +61,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -242,6 +242,7 @@ files:
 - config/locales/fletcher.en.yml
 - fletcher.gemspec
 - lib/fletcher.rb
+- lib/fletcher/cli/utility.rb
 - lib/fletcher/data.rb
 - lib/fletcher/models/amazon.rb
 - lib/fletcher/models/base.rb
@@ -290,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 900298913943302851
+      hash: 1525293915751678679
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: