frivol 0.3.1 → 0.4.0

data/test/test_multi_backend.rb

@@ -0,0 +1,127 @@
+require "#{File.expand_path(File.dirname(__FILE__))}/helper.rb"
+
+class TestMultiBackend < Test::Unit::TestCase
+  if multi_test?
+    KEY    = :foo
+    VALUE  = 'bar'
+    DATA   = Frivol::Helpers.dump_json({ KEY => VALUE })
+
+    def test_backends_must_be_uniq
+      assert_raises Frivol::Backend::Multi::BackendsNotUniqueError do
+        Frivol::Backend::Multi.new([ @old_backend, @old_backend ])
+      end
+
+      assert_raises Frivol::Backend::Multi::BackendsNotUniqueError do
+        Frivol::Backend::Multi.new([ @new_backend, @new_backend ])
+      end
+    end
+
+    def test_ttl
+      t = TestClass.new
+      assert_nil @backend.ttl(t.storage_key)
+
+      @old_backend.set(t.storage_key, DATA)
+      assert_nil @backend.ttl(t.storage_key)
+    end
+
+    def test_exists
+      t = TestClass.new
+      refute @backend.exists(t.storage_key)
+
+      @old_backend.set(t.storage_key, DATA)
+      assert @backend.exists(t.storage_key)
+    end
+
+    def test_del
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA)
+      assert @backend.exists(t.storage_key)
+      @backend.del(t.storage_key)
+      refute @backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_get
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA)
+      assert_equal DATA, @backend.get(t.storage_key)
+      # Because get migrates
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_retrieve_non_existing
+      t = TestClass.new
+      assert_nothing_raised do
+        assert_nil t.retrieve(:nothing => nil)
+      end
+    end
+
+    def test_retrieve
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA)
+      assert_equal VALUE, t.retrieve(KEY => false)
+      # Because get migrates
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_get_with_bucket
+      t = Class.new(TestClass) { storage_bucket :diamonds }.new
+      @old_backend.set(t.storage_key(:diamonds), DATA)
+      assert_equal DATA, @backend.get(t.storage_key(:diamonds))
+      # Because get migrates
+      assert @new_backend.exists(t.storage_key(:diamonds))
+      refute @old_backend.exists(t.storage_key(:diamonds))
+    end
+
+    def test_retrieve_with_bucket
+      t = Class.new(TestClass) { storage_bucket :sapphires }.new
+      @old_backend.set(t.storage_key(:sapphires), DATA)
+      assert_equal VALUE, t.retrieve_sapphires(KEY => false)
+      # Because get migrates
+      assert @new_backend.exists(t.storage_key(:sapphires))
+      refute @old_backend.exists(t.storage_key(:sapphires))
+    end
+
+    def test_set
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA)
+      @backend.set(t.storage_key, DATA)
+      assert_equal DATA, @backend.get(t.storage_key)
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_store
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA)
+      t.store KEY => VALUE
+      assert_equal VALUE, t.retrieve(KEY => false)
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_set_with_bucket
+      t = Class.new(TestClass) { storage_bucket :garnets }.new
+      @old_backend.set(t.storage_key(:garnets), DATA)
+      @backend.set(t.storage_key(:garnets), DATA)
+      assert_equal DATA, @backend.get(t.storage_key(:garnets))
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key(:garnets))
+      refute @old_backend.exists(t.storage_key(:garnets))
+    end
+
+    def test_store_with_bucket
+      t = Class.new(TestClass) { storage_bucket :topaz }.new
+      @old_backend.set(t.storage_key(:topaz), DATA)
+      t.store_topaz KEY => VALUE
+      assert_equal VALUE, t.retrieve_topaz(KEY => false)
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key(:topaz))
+      refute @old_backend.exists(t.storage_key(:topaz))
+    end
+  end
+end

data/test/test_multi_backend_counters.rb

@@ -0,0 +1,113 @@
+require "#{File.expand_path(File.dirname(__FILE__))}/helper.rb"
+
+class TestMultiBackendCounters < Test::Unit::TestCase
+  if multi_test?
+    KEY    = :foo
+    VALUE  = 'bar'
+    DATA   = Frivol::Helpers.dump_json({ KEY => VALUE })
+
+    def test_ttl
+      t = Class.new(TestClass) { storage_bucket :crows, :counter => true }.new
+      assert_nil @backend.ttl(t.storage_key(:crows))
+
+      @old_backend.setc(t.storage_key(:crows), 1)
+      assert_nil @backend.ttl(t.storage_key(:crows))
+    end
+
+    def test_existsc
+      t = Class.new(TestClass) { storage_bucket :doves, :counter => true }.new
+      refute @backend.existsc(t.storage_key(:doves))
+
+      @old_backend.setc(t.storage_key(:doves), 1)
+      assert @backend.existsc(t.storage_key(:doves))
+    end
+
+    def test_delc
+      t = Class.new(TestClass) { storage_bucket :toucans, :counter => true }.new
+      @old_backend.setc(t.storage_key(:toucans), 2)
+      assert @backend.existsc(t.storage_key(:toucans))
+      @backend.delc(t.storage_key(:toucans))
+      refute @backend.existsc(t.storage_key(:toucans))
+      refute @old_backend.existsc(t.storage_key(:toucans))
+    end
+
+    def test_getc
+      t = Class.new(TestClass) { storage_bucket :parrots, :counter => true }.new
+      @old_backend.setc(t.storage_key(:parrots), 1)
+      assert_equal 1, @backend.getc(t.storage_key(:parrots))
+      # Because get migrates
+      assert @new_backend.existsc(t.storage_key(:parrots))
+      refute @old_backend.existsc(t.storage_key(:parrots))
+    end
+
+    def test_retrieve
+      t = Class.new(TestClass) { storage_bucket :lovebirds, :counter => true }.new
+      @old_backend.setc(t.storage_key(:lovebirds), 1)
+      assert_equal 1, t.retrieve_lovebirds(KEY => false)
+      # Because get migrates
+      assert @new_backend.existsc(t.storage_key(:lovebirds))
+      refute @old_backend.existsc(t.storage_key(:lovebirds))
+    end
+
+    def test_setc
+      t = Class.new(TestClass) { storage_bucket :parakeets, :counter => true }.new
+      @old_backend.setc(t.storage_key(:parakeets), 1)
+      @backend.setc(t.storage_key(:parakeets), 2)
+      assert_equal 2, @backend.getc(t.storage_key(:parakeets)).to_i
+      # Because set deletes from old backends
+      assert @new_backend.existsc(t.storage_key(:parakeets))
+      refute @old_backend.existsc(t.storage_key(:parakeets))
+    end
+
+    def test_store
+      t = Class.new(TestClass) { storage_bucket :macaws, :counter => true }.new
+      @old_backend.setc(t.storage_key(:macaws), 1)
+      t.store_macaws 2
+      assert_equal 2, t.retrieve_macaws(0)
+      # Because set deletes from old backends
+      assert @new_backend.existsc(t.storage_key(:macaws))
+      refute @old_backend.existsc(t.storage_key(:macaws))
+    end
+
+    def test_increment
+      t = Class.new(TestClass) { storage_bucket :cockatoos, :counter => true }.new
+      @old_backend.setc(t.storage_key(:cockatoos), 2)
+      t.increment_cockatoos
+      assert_equal 3, t.retrieve_cockatoos(0)
+      # Because set deletes from old backends
+      assert @new_backend.existsc(t.storage_key(:cockatoos))
+      refute @old_backend.existsc(t.storage_key(:cockatoos))
+    end
+
+    def test_increment_by
+      t = Class.new(TestClass) { storage_bucket :canaries, :counter => true }.new
+      @old_backend.setc(t.storage_key(:canaries), 3)
+      t.increment_canaries_by(6)
+      assert_equal 9, t.retrieve_canaries(0)
+      # Because set deletes from old backends
+      assert @new_backend.existsc(t.storage_key(:canaries))
+      refute @old_backend.existsc(t.storage_key(:canaries))
+    end
+
+    def test_decrement
+      t = Class.new(TestClass) { storage_bucket :budgies, :counter => true }.new
+      @old_backend.setc(t.storage_key(:budgies), 7)
+      t.decrement_budgies
+      assert_equal 6, t.retrieve_budgies(0)
+      # Because set deletes from old backends
+      assert @new_backend.existsc(t.storage_key(:budgies))
+      refute @old_backend.existsc(t.storage_key(:budgies))
+    end
+
+    def test_decrement_by
+      t = Class.new(TestClass) { storage_bucket :finches, :counter => true }.new
+      @old_backend.setc(t.storage_key(:finches), 8)
+      t.decrement_finches_by(2)
+      assert_equal 6, t.retrieve_finches(0)
+      # Because set deletes from old backends
+      assert @new_backend.existsc(t.storage_key(:finches))
+      refute @old_backend.existsc(t.storage_key(:finches))
+    end
+
+  end
+end

data/test/test_multi_backend_expiry.rb

@@ -0,0 +1,128 @@
+require "#{File.expand_path(File.dirname(__FILE__))}/helper.rb"
+
+class TestMultiBackendExpiry < Test::Unit::TestCase
+  if multi_test?
+    KEY    = :foo
+    VALUE  = 'bar'
+    DATA   = Frivol::Helpers.dump_json({ KEY => VALUE })
+    EXPIRY = 10 #seconds
+
+    def test_ttl
+      t = Class.new(TestClass) { storage_expires_in EXPIRY }.new
+      assert_nil @backend.ttl(t.storage_key)
+
+      @old_backend.set(t.storage_key, DATA)
+      @old_backend.expire(t.storage_key, EXPIRY)
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key), 2
+    end
+
+    def test_exists
+      t = Class.new(TestClass) { storage_expires_in EXPIRY }.new
+      refute @backend.exists(t.storage_key)
+
+      @old_backend.set(t.storage_key, DATA)
+      assert @backend.exists(t.storage_key)
+    end
+
+    def test_exists_after_expire
+      t = Class.new(TestClass) { storage_expires_in -1 }.new
+      @old_backend.set(t.storage_key, DATA, -1)
+      assert_nil @backend.exists(t.storage_key)
+    end
+
+    def test_get
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA, EXPIRY)
+      assert_equal DATA, @backend.get(t.storage_key)
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key), 2
+      # Because get migrates
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_retrieve
+      t = Class.new(TestClass) { storage_expires_in EXPIRY }.new
+      @old_backend.set(t.storage_key, DATA, EXPIRY)
+      assert_equal VALUE, t.retrieve(KEY => false)
+      # Because get migrates
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key), 2
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_get_with_bucket
+      t = Class.new(TestClass) { storage_bucket :diamonds, :expires_in => EXPIRY }.new
+      @old_backend.set(t.storage_key(:diamonds), DATA, EXPIRY)
+      assert_equal DATA, @backend.get(t.storage_key(:diamonds))
+      # Because get migrates
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key(:diamonds)), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key(:diamonds)), 2
+      assert @new_backend.exists(t.storage_key(:diamonds))
+      refute @old_backend.exists(t.storage_key(:diamonds))
+    end
+
+    def test_retrieve_with_bucket
+      t = Class.new(TestClass) { storage_bucket :sapphires, :expires_in => EXPIRY }.new
+      @old_backend.set(t.storage_key(:sapphires), DATA, EXPIRY)
+      assert_equal VALUE, t.retrieve_sapphires(KEY => false)
+      # Because get migrates
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key(:sapphires)), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key(:sapphires)), 2
+      assert @new_backend.exists(t.storage_key(:sapphires))
+      refute @old_backend.exists(t.storage_key(:sapphires))
+    end
+
+    def test_set
+      t = TestClass.new
+      @old_backend.set(t.storage_key, DATA, EXPIRY)
+      @backend.set(t.storage_key, DATA, EXPIRY)
+      assert_equal DATA, @backend.get(t.storage_key)
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key), 2
+      assert_nil @old_backend.ttl(t.storage_key)
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_store
+      t = Class.new(TestClass) { storage_expires_in EXPIRY }.new
+      @old_backend.set(t.storage_key, DATA, EXPIRY)
+      t.store KEY => VALUE
+      assert_equal VALUE, t.retrieve(KEY => false)
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key), 2
+      assert_nil @old_backend.ttl(t.storage_key)
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key)
+      refute @old_backend.exists(t.storage_key)
+    end
+
+    def test_set_with_bucket
+      t = Class.new(TestClass) { storage_bucket :garnets, :expires_in => EXPIRY }.new
+      @old_backend.set(t.storage_key(:garnets), DATA, EXPIRY)
+      @backend.set(t.storage_key(:garnets), DATA, EXPIRY)
+      assert_equal DATA, @backend.get(t.storage_key(:garnets))
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key(:garnets)), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key(:garnets)), 2
+      assert_nil @old_backend.ttl(t.storage_key(:garnets))
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key(:garnets))
+      refute @old_backend.exists(t.storage_key(:garnets))
+    end
+
+    def test_store_with_bucket
+      t = Class.new(TestClass) { storage_bucket :topaz, :expires_in => EXPIRY }.new
+      @old_backend.set(t.storage_key(:topaz), DATA, EXPIRY)
+      t.store_topaz KEY => VALUE
+      assert_equal VALUE, t.retrieve_topaz(KEY => false)
+      assert_in_delta EXPIRY, @backend.ttl(t.storage_key(:topaz)), 2
+      assert_in_delta EXPIRY, @new_backend.ttl(t.storage_key(:topaz)), 2
+      assert_nil @old_backend.ttl(t.storage_key(:topaz))
+      # Because set deletes from old backends
+      assert @new_backend.exists(t.storage_key(:topaz))
+      refute @old_backend.exists(t.storage_key(:topaz))
+    end
+  end
+end

data/test/test_riak.rb

@@ -0,0 +1,41 @@
+require "#{File.expand_path(File.dirname(__FILE__))}/helper.rb"
+
+class TestRiak < Test::Unit::TestCase
+  if riak_test?
+    def test_prefix
+      backend = Frivol::Backend::Riak.new(
+        :nodes => [ { :host => '127.0.0.1' } ],
+        :prefix => 'test_riak_'
+      )
+      Frivol::Config.backend = backend
+
+      t = Class.new(TestClass) do
+        storage_bucket :meat
+        storage_bucket :and, :expires_in => 100
+        storage_bucket :veg, :counter => true
+      end.new
+
+      t.store :test_key => 'test_value'
+      nonprefixed_bucket = backend.connection.bucket("frivol_objects")
+      refute nonprefixed_bucket.exist?(t.storage_key)
+      prefixed_bucket = backend.connection.bucket("test_riak_frivol_objects")
+      assert prefixed_bucket.exist?(t.storage_key)
+
+      t.store_meat :test_key => 'test_value'
+      refute nonprefixed_bucket.exist?(t.storage_key(:meat))
+      assert prefixed_bucket.exist?(t.storage_key(:meat))
+
+      t.store_and :test_key => 'test_value'
+      nonprefixed_bucket = backend.connection.bucket("frivol_expires")
+      refute nonprefixed_bucket.exist?(t.storage_key(:and))
+      prefixed_bucket = backend.connection.bucket("test_riak_frivol_expires")
+      assert prefixed_bucket.exist?(t.storage_key(:and))
+
+      t.store_veg 5 # a day
+      nonprefixed_bucket = backend.connection.bucket("frivol_counters")
+      refute nonprefixed_bucket.exist?(t.storage_key(:veg))
+      prefixed_bucket = backend.connection.bucket("test_riak_frivol_counters")
+      assert prefixed_bucket.exist?(t.storage_key(:veg))
+    end
+  end
+end

data/test/test_threads.rb

@@ -1,15 +1,20 @@
 require "#{File.expand_path(File.dirname(__FILE__))}/helper.rb"
+require "thread"
 
 class TestThreads < Test::Unit::TestCase
   def test_each_thread_gets_its_own_connection
     threads = []
+    queue = Queue.new
     2.times do
       threads << Thread.new do
         t = TestClass.new
         t.retrieve :nothing => nil
+        queue << @backend.connection
       end
     end
     threads.each { |thread| thread.join }
-    assert_not_equal threads.first[:frivol_redis], threads.last[:frivol_redis]
+    connection1 = queue.pop
+    connection2 = queue.pop
+    assert_not_equal connection2, connection1
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frivol
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Marc Heiligers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -77,6 +91,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -109,6 +124,10 @@ files:
 - doc/rdoc-style.css
 - frivol.gemspec
 - lib/frivol.rb
+- lib/frivol/backend/multi.rb
+- lib/frivol/backend/redis.rb
+- lib/frivol/backend/redis_distributed.rb
+- lib/frivol/backend/riak.rb
 - lib/frivol/class_methods.rb
 - lib/frivol/config.rb
 - lib/frivol/functor.rb
@@ -116,6 +135,7 @@ files:
 - lib/frivol/time_extensions.rb
 - test/fake_redis.rb
 - test/helper.rb
+- test/test_backend.rb
 - test/test_buckets.rb
 - test/test_condition.rb
 - test/test_condition_with_counters.rb
@@ -124,6 +144,10 @@ files:
 - test/test_extensions.rb
 - test/test_frivol.rb
 - test/test_frivolize.rb
+- test/test_multi_backend.rb
+- test/test_multi_backend_counters.rb
+- test/test_multi_backend_expiry.rb
+- test/test_riak.rb
 - test/test_seeds.rb
 - test/test_threads.rb
 homepage: http://github.com/marcheiligers/frivol