lcbo 0.9.0 → 0.9.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+Version 0.9.1
+
+  * Removed dependency on Addressable.
+  * Refactored tests to use MiniTest::Spec instead of RSpec, removing another dependency.
+
 Version 0.9.0
 
  * Initial public release

data/Gemfile

@@ -1,6 +1,4 @@
 source 'http://rubygems.org'
 
-gem 'rspec',       '1.3.0'
-gem 'typhoeus',    '0.1.29'
-gem 'addressable', '2.1.2'
-gem 'nokogiri',    '1.4.3.1'
+gem 'typhoeus'
+gem 'nokogiri'

data/Gemfile.lock

@@ -1,18 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.1.2)
     nokogiri (1.4.3.1)
     rack (1.2.1)
-    rspec (1.3.0)
-    typhoeus (0.1.29)
+    typhoeus (0.1.31)
       rack
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable (= 2.1.2)
-  nokogiri (= 1.4.3.1)
-  rspec (= 1.3.0)
-  typhoeus (= 0.1.29)
+  nokogiri
+  typhoeus

data/README.md

@@ -22,6 +22,12 @@ This library is used to gather data for [LCBO API](http://lcboapi.com). It allow
 
 Use Ruby Gems: `gem install lcbo`
 
+## Notes
+
+ * Works with Ruby 1.9.2, not tested with 1.8.X or 1.9.1.
+ * Don't be evil, be nice.
+ * Lots of room to improve — fork your face off!
+
 ## Links
 
  * [Issue tracker](http://github.com/heycarsten/lcbo/issues)

data/Rakefile

@@ -1,9 +1,6 @@
-gem 'rspec', '1.3.0'
 require 'rubygems/specification' unless defined?(Gem::Specification)
-require 'spec/rake/spectask'
 require 'rake/gempackagetask'
-
-task :default => :spec
+require 'rake/testtask'
 
 def gemspec
   @gemspec ||= begin
@@ -11,6 +8,8 @@ def gemspec
   end
 end
 
+task :default => :spec
+
 desc 'Start an irb console'
 task :console do
   system 'irb -I lib -r lcbo'
@@ -42,10 +41,10 @@ end
 task :gem => :gemspec
 task :package => :gemspec
 
-desc 'Run the specs'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts  = %w[-fs --color]
+Rake::TestTask.new(:spec) do |t|
+  t.libs += %w[lcbo spec]
+  t.test_files = FileList['spec/**/*.rb']
+  t.verbose = true
 end
 
 desc 'Download all HTML indicated in YAML assertion files'

data/lcbo.gemspec

@@ -15,11 +15,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'lcbo'
 
   s.add_dependency 'typhoeus'
-  s.add_dependency 'addressable'
   s.add_dependency 'nokogiri'
 
-  s.add_development_dependency 'rspec', '1.3.0'
-
   s.files         = `git ls-files`.split(?\n)
   s.test_files    = `git ls-files -- {test,spec}/*`.split(?\n)
   s.require_paths = ['lib']

data/lib/lcbo/crawlkit.rb

@@ -1,5 +1,3 @@
-require 'addressable/template'
-require 'addressable/uri'
 require 'nokogiri'
 require 'typhoeus'
 require 'uri'

data/lib/lcbo/crawlkit/page.rb

@@ -126,7 +126,11 @@ module LCBO
 
       def as_hash
         @as_hash ||= begin
-          fields.reduce({}) { |hsh, field| hsh.merge(field => send(field)) }
+          fields.reduce({}) do |hsh, field|
+            value = send(field)
+            hsh[field] = value.is_a?(String) ? value.encode('utf-8') : value
+            hsh
+          end
         end
       end
 

data/lib/lcbo/crawlkit/request.rb

@@ -31,7 +31,10 @@ module LCBO
       end
 
       def uri
-        request_prototype.uri_template.expand(query_params).to_s
+        template = request_prototype.uri_template.dup
+        query_params.reduce(template) do |mem, (key, value)|
+          mem.gsub("{#{key}}", value.to_s)
+        end
       end
 
       def run

data/lib/lcbo/crawlkit/request_prototype.rb

@@ -15,7 +15,7 @@ module LCBO
       end
 
       def uri_template=(value)
-        @uri_template = Addressable::Template.new(value) if value
+        @uri_template = value
       end
 
       def body_params=(value)

data/lib/lcbo/version.rb

@@ -1,3 +1,3 @@
 module LCBO
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/crawlkit/eventable_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe LCBO::CrawlKit::Eventable, 'when mixed into a class' do
+describe LCBO::CrawlKit::Eventable do
 
   it 'should have three callbacks' do
-    SpecHelper::Evented.callbacks.size.should == 3
+    SpecHelper::Evented.callbacks.size.must_equal 3
   end
 
-  context 'upon firing the events' do
-    before :all do
+  describe 'upon firing the events' do
+    before do
       @evented = SpecHelper::Evented.new
       @evented.request!
     end
 
     it 'should run all events and fire all callbacks' do
-      @evented.requested.should be_true
-      @evented.test_1.should be_true
-      @evented.test_2.should be_true
-      @evented.test_3.should be_true
+      @evented.requested.must_equal true
+      @evented.test_1.must_equal true
+      @evented.test_2.must_equal true
+      @evented.test_3.must_equal true
     end
   end
 

data/spec/crawlkit/fastdate_helper_spec.rb

@@ -12,7 +12,7 @@ describe LCBO::CrawlKit::FastDateHelper do
 
   @expectations.each_pair do |input, expectation|
     it "should translate: #{input.inspect} to: #{expectation.inspect}" do
-      LCBO::CrawlKit::FastDateHelper[input].should == expectation
+      LCBO::CrawlKit::FastDateHelper[input].must_equal expectation
     end
   end
 end

data/spec/crawlkit/page_spec.rb

@@ -3,110 +3,122 @@ require 'spec_helper'
 describe LCBO::CrawlKit::Page do
 
   it 'should have a collection of emittable fields' do
-    SpecHelper::GetPage.fields.should include(:bro_no, :name, :desc)
-    SpecHelper::PostPage.fields.should include(:q, :type, :names)
-    SpecHelper::EventedPage.fields.should include(:message)
+    f = SpecHelper::GetPage.fields
+    f.must_include :bro_no
+    f.must_include :name
+    f.must_include :desc
+    f = SpecHelper::PostPage.fields
+    f.must_include :q
+    f.must_include :type
+    f.must_include :names
+    SpecHelper::EventedPage.fields.must_include :message
   end
 
   describe SpecHelper::GetPage do
     it 'should default to a GET request' do
-      SpecHelper::GetPage.http_method.should == :get
+      SpecHelper::GetPage.http_method.must_equal :get
     end
 
-    context 'when requested' do
-      before :all do
+    describe 'when requested' do
+      before do
         @page = SpecHelper::GetPage.request(:bro_no => 1)
       end
 
       it 'should not be parsed' do
-        @page.is_parsed?.should be_false
+        @page.is_parsed?.must_equal false
       end
 
       it 'should have a valid response object' do
-        @page.response.should be_a(LCBO::CrawlKit::Response)
+        @page.response.must_be_instance_of LCBO::CrawlKit::Response
       end
 
-      context 'the response' do
-        before :all do
+      describe 'the response' do
+        before do
           @page.process
         end
 
         it 'should be directly parsable' do
           page = SpecHelper::GetPage.parse(@page.response)
-          page.as_hash.values.should include(*@page.as_hash.values)
+          @page.as_hash.values.each do |value|
+            page.as_hash.values.must_include value
+          end
         end
 
         it 'should be parsable from a hash representation' do
           page = SpecHelper::GetPage.parse(@page.response.as_hash)
-          page.as_hash.values.should include(*@page.as_hash.values)
+          @page.as_hash.values.each do |value|
+            page.as_hash.values.must_include value
+          end
         end
       end
     end
 
-    context 'when processed' do
-      before :all do
+    describe 'when processed' do
+      before do
         @page = SpecHelper::GetPage.process(:bro_no => 1)
       end
 
       it 'should expand the URI template' do
-        @page.response.uri.should == 'http://bros.local/bros/1'
+        @page.response.uri.must_equal 'http://bros.local/bros/1'
       end
 
       it 'should emit expected values' do
-        @page.bro_no.should == 1
-        @page.name.should == 'Carsten'
-        @page.desc.should == 'Carsten is a bro.'
+        @page.bro_no.must_equal 1
+        @page.name.must_equal 'Carsten'
+        @page.desc.must_equal 'Carsten is a bro.'
       end
 
       it 'should emit a hash of expected values' do
         hsh = @page.as_hash
-        hsh[:bro_no].should == 1
-        hsh[:name].should == 'Carsten'
-        hsh[:desc].should == 'Carsten is a bro.'
+        hsh[:bro_no].must_equal 1
+        hsh[:name].must_equal 'Carsten'
+        hsh[:desc].must_equal 'Carsten is a bro.'
       end
     end
   end
 
   describe SpecHelper::PostPage do
     it 'should overide the default get http method with post' do
-      SpecHelper::PostPage.http_method.should == :post
+      SpecHelper::PostPage.http_method.must_equal :post
     end
 
-    context 'when processed' do
-      before :all do
+    describe 'when processed' do
+      before do
         @page = SpecHelper::PostPage.process(nil, :q => 'test', :type => 'test')
       end
 
       it 'should overide default body params with provided params' do
-        @page.body_params[:q].should == 'test'
-        @page.body_params[:type].should == 'test'
+        @page.body_params[:q].must_equal 'test'
+        @page.body_params[:type].must_equal 'test'
       end
 
       it 'should have a valid uri template' do
-        @page.response.uri.should == 'http://bros.local/search'
+        @page.response.uri.must_equal 'http://bros.local/search'
       end
 
       it 'should parse the page' do
-        @page.as_hash[:names].should include('Carsten', 'Kieran', 'Kevin')
+        %w[Carsten Kieran Kevin].each do |name|
+          @page.as_hash[:names].must_include name
+        end
       end
     end
   end
 
   describe SpecHelper::EventedPage do
     it 'should override the default http method with PUT' do
-      SpecHelper::EventedPage.http_method.should == :put
+      SpecHelper::EventedPage.http_method.must_equal :put
     end
 
-    context '(instantiated)' do
-      before :all do
+    describe '(instantiated)' do
+      before do
         @page = SpecHelper::EventedPage.process(:bro_no => 1)
       end
 
       it 'should fire the included events' do
-        @page.before_request.should be_true
-        @page.after_request.should be_true
-        @page.before_parse.should be_true
-        @page.after_parse.should be_true
+        @page.before_request.must_equal true
+        @page.after_request.must_equal true
+        @page.before_parse.must_equal true
+        @page.after_parse.must_equal true
       end
     end
   end

data/spec/crawlkit/request_spec.rb

@@ -2,27 +2,27 @@ require 'spec_helper'
 
 describe LCBO::CrawlKit::Request do
 
-  context 'GetRequest' do
-    before :all do
+  describe 'GET request' do
+    before do
       pro = LCBO::CrawlKit::RequestPrototype.new('http://bros.local/bros/{bro_no}')
       @request = LCBO::CrawlKit::Request.new(pro, :bro_no => 1)
     end
 
     it 'should perform a get request' do
-      @request.config[:method].should == :get
+      @request.config[:method].must_equal :get
     end
 
     it 'should build a uri based on the query param input' do
-      @request.uri.should == 'http://bros.local/bros/1'
+      @request.uri.must_equal 'http://bros.local/bros/1'
     end
 
     it 'should perform the request' do
-      @request.run.body.should == BRO_HTML
+      @request.run.body.must_equal SpecHelper::BRO_HTML
     end
   end
 
-  context 'PostRequest' do
-    before :all do
+  describe 'POST request' do
+    before do
       pro = LCBO::CrawlKit::RequestPrototype.new(
         'http://bros.local/search', :post,
         { :q => '', :type => 'all' })
@@ -31,11 +31,11 @@ describe LCBO::CrawlKit::Request do
     end
 
     it 'should build a uri appropriately' do
-      @request.uri.should == 'http://bros.local/search'
+      @request.uri.must_equal 'http://bros.local/search'
     end
 
     it 'should perform the request' do
-      @request.run.body.should == BRO_SEARCH_HTML
+      @request.run.body.must_equal SpecHelper::BRO_SEARCH_HTML
     end
   end
 end

data/spec/crawlkit/titlecase_helper_spec.rb

@@ -17,14 +17,14 @@ describe LCBO::CrawlKit::TitleCaseHelper do
 
   @expectations.each_pair do |input, expectation|
     it "should convert: #{input.inspect} to: #{expectation.inspect}" do
-      LCBO::CrawlKit::TitleCaseHelper[input].should == expectation
+      LCBO::CrawlKit::TitleCaseHelper[input].must_equal expectation
     end
   end
 
   it 'should translate lowercase characters to uppercase characters properly' do
     upper = LCBO::CrawlKit::TitleCaseHelper::UPPER_CHARS
     lower = LCBO::CrawlKit::TitleCaseHelper::LOWER_CHARS
-    LCBO::CrawlKit::TitleCaseHelper.upcase(lower).should == upper
+    LCBO::CrawlKit::TitleCaseHelper.upcase(lower).must_equal upper
   end
 
 end

data/spec/crawlkit/volume_helper_spec.rb

@@ -15,7 +15,7 @@ describe LCBO::CrawlKit::VolumeHelper do
 
   @expectations.each_pair do |input, expectation|
     it "should convert: #{input.inspect} to: #{expectation.inspect}" do
-      LCBO::CrawlKit::VolumeHelper[input].should == expectation
+      LCBO::CrawlKit::VolumeHelper[input].must_equal expectation
     end
   end
 end

data/spec/lcbo_spec.rb

@@ -1,38 +1,38 @@
 require 'spec_helper'
 
 describe LCBO do
-  context 'configuration' do
+  describe 'configuration' do
     it 'should be a hash' do
-      LCBO.config.should be_a(Hash)
+      LCBO.config.must_be_instance_of Hash
     end
 
     it 'should be configurable' do
       LCBO.config[:user_agent] = 'Test'
-      LCBO.config[:user_agent].should == 'Test'
+      LCBO.config[:user_agent].must_equal 'Test'
       LCBO.reset_config!
-      LCBO.config[:user_agent].should be_nil
+      LCBO.config[:user_agent].must_be_nil
     end
   end
 
-  context 'helper methods' do
+  describe 'helper methods' do
     it 'provides LCBO.parse' do
-      LCBO.should respond_to(:parse)
+      LCBO.must_respond_to :parse
     end
 
     it 'provides LCBO.product' do
-      LCBO.should respond_to(:product)
+      LCBO.must_respond_to :product
     end
 
     it 'provides LCBO.store' do
-      LCBO.should respond_to(:store)
+      LCBO.must_respond_to :store
     end
 
     it 'provides LCBO.inventory' do
-      LCBO.should respond_to(:inventory)
+      LCBO.must_respond_to :inventory
     end
 
     it 'provides LCBO.product_list' do
-      LCBO.should respond_to(:product_list)
+      LCBO.must_respond_to :product_list
     end
   end
 end

data/spec/pages_spec.rb

@@ -17,14 +17,18 @@ require 'yaml'
     end
 
     requests.each do |req|
-      context "given a #{req[:desc]}" do
-        before :all do
+      describe "given a #{req[:desc]}" do
+        before do
           @page = page.process(req[:query_params], req[:body_params])
         end
 
         req[:expectation].each_pair do |key, value|
           it "should have the expected value for :#{key}" do
-            @page[key].should == value
+            if (value.is_a?(String))
+              @page[key].must_equal value
+            else
+              @page[key].must_equal value
+            end
           end
         end
       end

data/spec/spec_helper.rb

@@ -1,77 +1,80 @@
-gem 'rspec', '1.3.0'
-
-require 'spec'
+require 'minitest/spec'
 require 'lcbo'
 
-BRO_HTML        = '<h1>Carsten</h1><p>Carsten is a bro.</p>'
-BRO_SEARCH_HTML = '<ul><li>Carsten</li><li>Kevin</li><li>Kieran</li></ul>'
-BRO_ICE_HTML    = '<h1>Bro!</h1><p>Yall just icy yo fellow bros!</p>'
+MiniTest::Unit.autorun
 
-module SpecHelper
+unless defined? SpecHelper
+  module SpecHelper
+    BRO_HTML        = '<h1>Carsten</h1><p>Carsten is a bro.</p>'
+    BRO_SEARCH_HTML = '<ul><li>Carsten</li><li>Kevin</li><li>Kieran</li></ul>'
+    BRO_ICE_HTML    = '<h1>Bro!</h1><p>Yall just icy yo fellow bros!</p>'
 
-  def self.hydrastub(method, uri, response_opts = {})
-    response_params = {
-      :code => 200,
-      :headers => '',
-      :body => '',
-      :time => 0.3
-    }.merge(response_opts)
-    response = Typhoeus::Response.new(response_params)
-    Typhoeus::Hydra.hydra.stub(method, uri).and_return(response)
-  end
+    def self.hydrastub(method, uri, response_opts = {})
+      response_params = {
+        :code => 200,
+        :headers => '',
+        :body => '',
+        :time => 0.3
+      }.merge(response_opts)
+      response = Typhoeus::Response.new(response_params)
+      Typhoeus::Hydra.hydra.stub(method, uri).and_return(response)
+    end
 
-  class Evented
-    include LCBO::CrawlKit::Eventable
-    on :before_request, :set_test_1
-    on :before_request, :set_test_2
-    on :after_request,  :set_test_3
-    attr_reader :test_1, :test_2, :test_3, :requested
-    def set_test_1; @test_1 = true; end
-    def set_test_2; @test_2 = true; end
-    def set_test_3; @test_3 = true; end
-    def request!
-      fire(:before_request)
-      @requested = true
-      fire(:after_request)
+    class Evented
+      include LCBO::CrawlKit::Eventable
+      on :before_request, :set_test_1
+      on :before_request, :set_test_2
+      on :after_request,  :set_test_3
+      attr_reader :test_1, :test_2, :test_3, :requested
+      def set_test_1; @test_1 = true; end
+      def set_test_2; @test_2 = true; end
+      def set_test_3; @test_3 = true; end
+      def request!
+        fire(:before_request)
+        @requested = true
+        fire(:after_request)
+      end
     end
-  end
 
-  class GetPage
-    include LCBO::CrawlKit::Page
-    uri 'http://bros.local/bros/{bro_no}'
-    emits(:bro_no) { query_params[:bro_no].to_i }
-    emits(:name)   { doc.css('h1')[0].content }
-    emits(:desc)   { doc.css('p')[0].content  }
-  end
+    class GetPage
+      include LCBO::CrawlKit::Page
+      uri 'http://bros.local/bros/{bro_no}'
+      emits(:bro_no) { query_params[:bro_no].to_i }
+      emits(:name)   { doc.css('h1')[0].content }
+      emits(:desc)   { doc.css('p')[0].content  }
+    end
 
-  class PostPage
-    include LCBO::CrawlKit::Page
-    http_method :post
-    uri 'http://bros.local/search'
-    default_body_params :q => '', :type => 'all'
-    emits(:q)     { body_params[:q].to_s }
-    emits(:type)  { body_params[:type].to_s }
-    emits(:names) { doc.css('li').map(&:content) }
-  end
+    class PostPage
+      include LCBO::CrawlKit::Page
+      http_method :post
+      uri 'http://bros.local/search'
+      default_body_params :q => '', :type => 'all'
+      emits(:q)     { body_params[:q].to_s }
+      emits(:type)  { body_params[:type].to_s }
+      emits(:names) { doc.css('li').map(&:content) }
+    end
 
-  class EventedPage
-    include LCBO::CrawlKit::Page
-    attr_reader :before_parse, :after_parse, :before_request, :after_request
-    on :before_parse,   :set_before_parse
-    on :after_parse,    :set_after_parse
-    on :before_request, :set_before_request
-    on :after_request,  :set_after_request
-    http_method :put
-    uri 'http://bros.local/ice/{bro_no}'
-    emits(:message) { doc.css('p')[0].content }
-    def set_before_parse;   @before_parse   = true; end
-    def set_after_parse;    @after_parse    = true; end
-    def set_before_request; @before_request = true; end
-    def set_after_request;  @after_request  = true; end
-  end
+    class EventedPage
+      include LCBO::CrawlKit::Page
+      attr_reader :before_parse, :after_parse, :before_request, :after_request
+      on :before_parse,   :set_before_parse
+      on :after_parse,    :set_after_parse
+      on :before_request, :set_before_request
+      on :after_request,  :set_after_request
+      http_method :put
+      uri 'http://bros.local/ice/{bro_no}'
+      emits(:message) { doc.css('p')[0].content }
+      def set_before_parse;   @before_parse   = true; end
+      def set_after_parse;    @after_parse    = true; end
+      def set_before_request; @before_request = true; end
+      def set_after_request;  @after_request  = true; end
+    end
 
+    SpecHelper.hydrastub :get, /http\:\/\/bros\.local\/bros\/.+/,
+      :body => BRO_HTML
+    SpecHelper.hydrastub :post, /http\:\/\/bros\.local\/search/,
+      :body => BRO_SEARCH_HTML
+    SpecHelper.hydrastub :put, /http\:\/\/bros\.local\/ice\/.+/,
+      :body => BRO_ICE_HTML
+  end
 end
-
-SpecHelper.hydrastub :get,  /http\:\/\/bros\.local\/bros\/.+/, :body => BRO_HTML
-SpecHelper.hydrastub :post, /http\:\/\/bros\.local\/search/,   :body => BRO_SEARCH_HTML
-SpecHelper.hydrastub :put,  /http\:\/\/bros\.local\/ice\/.+/,  :body => BRO_ICE_HTML

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Carsten Nielsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -04:00
+date: 2010-09-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,34 +43,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
-  version_requirements: *id004
 description: Request and parse product, store, inventory, and product search pages directly from the official LCBO website.
 email: 
 - heycarsten@gmail.com