scenic 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e48c4898ced79e149309b431569eff692ef95ff075a57ad0a02f2b80b59a262
-  data.tar.gz: 7de8b684edffe599452d125aaed7f32111bfc4f99ef4b7e475ca0b2882c7c137
+  metadata.gz: 75afe5531011de8c35f2272af574763575bdb4d9f9650eeb2845a3f163b1e941
+  data.tar.gz: a7ded9f2177997aba8c3c424e04c2aed14f08a2f452d4ab74d2030d692fe1e7c
 SHA512:
-  metadata.gz: 5a3f7c1e233cd63be18a94ac39c44f36baff1f1c1ba6cdcc71aa31063c52c2220b3321455a2e904366c157ed419d0a20454dccfdd22e66e42508584865f0aabe
-  data.tar.gz: 0ee497506b13cdf2b64c49aea4b18fc351cf620b902acb962a8c9b5281c319b37b473f56ecfbcb873f4561e521780a54c6c6269d43ac841cfc4a3508213a61af
+  metadata.gz: f1d00648e7f6c73b76242d43b3d49456afbc531a3a562dd43525b1f45f0b440f8650f1d4fb9459780aba7e46e87b49d33b3f7b92693ae43f03d51ea1fee39a67
+  data.tar.gz: 7da8bfdf0cac0c7bea6a7e67f09a37767943d5e6f2608ffb478db0b2884a93bc76e06b2b0d8fcf52a7d95d7b10d154d3b7cd2065de022a44d669f61b88699cfa

data/.travis.yml

@@ -18,21 +18,17 @@ notifications:
     - false
 sudo: false
 rvm:
-  - 2.6.1
-  - 2.5.3
+  - 2.7.0
   - 2.4.5
-  - 2.3.8
 gemfile:
-  - gemfiles/rails42.gemfile
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
   - gemfiles/rails52.gemfile
+  - gemfiles/rails60.gemfile
   - gemfiles/rails_edge.gemfile
 matrix:
   allow_failures:
     - gemfile: gemfiles/rails_edge.gemfile
   exclude:
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.4.5
+      gemfile: gemfiles/rails60.gemfile
     - rvm: 2.4.5
       gemfile: gemfiles/rails_edge.gemfile

data/Appraisals

@@ -1,24 +1,14 @@
-appraise "rails42" do
-  gem "activerecord", "~> 4.2.0"
-  gem "railties", "~> 4.2.0"
-end
-
-appraise "rails50" do
-  gem "activerecord", "~> 5.0.0"
-  gem "railties", "~> 5.0.0"
-end
-
-appraise "rails51" do
-  gem "activerecord", "~> 5.1.0"
-  gem "railties", "~> 5.1.0"
-end
-
 appraise "rails52" do
   gem "activerecord", "~> 5.2.0"
   gem "railties", "~> 5.2.0"
 end
 
 if RUBY_VERSION >= "2.5.0"
+  appraise "rails60" do
+    gem "activerecord", "~> 6.0.0"
+    gem "railties", "~> 6.0.0"
+  end
+
   appraise "rails-edge" do
     gem "rails", git: "https://github.com/rails/rails"
     gem "arel", git: "https://github.com/rails/arel"

data/{NEWS.md → CHANGELOG.md}

@@ -1,9 +1,22 @@
-# News
+# Changelog
 
 The noteworthy changes for each Scenic version are included here. For a complete
-changelog, see the [CHANGELOG] for each version via the version links.
+changelog, see the [commits] for each version via the version links.
 
-[CHANGELOG]: https://github.com/scenic-views/scenic/commits/master
+[commits]: https://github.com/scenic-views/scenic/commits/master
+
+## [1.5.2] - February 6, 2019
+
+### Fixed
+
+- The schema statement `create_view` is now reversible when passed a `version`
+  argument.
+- Calling `refresh_materialized_view` with both `concurrently` and `cascade` set
+  to `true` now correctly cascades the concurrent refresh to dependent views.
+- File generation and lookup now operates correctly for schema-qualified names
+  like `warehouse.archived_posts`.
+
+[1.5.2]: https://github.com/scenic-views/scenic/compare/v1.5.1...v1.5.2
 
 ## [1.5.1] - February 10, 2019
 

data/gemfiles/{rails42.gemfile → rails60.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.0"
-gem "railties", "~> 4.2.0"
+gem "activerecord", "~> 6.0.0"
+gem "railties", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/generators/scenic/view/view_generator.rb

@@ -73,6 +73,12 @@ module Scenic
 
       private
 
+      alias singular_name file_name
+
+      def file_name
+        super.tr(".", "_")
+      end
+
       def views_directory_path
         @views_directory_path ||= Rails.root.join("db", "views")
       end
@@ -93,10 +99,6 @@ module Scenic
         Scenic::Definition.new(plural_file_name, previous_version)
       end
 
-      def plural_file_name
-        @plural_file_name ||= file_name.pluralize.tr(".", "_")
-      end
-
       def destroying?
         behavior == :revoke
       end

data/lib/scenic/adapters/postgres.rb

@@ -209,8 +209,9 @@ module Scenic
       # @return [void]
       def refresh_materialized_view(name, concurrently: false, cascade: false)
         raise_unless_materialized_views_supported
+
         if cascade
-          refresh_dependencies_for(name)
+          refresh_dependencies_for(name, concurrently: concurrently)
         end
 
         if concurrently
@@ -242,11 +243,12 @@ module Scenic
         end
       end
 
-      def refresh_dependencies_for(name)
+      def refresh_dependencies_for(name, concurrently: false)
         Scenic::Adapters::Postgres::RefreshDependencies.call(
           name,
           self,
           connection,
+          concurrently: concurrently,
         )
       end
     end

data/lib/scenic/adapters/postgres/refresh_dependencies.rb

@@ -2,25 +2,29 @@ module Scenic
   module Adapters
     class Postgres
       class RefreshDependencies
-        def self.call(name, adapter, connection)
-          new(name, adapter, connection).call
+        def self.call(name, adapter, connection, concurrently: false)
+          new(name, adapter, connection, concurrently: concurrently).call
         end
 
-        def initialize(name, adapter, connection)
+        def initialize(name, adapter, connection, concurrently:)
           @name = name
           @adapter = adapter
           @connection = connection
+          @concurrently = concurrently
         end
 
         def call
           dependencies.each do |dependency|
-            adapter.refresh_materialized_view(dependency)
+            adapter.refresh_materialized_view(
+              dependency,
+              concurrently: concurrently,
+            )
           end
         end
 
         private
 
-        attr_reader :name, :adapter, :connection
+        attr_reader :name, :adapter, :connection, :concurrently
 
         class DependencyParser
           def initialize(raw_dependencies, view_to_refresh)

data/lib/scenic/command_recorder.rb

@@ -20,7 +20,8 @@ module Scenic
     end
 
     def invert_create_view(args)
-      [:drop_view, args]
+      drop_view_args = StatementArguments.new(args).remove_version.to_a
+      [:drop_view, drop_view_args]
     end
 
     def invert_drop_view(args)

data/lib/scenic/command_recorder/statement_arguments.rb

@@ -22,8 +22,12 @@ module Scenic
         StatementArguments.new([view, options_for_revert])
       end
 
+      def remove_version
+        StatementArguments.new([view, options_without_version])
+      end
+
       def to_a
-        @args.to_a
+        @args.to_a.dup.delete_if(&:empty?)
       end
 
       private
@@ -38,6 +42,10 @@ module Scenic
           revert_options.delete(:revert_to_version)
         end
       end
+
+      def options_without_version
+        options.except(:version)
+      end
     end
   end
 end

data/lib/scenic/configuration.rb

@@ -2,7 +2,7 @@ module Scenic
   class Configuration
     # The Scenic database adapter instance to use when executing SQL.
     #
-    # Defualts to an instance of {Adapters::Postgres}
+    # Defaults to an instance of {Adapters::Postgres}
     # @return Scenic adapter
     attr_accessor :database
 

data/lib/scenic/definition.rb

@@ -29,7 +29,7 @@ module Scenic
     private
 
     def filename
-      "#{@name}_v#{version}.sql"
+      "#{@name.to_s.tr('.', '_')}_v#{version}.sql"
     end
   end
 end

data/lib/scenic/version.rb

@@ -1,3 +1,3 @@
 module Scenic
-  VERSION = "1.5.1".freeze
+  VERSION = "1.5.2".freeze
 end

data/spec/generators/scenic/view/view_generator_spec.rb

@@ -38,14 +38,20 @@ describe Scenic::Generators::ViewGenerator, :generator do
   end
 
   context "for views created in a schema other than 'public'" do
-    it "creates view definition and migration files" do
-      migration = file("db/migrate/create_non_public_searches.rb")
+    it "creates a view definition" do
       view_definition = file("db/views/non_public_searches_v01.sql")
 
       run_generator ["non_public.search"]
 
-      expect(migration).to be_a_migration
       expect(view_definition).to exist
     end
+
+    it "creates a migration file" do
+      run_generator ["non_public.search"]
+
+      migration = migration_file("db/migrate/create_non_public_searches.rb")
+      expect(migration).to contain(/class CreateNonPublicSearches/)
+      expect(migration).to contain(/create_view "non_public.searches"/)
+    end
   end
 end

data/spec/scenic/adapters/postgres/refresh_dependencies_spec.rb

@@ -33,19 +33,24 @@ module Scenic
           )
 
           expect(adapter).to receive(:refresh_materialized_view)
-            .with("public.first").ordered
+            .with("public.first", concurrently: true).ordered
           expect(adapter).to receive(:refresh_materialized_view)
-            .with("public.second").ordered
+            .with("public.second", concurrently: true).ordered
           expect(adapter).to receive(:refresh_materialized_view)
-            .with("public.third").ordered
+            .with("public.third", concurrently: true).ordered
           expect(adapter).to receive(:refresh_materialized_view)
-            .with("public.fourth_1").ordered
+            .with("public.fourth_1", concurrently: true).ordered
           expect(adapter).to receive(:refresh_materialized_view)
-            .with("public.x_fourth").ordered
+            .with("public.x_fourth", concurrently: true).ordered
         end
 
         it "refreshes in the right order when called without namespace" do
-          described_class.call(:fourth, adapter, ActiveRecord::Base.connection)
+          described_class.call(
+            :fourth,
+            adapter,
+            ActiveRecord::Base.connection,
+            concurrently: true,
+          )
         end
 
         it "refreshes in the right order when called with namespace" do
@@ -53,6 +58,7 @@ module Scenic
             "public.fourth",
             adapter,
             ActiveRecord::Base.connection,
+            concurrently: true,
           )
         end
       end

data/spec/scenic/adapters/postgres_spec.rb

@@ -119,8 +119,14 @@ module Scenic
           connectable = double("Connectable", connection: connection)
           adapter = Postgres.new(connectable)
           expect(Scenic::Adapters::Postgres::RefreshDependencies)
-            .to receive(:call).with(:tests, adapter, connection)
-          adapter.refresh_materialized_view(:tests, cascade: true)
+            .to receive(:call)
+            .with(:tests, adapter, connection, concurrently: true)
+
+          adapter.refresh_materialized_view(
+            :tests,
+            cascade: true,
+            concurrently: true,
+          )
         end
 
         context "refreshing concurrently" do

data/spec/scenic/command_recorder_spec.rb

@@ -8,11 +8,25 @@ describe Scenic::CommandRecorder do
       expect(recorder.commands).to eq [[:create_view, [:greetings], nil]]
     end
 
-    it "reverts to drop_view" do
+    it "reverts to drop_view when not passed a version" do
       recorder.revert { recorder.create_view :greetings }
 
       expect(recorder.commands).to eq [[:drop_view, [:greetings]]]
     end
+
+    it "reverts to drop_view when passed a version" do
+      recorder.revert { recorder.create_view :greetings, version: 2 }
+
+      expect(recorder.commands).to eq [[:drop_view, [:greetings]]]
+    end
+
+    it "reverts materialized views appropriately" do
+      recorder.revert { recorder.create_view :greetings, materialized: true }
+
+      expect(recorder.commands).to eq [
+        [:drop_view, [:greetings, materialized: true]],
+      ]
+    end
   end
 
   describe "#drop_view" do

data/spec/scenic/definition_spec.rb

@@ -29,6 +29,12 @@ module Scenic
 
         expect(definition.path).to eq expected
       end
+
+      it "handles schema qualified view names" do
+        definition = Definition.new("non_public.searches", 1)
+
+        expect(definition.path).to eq "db/views/non_public_searches_v01.sql"
+      end
     end
 
     describe "full_path" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scenic
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Derek Prior
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -195,11 +195,11 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
-- NEWS.md
 - README.md
 - Rakefile
 - bin/appraisal
@@ -207,10 +207,8 @@ files:
 - bin/rspec
 - bin/setup
 - bin/yard
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/generators/scenic/generators.rb
 - lib/generators/scenic/materializable.rb

data/gemfiles/rails50.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-gem "railties", "~> 5.0.0"
-
-gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.0"
-gem "railties", "~> 5.1.0"
-
-gemspec path: "../"