dm-constant-cache 0.2.0 → 0.2.1

data/Rakefile

@@ -12,7 +12,8 @@ begin
     gem.homepage          = "http://www.viget.com/extend/"
     gem.files = %w(MIT-LICENSE README.md Rakefile) + Dir.glob("{lib,test}/**/*")
 
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "shoulda", ">= 0"
+    gem.add_development_dependency "jferris-mocha", ">= 0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/constant_cache/cache_methods.rb

@@ -8,7 +8,7 @@ module ConstantCache
   end
 
   def self.cache!
-    @descendants.each {|klass| klass.all.each {|instance| instance.set_instance_as_constant }}
+    @descendants.each {|klass| klass.cache!}
   end
 
   #
@@ -22,7 +22,7 @@ module ConstantCache
     # a simple interface to cache the data in the corresponding table as constants on the model:
     #
     #   class Status
-    #     caches_constants
+    #     include ConstantCache
     #   end
     # 
     # It makes certain assumptions about your schema: the constant created is based off of a <tt>name</tt>
@@ -36,7 +36,8 @@ module ConstantCache
     #   class State
     #     include ConstantCache
     # 
-    #     caches_constants :key => :abbreviation, :limit => 2
+    #     cache_as :abbreviation
+    #     cache_limit 2
     #   end
     #
     # This will use the <tt>abbreviation</tt> column to generate constants and will truncate constant names to 2 
@@ -54,13 +55,18 @@ module ConstantCache
     end
 
     def cache_options
-      # @cache_options = {:key => :name, :limit => CHARACTER_LIMIT}.merge(@cache_options || {})
       @cache_options ||= {:key => :name, :limit => CHARACTER_LIMIT}
     end
 
     def reset_cache_options
       @cache_options = {:key => :name, :limit => CHARACTER_LIMIT}
     end
+
+    def cache!
+      unless DataMapper::Repository.adapters.empty?
+        all.each {|instance| instance.set_instance_as_constant }
+      end
+    end
   end
 
   # 
@@ -79,4 +85,4 @@ module ConstantCache
     end
   end
   private :constant_name
-end
+end

data/lib/constant_cache/core_ext.rb

@@ -11,5 +11,4 @@ class String
     value = self.strip.gsub(/\s+/, '_').gsub(/[^\w_]/, '').gsub(/_{2,}/, '_').upcase
     (value == '') ? nil : value
   end
-
-end
+end

data/test/constant_cache/cache_methods_test.rb

@@ -1,5 +1,8 @@
 require 'test_helper'
 
+module DataMapper
+end
+
 class Cached
   include ConstantCache
   
@@ -11,23 +14,25 @@ class CacheMethodsTest < Test::Unit::TestCase
   context "A class with ConstantCache mixed in" do
     should "have default options for the cache key and character limit" do
       Cached.reset_cache_options
-      Cached.cache_options.should == {:key => :name, :limit => 64}
+      assert_equal({:key => :name, :limit => 64}, Cached.cache_options)
     end
 
     should "all overridden options for key and character limit" do
       Cached.cache_as :abbreviation
       Cached.cache_limit 20
-      Cached.cache_options.should == {:key => :abbreviation, :limit => 20}
+      assert_equal({:key => :abbreviation, :limit => 20}, Cached.cache_options)
     end
 
     should "revert the limit on characters if less than 1" do
       Cached.cache_limit -10
-      Cached.cache_options.should == {:key => :name, :limit => 64}
+      assert_equal({:key => :name, :limit => 64}, Cached.cache_options)
     end
   end
 
   context "ConstantCache" do
     should "be able to cache all instances as constants" do
+      DataMapper::Repository = stub(:adapters => ["an adapter"])
+
       c1 = Cached.new
       c1.name = 'al einstein'
       c1.expects(:set_instance_as_constant)
@@ -50,14 +55,14 @@ class CacheMethodsTest < Test::Unit::TestCase
     should "create a constant as a reference to the instance" do
       @cached.name = 'al sharpton'
       @cached.set_instance_as_constant
-      Cached.constants.include?("AL_SHARPTON").should == true
-      Cached::AL_SHARPTON.should == @cached
+      assert_equal true, Cached.constants.include?("AL_SHARPTON")
+      assert_equal @cached, Cached::AL_SHARPTON
     end
 
     should "not create a constant without a key value" do
       size = Cached.constants.size
       @cached.set_instance_as_constant
-      Cached.constants.size.should == size
+      assert_equal size, Cached.constants.size
     end
 
     should "not raise an exception on duplicate constant" do
@@ -73,8 +78,8 @@ class CacheMethodsTest < Test::Unit::TestCase
 
       @cached.name = 'a'*65
       @cached.set_instance_as_constant
-      
-      Cached.constants.include?(constant_name).should == true
+
+      assert_equal true, Cached.constants.include?(constant_name)
     end
   end
 end

data/test/constant_cache/core_ext_test.rb

@@ -3,31 +3,31 @@ require 'test_helper'
 class CoreExtTest < Test::Unit::TestCase
   context "The String core extension" do
     should "upcase its characters" do
-      'test'.constant_name.should == 'TEST'
+      assert_equal 'TEST', 'test'.constant_name
     end
   
     should "replace whitespace with a single underscore" do
-      "test this \tformat\nplease.".constant_name.should == 'TEST_THIS_FORMAT_PLEASE'
+      assert_equal 'TEST_THIS_FORMAT_PLEASE', "test this \tformat\nplease.".constant_name
     end
   
     should "remove leading and trailing whitespace" do
-      ' test '.constant_name.should == 'TEST'
+      assert_equal 'TEST', ' test '.constant_name
     end
   
     should "remove non-word characters" do
-      '!test?'.constant_name.should == 'TEST'
+      assert_equal 'TEST', '!test?'.constant_name
     end
   
     should "not singularize plural name" do
-      'tests'.constant_name.should == 'TESTS'
+      assert_equal 'TESTS', 'tests'.constant_name
     end
   
     should "return nil when all characters are removed" do
-      '?'.constant_name.should be(nil)
+      assert_nil '?'.constant_name
     end
   
     should "collapse multiple underscores" do
-      'test__me'.constant_name.should == 'TEST_ME'
+      assert_equal 'TEST_ME', 'test__me'.constant_name
     end
   end
-end
+end

data/test/test_helper.rb

@@ -3,7 +3,6 @@ $:.reject! { |e| e.include? 'TextMate' }
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'matchy'
 require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-constant-cache
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tony Pitale
@@ -15,21 +16,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -07:00
+date: 2010-08-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jferris-mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: ""
 email: tony.pitale@viget.com
 executables: []
@@ -60,23 +77,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ""