glebpom-prop 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.0.4

data/glebpom-prop.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{glebpom-prop}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/prop.rb",
     "lib/glebpom-prop.rb",
     "glebpom-prop.gemspec",
     "test/helper.rb",

data/lib/glebpom-prop.rb

@@ -1,116 +1,3 @@
-require 'digest/md5'
+puts 'loading glebpom-prop gem...'
 
-class Object
-  def define_prop_class_method(name, &blk)
-    (class << self; self; end).instance_eval { define_method(name, &blk) }
-  end
-end
-
-class Prop
-  class RateLimitExceededError < RuntimeError
-    attr_accessor :handle, :retry_after
-
-    def self.create(handle, key, threshold)
-      error = new("#{handle} threshold of #{threshold} exceeded for key '#{key}'")
-      error.handle      = handle
-      error.retry_after = threshold - Time.now.to_i % threshold if threshold > 0
-      raise error
-    end
-  end
-
-  class << self
-    attr_accessor :handles, :reader, :writer
-
-    def read(&blk)
-      self.reader = blk
-    end
-
-    def write(&blk)
-      self.writer = blk
-    end
-
-    def increment(&blk)
-      self.incrementer = blk
-    end
-
-    def incrementer=(value)
-      @incrementer = value
-    end
-
-    def incrementer
-      @incrementer ? Proc.new { |key, inc| @incrementer.call(key, inc) } :
-        Proc.new { |key, inc| self.writer.call(key, (self.reader.call(key) || 0).to_i + inc) }
-    end
-
-    def defaults(handle, defaults)
-      raise RuntimeError.new("Invalid threshold setting") unless defaults[:threshold].to_i > 0
-      raise RuntimeError.new("Invalid interval setting")  unless defaults[:interval].to_i > 0
-
-      self.handles ||= {}
-      self.handles[handle] = defaults
-    end
-
-    def throttle!(handle, key = nil, options = {})
-      options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
-      counter   = reader.call(cache_key).to_i
-
-      incrementer.call(cache_key, [ 1, options[:increment].to_i ].max)
-
-      if counter >= options[:threshold]
-        raise Prop::RateLimitExceededError.create(handle, normalize_cache_key(key), options[:threshold])
-      end
-    end
-
-    def throttled?(handle, key = nil, options = {})
-      options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
-
-      reader.call(cache_key).to_i >= options[:threshold]
-    end
-
-    def reset(handle, key = nil, options = {})
-      options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
-
-      writer.call(cache_key, 0)
-    end
-
-    def query(handle, key = nil, options = {})
-      options   = sanitized_prop_options(handle, key, options)
-      cache_key = sanitized_prop_key(key, options[:interval])
-
-      reader.call(cache_key).to_i
-    end
-
-    private
-
-    # Builds the expiring cache key
-    def sanitized_prop_key(key, interval)
-      window    = (Time.now.to_i / interval)
-      cache_key = "#{normalize_cache_key(key)}/#{ window }"
-      "prop/#{Digest::MD5.hexdigest(cache_key)}"
-    end
-
-    # Sanitizes the option set and sets defaults
-    def sanitized_prop_options(handle, key, options)
-      defaults = (handles || {})[handle] || {}
-      return {
-        :key       => normalize_cache_key(key),
-        :increment => defaults[:increment],
-        :threshold => defaults[:threshold].to_i,
-        :interval  => defaults[:interval].to_i
-      }.merge(options)
-    end
-
-    # Simple key expansion only supports arrays and primitives
-    def normalize_cache_key(key)
-      if key.is_a?(Array)
-        key.map { |part| normalize_cache_key(part) }.join('/')
-      else
-        key.to_s
-      end
-    end
-
-  end
-end
+require 'prop'

data/lib/prop.rb

@@ -0,0 +1,116 @@
+require 'digest/md5'
+
+class Object
+  def define_prop_class_method(name, &blk)
+    (class << self; self; end).instance_eval { define_method(name, &blk) }
+  end
+end
+
+class Prop
+  class RateLimitExceededError < RuntimeError
+    attr_accessor :handle, :retry_after
+
+    def self.create(handle, key, threshold)
+      error = new("#{handle} threshold of #{threshold} exceeded for key '#{key}'")
+      error.handle      = handle
+      error.retry_after = threshold - Time.now.to_i % threshold if threshold > 0
+      raise error
+    end
+  end
+
+  class << self
+    attr_accessor :handles, :reader, :writer
+
+    def read(&blk)
+      self.reader = blk
+    end
+
+    def write(&blk)
+      self.writer = blk
+    end
+
+    def increment(&blk)
+      self.incrementer = blk
+    end
+
+    def incrementer=(value)
+      @incrementer = value
+    end
+
+    def incrementer
+      @incrementer ? Proc.new { |key, inc| @incrementer.call(key, inc) } :
+        Proc.new { |key, inc| self.writer.call(key, (self.reader.call(key) || 0).to_i + inc) }
+    end
+
+    def defaults(handle, defaults)
+      raise RuntimeError.new("Invalid threshold setting") unless defaults[:threshold].to_i > 0
+      raise RuntimeError.new("Invalid interval setting")  unless defaults[:interval].to_i > 0
+
+      self.handles ||= {}
+      self.handles[handle] = defaults
+    end
+
+    def throttle!(handle, key = nil, options = {})
+      options   = sanitized_prop_options(handle, key, options)
+      cache_key = sanitized_prop_key(key, options[:interval])
+      counter   = reader.call(cache_key).to_i
+
+      incrementer.call(cache_key, [ 1, options[:increment].to_i ].max)
+
+      if counter >= options[:threshold]
+        raise Prop::RateLimitExceededError.create(handle, normalize_cache_key(key), options[:threshold])
+      end
+    end
+
+    def throttled?(handle, key = nil, options = {})
+      options   = sanitized_prop_options(handle, key, options)
+      cache_key = sanitized_prop_key(key, options[:interval])
+
+      reader.call(cache_key).to_i >= options[:threshold]
+    end
+
+    def reset(handle, key = nil, options = {})
+      options   = sanitized_prop_options(handle, key, options)
+      cache_key = sanitized_prop_key(key, options[:interval])
+
+      writer.call(cache_key, 0)
+    end
+
+    def query(handle, key = nil, options = {})
+      options   = sanitized_prop_options(handle, key, options)
+      cache_key = sanitized_prop_key(key, options[:interval])
+
+      reader.call(cache_key).to_i
+    end
+
+    private
+
+    # Builds the expiring cache key
+    def sanitized_prop_key(key, interval)
+      window    = (Time.now.to_i / interval)
+      cache_key = "#{normalize_cache_key(key)}/#{ window }"
+      "prop/#{Digest::MD5.hexdigest(cache_key)}"
+    end
+
+    # Sanitizes the option set and sets defaults
+    def sanitized_prop_options(handle, key, options)
+      defaults = (handles || {})[handle] || {}
+      return {
+        :key       => normalize_cache_key(key),
+        :increment => defaults[:increment],
+        :threshold => defaults[:threshold].to_i,
+        :interval  => defaults[:interval].to_i
+      }.merge(options)
+    end
+
+    # Simple key expansion only supports arrays and primitives
+    def normalize_cache_key(key)
+      if key.is_a?(Array)
+        key.map { |part| normalize_cache_key(part) }.join('/')
+      else
+        key.to_s
+      end
+    end
+
+  end
+end

data/test/helper.rb

@@ -6,7 +6,7 @@ require 'time'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'glebpom-prop'
+require 'prop'
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glebpom-prop
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -63,6 +63,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/prop.rb
 - lib/glebpom-prop.rb
 - glebpom-prop.gemspec
 - test/helper.rb