cached_values 1.7.3 → 1.8.0

data/Gemfile

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'object_proxy'
+
+group :test do
+  gem 'sqlite3'
+  gem 'shoulda'
+  gem 'activerecord'
+  gem 'activesupport'
+end

data/VERSION

@@ -1 +1 @@
-1.7.3
+1.8.0

data/cached_values.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cached_values}
-  s.version = "1.7.3"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]
-  s.date = %q{2011-04-10}
+  s.date = %q{2011-04-18}
   s.description = %q{Speedup your ActiveRecord by storing and updating the results of SQL or Ruby expressions into record attributes}
   s.email = %q{rubygems@6brand.com}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.markdown"
   ]
   s.files = [
+    "Gemfile",
     "LICENSE",
     "MIT-LICENSE",
     "README.markdown",
@@ -50,13 +51,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<object_proxy>, [">= 0"])
       s.add_runtime_dependency(%q<object_proxy>, [">= 0"])
       s.add_development_dependency(%q<active_record>, [">= 0"])
     else
+      s.add_dependency(%q<object_proxy>, [">= 0"])
       s.add_dependency(%q<object_proxy>, [">= 0"])
       s.add_dependency(%q<active_record>, [">= 0"])
     end
   else
+    s.add_dependency(%q<object_proxy>, [">= 0"])
     s.add_dependency(%q<object_proxy>, [">= 0"])
     s.add_dependency(%q<active_record>, [">= 0"])
   end

data/lib/cached_value.rb

@@ -47,7 +47,7 @@ module ActiveRecord
       end
       
       def find_target_by_sql
-        sql = sanitize_sql(interpolate_sql(@reflection.options[:sql]))
+        sql = interpolate_and_sanitize_sql(@reflection.options[:sql])
         result = @owner.class.connection.select_value(sql)
         result = typecast_result(result)
         result
@@ -121,12 +121,13 @@ module ActiveRecord
         end
       end
       
-      def interpolate_sql(sql, record = nil)
-        @owner.send(:interpolate_sql, sql, record)
-      end
-
-      def sanitize_sql(sql)
-        @owner.class.send(:sanitize_sql, sql)
+      def interpolate_and_sanitize_sql(sql, record = nil)
+        sanitized = @owner.class.send(:sanitize_sql, sql, record)
+        if sanitized =~ /\#\{.*\}/
+          @owner.instance_eval("%@#{sanitized.gsub('@', '\@')}@", __FILE__, __LINE__)
+        else
+          sanitized
+        end
       end
       
   end

data/lib/cached_values.rb

@@ -69,10 +69,7 @@ module CachedValues # :nodoc:
   
     def create_cached_value_reflection(name, options)
       options.assert_valid_keys(:sql, :eval, :cache, :clear, :load, :reload)
-      
-      reflection = ActiveRecord::Reflection::MacroReflection.new(:cached_value, name, options, self)
-      write_inheritable_hash :reflections, name => reflection
-      reflection
+      ActiveRecord::Reflection::MacroReflection.new(:cached_value, name, options, self)
     end
 
     def cached_value_accessor_method(reflection, association_proxy_class)
@@ -90,8 +87,8 @@ module CachedValues # :nodoc:
     
     def cached_value_callback_methods(reflection)
       if events = reflection.options[:reload]
-        events = Array(events).map { |event| event.to_s }
-        ActiveRecord::Callbacks::CALLBACKS.each do |callback|
+        events = Array(events).map(&:to_sym)
+        ActiveRecord::Callbacks::CALLBACKS.map(&:to_sym).each do |callback|
           if events.include?(callback)
             # before_save do |record|
             send callback do |record|

data/test/test_helper.rb

@@ -1,11 +1,13 @@
 # Include this file in your test by copying the following line to your test:
 #   require File.expand_path(File.dirname(__FILE__) + "/test_helper")
 
+require 'rubygems'
+require 'bundler'
+Bundler.require :default, :test
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-require 'rubygems'
-gem 'test-unit'
-require 'test/unit'
+require 'shoulda'
 require 'active_support'
 require 'active_record'
 require 'active_record/fixtures'
@@ -36,3 +38,4 @@ class ActiveSupport::TestCase #:nodoc:
 
   # Add more helper methods to be used by all tests here...
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cached_values
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 55
   prerelease: 
   segments: 
   - 1
-  - 7
-  - 3
-  version: 1.7.3
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -07:00
+date: 2011-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: object_proxy
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: active_record
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: object_proxy
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,8 +43,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+  prerelease: false
+  name: object_proxy
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id002
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  prerelease: false
+  name: active_record
 description: Speedup your ActiveRecord by storing and updating the results of SQL or Ruby expressions into record attributes
 email: rubygems@6brand.com
 executables: []
@@ -56,6 +70,7 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
+- Gemfile
 - LICENSE
 - MIT-LICENSE
 - README.markdown