scenic 1.4.1 → 1.5.0

data/spec/acceptance/user_manages_views_spec.rb

@@ -1,4 +1,5 @@
 require "acceptance_helper"
+require "English"
 
 describe "User manages views" do
   it "handles simple views" do
@@ -56,7 +57,7 @@ describe "User manages views" do
 
   def successfully(command)
     `RAILS_ENV=test #{command}`
-    expect($?.exitstatus).to eq(0), "'#{command}' was unsuccessful"
+    expect($CHILD_STATUS.exitstatus).to eq(0), "'#{command}' was unsuccessful"
   end
 
   def write_definition(file, contents)

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,5 @@
+if Rails::VERSION::STRING >= "5.0.0"
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/spec/generators/scenic/model/model_generator_spec.rb

@@ -6,7 +6,7 @@ module Scenic::Generators
     before do
       allow(ViewGenerator).to receive(:new)
         .and_return(
-          instance_double("Scenic::Generators::ViewGenerator").as_null_object
+          instance_double("Scenic::Generators::ViewGenerator").as_null_object,
         )
     end
 

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

@@ -31,7 +31,7 @@ describe Scenic::Generators::ViewGenerator, :generator do
 
       run_generator ["aired_episode", "--materialized"]
       migration = migration_file(
-        "db/migrate/update_aired_episodes_to_version_2.rb"
+        "db/migrate/update_aired_episodes_to_version_2.rb",
       )
       expect(migration).to contain "materialized: true"
     end

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

@@ -3,39 +3,73 @@ require "spec_helper"
 module Scenic
   module Adapters
     describe Postgres::RefreshDependencies, :db do
-      it "refreshes dependecies in the correct order" do
-        adapter = Postgres.new
+      context "view has dependencies" do
+        let(:adapter) { Postgres.new }
 
-        adapter.create_materialized_view(
-          "first",
-          "SELECT text 'hi' AS greeting",
-        )
+        before do
+          adapter.create_materialized_view(
+            "first",
+            "SELECT text 'hi' AS greeting",
+          )
+          adapter.create_materialized_view(
+            "second",
+            "SELECT * FROM first",
+          )
+          adapter.create_materialized_view(
+            "third",
+            "SELECT * FROM first UNION SELECT * FROM second",
+          )
+          adapter.create_materialized_view(
+            "fourth_1",
+            "SELECT * FROM third",
+          )
+          adapter.create_materialized_view(
+            "x_fourth",
+            "SELECT * FROM fourth_1",
+          )
+          adapter.create_materialized_view(
+            "fourth",
+            "SELECT * FROM fourth_1 UNION SELECT * FROM x_fourth",
+          )
 
-        adapter.create_materialized_view(
-          "second",
-          "SELECT * from first",
-        )
+          expect(adapter).to receive(:refresh_materialized_view)
+            .with("public.first").ordered
+          expect(adapter).to receive(:refresh_materialized_view)
+            .with("public.second").ordered
+          expect(adapter).to receive(:refresh_materialized_view)
+            .with("public.third").ordered
+          expect(adapter).to receive(:refresh_materialized_view)
+            .with("public.fourth_1").ordered
+          expect(adapter).to receive(:refresh_materialized_view)
+            .with("public.x_fourth").ordered
+        end
 
-        adapter.create_materialized_view(
-          "third",
-          "SELECT * from first UNION SELECT * from second",
-        )
+        it "refreshes in the right order when called without namespace" do
+          described_class.call(:fourth, adapter, ActiveRecord::Base.connection)
+        end
 
-        adapter.create_materialized_view(
-          "fourth",
-          "SELECT * from third",
-        )
-
-        expect(adapter).to receive(:refresh_materialized_view).
-          with("public.first").ordered
+        it "refreshes in the right order when called with namespace" do
+          described_class.call(
+            "public.fourth",
+            adapter,
+            ActiveRecord::Base.connection,
+          )
+        end
+      end
 
-        expect(adapter).to receive(:refresh_materialized_view).
-          with("public.second").ordered
+      context "view has no dependencies" do
+        it "does not raise an error" do
+          adapter = Postgres.new
 
-        expect(adapter).to receive(:refresh_materialized_view).
-          with("public.third").ordered
+          adapter.create_materialized_view(
+            "first",
+            "SELECT text 'hi' AS greeting",
+          )
 
-        described_class.call(:fourth, adapter, ActiveRecord::Base.connection)
+          expect {
+            described_class.call(:first, adapter, ActiveRecord::Base.connection)
+          }.not_to raise_error
+        end
       end
     end
   end

data/spec/scenic/adapters/postgres_spec.rb

@@ -104,8 +104,8 @@ module Scenic
           connection = double("Connection").as_null_object
           connectable = double("Connectable", connection: connection)
           adapter = Postgres.new(connectable)
-          expect(Scenic::Adapters::Postgres::RefreshDependencies).
-            to receive(:call).with(:tests, adapter, connection)
+          expect(Scenic::Adapters::Postgres::RefreshDependencies)
+            .to receive(:call).with(:tests, adapter, connection)
           adapter.refresh_materialized_view(:tests, cascade: true)
         end
 

data/spec/scenic/definition_spec.rb

@@ -22,7 +22,7 @@ module Scenic
     end
 
     describe "path" do
-      it "returns a sql file in db/views with padded version and view name"  do
+      it "returns a sql file in db/views with padded version and view name" do
         expected = "db/views/searches_v01.sql"
 
         definition = Definition.new("searches", 1)

data/spec/scenic/schema_dumper_spec.rb

@@ -15,7 +15,8 @@ describe Scenic::SchemaDumper, :db do
     ActiveRecord::SchemaDumper.dump(Search.connection, stream)
 
     output = stream.string
-    expect(output).to include 'create_view "searches"'
+
+    expect(output).to include 'create_view "searches", sql_definition: <<-SQL'
     expect(output).to include view_definition
 
     Search.connection.drop_view :searches
@@ -25,6 +26,19 @@ describe Scenic::SchemaDumper, :db do
     expect(Search.first.haystack).to eq "needle"
   end
 
+  it "dumps a create_view for a materialized view in the database" do
+    view_definition = "SELECT 'needle'::text AS haystack"
+    Search.connection.create_view :searches, materialized: true, sql_definition: view_definition
+    stream = StringIO.new
+
+    ActiveRecord::SchemaDumper.dump(Search.connection, stream)
+
+    output = stream.string
+
+    expect(output).to include 'create_view "searches", materialized: true, sql_definition: <<-SQL'
+    expect(output).to include view_definition
+  end
+
   context "with views in non public schemas" do
     it "dumps a create_view including namespace for a view in the database" do
       view_definition = "SELECT 'needle'::text AS haystack"
@@ -79,7 +93,8 @@ describe Scenic::SchemaDumper, :db do
     it "dumps a create_view for a view in the database" do
       view_definition = "SELECT 'needle'::text AS haystack"
       Search.connection.execute(
-        "CREATE SCHEMA scenic; SET search_path TO scenic, public")
+        "CREATE SCHEMA scenic; SET search_path TO scenic, public",
+      )
       Search.connection.create_view 'scenic."search in a haystack"',
         sql_definition: view_definition
       stream = StringIO.new

data/spec/scenic/statements_spec.rb

@@ -33,14 +33,14 @@ module Scenic
       it "creates version 1 of the view if neither version nor sql_defintion are provided" do
         version = 1
         definition_stub = instance_double("Definition", to_sql: "foo")
-        allow(Definition).to receive(:new).
-          with(:views, version).
-          and_return(definition_stub)
+        allow(Definition).to receive(:new)
+          .with(:views, version)
+          .and_return(definition_stub)
 
         connection.create_view :views
 
-        expect(Scenic.database).to have_received(:create_view).
-          with(:views, definition_stub.to_sql)
+        expect(Scenic.database).to have_received(:create_view)
+          .with(:views, definition_stub.to_sql)
       end
 
       it "raises an error if both version and sql_defintion are provided" do
@@ -52,12 +52,29 @@ module Scenic
 
     describe "create_view :materialized" do
       it "sends the create_materialized_view message" do
-        allow(Definition).to receive(:new)
-          .and_return(instance_double("Scenic::Definition").as_null_object)
+        definition = instance_double("Scenic::Definition", to_sql: "definition")
+        allow(Definition).to receive(:new).and_return(definition)
 
         connection.create_view(:views, version: 1, materialized: true)
 
         expect(Scenic.database).to have_received(:create_materialized_view)
+          .with(:views, definition.to_sql, no_data: false)
+      end
+    end
+
+    describe "create_view :materialized with :no_data" do
+      it "sends the create_materialized_view message" do
+        definition = instance_double("Scenic::Definition", to_sql: "definition")
+        allow(Definition).to receive(:new).and_return(definition)
+
+        connection.create_view(
+          :views,
+          version: 1,
+          materialized: { no_data: true },
+        )
+
+        expect(Scenic.database).to have_received(:create_materialized_view)
+          .with(:views, definition.to_sql, no_data: true)
       end
     end
 
@@ -95,8 +112,8 @@ module Scenic
 
         connection.update_view(:name, sql_definition: sql_definition)
 
-        expect(Scenic.database).to have_received(:update_view).
-          with(:name, sql_definition)
+        expect(Scenic.database).to have_received(:update_view)
+          .with(:name, sql_definition)
       end
 
       it "updates the materialized view in the database" do
@@ -107,14 +124,31 @@ module Scenic
 
         connection.update_view(:name, version: 3, materialized: true)
 
-        expect(Scenic.database).to have_received(:update_materialized_view).
-          with(:name, definition.to_sql)
+        expect(Scenic.database).to have_received(:update_materialized_view)
+          .with(:name, definition.to_sql, no_data: false)
+      end
+
+      it "updates the materialized view in the database with NO DATA" do
+        definition = instance_double("Definition", to_sql: "definition")
+        allow(Definition).to receive(:new)
+          .with(:name, 3)
+          .and_return(definition)
+
+        connection.update_view(
+          :name,
+          version: 3,
+          materialized: { no_data: true },
+        )
+
+        expect(Scenic.database).to have_received(:update_materialized_view)
+          .with(:name, definition.to_sql, no_data: true)
       end
 
       it "raises an error if not supplied a version or sql_defintion" do
         expect { connection.update_view :views }.to raise_error(
           ArgumentError,
-          /sql_definition or version must be specified/)
+          /sql_definition or version must be specified/,
+        )
       end
 
       it "raises an error if both version and sql_defintion are provided" do
@@ -122,7 +156,8 @@ module Scenic
           connection.update_view(
             :views,
             version: 1,
-            sql_definition: "a defintion")
+            sql_definition: "a defintion",
+          )
         end.to raise_error ArgumentError, /cannot both be set/
       end
     end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require "database_cleaner"
 
-require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("dummy/config/environment", __dir__)
 require "support/generator_spec_setup"
 require "support/view_definition_helpers"
 

data/spec/support/generator_spec_setup.rb

@@ -5,7 +5,7 @@ require "ammeter/init"
 
 RSpec.configure do |config|
   config.before(:example, :generator) do
-    fake_rails_root = File.expand_path("../../../tmp", __FILE__)
+    fake_rails_root = File.expand_path("../../tmp", __dir__)
     allow(Rails).to receive(:root).and_return(Pathname.new(fake_rails_root))
 
     destination fake_rails_root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scenic
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Derek Prior
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -85,16 +85,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -191,9 +191,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -205,11 +207,10 @@ files:
 - bin/rspec
 - bin/setup
 - bin/yard
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/generators/scenic/generators.rb
 - lib/generators/scenic/materializable.rb
@@ -243,6 +244,7 @@ files:
 - spec/acceptance_helper.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -269,7 +271,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/generator_spec_setup.rb
 - spec/support/view_definition_helpers.rb
-homepage: https://github.com/thoughtbot/scenic
+homepage: https://github.com/scenic-views/scenic
 licenses:
 - MIT
 metadata: {}
@@ -279,17 +281,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Support for database views in Rails migrations
@@ -298,6 +299,7 @@ test_files:
 - spec/acceptance_helper.rb
 - spec/dummy/.gitignore
 - spec/dummy/Rakefile
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake

data/gemfiles/rails40.gemfile

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

data/gemfiles/rails41.gemfile

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