activerecord_views 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e64bd87ba9a26795e83b579cc0047078b712c46f7e63be89f9ba7a5aad7de6d7
-  data.tar.gz: a7039933d362f05912e01469ee20f7b66f30004d9e1b036b33e8cc73b8641ce0
+  metadata.gz: fc8196b50d197fd74c7c92238a69124295490b6a991f1618fae1daf610ad041d
+  data.tar.gz: 235d0e987824299051a1249e9f955a11ccc8966e77ffb0939485797f5285e559
 SHA512:
-  metadata.gz: 2fa8934e9212705d81769c05fcb6271dd42f6baa2dc7525c11a8a78166c65bfb46482fc50caa96d525c182aabf746663fab4431e57c1fb7cae2fcfa35c580fa0
-  data.tar.gz: f7f9b27dbe7a1b47c77592cae929f6f2b6cfa2c83cbcbd298eb84d521521eba5f0196cbdb475097fd875558747c7e05ffd77390a57efff3077fabc918cb7d8f7
+  metadata.gz: 7f9370196f53175590f98636c67d98885c7a6e0ac29a030baaea0357536e643500eb4f937d06da114a0054b5febd6b91c1c13abcb3f5853118c4e9685ed1ac82
+  data.tar.gz: 3f751a3bbdd5761dff8e3e73d587cdc335a68d9b3d08fbfc3a6b7285f1e5de22236857dfc7f842024a5486db6e6ebb7c41186147d56640c1316f40941e20083a

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.5
+ruby 2.7.7

data/Appraisals

@@ -11,5 +11,5 @@ appraise 'rails6_1' do
 end
 
 appraise 'rails7_0' do
-  gem 'rails', '~> 7.0.0.rc1'
+  gem 'rails', '~> 7.0.0'
 end

data/activerecord_views.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'rspec-rails', '>= 2.14'
-  gem.add_development_dependency 'super_diff'
   gem.add_development_dependency 'combustion', '>= 0.5.1'
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'warning'

data/gemfiles/rails7_0.gemfile

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

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/tasks/active_record_views.rake

@@ -69,6 +69,8 @@ Rake::Task[schema_rake_task].enhance do
 
       pg_tasks.send(:remove_sql_header_comments, active_record_views_dump.path)
 
+      active_record_views_dump_content = active_record_views_dump.read
+
       # Substitute out any timestamps that were dumped from the active_record_views table
       #
       # Before:
@@ -82,12 +84,17 @@ Rake::Task[schema_rake_task].enhance do
       #     COPY public.active_record_views (name, class_name, checksum, options, refreshed_at) FROM stdin;
       #     test_view       TestView        42364a017b73ef516a0eca9827e6fa00623257ee        {"dependencies":[]}     \N
       #     \.
-      active_record_views_dump_content = active_record_views_dump.read
       if active_record_views_dump_content !~ /^COPY public.active_record_views \(.+, refreshed_at\) FROM stdin;$/
         raise 'refreshed_at is not final column'
       end
       active_record_views_dump_content.gsub!(/\t\d\d\d\d-\d\d-\d\d.*$/, "\t\\N")
 
+      active_record_views_dump_content = active_record_views_dump_content
+        .lines
+        .chunk { |line| line.include?("\t") }
+        .flat_map { |is_data, lines| is_data ? lines.sort : lines }
+        .join
+
       File.open filename, 'a' do |io|
         io.puts active_record_views_dump_content
       end

data/spec/spec_helper.rb

@@ -18,12 +18,12 @@ Rails.application.config.paths['app/models'] << 'app/models_temp'
 
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
+  config.secret_key_base = 'dummy'
   if Gem::Version.new(Rails.version) >= Gem::Version.new("6.1")
     config.active_record.legacy_connection_handling = false
   end
 end
 require 'rspec/rails'
-require 'super_diff/rspec-rails'
 
 RSpec.shared_context 'sql_statements' do
   let(:sql_statements) { [] }
@@ -82,15 +82,13 @@ RSpec.configure do |config|
 end
 
 def test_request
-  Rails.application.reloader.wrap do
-    status, headers, body = Rails.application.call(
-      'REQUEST_METHOD' => 'GET',
-      'PATH_INFO' => '/',
-      'rack.input' => StringIO.new,
-    )
-    expect(status).to eq 204
-    body.close
-  end
+  status, headers, body = Rails.application.call(
+    'REQUEST_METHOD' => 'GET',
+    'PATH_INFO' => '/',
+    'rack.input' => StringIO.new,
+  )
+  expect(status).to eq 204
+  body.close
 end
 
 def update_file(file, new_content)

data/spec/tasks_spec.rb

@@ -62,7 +62,9 @@ describe 'rake tasks' do
       FileUtils.rm_f 'spec/internal/db/schema.rb'
       FileUtils.rm_f 'spec/internal/db/structure.sql'
 
-      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view', 'TestView', 'SELECT 1'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view_1', 'TestView1', 'SELECT 1'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view_3', 'TestView3', 'SELECT 3'
+      ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view_2', 'TestView2', 'SELECT 2'
     end
 
     after do
@@ -79,11 +81,12 @@ describe 'rake tasks' do
       sql = File.read('spec/internal/db/structure.sql')
       expect(sql).to match(/CREATE TABLE public\.schema_migrations/)
       expect(sql).to match(/CREATE VIEW public\.test_view/)
-      expect(sql).to match(/COPY public\.active_record_views.+test_view\tTestView\t.*\t.*\t\\N$/m)
+      expect(sql).to match(/COPY public\.active_record_views.+test_view_1\tTestView1\t.*\t.*\t\\N$/m)
+      expect(sql).to match(/^test_view_1.+^test_view_2.+^test_view_3/m)
     end
 
     it 'clears refreshed_at values' do
-      ActiveRecord::Base.connection.execute "UPDATE active_record_views SET refreshed_at = current_timestamp AT TIME ZONE 'UTC' WHERE name = 'test_view';"
+      ActiveRecord::Base.connection.execute "UPDATE active_record_views SET refreshed_at = current_timestamp AT TIME ZONE 'UTC' WHERE name = 'test_view_1';"
 
       rake schema_rake_task
 
@@ -96,7 +99,7 @@ describe 'rake tasks' do
       system 'psql -X -q -o /dev/null -f spec/internal/db/structure.sql activerecord_views_test'
       raise unless $?.success?
 
-      refreshed_ats = ActiveRecord::Base.connection.select_values("SELECT refreshed_at FROM active_record_views WHERE name = 'test_view'")
+      refreshed_ats = ActiveRecord::Base.connection.select_values("SELECT refreshed_at FROM active_record_views WHERE name = 'test_view_1'")
       expect(refreshed_ats).to eq [nil]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jason Weathered
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: super_diff
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord