secretary-rails 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a3fabc2aa72279b7c65cfb1437502c7828516aa
+  data.tar.gz: e1a90574dfafbcc326d590658fd6a7841aebfa4b
+SHA512:
+  metadata.gz: df71ac7242fe988ee50c01f21a83ced6c0ff2d3a3ba620ca09eee8eb3b0298aec0ef6014fd8e12fc005a9c776bfd782f3bde541e341e3851b35e66e533d46779
+  data.tar.gz: 029dfa9765095925a73db1c3d2d2d894878731725fc7cbaf9d1522e872bbf190ac2da8d294839a00b39aef16d33780de0269280b5fd8bf3554331abf712f0093

data/lib/secretary/dirty_associations.rb

@@ -82,7 +82,8 @@ module Secretary
     def assign_to_or_mark_for_destruction(record, *args)
       name = association_name(record)
 
-      if self.class.reflect_on_association(name).collection?
+      if self.class.reflect_on_association(name).collection? &&
+      versioned_attribute?(name)
         previous = changed_attributes[name]
 
         # Assume it will change. It may not. We'll handle that scenario

data/lib/secretary/gem_version.rb

@@ -1,3 +1,3 @@
 module Secretary
-  GEM_VERSION = "1.0.0.beta4"
+  GEM_VERSION = "1.0.0.beta5"
 end

data/lib/secretary/tracks_association.rb

@@ -55,7 +55,20 @@ module Secretary
             raise NoAssociationError, name, self.name
           end
 
-          self.versioned_attributes << name.to_s
+          # If the environment is loaded, the following line will be
+          # evaluated for any `tracks_association` calls. `versioned_attributes`
+          # calls `self.column_names`, which requires the table to exist.
+          #
+          # So the problem is that if our database or table doesn't exist,
+          # we can't load the environment, and the environment needs to be
+          # loaded in order to load in the schema.
+          #
+          # So, we rescue! And warn.
+          begin
+            self.versioned_attributes << name.to_s
+          rescue => e
+            warn  "Caught an error while updating versioned attributes. #{e}"
+          end
 
           define_dirty_association_methods(name, reflection)
 
@@ -75,7 +88,12 @@ module Secretary
 
     def association_name(association_object)
       klass = association_object.class
-      name = self.class.reflections.find { |r| r[1].klass == klass }[0]
+
+      reflection = self.class.reflections.find do |name, reflection|
+        reflection.klass >= klass
+      end
+
+      reflection[0] if reflection
     end
   end
 end

data/lib/secretary/versioned_attributes.rb

@@ -17,7 +17,10 @@ module Secretary
         # which attributes to ignore.
         #
         # Each takes an array of column names *as strings*.
-        attr_writer :versioned_attributes
+        def versioned_attributes=(attributes)
+          verify_strings!(attributes)
+          @versioned_attributes = attributes
+        end
 
         def versioned_attributes
           @versioned_attributes ||=
@@ -26,8 +29,9 @@ module Secretary
             unversioned_attributes
         end
 
-        def unversioned_attributes=(array)
-          self.versioned_attributes -= array
+        def unversioned_attributes=(attributes)
+          verify_strings!(attributes)
+          self.versioned_attributes -= attributes
         end
 
         private
@@ -35,6 +39,13 @@ module Secretary
         def unversioned_attributes
           @unversioned_attributes ||= []
         end
+
+        def verify_strings!(array)
+          if array.any? { |e| !e.is_a?(String) }
+            raise ArgumentError,
+              "Versioned attributes must be declared as strings."
+          end
+        end
       end
     end