transient 1.0.2 → 1.1.0

data/History.txt

@@ -1,6 +1,8 @@
-= 1.0.2 2010--3-18
+= 1.0.2 2010-03-18
 
 * Fixed bug where the effective_at date when implicitly set was not UTC.
+* Started using the method calls (self.effective_at) as opposed to the self[:effective_at] whenever possible.
+* Renamed the effective_at method to expires_at.
 
 
 = 1.0.1 2009-12-29

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/transient/active_record_extensions.rb

@@ -22,36 +22,53 @@ module Transient
 
     module InstanceMethods
       def self.included( base ) #:nodoc:
+        base.instance_eval do
+          def is_active_record_3?
+            respond_to? :where
+          end
+
+          def scope_method_name
+            is_active_record_3? ?
+              :scope :
+              :named_scope
+          end
+        end
+
         base.validates_presence_of :effective_at
         #base.validates_presence_of :expiring_at
 
-        base.named_scope :effective, lambda { { :conditions => ["effective_at <= ? AND (expiring_at IS NULL OR expiring_at > ?)",
-                                                                  DateTime.now.utc, DateTime.now.utc] } }
+        base.send( base.scope_method_name, :effective,
+                                           lambda { { :conditions => ["effective_at <= ? AND (expiring_at IS NULL OR expiring_at > ?)",
+                                                                      DateTime.now.utc, DateTime.now.utc] } } )
 
-        base.before_validation_on_create :check_and_set_effective_at
+        if base.is_active_record_3?
+          base.before_validation :check_and_set_effective_at, :on => :create
+        else
+          base.before_validation_on_create :check_and_set_effective_at
+        end
 
         protected
-        
+
         def check_and_set_effective_at
           self.effective_at = Time.zone.now if self.effective_at.nil?
         end
-        
+
         public
 
-        # Validates this record's effective dates occur in correct sequence (ie. effective_at is before 
-        # expiring_at). 
+        # Validates this record's effective dates occur in correct sequence (ie. effective_at is before
+        # expiring_at).
         #
-        def validate 
+        def validate
           return unless self.effective_at && self.expiring_at
 
-          unless self.effective_at.to_datetime <= self.expiring_at.to_datetime
+          unless self.effective_at.to_datetime <= self.expires_at.to_datetime
             self.errors.add( :effective_through, "effective at should be earlier than expiring at" )
           end
 
-          super
+          super unless self.class.is_active_record_3?
         end
 
-        # The date this record expires.  Returns DateTime.end_of for records that have a 
+        # The date this record expires.  Returns DateTime.end_of for records that have a
         # nil value in the database.
         #
         def expires_at
@@ -61,7 +78,7 @@ module Transient
         # The range this record is effective wihtin.
         #
         def effective_through
-          self.effective_at.to_datetime..self.expiring_at.to_datetime
+          self.effective_at.to_datetime..self.expires_at.to_datetime
         end
 
         # Sets the range this record is effective within.
@@ -86,7 +103,7 @@ module Transient
         # Returns true if this record is expired, otherwise false.
         #
         def expired?
-          self.expiring_at.to_datetime < DateTime.now
+          self.expires_at.to_datetime < DateTime.now
         end
 
         # Expires and saves this record.
@@ -98,7 +115,7 @@ module Transient
           after_expire! if self.respond_to?( :after_expire! )
         end
 
-        # Returns true if this record is not yet effective, but will become effective at some point in the 
+        # Returns true if this record is not yet effective, but will become effective at some point in the
         # future, otherwise false.
         #
         def future?
@@ -122,9 +139,9 @@ module Transient
     module SingleActive
       def self.included( base ) #:nodoc:
         base.before_create :expire_current_active
-        
+
         private
-        
+
         def expire_current_active
           #if self.transient_options[:check_exists]
           #  exists_conditions = {}
@@ -132,7 +149,7 @@ module Transient
           #  #cur = self.class.current.find( :first, :conditions => exists_conditions )
           #  return true if self.class.current.exists?( exists_conditions )
           #end
-          
+
           conditions = {}
           self.transient_options[:single_active].each { |attr| conditions.merge!( attr.to_sym => attributes[attr] ) }
           old = self.class.effective.first( :conditions => conditions )

data/transient.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{transient}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2010-03-18}
+  s.date = %q{2011-04-20}
   s.description = %q{Provides an API for making any ActiveRecord object transient.  In addition, provides functionality for models where only a single instance of the model can be current at one time.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/midas/transient}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Provides an API for making any ActiveRecord object transient.}
   s.test_files = [
     "spec/date_time_extensions_spec.rb",
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: transient
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -9,39 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -05:00
+date: 2011-04-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Provides an API for making any ActiveRecord object transient.  In addition, provides functionality for models where only a single instance of the model can be current at one time.
 email: jason@lookforwardenterprises.com
 executables: []
@@ -82,21 +104,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"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Provides an API for making any ActiveRecord object transient.