cached_enumeration 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 7dbdccc32a47ad95a80e5bcff167261ada058543
-  data.tar.gz: 15f3fe9d20579051041d4cdb79daa73d8910b90b
-SHA512: 
-  metadata.gz: bf2bf65c921160df82a3be23416a96e99a2e1ef5827c422a18d4304fe3b00c5e46ccb853f0948f5e78096c871eabc8b6bb87b36d050a95c8f17846bd750ce26b
-  data.tar.gz: b55171870df0726aaf90d035735c0f5b8c9aeb0bbb0d784aebf720ff964617b038f4c545566ec6e17a85e58cfa234fd84dc17e23bccb70b9afd071881e8d3944
+---
+SHA1:
+  metadata.gz: 762f263592f84d596f9aa2ecec54a39cf4004322
+  data.tar.gz: de7d357cc9c67fdf7cc1148977e35d516b1c2d8c
+SHA512:
+  metadata.gz: 13e7afddd458f163181c2b848c976c5374e80e41862775343725ce1ebc767d04047db575f37904ab936d903718cb09279280e86b8e5b442e9cafa0628a426306
+  data.tar.gz: d9bc25c0ead3780447145195aa56f78ff045444c6a65b2c587c29975a717abc3b94fa2b31e181076d483627ceeae35ece5471bc614a1122f83915ea4db8e4054

data/cached_enumeration.gemspec

@@ -22,9 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec","~> 3.1"
   spec.add_development_dependency "sqlite3","1.3.8"
-#  spec.add_development_dependency "byebug"
-#  spec.add_development_dependency "rubinius-debugger"
-  spec.add_dependency "activerecord","~> 4.1"
+  spec.add_dependency "activerecord","~> 4.1.0"
 
 end
 

data/lib/cached_enumeration/version.rb

@@ -1,3 +1,3 @@
 module CachedEnumeration
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/spec/lib/association_spec.rb

@@ -51,8 +51,8 @@ describe 'association caching' do
       him
       him.reload #to empty the assoc cache
 
-      Gender.connection.should_not_receive(:exec_query)
-      him.gender.name.should == 'male'
+      expect(Gender.connection).not_to receive(:exec_query)
+      expect(him.gender.name).to eq('male')
     end
 
 =begin

data/spec/lib/cached_enumeration_spec.rb

@@ -27,13 +27,13 @@ describe 'simple caching' do
 
   context "cache_enumeration?" do
     it "should return the rigth value" do
-      @klass.should_not be_cache_enumeration
+      expect(@klass).not_to be_cache_enumeration
       @klass.cache_enumeration.cache!
-      @klass.should be_cache_enumeration
+      expect(@klass).to be_cache_enumeration
     end
     it "should not cache if not activated" do
       @klass.all
-      @klass.should_not be_cache_enumeration
+      expect(@klass).not_to be_cache_enumeration
     end
   end
 
@@ -45,29 +45,29 @@ describe 'simple caching' do
 
     it "should fire db queries if all is modified" do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_receive(:exec_query).and_call_original
-      @klass.where("name in ('one','two')").all.size.should == 2
+      expect(@klass.connection).to receive(:exec_query).and_call_original
+      expect(@klass.where("name in ('one','two')").all.size).to eq(2)
     end
 
     it 'should fire db queries if all has parameters' do
       @klass.cache_enumeration.cache!
       #@klass.connection.should_receive(:exec_query)..and_call_original
-      @klass.where("name = 'one'").all.size.should == 1
+      expect(@klass.where("name = 'one'").all.size).to eq(1)
     end
 
     it 'should fire db queries if all with parameters is used through find(:all)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_receive(:exec_query).and_call_original
-      @klass.where("name = 'one'").all.size.should == 1
+      expect(@klass.connection).to receive(:exec_query).and_call_original
+      expect(@klass.where("name = 'one'").all.size).to eq(1)
     end
       
     it 'should fire db queries if all with select parameter is used through find(:all)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_receive(:exec_query).and_call_original
+      expect(@klass.connection).to receive(:exec_query).and_call_original
       entry = @klass.select("id, name").all.first
-      lambda {
+      expect {
         entry.other
-      }.should raise_error(ActiveModel::MissingAttributeError, 'missing attribute: other')
+      }.to raise_error(ActiveModel::MissingAttributeError, 'missing attribute: other')
     end
       
   end
@@ -75,40 +75,40 @@ describe 'simple caching' do
   context 'first' do
     it 'should find the first entry' do
       @klass.cache_enumeration.cache!
-      @klass.first.should == one
+      expect(@klass.first).to eq(one)
     end
     it 'should allwo string order (and use cache)' do
       @klass.cache_enumeration(:order => "other").cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.order('other').first.should == three
+      expect(@klass.order('other').first).to eq(three)
     end
     it 'should allow hash condition (and use cache)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.where(:name => 'three').first.should == three
+      expect(@klass.where(:name => 'three').first).to eq(three)
     end
     it 'should allow string conditions (and ask db)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_receive(:exec_query).and_call_original
-      @klass.where("other = 'drei'").first.should == three
+      expect(@klass.connection).to receive(:exec_query).and_call_original
+      expect(@klass.where("other = 'drei'").first).to eq(three)
     end
 
     it 'should allow hash conditions in first (and use cache)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_not_receive(:exec_query)
-      @klass.where(:name => 'three' ).first.should == three
+      expect(@klass.connection).not_to receive(:exec_query)
+      expect(@klass.where(:name => 'three' ).first).to eq(three)
     end
 
     it 'should allow conditions for first (and use db)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_receive(:exec_query).and_call_original
-      @klass.where("other = 'drei'").first.should == three
+      expect(@klass.connection).to receive(:exec_query).and_call_original
+      expect(@klass.where("other = 'drei'").first).to eq(three)
     end
     it 'should allow conditions for first (and use db)' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_receive(:exec_query).and_call_original
+      expect(@klass.connection).to receive(:exec_query).and_call_original
       expect(@klass.where("name = 'three'").first).not_to be_nil
     end
   end
@@ -120,40 +120,40 @@ describe 'simple caching' do
 
     it 'should find objects providing id' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.find(one.id).id.should == one.id
-      @klass.find(one.id).frozen?().should eq(true)
-      @klass.find([one.id])[0].id.should == one.id
-      @klass.find([]).size.should == 0
+      expect(@klass.find(one.id).id).to eq(one.id)
+      expect(@klass.find(one.id).frozen?()).to eq(true)
+      expect(@klass.find([one.id])[0].id).to eq(one.id)
+      expect(@klass.find([]).size).to eq(0)
 
-      lambda { @klass.find(0) }.should raise_error(ActiveRecord::RecordNotFound)
-      lambda { @klass.find(nil) }.should raise_error(ActiveRecord::RecordNotFound)
+      expect { @klass.find(0) }.to raise_error(ActiveRecord::RecordNotFound)
+      expect { @klass.find(nil) }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "should find an array of object ids (and hit cache)" do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.find([one.id, three.id]).collect { |item| item.id }.should == [one.id, three.id]
+      expect(@klass.find([one.id, three.id]).collect { |item| item.id }).to eq([one.id, three.id])
     end
 
     it 'should find_by' do
       @klass.cache_enumeration.cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.find_by(:id => one.id).id.should == one.id
-      @klass.find_by(:id => one.id.to_s).id.should == one.id
-      @klass.find_by(:id => 0).should be_nil
+      expect(@klass.find_by(:id => one.id).id).to eq(one.id)
+      expect(@klass.find_by(:id => one.id.to_s).id).to eq(one.id)
+      expect(@klass.find_by(:id => 0)).to be_nil
     end
 
     it 'should find objects by_name' do
       one
       @klass.cache_enumeration.cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.find_by(:name => 'one').id.should == one.id
-      @klass.find_by(:name => 'no such name').should be_nil
+      expect(@klass.find_by(:name => 'one').id).to eq(one.id)
+      expect(@klass.find_by(:name => 'no such name')).to be_nil
     end
 
   end
@@ -161,43 +161,43 @@ describe 'simple caching' do
   context "multiple keys" do
     it 'it should store by multiple keys (hashing)' do
       @klass.cache_enumeration(:hashed => ['id', 'other', 'name']).cache!
-      @klass.connection.should_not_receive(:exec_query)
-      @klass.find_by(:other => 'eins').id.should ==one.id
-      @klass.find_by(:name => 'one').id.should ==one.id
+      expect(@klass.connection).not_to receive(:exec_query)
+      expect(@klass.find_by(:other => 'eins').id).to eq(one.id)
+      expect(@klass.find_by(:name => 'one').id).to eq(one.id)
     end
   end
   context "sorting of all" do
     it 'should sort by option' do
       @klass.cache_enumeration(:order => 'name').cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass.order("name").all.collect { |item| item.id }.should == [one.id, three.id, two.id]
+      expect(@klass.order("name").all.collect { |item| item.id }).to eq([one.id, three.id, two.id])
     end
 
   end
   context "constantize" do
     it "should constantize name by default" do
-      @klass.cache_enumeration.options[:constantize].should == 'name'
+      expect(@klass.cache_enumeration.options[:constantize]).to eq('name')
     end
     it "should without no preloading" do
 
       @klass.cache_enumeration
-      @klass::ONE.id.should == one.id
+      expect(@klass::ONE.id).to eq(one.id)
     end
 
     it 'should constantize other fields' do
       @klass.cache_enumeration(:constantize => 'other').cache!
-      @klass.cache_enumeration.options[:constantize].should == 'other'
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.cache_enumeration.options[:constantize]).to eq('other')
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass::EINS.id.should == one.id
+      expect(@klass::EINS.id).to eq(one.id)
     end
 
     it "should contantize by lambda" do
       @klass.cache_enumeration(:constantize => lambda { |model| model.other }).cache!
-      @klass.connection.should_not_receive(:exec_query)
+      expect(@klass.connection).not_to receive(:exec_query)
 
-      @klass::EINS.id.should == one.id
+      expect(@klass::EINS.id).to eq(one.id)
     end
   end
 

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require 'cached_enumeration'
 require 'logger'
 #ActiveRecord::Base.logger=Logger.new(STDOUT)
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,77 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cached_enumeration
-version: !ruby/object:Gem::Version 
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - Peter Schrammel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-08-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id006 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.8
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.1"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 description: Cache nonchanging ActiveRecord models in memory
-email: 
+email:
 - peter.schrammel@experteer.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -85,31 +100,31 @@ files:
 - spec/lib/association_spec.rb
 - spec/lib/cached_enumeration_spec.rb
 - spec/spec_helper.rb
-homepage: ""
-licenses: 
+homepage: ''
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id006
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id006
+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.4.8
 signing_key: 
 specification_version: 4
 summary: Cache nonchanging ActiveRecord models in memory
-test_files: 
+test_files:
 - spec/lib/association_spec.rb
 - spec/lib/cached_enumeration_spec.rb
 - spec/spec_helper.rb
-has_rdoc: