en_masse 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6aacf9d6b65da55afc86a7ddbee21ec434883d5
-  data.tar.gz: ee5ddb583d9f6f960f93309c77ade2ec1aa10d14
+  metadata.gz: d027aa18c0ede70cbc3033d8518116deea9415bd
+  data.tar.gz: 670c6c497af6d875812359afa3e8c42ed73c5d01
 SHA512:
-  metadata.gz: 1a1d8115b21cf42c7cd8eecfeffb1c462a3074594648f02b18f6d3bd780a0a5ff84da2f95f47bb8312a4720a9abdb969a51843df7e3260ce965a62cc46788140
-  data.tar.gz: a69508c71040b07c3bcd3367cc60488a0501b3994b5fce81e3b5bf36e2ee350f23fba7e4bc7ec68575d55d5139541d5c3019e3141f3e6cc0325e04ed2cc22286
+  metadata.gz: 3be126dfa5c7fb988537d5ebbd316048475a4590adb3e58a90333e2db50a85b38c43b39effa7f72612efd9d6e36de4024a94e4bb10f98ba2c7433390907c2ed3
+  data.tar.gz: 1218b95c5702f866a381feb8e648417e81dff01138494410155b2c451d0a2c4635ec51a9cffa05b2c7c50b0081990bc37cea61bc97e33486e62445e1631fcad7

data/lib/en_masse/refinements.rb

@@ -1,3 +1,5 @@
+require "benchmark"
+
 module EnMasse::Refinements
 
   refine ::ActiveRecord::Base.singleton_class do
@@ -12,11 +14,15 @@ module EnMasse::Refinements
       end
       values = collection.map{|record|
         "(#{ record.values_for_insert(column_names).join(",") })"
-      }.join(",")
-      ActiveRecord::Base.connection.execute %Q[
-        INSERT INTO #{table_name} (#{column_names.join(",")})
-        VALUES #{values};
-      ]
+      }
+      log_elapsed_time :debug, %Q[INSERT INTO #{table_name} (#{column_names.join(",")}) VALUES <#{values.count} values ...>;] do
+        with_ar_log_level Logger::ERROR do
+          connection.execute %Q[
+            INSERT INTO #{table_name} (#{column_names.join(",")})
+            VALUES #{values.join(",")};
+          ]
+        end
+      end
     end
 
     def reflect_on_dependent_associations
@@ -32,7 +38,7 @@ module EnMasse::Refinements
     end
 
     def allocate_ids amount
-      next_value = connection.execute(%Q[
+      next_value = connection.execute(squeeze_ws(%Q[
         SELECT pg_advisory_lock(#{primary_key_sequence_update_lock}),
                setval('#{sequence_name}', greatest(
                                              (select max(id) from #{table_name}),
@@ -40,11 +46,42 @@ module EnMasse::Refinements
                                           + #{amount}),
                currval('#{sequence_name}'),
                pg_advisory_unlock(#{primary_key_sequence_update_lock});
-                                      ]).first["currval"].to_i
+                                      ])).first["currval"].to_i
       start_value = next_value - amount + 1
       start_value..next_value
     end
 
+    def with_ar_log_level level, &block
+      if logger
+        begin
+          original_level = logger.level
+          logger.level = level
+          yield
+        ensure
+          logger.level = original_level if logger
+        end
+      else
+        yield
+      end
+    end
+
+    def log_elapsed_time level, message, &block
+      if logger
+        seconds = Benchmark.realtime &block
+        ms = "#{(seconds*1000).round(1)}ms"
+        logger.send level, "   (#{ms})  #{message}"
+      else
+        yield
+      end
+    end
+
+    def squeeze_ws string
+      string
+        .gsub(/\A\s+/, "")
+        .gsub(/\s+\z/, "")
+        .gsub(/\s+/, " ")
+    end
+
   end
 
   refine ::ActiveRecord::Base do
@@ -77,13 +114,23 @@ module EnMasse::Refinements
     end
 
     def dependents
-      direct_dependents = self.class
-        .reflect_on_dependent_associations
-        .flat_map{|association| self.send(association.name)}
-        .compact
-        .uniq
+      direct_dependents = with_cleared_pk {
+        self.class
+          .reflect_on_dependent_associations
+          .flat_map{|association| self.send(association.name) }
+          .compact
+          .uniq
+      }
       direct_dependents + direct_dependents.flat_map{|dependent| dependent.dependents}
     end
 
+    def with_cleared_pk &block
+      pk = self[self.class.primary_key]
+      self[self.class.primary_key] = nil
+      yield
+    ensure
+      self[self.class.primary_key] = pk
+    end
+
   end
 end

data/lib/en_masse/version.rb

@@ -1,3 +1,3 @@
 module EnMasse
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: en_masse
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Artem Baguinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler