resterl 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTEyZGFhZmRlNTc1ZTQxZmVhODliZTYxNjkzYTExMDA2OGFhYzExNA==
-  data.tar.gz: !binary |-
-    ZTBiY2I0NTJlNzFhZjcxZGMxYTA0Nzc3ODZjYzQ3MTQxNjA3OTNhYg==
+SHA1:
+  metadata.gz: e927695ca56a351455ca5ea51eab5201f4663ba3
+  data.tar.gz: 24d36643d33e40fe72f08496b27874bb8cccb1bd
 SHA512:
-  metadata.gz: !binary |-
-    MDRiOWMwYTgyNWU2MWUyOTEwZDRjYjgwMjhjNmRkNThhZmMzZTY0MWNlYzE5
-    ZjkwODhhOGRhOTQyMmIwYjU3OTJiYzAzYzgxODE4ZjRkOGM3MzE5ZmRmNmFj
-    Yzg0MTcwNTZlNDBkZmEyZmExMmI0NDMxNzI0YjRlOGIzYTY2OGQ=
-  data.tar.gz: !binary |-
-    ZmYxOTg1NWYwZGY2OGI2MTE4ZGYzNjE4NTNjZmU0ODU1M2YwZGRhYzZkMDA5
-    MTQ2ZGNkM2IwZGEzZTgzZTk4ZjkyZTQ4Nzk5MGQyMDVlNzc5MWNlYTU0MzRm
-    NTBkZGVjMTY1NzBhZDRkNzJlNThiMjE5ZGJkYTBiZDFhYmI0YzQ=
+  metadata.gz: d3c59e6dd212727d2c538d5fe1cc530eef15d45303c385c8f273f0df8977d1e8800022eb760aaeb399e0dc20454f5c581fecb1a327f07c77d26339d2015bad88
+  data.tar.gz: 34313e88f25883f86d235fca6c5467a0b124c3d07f4493643e1941ae7e553510ae314cfd0f36d120bc7dd3341f16b35e7084d91dded394176ddbf0083be39006

data/lib/resterl/caches/simple_cache.rb

@@ -1,109 +1,113 @@
 # From:
 # http://github.com/der-flo/localmemcache_store/blob/master/lib/expiry_cache.rb
 
-class Resterl::Caches::SimpleCache < Resterl::Caches::CacheInterface
-
-  class Entry < Struct.new(:data, :expires_at)
-    def expired?
-      expires_at && expires_at <= Time.now
-    end
-  end
-
-  def initialize options = {}
-    @options = {
-      :expiration_check_interval => 1_000,
-      :cache_key_prefix => 'RESTERL_'
-    }.merge options
-    @expiration_check_counter = 0
-    @data = {}
-  end
-
-  def read key
-    key = internal_key key
-    #ap "in read #{key}"
-
-    do_expiration_check
-    entry = @data[key]
-
-    # return if nothing in cache
-    return nil unless entry
-
-    # entry expired?
-    if verify_entry_not_expired(key, entry)
-      entry.data
-    else
-      nil
+module Resterl
+  module Caches
+    class SimpleCache < CacheInterface
+      class Entry < Struct.new(:data, :expires_at)
+        def expired?
+          expires_at && expires_at <= Time.now
+        end
+      end
+
+      def initialize options = {}
+        @options = {
+          expiration_check_interval: 1_000,
+          cache_key_prefix: 'RESTERL_'
+        }.merge options
+        @expiration_check_counter = 0
+        @data = {}
+      end
+
+      def read key
+        key = internal_key key
+
+        do_expiration_check
+        entry = @data[key]
+
+        # return if nothing in cache
+        return nil unless entry
+
+        # entry expired?
+        if verify_entry_not_expired(key, entry)
+          entry.data
+        else
+          nil
+        end
+      end
+
+      def write key, value, expires_in = nil
+        key = internal_key key
+
+        do_expiration_check
+
+        # calculate expiration
+        expires_at = Time.now + expires_in.to_i if expires_in.to_i > 0
+
+        # store data
+        if expires_at.nil? || expires_at > Time.now
+          entry = Entry.new(value, expires_at)
+          @data[key] = entry
+        end
+
+        value
+      end
+
+      def delete key
+        key = internal_key key
+
+        @data.delete key
+      end
+
+      def flush
+        @data = {}
+      end
+
+      private
+
+      def verify_key_not_expired key
+        entry = @cache[key]
+        verify_entry_not_expired(key, entry) if entry
+      end
+
+      def verify_entry_not_expired key, entry
+        if entry.expired?
+          @data.delete(key)
+          false
+        else
+          true
+        end
+      end
+
+      def do_expiration_check
+        @expiration_check_counter += 1
+        unless @expiration_check_counter >= @options[:expiration_check_interval]
+          return
+        end
+        @expiration_check_counter = 0
+        expire_random_entries
+      end
+
+      def expire_random_entries count = 1_000
+        [count, @data.length].min.times do
+          key = @data.keys.sample
+          break if key.nil?
+          entry = @data[key]
+          verify_entry_not_expired key, entry
+        end
+      end
+
+      def expire_some_entries count = 100
+        count = [count, @data.length].min
+        @data.each_key do |key|
+          break if count <= 0
+          count -= 1 unless verify_entry_not_expired(key, entry)
+        end
+      end
+
+      def internal_key key
+        "#{@options[:cache_key_prefix]}#{key}"
+      end
     end
   end
-
-  def write key, value, expires_in = nil
-    key = internal_key key
-
-    do_expiration_check
-    #value.freeze
-
-    # calculate expiration
-    expires_at = if expires_in.to_i > 0
-      Time.now + expires_in.to_i
-    end
-
-    # store data
-    if expires_at.nil? || expires_at > Time.now
-      entry = Entry.new(value, expires_at)
-      @data[key] = entry
-    end
-
-    value
-  end
-
-  def delete key
-    key = internal_key key
-
-    @data.delete key
-  end
-
-  private
-
-  def verify_key_not_expired key
-    entry = @cache[key]
-    verify_entry_not_expired(key, entry) if entry
-  end
-
-  def verify_entry_not_expired key, entry
-    if entry.expired?
-      @data.delete(key)
-      false
-    else
-      true
-    end
-  end
-
-  def do_expiration_check
-    @expiration_check_counter += 1
-    unless @expiration_check_counter >= @options[:expiration_check_interval]
-      return
-    end
-    @expiration_check_counter = 0
-    expire_random_entries
-  end
-
-  def expire_random_entries count = 1_000
-    [count, @data.length].min.times do
-      key, entry = @data.random_pair
-      break if key.nil?
-      verify_entry_not_expired key, entry
-    end
-  end
-
-  def expire_some_entries count = 100
-    count = [count, @data.length].min
-    @data.each_pair do |key, value|
-      break if count <= 0
-      count -= 1 unless verify_entry_not_expired(key, entry)
-    end
-  end
-
-  def internal_key key
-    "#{@options[:cache_key_prefix]}#{key}"
-  end
 end

data/lib/resterl/client.rb

@@ -2,7 +2,7 @@
 
 module Resterl
   class Client
-    attr_reader :options
+    attr_reader :options, :cache
     DEFAULTS = {
       max_redirect_depth: 10,
       cache: Resterl::Caches::SimpleCache.new,

data/lib/resterl/version.rb

@@ -1,3 +1,3 @@
 module Resterl
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resterl
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Florian Dütsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -42,14 +42,14 @@ dependencies:
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -94,19 +94,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Rudimentary HTTP client with focus on caching
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_resterl.rb
 has_rdoc: