lcbo 1.4.0 → 1.5.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 1.5.0
+
+  * Updated Gemfile to use an explicit source URL.
+  * Updated dependencies to ensure compatability with Ruby 2.0.0.
+  * Updated default user-agent string to be more informative.
+
 Version 1.4.0
 
   * Fixed issue with store list spec not using stubbed HTML data.

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec
 
 group :development do

data/lcbo.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'lcbo'
 
-  s.add_dependency 'typhoeus',      '~> 0.3.3'
-  s.add_dependency 'nokogiri',      '~> 1.5.5'
-  s.add_dependency 'unicode_utils', '~> 1.2.2'
-  s.add_dependency 'stringex',      '~> 1.3.3'
+  s.add_dependency 'typhoeus',      '~> 0.6.3'
+  s.add_dependency 'nokogiri',      '~> 1.5.9'
+  s.add_dependency 'unicode_utils', '~> 1.4.0'
+  s.add_dependency 'stringex',      '~> 1.5.1'
 
   s.files         = `git ls-files`.split(?\n)
   s.test_files    = `git ls-files -- {test,spec}/*`.split(?\n)

data/lib/lcbo.rb

@@ -1,7 +1,7 @@
 module LCBO
 
   DEFAULT_CONFIG = {
-    :user_agent  => nil, # Use the default User-Agent by default
+    :user_agent  => nil, # Use the default User-Agent
     :max_retries => 8,   # Number of times to retry a request that fails
     :timeout     => 2    # Seconds to wait for a request before timing out
   }.freeze
@@ -15,6 +15,12 @@ module LCBO
     @config = DEFAULT_CONFIG.dup
   end
 
+  def self.user_agent
+    config[:user_agent] ||
+    ENV['LCBO_USER_AGENT'] ||
+    "LCBO #{VERSION} - http://github.com/heycarsten/lcbo"
+  end
+
 end
 
 require 'lcbo/version'

data/lib/lcbo/crawlkit.rb

@@ -7,12 +7,6 @@ require 'uri'
 
 module LCBO
   module CrawlKit
-    USER_AGENT ||= begin
-      LCBO.config[:user_agent] ||
-      ENV['LCBO_USER_AGENT'] ||
-      Typhoeus::USER_AGENT
-    end
-
     class MalformedError < StandardError; end
     class NotFoundError < StandardError; end
     class RedirectedError < StandardError; end

data/lib/lcbo/crawlkit/request.rb

@@ -27,15 +27,17 @@ module LCBO
       def config
         opts = {}
         opts[:method]  = request_prototype.http_method
-        opts[:headers] = { 'User-Agent' => USER_AGENT }
-        opts[:body]    = _body if body_params && !gettable?
+        opts[:headers] = { 'User-Agent' => LCBO.user_agent }
+        opts[:body]    = body_params if (body_params && body_params.any?) && !gettable?
         opts
       end
 
       def uri
-        template = request_prototype.uri_template.dup
-        query_params.reduce(template) do |mem, (key, value)|
-          mem.gsub("{#{key}}", value.to_s)
+        @uri ||= begin
+          template = request_prototype.uri_template.dup
+          query_params.reduce(template) do |mem, (key, value)|
+            mem.gsub("{#{key}}", value.to_s)
+          end
         end
       end
 
@@ -45,19 +47,14 @@ module LCBO
 
       protected
 
-      def _body
-        traversal = Typhoeus::Utils.traverse_params_hash(body_params)
-        Typhoeus::Utils.traversal_to_param_string(traversal)
-      end
-
       def _run(tries = 0)
         response = Timeout.timeout(LCBO.config[:timeout]) do
-          Typhoeus::Request.run(uri, config)
+          Typhoeus::Request.new(uri, config).run
         end
         Response.new \
           :code         => response.code,
-          :uri          => response.request.url,
-          :http_method  => response.request.method,
+          :uri          => uri,
+          :http_method  => (response.options[:method] || :get),
           :time         => response.time,
           :query_params => query_params,
           :body_params  => body_params,

data/lib/lcbo/version.rb

@@ -1,3 +1,3 @@
 module LCBO
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ unless defined? SpecHelper
         :time => 0.3
       }.merge(response_opts)
       response = Typhoeus::Response.new(response_params)
-      Typhoeus::Hydra.hydra.stub(method, uri).and_return(response)
+      Typhoeus.stub(uri).and_return(response)
     end
 
     class Evented

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lcbo
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.5.1
 description: Request and parse product, store, inventory, and product search pages
   directly from the official LCBO website.
 email:
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606382671163212704
+      hash: 2175933647770352577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,10 +177,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3606382671163212704
+      hash: 2175933647770352577
 requirements: []
 rubyforge_project: lcbo
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A library for parsing HTML pages from http://lcbo.com