garland 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2683e3c450c0889b0af41f66a2fcdbef0e8e8caa
-  data.tar.gz: e52fac122859a535f1903c7c58e8ed5a2e0c8855
+  metadata.gz: 633f8442d2f0646ca3e812f01370fd4ebbcc3f93
+  data.tar.gz: 78d637e6b0ea8a790a7cb8ec446acb861938a625
 SHA512:
-  metadata.gz: b285119071ce1823eebeb8c1a70968491614f1bc65734acf6a8ecf2a41101673f6210ad6aa8a9ecf888b703ecd16c8a573c7374a67fb3d1ec0836fa5465bd0f9
-  data.tar.gz: 3ba6409d950c83a7a3513fa9eae2e5fc80c6943a0ddc8d111ca28a69b954257db0b1559824edf654ebde43c2c0a96a8c3768585b176ba0c114abf645ab015e1c
+  metadata.gz: 321978763b6b8bed65d58cab3b24c855234cc85f2991107f8bd82fe2cf121e0f669c042fa51d061c11719e26d0a242b5eff2214362821151b5cd3884c28b883c
+  data.tar.gz: 5981c569dab5ab5467ce1593e22758b166706541804ca3da3d6623326efead50651d612655ab8eafdd55cc8916f136200ac7371789ba7eac658fc16fb888de35

data/lib/garland_rails.rb

@@ -2,6 +2,28 @@ module GarlandRails
   DIFF = true
   SNAPSHOT = false
 
+  module Extend
+    def self.included(base)
+      base.extend(self)
+    end
+
+    def has_many(name, scope = nil, options = {}, &extension)
+      name_superclass = name.to_s.classify.constantize.superclass
+      if name_superclass == GarlandRails::Base
+        # if there are no scope and there are some options,
+        # scope will contain options, and we need to swap them
+        if scope.class == Hash
+          options = scope
+          scope = nil
+        end
+
+        options = options.merge({ as: :belongs_to })
+      end
+
+      super(name, scope, options, &extension)
+    end
+  end
+
   class Base < Garland
     self.table_name = "garlands"
 
@@ -16,10 +38,16 @@ module GarlandRails
       :next,
     ], conditions: -> { where("next IS NULL OR previous IS NULL") }
 
-    def self.belongs_to(type)
-      super type, foreign_key: "belongs_to_id"
-      validates type, presence: true
-      validates_inclusion_of :belongs_to_type, in: ["#{type.capitalize}"]
+    # everything seems to work without `polymorphic: true`,
+    # but we will set it just for accordance to docs
+    def self.belongs_to(name, scope = nil, options = {}, &extension)
+      if scope.class == Hash
+        options = scope
+        scope = nil
+      end
+      options = options.merge({ polymorphic: true })
+
+      super(name, scope, options, &extension)
     end
 
     def self.push(args)
@@ -106,13 +134,14 @@ module GarlandRails
          # third+: diffs
          unless brand_new_tail.save
            Rails.logger.error("Unable to create new tail with props '#{tail_props}'")
+           ActiveRecord::Base.connection.release_savepoint("savepoint_before_init")
            return nil
          end
 
          # belongs_to validations were in `brand_new_tail.save`
          # here and below validations may be skipped as long as we check for continuity later
-         first_diff.save(validate: false)
          brand_new_head.save(validate: false)
+         first_diff.save(validate: false)
          brand_new_tail.update_attribute(:next, first_diff.id)
          first_diff.update_attribute(:previous, brand_new_tail.id)
          first_diff.update_attribute(:next, brand_new_head.id)
@@ -121,6 +150,7 @@ module GarlandRails
          unless self.continuous?(belongs_to)
            Rails.logger.error("Initialized garland is not continuous")
            ActiveRecord::Base.connection.exec_rollback_to_savepoint("savepoint_before_init")
+           ActiveRecord::Base.connection.release_savepoint("savepoint_before_init")
            return nil
          end
       end
@@ -151,6 +181,7 @@ module GarlandRails
          # because we don't want to check for continuity on every push
          unless new_diff.save
            Rails.logger.error("Unable to create new_diff with props '#{new_diff_props}'")
+           ActiveRecord::Base.connection.release_savepoint("savepoint_before_init")
            return nil
          end
 
@@ -158,6 +189,7 @@ module GarlandRails
          unless last_diff.save
            Rails.logger.error("Unable to save last_diff with 'next' = '#{new_diff.id}'")
            ActiveRecord::Base.connection.exec_rollback_to_savepoint("savepoint_before_insert_diff")
+           ActiveRecord::Base.connection.release_savepoint("savepoint_before_init")
            return nil
          end
 
@@ -165,6 +197,7 @@ module GarlandRails
          unless head.save
            Rails.logger.error("Unable to save head with 'previous' = '#{new_diff.id}'")
            ActiveRecord::Base.connection.exec_rollback_to_savepoint("savepoint_before_insert_diff")
+           ActiveRecord::Base.connection.release_savepoint("savepoint_before_init")
            return nil
          end
 
@@ -172,6 +205,7 @@ module GarlandRails
          unless head.save
            Rails.logger.error("Unable to save head with 'entity' = '#{hash.to_s}'")
            ActiveRecord::Base.connection.exec_rollback_to_savepoint("savepoint_before_insert_diff")
+           ActiveRecord::Base.connection.release_savepoint("savepoint_before_init")
            return nil
          end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: garland
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Alexander Morozov
@@ -24,8 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Provides GarlandRails::Base class for ActiveRecord, which allows to save
-  Hashes using snapshots and diffs.
+description: Provides GarlandRails::Base class for ActiveRecord, which allows you
+  to save Hashes using snapshots and diffs (in short, it's HashDiff Rails storage).
 email: ntcomp12@gmail.com
 executables: []
 extensions: []