activerecord_views 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b2627c1dce47cf8e2c072dc3e47c36792dac3d2f1ff21271dc0c3268e502f386
-  data.tar.gz: e7faba517dfd15a41741c87e7657dd9e190e8b5a1047c155e18f8bfd300de3be
+SHA1:
+  metadata.gz: 3311e70b5371fad5e3e179b012cd73157503ba33
+  data.tar.gz: 570acd248425e41f312240c6ffd3f6ec76c4e99a
 SHA512:
-  metadata.gz: d93b3071f407c190a08c52f8bc998600049971bd1751ecf1f1a1b05682061b4e75d1d5ec2aa46d32feb54b24ba2153045644a0c22e1e6a595e4e6b212b44f857
-  data.tar.gz: f3df8e14207b91c5be93f40473ef63f4b3d56a52075d875c2e624edda16fe1594e9cb01bd9faa08ecf0408354cb7dd244c7d2dec1d0b14cb3635ce23aabe6c5f
+  metadata.gz: 32f32cc5728ec20db1b1342baaad6763c75116ce411fd59939449a71def61571405017654ffb8b47744b2ae0dbb394e0873b770bf1574a48ac626f716edf9355
+  data.tar.gz: c4f8fb9024b8bdcd0c540e520e4a5280d406b55879ff1ff438ff44b405fd59c10a6cbde8d217906bdcd8e76c3210a073b9be9a8c10edb2e7087f18c84a1134bd

data/.gitignore

@@ -2,4 +2,5 @@
 Gemfile.lock
 gemfiles/*.gemfile.lock
 pkg
+spec/internal/db/schema.rb
 spec/internal/log/*.log

data/Appraisals

@@ -1,15 +1,15 @@
-appraise 'rails3_2' do
-  gem 'rails', '~> 3.2.0'
+appraise 'rails4_2' do
+  gem 'rails', '~> 4.2.0'
 end
 
-appraise 'rails4_0' do
-  gem 'rails', '~> 4.0.0'
+appraise 'rails5_0' do
+  gem 'rails', '~> 5.0.0'
 end
 
-appraise 'rails4_1' do
-  gem 'rails', '~> 4.1.0'
+appraise 'rails5_1' do
+  gem 'rails', '~> 5.1.0'
 end
 
-appraise 'rails4_2' do
-  gem 'rails', '~> 4.2.0'
+appraise 'rails5_2' do
+  gem 'rails', '~> 5.2.0'
 end

data/activerecord_views.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activerecord', ['>= 3.2', '< 4.3']
+  gem.add_dependency 'activerecord', ['>= 4.2', '< 5.3']
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'rspec-rails', '>= 2.14'

data/gemfiles/rails4_2.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails3_2.gemfile → rails5_0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.0"
+gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails4_0.gemfile → rails5_1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails4_1.gemfile → rails5_2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 5.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/active_record_views.rb

@@ -320,4 +320,12 @@ module ActiveRecordViews
       end
     end
   end
+
+  def self.drop_unregistered_views!
+    connection = ActiveRecord::Base.connection
+
+    connection.select_rows('SELECT name, class_name FROM active_record_views')
+      .reject { |name, class_name| Object.const_defined? class_name }
+      .each { |name, class_name| ActiveRecordViews.drop_view connection, name }
+  end
 end

data/lib/active_record_views/checksum_cache.rb

@@ -6,7 +6,11 @@ module ActiveRecordViews
     end
 
     def init_state_table!
-      table_exists = @connection.table_exists?('active_record_views')
+      table_exists = if Rails::VERSION::MAJOR >= 5
+        @connection.data_source_exists?('active_record_views')
+      else
+        @connection.table_exists?('active_record_views')
+      end
 
       if table_exists && !@connection.column_exists?('active_record_views', 'class_name')
         @connection.transaction :requires_new => true do

data/lib/active_record_views/extension.rb

@@ -4,6 +4,18 @@ module ActiveRecordViews
   module Extension
     extend ActiveSupport::Concern
 
+    mattr_accessor :create_enabled
+    self.create_enabled = true
+
+    mattr_accessor :create_queue
+    self.create_queue = []
+
+    def self.process_create_queue!
+      while create_args = create_queue.shift
+        ActiveRecordViews.create_view ActiveRecord::Base.connection, *create_args
+      end
+    end
+
     def self.currently_migrating?
       if defined?(Rake) && Rake.respond_to?(:application)
         Rake.application.top_level_tasks.any? { |task_name| task_name =~ /^db:migrate($|:)/ }
@@ -12,8 +24,6 @@ module ActiveRecordViews
 
     module ClassMethods
       def is_view(*args)
-        return if ActiveRecordViews::Extension.currently_migrating?
-
         cattr_accessor :view_options
         self.view_options = args.extract_options!
 
@@ -26,7 +36,12 @@ module ActiveRecordViews
           ActiveRecordViews.read_sql_file(sql_path)
         end
 
-        ActiveRecordViews.create_view self.connection, self.table_name, self.name, sql, self.view_options
+        create_args = [self.table_name, self.name, sql, self.view_options]
+        if ActiveRecordViews::Extension.create_enabled && !ActiveRecordViews::Extension.currently_migrating?
+          ActiveRecordViews.create_view self.connection, *create_args
+        else
+          ActiveRecordViews::Extension.create_queue << create_args
+        end
       end
 
       def refresh_view!(options = {})
@@ -60,7 +75,11 @@ module ActiveRecordViews
           raise ArgumentError, 'not a materialized view'
         end
 
-        ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+        if Rails::VERSION::MAJOR < 5
+          value = ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+        end
+
+        value
       end
 
       def refreshed_at

data/lib/active_record_views/railtie.rb

@@ -7,6 +7,7 @@ module ActiveRecordViews
       end
 
       ActiveSupport.on_load :action_controller do
+        ActiveRecordViews::Extension.create_enabled = !app.config.cache_classes
         unless app.config.cache_classes
           ActionDispatch::Callbacks.before do
             ActiveRecordViews.reload_stale_views!

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/lib/tasks/active_record_views.rake

@@ -1,5 +1,19 @@
+Rake::Task['db:migrate'].enhance do
+  if Rails.application.config.cache_classes
+    Rails.application.eager_load!
+    ActiveRecordViews::Extension.process_create_queue!
+    ActiveRecordViews.drop_unregistered_views!
+  end
+end
+
 Rake::Task['db:structure:dump'].enhance do
-  if ActiveRecord::Base.connection.table_exists?('active_record_views')
+  table_exists = if Rails::VERSION::MAJOR >= 5
+    ActiveRecord::Base.connection.data_source_exists?('active_record_views')
+  else
+    ActiveRecord::Base.connection.table_exists?('active_record_views')
+  end
+
+  if table_exists
     filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
 
     if defined? ActiveRecord::Tasks::DatabaseTasks

data/spec/active_record_views_checksum_cache_spec.rb

@@ -4,13 +4,21 @@ describe ActiveRecordViews::ChecksumCache do
   let(:connection) { ActiveRecord::Base.connection }
 
   describe 'initialisation' do
+    def metadata_table_exists?
+      if Rails::VERSION::MAJOR >= 5
+        connection.data_source_exists?('active_record_views')
+      else
+        connection.table_exists?('active_record_views')
+      end
+    end
+
     context 'no existing table' do
       it 'creates the table' do
         expect(ActiveRecord::Base.connection).to receive(:execute).with(/\ACREATE TABLE active_record_views/).once.and_call_original
 
-        expect(connection.table_exists?('active_record_views')).to eq false
+        expect(metadata_table_exists?).to eq false
         ActiveRecordViews::ChecksumCache.new(connection)
-        expect(connection.table_exists?('active_record_views')).to eq true
+        expect(metadata_table_exists?).to eq true
 
         expect(connection.column_exists?('active_record_views', 'class_name')).to eq true
         expect(connection.column_exists?('active_record_views', 'options')).to eq true
@@ -20,7 +28,7 @@ describe ActiveRecordViews::ChecksumCache do
     context 'existing table with current structure' do
       before do
         ActiveRecordViews::ChecksumCache.new(connection)
-        expect(connection.table_exists?('active_record_views')).to eq true
+        expect(metadata_table_exists?).to eq true
       end
 
       it 'does not recreate the table' do
@@ -42,9 +50,6 @@ describe ActiveRecordViews::ChecksumCache do
 
       it 'drops existing managed views recreates the table' do
         expect(ActiveRecord::Base.connection).to receive(:execute).with(/\ABEGIN\z/).once.and_call_original
-        if Rails::VERSION::MAJOR < 4
-          expect(ActiveRecord::Base.connection).to receive(:execute).with('SELECT name FROM active_record_views;', nil).once.and_call_original
-        end
         expect(ActiveRecord::Base.connection).to receive(:execute).with(/\ADROP VIEW IF EXISTS test_view CASCADE;\z/).once.and_call_original
         expect(ActiveRecord::Base.connection).to receive(:execute).with(/\ADROP TABLE active_record_views;\z/).once.and_call_original
         expect(ActiveRecord::Base.connection).to receive(:execute).with(/\ACREATE TABLE active_record_views/).once.and_call_original

data/spec/active_record_views_extension_spec.rb

@@ -353,5 +353,32 @@ describe ActiveRecordViews::Extension do
         dependency_check_good_unmanageds
       ]
     end
+
+    context 'without create_enabled' do
+      around do |example|
+        without_create_enabled(&example)
+      end
+
+      it 'delays create_view until process_create_queue! is called' do
+        allow(ActiveRecordViews).to receive(:create_view).and_call_original
+
+        expect(ActiveRecordViews::Extension.create_queue.size).to eq 0
+        expect(ActiveRecordViews).to_not have_received(:create_view)
+
+        expect {
+          expect(HeredocTestModel.first.name).to eq 'Here document'
+        }.to raise_error ActiveRecord::StatementInvalid
+
+        expect(ActiveRecordViews::Extension.create_queue.size).to eq 1
+        expect(ActiveRecordViews).to_not have_received(:create_view)
+
+        ActiveRecordViews::Extension.process_create_queue!
+
+        expect(ActiveRecordViews::Extension.create_queue.size).to eq 0
+        expect(ActiveRecordViews).to have_received(:create_view)
+
+        expect(HeredocTestModel.first.name).to eq 'Here document'
+      end
+    end
   end
 end

data/spec/active_record_views_spec.rb

@@ -92,14 +92,14 @@ describe ActiveRecordViews do
         it 'updates view with compatible change' do
           create_test_view 'select 2 as id'
           expect(test_view_sql).to eq 'SELECT 2 AS id;'
-          expect(connection.select_value('SELECT id2 FROM dependant2a')).to eq '4'
+          expect(Integer(connection.select_value('SELECT id2 FROM dependant2a'))).to eq 4
         end
 
         describe 'changes incompatible with CREATE OR REPLACE' do
           it 'updates view with new column added before existing' do
             create_test_view "select 'foo'::text as name, 3 as id"
             expect(test_view_sql).to eq "SELECT 'foo'::text AS name, 3 AS id;"
-            expect(connection.select_value('SELECT id2 FROM dependant2a')).to eq '6'
+            expect(Integer(connection.select_value('SELECT id2 FROM dependant2a'))).to eq 6
           end
 
           it 'fails to update view if column used by dependant view is removed' do
@@ -107,7 +107,7 @@ describe ActiveRecordViews do
               create_test_view "select 'foo'::text as name"
             }.to raise_error ActiveRecord::StatementInvalid, /column test.id does not exist/
             expect(test_view_sql).to eq 'SELECT 1 AS id;'
-            expect(connection.select_value('SELECT id2 FROM dependant2a')).to eq '2'
+            expect(Integer(connection.select_value('SELECT id2 FROM dependant2a'))).to eq 2
           end
         end
 

data/spec/internal/Rakefile

@@ -8,8 +8,7 @@ Combustion::Database.instance_eval do
 end
 
 Combustion.initialize! :active_record, :action_controller do
-  config.cache_classes = false
-  config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR < 4
+  config.cache_classes = ENV['CACHE_CLASSES'] == 'true'
 end
 
 load 'active_record/railties/databases.rake'

data/spec/internal/app/models/missing_file_test_model.rb

@@ -1,3 +1,5 @@
-class MissingFileTestModel < ActiveRecord::Base
-  is_view
+unless ActiveRecordViews::Extension.currently_migrating?
+  class MissingFileTestModel < ActiveRecord::Base
+    is_view
+  end
 end

data/spec/spec_helper.rb

@@ -2,13 +2,16 @@ require 'bundler'
 Bundler.setup
 
 require 'rails/version'
-$VERBOSE = true unless Rails::VERSION::MAJOR < 4
+$VERBOSE = true
 
 require 'combustion'
 require 'active_record_views'
+
+FileUtils.mkdir_p 'spec/internal/db'
+File.write 'spec/internal/db/schema.rb', ''
+
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
-  config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR < 4
 end
 require 'rspec/rails'
 
@@ -16,8 +19,12 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   config.before do
-    ActionDispatch::Reloader.cleanup!
-    ActionDispatch::Reloader.prepare!
+    if Rails::VERSION::MAJOR >= 5
+      Rails.application.reloader.reload!
+    else
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+    end
 
     connection = ActiveRecord::Base.connection
 
@@ -41,7 +48,6 @@ RSpec.configure do |config|
       connection.execute "DROP MATERIALIZED VIEW IF EXISTS #{connection.quote_table_name view_name} CASCADE"
     end
   end
-
 end
 
 def test_request
@@ -92,3 +98,11 @@ def without_dependency_checks
 ensure
   allow(ActiveRecordViews).to receive(:check_dependencies).and_call_original
 end
+
+def without_create_enabled
+  old_enabled = ActiveRecordViews::Extension.create_enabled
+  ActiveRecordViews::Extension.create_enabled = false
+  yield
+ensure
+  ActiveRecordViews::Extension.create_enabled = old_enabled
+end

data/spec/tasks_spec.rb

@@ -1,17 +1,68 @@
 require 'spec_helper'
 
-describe 'rake db:structure:dump' do
-  it 'copies over activerecord_views data' do
-    ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view', 'TestView', 'SELECT 1'
-
-    FileUtils.rm_f 'spec/internal/db/structure.sql'
-    system("rake -f spec/internal/Rakefile db:structure:dump")
+describe 'rake tasks' do
+  def rake(task_name, cache_classes: false)
+    system(*%W[
+      rake
+      -f spec/internal/Rakefile
+      #{task_name}
+      CACHE_CLASSES=#{cache_classes}
+    ])
     raise unless $?.success?
+  end
+
+  describe 'db:migrate' do
+    def view_names
+      ActiveRecord::Base.connection.select_values(<<~SQL.squish)
+        SELECT table_name
+        FROM information_schema.views
+        WHERE table_schema = 'public'
+      SQL
+    end
+
+    it 'does not create any database views' do
+      expect(view_names).to be_empty
+      rake 'db:migrate'
+      expect(view_names).to be_empty
+    end
+
+    it 'creates database views when classes are cached (production mode)' do
+      expect(view_names).to be_empty
+      rake 'db:migrate', cache_classes: true
+      expect(view_names).to_not be_empty
+    end
+
+    context 'with unregistered view' do
+      before do
+        ActiveRecordViews.create_view ActiveRecord::Base.connection, 'old_view', 'OldView', 'SELECT 42 AS id'
+      end
+
+      it 'does not drop unregistered views' do
+        expect(view_names).to include 'old_view'
+        rake 'db:migrate'
+        expect(view_names).to include 'old_view'
+      end
+
+      it 'drops unregistered views when classes are cached (production mode)' do
+        expect(view_names).to include 'old_view'
+        rake 'db:migrate', cache_classes: true
+        expect(view_names).to_not include 'old_view'
+      end
+    end
+  end
+
+  describe 'db:structure:dump' do
+    it 'copies over activerecord_views data' do
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view', 'TestView', 'SELECT 1'
+
+      FileUtils.rm_f 'spec/internal/db/structure.sql'
+      rake 'db:structure:dump'
 
-    sql = File.read('spec/internal/db/structure.sql')
-    FileUtils.rm_f 'spec/internal/db/structure.sql'
+      sql = File.read('spec/internal/db/structure.sql')
+      FileUtils.rm_f 'spec/internal/db/structure.sql'
 
-    expect(sql).to match(/COPY public\.active_record_views.+test_view\tTestView/m)
-    expect(sql).to match(/UPDATE public\.active_record_views SET refreshed_at = NULL/)
+      expect(sql).to match(/COPY public\.active_record_views.+test_view\tTestView/m)
+      expect(sql).to match(/UPDATE public\.active_record_views SET refreshed_at = NULL/)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -101,10 +101,10 @@ files:
 - README.markdown
 - Rakefile
 - activerecord_views.gemspec
-- gemfiles/rails3_2.gemfile
-- gemfiles/rails4_0.gemfile
-- gemfiles/rails4_1.gemfile
 - gemfiles/rails4_2.gemfile
+- gemfiles/rails5_0.gemfile
+- gemfiles/rails5_1.gemfile
+- gemfiles/rails5_2.gemfile
 - lib/active_record_views.rb
 - lib/active_record_views/checksum_cache.rb
 - lib/active_record_views/database_cleaner/truncation_extension.rb
@@ -132,7 +132,6 @@ files:
 - spec/internal/app/models/namespace/test_model.rb
 - spec/internal/app/models/namespace/test_model.sql
 - spec/internal/config/database.yml
-- spec/internal/db/schema.rb
 - spec/spec_helper.rb
 - spec/tasks_spec.rb
 homepage: http://github.com/jasoncodes/activerecord_views
@@ -155,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord
@@ -178,6 +177,5 @@ test_files:
 - spec/internal/app/models/namespace/test_model.rb
 - spec/internal/app/models/namespace/test_model.sql
 - spec/internal/config/database.yml
-- spec/internal/db/schema.rb
 - spec/spec_helper.rb
 - spec/tasks_spec.rb

data/spec/internal/db/schema.rb

@@ -1,2 +0,0 @@
-ActiveRecord::Schema.define do
-end