glebtv-httpclient 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1fdf05ea5ea3a8e6ae1d34a30ea0c9f2d96d64
-  data.tar.gz: 63dc5a23fd66a60cc43dcb36822bf584ac0ad46b
+  metadata.gz: cf53dd7d1fb84aafaf0d492a43fea2120759dab6
+  data.tar.gz: e57fc09b5ff8aecaffe1b6691175c4fdadb50e33
 SHA512:
-  metadata.gz: 72a594a622305d413831c95ee52af3303894c0a7f945ae9ca82b8015f675aee44df2da25163100e33575ab02d270f498849c2c2b5ac358280db98f7fcb708417
-  data.tar.gz: 29a42481ba18e44194d22a48b05aa808eb779e524a4fe06b2ed23829c2ab68cb3db0107783c043c7d4709a12ef3bd539460826f28514ed6ac2b37efd74717a3e
+  metadata.gz: 007324756e3fc82d18487b249df8568963b1b783d9af76179db92bc75be378672dd1afde44cce40a2a7175945ac403c889d3855fb1c63ac97f087005a729b489
+  data.tar.gz: fbcccac32b648db73853951458782f978e17e3094060740f4fb9d93fbd437cdd751afa300fa0cf871143fd87e9842a908910121b6a057c10b6108c0fe5d58404

data/.travis.yml

@@ -2,5 +2,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
-  - rbx-2.2.1
+
+notifications:
+  email: false

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    glebtv-httpclient (3.2.0)
-      PriorityQueue
+    glebtv-httpclient (3.2.1)
       activesupport
       addressable
+      lru_redux
 
 GEM
   remote: http://rubygems.org/
   specs:
-    PriorityQueue (0.1.2)
     activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
@@ -29,6 +28,7 @@ GEM
     ffi2-generators (0.1.1)
     i18n (0.6.9)
     json (1.8.1)
+    lru_redux (0.8.1)
     mime-types (2.1)
     minitest (4.7.5)
     multi_json (1.8.4)
@@ -46,7 +46,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.5)
     rubinius-coverage (2.0.3)
-    rubinius-debugger (2.0.0)
+    rubinius-debugger (2.0.1)
     rubinius-developer_tools (2.0.0)
       rubinius-coverage (~> 2.0)
       rubinius-debugger (~> 2.0)

data/httpclient.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "PriorityQueue"
+  spec.add_dependency "lru_redux"
   spec.add_dependency "addressable"
 
   spec.add_development_dependency "bundler"

data/lib/httpclient.rb

@@ -21,7 +21,6 @@ require 'httpclient/cookie'
 require 'httpclient/cookie'
 
 require 'httpclient/lru_cache'
-require 'httpclient/lru_threadsafe'
 
 require 'active_support/core_ext'
 
@@ -235,7 +234,7 @@ require 'active_support/core_ext'
 #   ruby -rhttpclient -e 'p HTTPClient.head(ARGV.shift).header["last-modified"]' http://dev.ctor.org/
 #
 class HTTPClient
-  @@dns_cache = HTTPClient::ThreadSafeCache.new(ttl: 20.minutes, soft_ttl: 10.minute, retry_delay: 5.minutes)
+  @@dns_cache = HTTPClient::LRUCache.new(ttl: 20.minutes, soft_ttl: 10.minute, retry_delay: 5.minutes)
   cattr_accessor :dns_cache
 
   def own_methods

data/lib/httpclient/lru_cache.rb

@@ -3,18 +3,16 @@
 # Taken from: https://github.com/kindkid/lrucache/blob/master/lib/lrucache.rb
 # (MIT Licensed). Thanks!
 
-require "priority_queue"
+require "lru_redux"
 
 # Not thread-safe!
 class HTTPClient
   class LRUCache
 
-    attr_reader :default, :max_size, :ttl, :soft_ttl, :retry_delay
+    attr_reader :max_size, :ttl, :soft_ttl, :retry_delay
 
     def initialize(opts={})
       @max_size = Integer(opts[:max_size] || 100)
-      @default = opts[:default]
-      @eviction_handler = opts[:eviction_handler]
       @ttl = Float(opts[:ttl] || 0)
       @soft_ttl = Float(opts[:soft_ttl] || 0)
       @retry_delay = Float(opts[:retry_delay] || 0)
@@ -23,96 +21,39 @@ class HTTPClient
       raise "soft_ttl must not be negative" if @soft_ttl < 0
       raise "retry_delay must not be negative" if @retry_delay < 0
 
-      @pqueue = PriorityQueue.new
-      @data = {}
-      @counter = 0
+      @data = LruRedux::Cache.new(@max_size)
     end
 
-    def clear
-      @data.clear
-      @pqueue.delete_min until @pqueue.empty?
-      @counter = 0 #might as well
-    end
-
-    def include?(key)
-      datum = @data[key]
-      return false if datum.nil?
-      if datum.expired?
-        delete(key)
-        false
-      else
-        access(key)
-        true
-      end
-    end
-
-    def store(key, value, args={})
-      evict_lru! unless @data.include?(key) || @data.size < max_size
-      ttl, soft_ttl, retry_delay = extract_arguments(args)
-      expiration = expiration_date(ttl)
-      soft_expiration = expiration_date(soft_ttl)
+    def store(key, value)
+      expiration = Time.now + @ttl
+      soft_expiration = Time.now + @soft_ttl
       @data[key] = Datum.new(value, expiration, soft_expiration)
-      access(key)
       value
     end
 
     alias :[]= :store
 
-    def fetch(key, args={})
+    def fetch(key)
       datum = @data[key]
       if datum.nil?
-        if block_given?
-          store(key, value = yield, args)
-        else
-          @default
-        end
+        store(key, value = yield)
       elsif datum.expired?
         delete(key)
-        if block_given?
-          store(key, value = yield, args)
-        else
-          @default
-        end
+        store(key, value = yield)
       elsif datum.soft_expired?
-        if block_given?
-          begin
-            store(key, value = yield, args)
-          rescue RuntimeError => e
-            access(key)
-            ttl, soft_ttl, retry_delay = extract_arguments(args)
-            datum.soft_expiration = (Time.now + retry_delay) if retry_delay > 0
-            datum.value
-          end
-        else
-          access(key)
+        begin
+          store(key, value = yield)
+        rescue RuntimeError => e
+          datum.soft_expiration = (Time.now + retry_delay) if retry_delay > 0
           datum.value
         end
       else
-        access(key)
         datum.value
       end
     end
 
     alias :[] :fetch
 
-    def empty?
-      size == 0
-    end
-
-    def size
-      @data.size
-    end
-
-    def keys
-      @data.keys
-    end
-
-    def delete(key)
-      @pqueue.delete(key)
-      datum = @data.delete(key)
-      datum.value unless datum.nil?
-    end
-
     private
 
     class Datum
@@ -132,40 +73,5 @@ class HTTPClient
         !@soft_expiration.nil? && @soft_expiration <= Time.now
       end
     end
-
-    def expiration_date(ttl)
-      if ttl.is_a?(Time)
-        ttl
-      else
-        ttl = Float(ttl)
-        (ttl > 0) ? (Time.now + ttl) : nil
-      end
-    end
-
-    def extract_arguments(args)
-      if args.is_a?(Hash)
-        ttl = args[:ttl] || @ttl
-        soft_ttl = args[:soft_ttl] || @soft_ttl
-        retry_delay = args[:retry_delay] || @retry_delay
-        [ttl, soft_ttl, retry_delay]
-      else
-        # legacy arg
-        ttl = args || @ttl
-        [ttl, @soft_ttl, @retry_delay]
-      end
-    end
-
-    def evict_lru!
-      key, priority = @pqueue.delete_min
-      unless priority.nil?
-        datum = @data.delete(key)
-        @eviction_handler.call(datum.value) if @eviction_handler && datum
-      end
-    end
-
-    def access(key)
-      @pqueue.change_priority(key, @counter += 1)
-    end
-
   end
 end

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '3.2.0' unless defined?(VERSION)
+  VERSION = '3.2.1' unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-httpclient
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: PriorityQueue
+  name: lru_redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -169,7 +169,6 @@ files:
 - lib/httpclient/http.rb
 - lib/httpclient/include_client.rb
 - lib/httpclient/lru_cache.rb
-- lib/httpclient/lru_threadsafe.rb
 - lib/httpclient/session.rb
 - lib/httpclient/ssl_config.rb
 - lib/httpclient/util.rb

data/lib/httpclient/lru_threadsafe.rb

@@ -1,29 +0,0 @@
-# Make LRU cache Threadsafe
-# Idea from: https://github.com/SamSaffron/lru_redux/blob/master/lib/lru_redux/thread_safe_cache.rb
-# (MIT License)
-
-require 'thread'
-require 'monitor'
-
-class HTTPClient::ThreadSafeCache < HTTPClient::LRUCache
-  include MonitorMixin
-
-  def initialize(opts={})
-    super(opts)
-  end
-
-  def self.synchronize(*methods)
-    methods.each do |method|
-      define_method method do |*args, &blk|
-        synchronize do
-          super(*args, &blk)
-        end
-      end
-    end
-
-    alias :[]= :store
-    alias :[] :fetch
-  end
-
-  synchronize :fetch, :store, :delete, :clear, :include?, :empty, :size, :keys 
-end