activerecord_views 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad72d8911d4f996a5b7eb841d2a7b1f930d16aac
-  data.tar.gz: 1891b3ee70bfa4e3737213f285b2e350c9c628ae
+  metadata.gz: 9eded5dc204c84d1913a10b2c73a15b80ba1aeb4
+  data.tar.gz: 3cc3301d035582053ebc27c447d7a0eab65da7ba
 SHA512:
-  metadata.gz: dda606e695a85d2e07170c2337d315d72a23cab5e0c53650035168d520e8ebfd9661a8e78a1025a46f9c556fd080eb9da07c1101343d614bae12ca97ce209988
-  data.tar.gz: b84c8e82443bf416f9c754ecba2a097ed002bf7b97c2c8a24c90049e6f4984e8f3ba7626ebef7e33cc41d968401a219b1d54bcb0755ca6c2272341c9ed9ed23d
+  metadata.gz: 74a57fb79e1136a4f2a00977d98221bf032a42cff691ccba96bd12a36c243754e08298fed60e4678c9e053614bd09b552e7c0bbbfa8e66bdc9428ad1a20d8e26
+  data.tar.gz: a5c0e4987e1925e0cad58a2024262c41249601cc4e11cd40d4266eb8db490c03a2cd0ec7f1ffd87ec814b4a9084365653d871cf5f8668faa1e779c49e210bfb9

data/README.markdown

@@ -99,7 +99,7 @@ end
 
 ## Materialized views
 
-ActiveRecordViews has support [PostgreSQL's materialized views](http://www.postgresql.org/docs/9.4/static/rules-materializedviews.html).
+ActiveRecordViews has support for [PostgreSQL's materialized views](http://www.postgresql.org/docs/9.4/static/rules-materializedviews.html).
 By default, views execute their query to calculate the output every time they are accessed.
 Materialized views let you cache the output of views. This is useful for views which have expensive calculations. Your application can then trigger a refresh of the cached data as required.
 

data/lib/active_record_views/database_cleaner/truncation_extension.rb

@@ -0,0 +1,13 @@
+require 'database_cleaner/active_record/truncation'
+
+module ActiveRecordViews
+  module DatabaseCleaner
+    module TruncationExtension
+      def migration_storage_names
+        super + %w[active_record_views]
+      end
+    end
+  end
+end
+
+::DatabaseCleaner::ActiveRecord::Truncation.prepend ActiveRecordViews::DatabaseCleaner::TruncationExtension

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/lib/active_record_views.rb

@@ -15,6 +15,7 @@ module ActiveRecordViews
   def self.init!
     require 'active_record_views/extension'
     ::ActiveRecord::Base.send :include, ActiveRecordViews::Extension
+    require 'active_record_views/database_cleaner/truncation_extension' if defined? ::DatabaseCleaner
   end
 
   def self.find_sql_file(name)
@@ -34,22 +35,28 @@ module ActiveRecordViews
       !connection.outside_transaction?
     end
 
-    begin
-      recursing = Thread.current[:active_record_views_without_transaction]
-      Thread.current[:active_record_views_without_transaction] = true
+    states = Thread.current[:active_record_views_without_transaction] ||= {}
 
-      if in_transaction && !recursing
+    begin
+      if states[connection]
+        yield states[connection]
+      elsif in_transaction
         begin
           temp_connection = connection.pool.checkout
+          states[temp_connection] = states[connection] = temp_connection
           yield temp_connection
         ensure
           connection.pool.checkin temp_connection
+          states[temp_connection] = states[connection] = nil
         end
       else
-        yield connection
+        begin
+          states[connection] = connection
+          yield connection
+        ensure
+          states[connection] = nil
+        end
       end
-    ensure
-      Thread.current[:active_record_views_without_transaction] = nil
     end
   end
 

data/spec/active_record_views_spec.rb

@@ -241,5 +241,37 @@ describe ActiveRecordViews do
         end
       end
     end
+
+    it 'yields same isolated connection if called recursively on original connection inside transaction' do
+      original_connection.transaction do
+        ActiveRecordViews.without_transaction original_connection do |new_connection_1|
+          expect(new_connection_1).to_not eq original_connection
+          ActiveRecordViews.without_transaction original_connection do |new_connection_2|
+            expect(new_connection_2).to eq new_connection_1
+          end
+        end
+      end
+    end
+
+    it 'yields different isolated connection if called recursively on different connections inside transcation' do
+      begin
+        original_connection_2 = original_connection.pool.checkout
+
+        original_connection.transaction do
+          ActiveRecordViews.without_transaction original_connection do |new_connection_1|
+            expect(new_connection_1).to_not eq original_connection
+            original_connection_2.transaction do
+              ActiveRecordViews.without_transaction original_connection_2 do |new_connection_2|
+                expect(new_connection_2).to_not eq original_connection
+                expect(new_connection_2).to_not eq original_connection_2
+                expect(new_connection_2).to_not eq new_connection_1
+              end
+            end
+          end
+        end
+      ensure
+        original_connection.pool.checkin original_connection_2
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -107,6 +107,7 @@ files:
 - gemfiles/rails4_2.gemfile
 - lib/active_record_views.rb
 - lib/active_record_views/checksum_cache.rb
+- lib/active_record_views/database_cleaner/truncation_extension.rb
 - lib/active_record_views/extension.rb
 - lib/active_record_views/railtie.rb
 - lib/active_record_views/registered_view.rb