lock_and_cache 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a3eaf745d9a9532d2062ea332fb63420fabbdd9
-  data.tar.gz: d1f4ec88da5e0f728da43d9b2f40d536c4224498
+  metadata.gz: c01496db7fee2406fdd535409a2ef112969f9243
+  data.tar.gz: becfd8a7f466108d3f592bfe7c8f51e92fcb2a8f
 SHA512:
-  metadata.gz: f34529d617b048841b0d33234619846f49a7367ff5627e653298098f0780401314f37df6aa9afe73d967ad358eeaffc3fd0d70ccbc043ecb6a8c1b360c2b61f7
-  data.tar.gz: d006e7f9e798425f6137d5611c3688b3e78fd906e15390ad0ff015f0834f3fd3e9a4d820c4ca546fa606f17f9ea481296d7f444dc0189cb48b4e368643251648
+  metadata.gz: d401e8f1d206a4496fd911a863d8ad78ac2aa4354e94d3a608c428667adbdd92fe5d3870ad4f4913a8c90183a9776ddba90ed931ea4fea705ffbb14e953a39e6
+  data.tar.gz: 85a4e1bf664f77d1bf4ea4d6d186593e288ffe488578db96d4090f16bee36b9a2c79fea3bd271b9b64ad3dfae9b68d3c34c9557615f2b343bf67eef1c757f079

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.1.2
+  - 2.3.0
+  - 2.4.1
 services:
   - redis-server

data/CHANGELOG

@@ -1,3 +1,17 @@
+unreleased
+
+* ?
+
+  * Don't test on ruby 2.1
+
+4.0.5 / 2017-04-01
+
+* Enhancements
+
+  * allow dates and times in keys
+  * Test on ruby 2.3.0 and 2.4.1
+  * 2x faster key generation
+
 4.0.4 / 2016-04-11
 
 * Bug fixes

data/benchmarks/allowed_in_keys.rb

@@ -0,0 +1,87 @@
+require 'set'
+require 'date'
+require 'benchmark/ips'
+
+ALLOWED_IN_KEYS = [
+  ::String,
+  ::Symbol,
+  ::Numeric,
+  ::TrueClass,
+  ::FalseClass,
+  ::NilClass,
+  ::Integer,
+  ::Float,
+  ::Date,
+  ::DateTime,
+  ::Time,
+].to_set
+parts = RUBY_VERSION.split('.').map(&:to_i)
+unless parts[0] >= 2 and parts[1] >= 4
+  ALLOWED_IN_KEYS << ::Fixnum
+  ALLOWED_IN_KEYS << ::Bignum  
+end
+
+EXAMPLES = [
+  'hi',
+  :there,
+  123,
+  123.54,
+  1e99,
+  123456789 ** 2,
+  1e999,
+  true,
+  false,
+  nil,
+  Date.new(2015,1,1),
+  Time.now,
+  DateTime.now,
+  Mutex,
+  Mutex.new,
+  Benchmark,
+  { hi: :world },
+  [[]],
+  Fixnum,
+  Struct,
+  Struct.new(:a),
+  Struct.new(:a).new(123)
+]
+EXAMPLES.each do |example|
+  puts "#{example} -> #{example.class}"
+end
+
+puts
+
+[
+  Date.new(2015,1,1),
+  Time.now,
+  DateTime.now,
+].each do |x|
+    puts x.to_s
+end
+
+puts
+
+EXAMPLES.each do |example|
+  a = ALLOWED_IN_KEYS.any? { |thing| example.is_a?(thing) }
+  b = ALLOWED_IN_KEYS.include? example.class
+  unless a == b
+    raise "#{example.inspect}: #{a.inspect} vs #{b.inspect}"
+  end
+end
+
+Benchmark.ips do |x|
+  x.report("any") do
+    example = EXAMPLES.sample
+    y = ALLOWED_IN_KEYS.any? { |thing| example.is_a?(thing) }
+    a = 1
+    y
+  end
+
+  x.report("include") do
+    example = EXAMPLES.sample
+    y = ALLOWED_IN_KEYS.include? example.class
+    a = 1
+    y
+  end
+
+end

data/lib/lock_and_cache/key.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module LockAndCache
   # @private
   class Key
@@ -22,8 +24,11 @@ module LockAndCache
       #
       # Recursively extract id from obj. Calls #lock_and_cache_key if available, otherwise #id
       def extract_obj_id(obj)
-        if ALLOWED_IN_KEYS.any? { |k| obj.is_a?(k) }
+        klass = obj.class
+        if ALLOWED_IN_KEYS.include?(klass)
           obj
+        elsif DATE.include?(klass)
+          obj.to_s
         elsif obj.respond_to?(:lock_and_cache_key)
           extract_obj_id obj.lock_and_cache_key
         elsif obj.respond_to?(:id)
@@ -43,7 +48,19 @@ module LockAndCache
       ::TrueClass,
       ::FalseClass,
       ::NilClass,
-    ]
+      ::Integer,
+      ::Float,
+    ].to_set
+    parts = ::RUBY_VERSION.split('.').map(&:to_i)
+    unless parts[0] >= 2 and parts[1] >= 4
+      ALLOWED_IN_KEYS << ::Fixnum
+      ALLOWED_IN_KEYS << ::Bignum  
+    end
+    DATE = [
+      ::Date,
+      ::DateTime,
+      ::Time,
+    ].to_set
     METHOD_NAME_IN_CALLER = /in `([^']+)'/
 
     attr_reader :context

data/lib/lock_and_cache/version.rb

@@ -1,3 +1,3 @@
 module LockAndCache
-  VERSION = '4.0.4'
+  VERSION = '4.0.5'
 end

data/spec/lock_and_cache/key_spec.rb

@@ -21,13 +21,23 @@ describe LockAndCache::Key do
       expect(described_class.new(a: 1).send(:parts)).to eq(described_class.new([[:a, 1]]).send(:parts))
     end
     
+    now = Time.now
+    today = Date.today
     {
       [1]                                                => [1],
-      ["you"]                                            => ['you'],
-      [["you"]]                                          => [['you']],
-      [["you"], "person"]                                => [["you"], "person"],
-      [["you"], {:silly=>:person}]                       => [["you"], [[:silly, :person]] ],
-      { hi: 'you' }                                      => [[:hi, "you"]],
+      ['you']                                            => ['you'],
+      [['you']]                                          => [['you']],
+      [['you'], "person"]                                => [['you'], "person"],
+      [['you'], {:silly=>:person}]                       => [['you'], [[:silly, :person]] ],
+      [now]                                              => [now.to_s],
+      [[now]]                                            => [[now.to_s]],
+      [today]                                            => [today.to_s],
+      [[today]]                                          => [[today.to_s]],
+      { hi: 'you' }                                      => [[:hi, 'you']],
+      { hi: 123 }                                        => [[:hi, 123]],
+      { hi: 123.0 }                                      => [[:hi, 123.0]],
+      { hi: now }                                        => [[:hi, now.to_s]],
+      { hi: today }                                      => [[:hi, today.to_s]],
       [KeyTestId.new]                                    => ['id'],
       [[KeyTestId.new]]                                  => [['id']],
       { a: KeyTestId.new }                               => [[:a, "id"]],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lock_and_cache
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -167,6 +167,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmarks/allowed_in_keys.rb
 - lib/lock_and_cache.rb
 - lib/lock_and_cache/action.rb
 - lib/lock_and_cache/key.rb
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Lock and cache methods.
@@ -203,4 +204,3 @@ test_files:
 - spec/lock_and_cache/key_spec.rb
 - spec/lock_and_cache_spec.rb
 - spec/spec_helper.rb
-has_rdoc: