elephas 2.2.0 → 3.0.0

data/spec/elephas/cache_spec.rb

@@ -7,44 +7,41 @@
 require "spec_helper"
 
 describe ::Elephas::Cache do
-  let(:entry) { ::Elephas::Entry.ensure("VALUE", ::Elephas::Cache.default_prefix + "[KEY]", {ttl: 3600}) }
+  let(:entry) { ::Elephas::Entry.ensure("VALUE", ::Elephas::Cache.new(nil).prefix + "[KEY]", {ttl: 3600}) }
+  let(:reference) { ::Elephas::Cache.new(::Elephas::Backends::Hash.new) }
 
   describe ".use" do
-    before(:each) do
-      ::Elephas::Cache.provider = Elephas::Providers::Hash.new
-    end
-
     it "should use the provider for reading the value" do
-      ::Elephas::Cache.provider.should_receive(:read)
-      ::Elephas::Cache.use("KEY") do "VALUE" end
+      reference.backend.should_receive(:read)
+      reference.use("KEY") do "VALUE" end
     end
 
     it "should skip the provider if requested to" do
-      ::Elephas::Cache.use("KEY", {ttl: 0}) do "VALUE" end
-      ::Elephas::Cache.provider.should_not_receive(:read)
-      ::Elephas::Cache.use("KEY", {force: true}) do "VALUE" end
-      ::Elephas::Cache.provider.should_not_receive(:read)
+      reference.use("KEY", {ttl: 0}) do "VALUE" end
+      reference.backend.should_not_receive(:read)
+      reference.use("KEY", {force: true}) do "VALUE" end
+      reference.backend.should_not_receive(:read)
     end
 
     it "should use the block for value computation" do
-      expect{ ::Elephas::Cache.use("KEY") do raise ArgumentError end }.to raise_error(ArgumentError)
+      expect{ reference.use("KEY") do raise ArgumentError end }.to raise_error(ArgumentError)
     end
 
     it "should not use the block if the value is valid" do
-      ::Elephas::Cache.use("KEY") do entry end
-      expect{ ::Elephas::Cache.use("KEY") do raise ArgumentError end }.not_to raise_error(ArgumentError)
+      reference.use("KEY") do entry end
+      expect{ reference.use("KEY") do raise ArgumentError end }.not_to raise_error(ArgumentError)
     end
 
     it "should store the value in the cache" do
-      ::Elephas::Cache.use("KEY") do entry end
-      expect(::Elephas::Cache.provider.read(entry.hash)).to eq(entry)
+      reference.use("KEY") do entry end
+      expect(reference.backend.read(entry.hash)).to eq(entry)
     end
 
     it "should return the entire entry or only the value" do
-      ::Elephas::Cache.use("KEY") do "VALUE" end
+      reference.use("KEY") do "VALUE" end
 
-      expect(::Elephas::Cache.use("KEY")).to eq("VALUE")
-      value = ::Elephas::Cache.use("KEY", {as_entry: true})
+      expect(reference.use("KEY")).to eq("VALUE")
+      value = reference.use("KEY", {as_entry: true})
       expect(value).to be_a(::Elephas::Entry)
       expect(value.value).to eq("VALUE")
     end
@@ -52,36 +49,36 @@ describe ::Elephas::Cache do
 
   describe ".read" do
     it "should be forwarded to the provider" do
-      ::Elephas::Cache.provider.should_receive(:read)
-      ::Elephas::Cache.read("KEY")
+      reference.backend.should_receive(:read)
+      reference.read("KEY")
     end
   end
 
   describe ".write" do
     it "should be forwarded to the provider" do
-      ::Elephas::Cache.provider.should_receive(:write)
-      ::Elephas::Cache.write("KEY", "VALUE")
+      reference.backend.should_receive(:write)
+      reference.write("KEY", "VALUE")
     end
   end
 
   describe ".delete" do
     it "should be forwarded to the provider" do
-      ::Elephas::Cache.provider.should_receive(:delete)
-      ::Elephas::Cache.delete("KEY")
+      reference.backend.should_receive(:delete)
+      reference.delete("KEY")
     end
   end
 
   describe ".exists?" do
     it "should be forwarded to the provider" do
-      ::Elephas::Cache.provider.should_receive(:exists?)
-      ::Elephas::Cache.exists?("KEY")
+      reference.backend.should_receive(:exists?)
+      reference.exists?("KEY")
     end
   end
 
   describe "setup_options" do
     it "should set good defaults for options" do
       hashes = {
-        base: ::Elephas::Entry.hashify_key("#{::Elephas::Cache.default_prefix}[KEY]"),
+        base: ::Elephas::Entry.hashify_key("#{reference.prefix}[KEY]"),
         alternative: ::Elephas::Entry.hashify_key("prefix[KEY]")
       }
       
@@ -96,17 +93,17 @@ describe ::Elephas::Cache do
       ]
 
       reference_hashes = [
-        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: ::Elephas::Cache.default_prefix, complete_key: "#{::Elephas::Cache.default_prefix}[KEY]", hash: hashes[:base]},
-        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: ::Elephas::Cache.default_prefix, complete_key: "#{::Elephas::Cache.default_prefix}[KEY]", hash: hashes[:base]},
-        {key: "KEY", ttl: 2.hour, force: false, as_entry: false, prefix: ::Elephas::Cache.default_prefix, complete_key: "#{::Elephas::Cache.default_prefix}[KEY]", hash: hashes[:base]},
-        {key: "KEY", ttl: 1.hour * 1000, force: true, as_entry: false, prefix: ::Elephas::Cache.default_prefix, complete_key: "#{::Elephas::Cache.default_prefix}[KEY]", hash: hashes[:base]},
-        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: true, prefix: ::Elephas::Cache.default_prefix, complete_key: "#{::Elephas::Cache.default_prefix}[KEY]", hash: hashes[:base]},
+        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: reference.prefix, complete_key: "#{reference.prefix}[KEY]", hash: hashes[:base]},
+        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: reference.prefix, complete_key: "#{reference.prefix}[KEY]", hash: hashes[:base]},
+        {key: "KEY", ttl: 2.hour, force: false, as_entry: false, prefix: reference.prefix, complete_key: "#{reference.prefix}[KEY]", hash: hashes[:base]},
+        {key: "KEY", ttl: 1.hour * 1000, force: true, as_entry: false, prefix: reference.prefix, complete_key: "#{reference.prefix}[KEY]", hash: hashes[:base]},
+        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: true, prefix: reference.prefix, complete_key: "#{reference.prefix}[KEY]", hash: hashes[:base]},
         {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: "prefix", complete_key: "prefix[KEY]", hash: hashes[:alternative]},
-        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: ::Elephas::Cache.default_prefix, complete_key: "#{::Elephas::Cache.default_prefix}[KEY]", hash: "hash"}
+        {key: "KEY", ttl: 1.hour * 1000, force: false, as_entry: false, prefix: reference.prefix, complete_key: "#{reference.prefix}[KEY]", hash: "hash"}
       ]
 
       options_hashes.each_with_index do |options, i|
-        expect(::Elephas::Cache.setup_options(options, "KEY")).to eq(reference_hashes[i])
+        expect(reference.setup_options(options, "KEY")).to eq(reference_hashes[i])
       end
     end
   end

data/spec/elephas/entry_spec.rb

@@ -7,6 +7,7 @@
 require "spec_helper"
 
 describe Elephas::Entry do
+  let(:backend) { ::Elephas::Backends::Hash.new }
   subject { ::Elephas::Entry.new("KEY", "VALUE") }
 
   describe "#initialize" do
@@ -41,9 +42,9 @@ describe Elephas::Entry do
     end
 
     it "should save to the cache" do
-      expect(::Elephas::Cache.provider.read(subject.hash)).not_to eq(subject)
-      subject.refresh(true)
-      expect(::Elephas::Cache.provider.read(subject.hash)).to eq(subject)
+      expect(backend.read(subject.hash)).not_to eq(subject)
+      subject.refresh(true, backend)
+      expect(backend.read(subject.hash)).to eq(subject)
     end
   end
 
@@ -54,13 +55,13 @@ describe Elephas::Entry do
 
     it "should return true if the ttl is still valid" do
       ::Time.stub(:now).and_return(1000)
-      expect(subject.valid?).to be_true
+      expect(subject.valid?(backend)).to be_true
     end
 
     it "should return true if the ttl has expired" do
       ::Time.stub(:now).and_return(10000)
       subject.updated_at = 1000
-      expect(subject.valid?).to be_false
+      expect(subject.valid?(backend)).to be_false
     end
   end
 

data/spec/elephas/{provider_spec.rb → providers/base_spec.rb}

@@ -6,12 +6,8 @@
 
 require "spec_helper"
 
-describe Elephas::Providers::Base do
-  class BaseProvider
-    include Elephas::Providers::Base
-  end
-
-  let(:provider) { BaseProvider.new }
+describe Elephas::Backends::Base do
+  let(:provider) { Elephas::Backends::Base.new }
 
   describe ".read" do
     it "should raise an ArgumentError exception" do

data/spec/elephas/providers/hash_spec.rb

@@ -6,22 +6,22 @@
 
 require "spec_helper"
 
-describe Elephas::Providers::Hash do
-  subject { ::Elephas::Providers::Hash.new }
+describe Elephas::Backends::Hash do
+  subject { ::Elephas::Backends::Hash.new }
   let!(:value) { subject.write("KEY", ::Elephas::Entry.ensure("VALUE", "KEY", {ttl: 3600})) }
 
   describe "#initialize" do
     it "should create a store with an empty hash" do
-      expect(::Elephas::Providers::Hash.new.data).to eq({})
+      expect(::Elephas::Backends::Hash.new.data).to eq({})
     end
 
     it "should create a store with an given hash" do
-      expect(::Elephas::Providers::Hash.new({a: :b}).data).to eq({a: :b})
+      expect(::Elephas::Backends::Hash.new({a: :b}).data).to eq({a: :b})
     end
 
     it "should ensure that the store is an Hash" do
-      expect(::Elephas::Providers::Hash.new(nil).data).to eq({})
-      expect(::Elephas::Providers::Hash.new("INVALID").data).to eq({})
+      expect(::Elephas::Backends::Hash.new(nil).data).to eq({})
+      expect(::Elephas::Backends::Hash.new("INVALID").data).to eq({})
     end
   end
 

data/spec/elephas/providers/ruby_on_rails_spec.rb

@@ -6,7 +6,7 @@
 
 require "spec_helper"
 
-describe Elephas::Providers::RubyOnRails do
+describe Elephas::Backends::RubyOnRails do
   class TempRailsCache < Hash # This class simulate the presence of Rails
     def read(key)
       self[key]
@@ -28,7 +28,7 @@ describe Elephas::Providers::RubyOnRails do
     end
   end
 
-  subject { ::Elephas::Providers::RubyOnRails.new }
+  subject { ::Elephas::Backends::RubyOnRails.new }
   let!(:value) { subject.write("KEY", ::Elephas::Entry.ensure("VALUE", "KEY", {ttl: 3600})) }
 
   describe "#read" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elephas
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lazier
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 description: A storage agnostic caching framework.
 email:
 - shogun_panda@me.com
@@ -42,12 +42,12 @@ files:
 - README.md
 - Rakefile
 - doc/Elephas.html
+- doc/Elephas/Backends.html
+- doc/Elephas/Backends/Base.html
+- doc/Elephas/Backends/Hash.html
+- doc/Elephas/Backends/RubyOnRails.html
 - doc/Elephas/Cache.html
 - doc/Elephas/Entry.html
-- doc/Elephas/Providers.html
-- doc/Elephas/Providers/Base.html
-- doc/Elephas/Providers/Hash.html
-- doc/Elephas/Providers/RubyOnRails.html
 - doc/Elephas/Version.html
 - doc/_index.html
 - doc/class_list.html
@@ -65,18 +65,18 @@ files:
 - doc/top-level-namespace.html
 - elephas.gemspec
 - lib/elephas.rb
+- lib/elephas/backends/base.rb
+- lib/elephas/backends/hash.rb
+- lib/elephas/backends/ruby_on_rails.rb
 - lib/elephas/cache.rb
 - lib/elephas/entry.rb
-- lib/elephas/provider.rb
-- lib/elephas/providers/hash.rb
-- lib/elephas/providers/ruby_on_rails.rb
 - lib/elephas/version.rb
 - locales/en.yml
 - locales/it.yml
 - spec/coverage_helper.rb
 - spec/elephas/cache_spec.rb
 - spec/elephas/entry_spec.rb
-- spec/elephas/provider_spec.rb
+- spec/elephas/providers/base_spec.rb
 - spec/elephas/providers/hash_spec.rb
 - spec/elephas/providers/ruby_on_rails_spec.rb
 - spec/spec_helper.rb
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3747223842463802864
+      hash: 3158836318687303019
 requirements: []
 rubyforge_project: elephas
 rubygems_version: 1.8.25
@@ -111,7 +111,7 @@ test_files:
 - spec/coverage_helper.rb
 - spec/elephas/cache_spec.rb
 - spec/elephas/entry_spec.rb
-- spec/elephas/provider_spec.rb
+- spec/elephas/providers/base_spec.rb
 - spec/elephas/providers/hash_spec.rb
 - spec/elephas/providers/ruby_on_rails_spec.rb
 - spec/spec_helper.rb