activerecord-userstamp 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6113fc9e7a0eec6ad0ebe4f883c2b07d0f10d3f2
-  data.tar.gz: 481179a5004384a5f8173cd04efaf69f7bee1e37
+  metadata.gz: 7a7867df9eb9d4eea12bdad4a66da1c5412e0593
+  data.tar.gz: b888a7d64f3f13306a2e0cf371775d3e99ba7aba
 SHA512:
-  metadata.gz: 4a0260351476dde1e1893b9182bff0c19eb8118c9fa5d30db8b1be28a22dcdce1ea4a7a346e39bd0ff81a42e91a1a44b29e4c2f5d1ccacba485f12b0451f2d33
-  data.tar.gz: 8661e0637d5ee7231ac426243f9b1ceec0e03b42ac980d269462f243b054feaadb3717a7c3d2dc5eca5e0ae429bd436215d7c1d0f7c8237c0debf363a3711d1e
+  metadata.gz: 91875d1531de92434925a3408e7da73bd84b82a56490d4687409dd68c4169b33aa3e0e616a10f225829fd2257b42e61cfb1cc5a5b2d8957d4c645617bbec5555
+  data.tar.gz: d11f8898d2a39b569a76e9e124f78036a4dbcd2d46f396e1df94256d4861a31232df35b3d5e0cde13249d7a693d3ea1e32628eba13b4978d41f950fd7384da05

data/.gitignore

@@ -2,4 +2,3 @@
 *.sqlite3
 /.rdoc
 /spec/examples.txt
-/.bundle

data/CHANGELOG.md

@@ -1,4 +1,9 @@
  # Changelog
+ ## 3.0.1 (11-7-2015)
+  * Joel Low          - Only declare the creator/updater/deleter associations when the table has
+                        the attribute columns. If the columns cannot be determined (e.g. if the
+                        table has not been defined, such as during tests), then the model would
+                        need to explicitly call `stampable`.
 
  ## 3.0.0 (10-7-2015)
   * Joel Low          - Remove `compatibility_mode`. Use the `creator_attribute`,

data/README.md

@@ -27,7 +27,7 @@ In addition to these, I have cherry picked ideas and changes from the following
  - [konvenit](https://github.com/konvenit/userstamp)
 
 Finally, this gem only supports Ruby 2.0 and above. Yes, you really should upgrade to a supported
-version of Ruby.
+version of Ruby. This gem is tested only on Rails 4.2; but it should work with Rails 4+.
 
 ## Features
 ### Soft-deletes
@@ -57,7 +57,8 @@ Do create a ticket if it is broken, with a pull-request if possible.
 While examining the userstamp gem's network on Github, it was noticed that quite a few forks were
 made to allow customisability in the name and type of the column with the database migration.
 
-This gem now supports customised column names.
+This gem now supports customised column names. See the [usage](#usage) section on the
+configuration options supported.
 
 ### Saving before validation
 This fork includes changes to perform model stamping before validation. This allows models to

data/lib/active_record/userstamp/stampable.rb

@@ -68,21 +68,23 @@ module ActiveRecord::Userstamp::Stampable
 
     # Defines the associations for Userstamp.
     def add_userstamp_associations(options)
-      config = ActiveRecord::Userstamp.config
-      klass = stamper_class.try(:name)
-      relation_options = options.reverse_merge(class_name: klass)
-
       ActiveRecord::Userstamp::Utilities.remove_association(self, :creator)
       ActiveRecord::Userstamp::Utilities.remove_association(self, :updater)
       ActiveRecord::Userstamp::Utilities.remove_association(self, :deleter)
 
-      belongs_to :creator, relation_options.reverse_merge(foreign_key: config.creator_attribute)
-      belongs_to :updater, relation_options.reverse_merge(foreign_key: config.updater_attribute)
+      associations = ActiveRecord::Userstamp::Utilities.available_association_columns(self)
+      return if associations.nil?
 
-      if config.deleter_attribute
-        remove_method(:deleter) if method_defined?(:deleter)
-        belongs_to :deleter, relation_options.reverse_merge(foreign_key: config.deleter_attribute)
-      end
+      config = ActiveRecord::Userstamp.config
+      klass = stamper_class.try(:name)
+      relation_options = options.reverse_merge(class_name: klass)
+
+      belongs_to :creator, relation_options.reverse_merge(foreign_key: config.creator_attribute) if
+        associations.first
+      belongs_to :updater, relation_options.reverse_merge(foreign_key: config.updater_attribute) if
+        associations.second
+      belongs_to :deleter, relation_options.reverse_merge(foreign_key: config.deleter_attribute) if
+        associations.third
     end
   end
 

data/lib/active_record/userstamp/utilities.rb

@@ -1,4 +1,9 @@
 module ActiveRecord::Userstamp::Utilities
+  # Removes the association methods from the model.
+  #
+  # @param [Class] model The model to remove methods from.
+  # @param [Symbol] association The name of the association to remove.
+  # @return [void]
   def self.remove_association(model, association)
     methods = [
       association,
@@ -14,5 +19,22 @@ module ActiveRecord::Userstamp::Utilities
       end
     end
   end
+
+  # Obtains the creator/updater/deleter columns which are present in the model.
+  #
+  # @param [Class] model The model to query.
+  # @return [nil|Array<(bool, bool, bool)>] Nil if the model does not have a table defined.
+  #   Otherwise, a tuple of booleans indicating the presence of the created, updated, and deleted
+  #   columns.
+  def self.available_association_columns(model)
+    columns = Set[*model.column_names]
+    config = ActiveRecord::Userstamp.config
+
+    [config.creator_attribute.present? && columns.include?(config.creator_attribute.to_s),
+     config.updater_attribute.present? && columns.include?(config.updater_attribute.to_s),
+     config.deleter_attribute.present? && columns.include?(config.deleter_attribute.to_s)]
+  rescue ActiveRecord::StatementInvalid => _
+    nil
+  end
 end
 

data/lib/active_record/userstamp/version.rb

@@ -1,4 +1,4 @@
 module ActiveRecord; end
 module ActiveRecord::Userstamp
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-userstamp
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Joel Low
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport