dirty_history 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/dirty_history.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dirty_history"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gavin Todes"]
-  s.date = "2012-11-26"
+  s.date = "2012-11-27"
   s.description = "Dirty History is a simple gem that allows you to keep track of changes to specific fields in your Rails models using the ActiveRecord::Dirty module."
   s.email = "gavin.todes@gmail.com"
   s.extra_rdoc_files = [

data/lib/dirty_history/dirty_history_record.rb

@@ -4,23 +4,23 @@ class DirtyHistoryRecord < ActiveRecord::Base
 
   validates_presence_of :object_type, :object_id, :column_name, :column_type, :new_value
 
-  scope :created_by,            lambda { |creator| where(["dirty_history_records.creator_id = ? AND dirty_history_records.creator_type = ?", creator.id, creator.class.name]) }
-  scope :not_created_by,        lambda { |non_creator| where(["dirty_history_records.creator_id <> ? OR dirty_history_records.creator_type <> ?", non_creator.id, non_creator.class.name]) }
-  scope :for_object_type,       lambda { |object_type| where(:object_type => object_type.to_s.classify) }
-  scope :for_column,            lambda { |column| where(:column_name => column.to_s) }
+  scope :created_by,            lambda { |creator| where(["#{table_name}.creator_id = ? AND #{table_name}.creator_type = ?", creator.id, creator.class.name]) }
+  scope :not_created_by,        lambda { |non_creator| where(["#{table_name}.creator_id <> ? OR #{table_name}.creator_type <> ?", non_creator.id, non_creator.class.name]) }
+  scope :for_object_type,       lambda { |object_type| where(object_type: object_type.to_s.classify) }
+  scope :for_column,            lambda { |column| where(column_name: column.to_s) }
   scope :created_in_range,      lambda { |range| created_at_gte(range.first).created_at_lte(range.last) }
   scope :created_at_gte,        lambda { |date| created_at_lte_or_gte(date,"gte") }
   scope :created_at_lte,        lambda { |date| created_at_lte_or_gte(date,"lte") }
   scope :created_at_lte_or_gte, lambda { |date, lte_or_gte| 
     lte_or_gte = lte_or_gte.to_s == "lte" ? "<=" : ">="
-    where("((dirty_history_records.revised_created_at is NULL OR dirty_history_records.revised_created_at = '') AND dirty_history_records.created_at #{lte_or_gte} ?) " + 
-          " OR dirty_history_records.revised_created_at #{lte_or_gte} ?", date, date)
+    where("((#{table_name}.revised_created_at is NULL OR #{table_name}.revised_created_at = '') AND #{table_name}.created_at #{lte_or_gte} ?) " + 
+          " OR #{table_name}.revised_created_at #{lte_or_gte} ?", date, date)
   }
 
   scope :order_asc, lambda { order_by_action_timestamp("ASC") }
   scope :order_desc, lambda { order_by_action_timestamp("DESC") }
   scope :order_by_action_timestamp, lambda { |asc_or_desc|
-    order("if(dirty_history_records.revised_created_at IS NULL OR dirty_history_records.revised_created_at = '', dirty_history_records.created_at, dirty_history_records.revised_created_at) #{asc_or_desc}")
+    order("CASE WHEN (#{table_name}.revised_created_at IS NULL OR #{table_name}.revised_created_at = '') then #{table_name}.created_at else #{table_name}.revised_created_at END #{asc_or_desc}")
   }
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dirty_history
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -2345,7 +2345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2924950002014025850
+      hash: 3890497398513022182
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: