scenic 1.0.0 → 1.2.0

data/spec/scenic/adapters/postgres_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module Scenic
   module Adapters
     describe Postgres, :db do
-      describe "create_view" do
+      describe "#create_view" do
         it "successfully creates a view" do
           adapter = Postgres.new
 
@@ -13,7 +13,7 @@ module Scenic
         end
       end
 
-      describe "create_materialized_view" do
+      describe "#create_materialized_view" do
         it "successfully creates a materialized view" do
           adapter = Postgres.new
 
@@ -26,9 +26,19 @@ module Scenic
           expect(view.name).to eq("greetings")
           expect(view.materialized).to eq true
         end
+
+        it "raises an exception if the version of PostgreSQL is too old" do
+          connection = double("Connection", supports_materialized_views?: false)
+          connectable = double("Connectable", connection: connection)
+          adapter = Postgres.new(connectable)
+          err = Scenic::Adapters::Postgres::MaterializedViewsNotSupportedError
+
+          expect { adapter.create_materialized_view("greetings", "select 1") }
+            .to raise_error err
+        end
       end
 
-      describe "drop_view" do
+      describe "#drop_view" do
         it "successfully drops a view" do
           adapter = Postgres.new
 
@@ -39,7 +49,7 @@ module Scenic
         end
       end
 
-      describe "drop_materialized_view" do
+      describe "#drop_materialized_view" do
         it "successfully drops a materialized view" do
           adapter = Postgres.new
 
@@ -51,30 +61,82 @@ module Scenic
 
           expect(adapter.views.map(&:name)).not_to include("greetings")
         end
+
+        it "raises an exception if the version of PostgreSQL is too old" do
+          connection = double("Connection", supports_materialized_views?: false)
+          connectable = double("Connectable", connection: connection)
+          adapter = Postgres.new(connectable)
+          err = Scenic::Adapters::Postgres::MaterializedViewsNotSupportedError
+
+          expect { adapter.drop_materialized_view("greetings") }
+            .to raise_error err
+        end
+      end
+
+      describe "#refresh_materialized_view" do
+        it "raises an exception if the version of PostgreSQL is too old" do
+          connection = double("Connection", supports_materialized_views?: false)
+          connectable = double("Connectable", connection: connection)
+          adapter = Postgres.new(connectable)
+          err = Scenic::Adapters::Postgres::MaterializedViewsNotSupportedError
+
+          expect { adapter.refresh_materialized_view(:tests) }
+            .to raise_error err
+        end
+
+        context "refreshing concurrently" do
+          it "raises descriptive error if concurrent refresh is not possible" do
+            adapter = Postgres.new
+            adapter.create_materialized_view(:tests, "SELECT text 'hi' as text")
+
+            expect {
+              adapter.refresh_materialized_view(:tests, concurrently: true)
+            }.to raise_error(/Create a unique index with no WHERE clause/)
+          end
+
+          it "raises an exception if the version of PostgreSQL is too old" do
+            connection = double("Connection", postgresql_version: 90300)
+            connectable = double("Connectable", connection: connection)
+            adapter = Postgres.new(connectable)
+            e = Scenic::Adapters::Postgres::ConcurrentRefreshesNotSupportedError
+
+            expect {
+              adapter.refresh_materialized_view(:tests, concurrently: true)
+            }.to raise_error e
+          end
+        end
       end
 
-      it "finds views and builds Scenic::View objects" do
-        adapter = Postgres.new
-
-        ActiveRecord::Base.connection.execute(
-          "CREATE VIEW greetings AS SELECT text 'hi' AS greeting"
-        )
-        ActiveRecord::Base.connection.execute(
-          "CREATE MATERIALIZED VIEW farewells AS SELECT text 'bye' AS farewell"
-        )
-
-        expect(adapter.views).to eq([
-          Scenic::View.new(
-            name: "farewells",
-            definition: "SELECT 'bye'::text AS farewell;",
-            materialized: true,
-          ),
-          Scenic::View.new(
-            name: "greetings",
-            definition: "SELECT 'hi'::text AS greeting;",
-            materialized: false,
-          ),
-        ])
+      describe "#views" do
+        it "returns the views defined on this connection" do
+          adapter = Postgres.new
+
+          ActiveRecord::Base.connection.execute <<-SQL
+            CREATE VIEW parents AS SELECT text 'Joe' AS name
+          SQL
+
+          ActiveRecord::Base.connection.execute <<-SQL
+            CREATE VIEW children AS SELECT text 'Owen' AS name
+          SQL
+
+          ActiveRecord::Base.connection.execute <<-SQL
+            CREATE MATERIALIZED VIEW people AS
+            SELECT name FROM parents UNION SELECT name FROM children
+          SQL
+
+          ActiveRecord::Base.connection.execute <<-SQL
+            CREATE VIEW people_with_names AS
+            SELECT name FROM people
+            WHERE name IS NOT NULL
+          SQL
+
+          expect(adapter.views.map(&:name)).to eq [
+            "parents",
+            "children",
+            "people",
+            "people_with_names",
+          ]
+        end
       end
     end
   end

data/spec/scenic/statements_spec.rb

@@ -65,7 +65,7 @@ module Scenic
     end
 
     describe "update_view" do
-      it "drops the existing version and creates the new" do
+      it "updates the view in the database" do
         definition = instance_double("Definition", to_sql: "definition")
         allow(Definition).to receive(:new)
           .with(:name, 3)
@@ -73,8 +73,19 @@ module Scenic
 
         connection.update_view(:name, version: 3)
 
-        expect(Scenic.database).to have_received(:drop_view).with(:name)
-        expect(Scenic.database).to have_received(:create_view)
+        expect(Scenic.database).to have_received(:update_view)
+          .with(:name, definition.to_sql)
+      end
+
+      it "updates the materialized view in the database" 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: true)
+
+        expect(Scenic.database).to have_received(:update_materialized_view)
           .with(:name, definition.to_sql)
       end
 
@@ -84,18 +95,6 @@ module Scenic
       end
     end
 
-    describe "update_view :materialized" do
-      it "raises an error because this is not supported" do
-        definition = instance_double("Definition").as_null_object
-        allow(Definition).to receive(:new).and_return(definition)
-
-        expect { connection.update_view(:name, version: 3, materialized: true) }.
-          to raise_error(/not supported/)
-        expect(Scenic.database).not_to have_received(:drop_materialized_view)
-        expect(Scenic.database).not_to have_received(:create_materialized_view)
-      end
-    end
-
     def connection
       Class.new { extend Statements }
     end

data/spec/smoke

@@ -21,18 +21,25 @@ trap teardown EXIT
 verifySearchResults() {
   echo "verify search results"
   local expectedResult=$1
-  local actualResult=$(rails runner "puts Search.first.results")
+  local actualResult=$(rails runner "puts Search.take.results")
   [[ "$actualResult" == "$expectedResult" ]] || exit 1
   echo "[success]"
 }
 
+verifySchemaContains() {
+  local expectedString=$1
+  echo "verify schema contains '$expectedString'"
+  grep -q "$expectedString" db/schema.rb || exit 1
+  echo "[success]"
+}
+
 writeToFileAndMigrateAndVerifySearchResults() {
   echo "write search definition and migrate"
   local version=$1
   local expectedResult=$2
   local filePath=db/views/searches_v$version\.sql
   cp /dev/null $filePath
-  echo "SELECT '$expectedResult'::text AS results" >> $filePath
+  echo "SELECT '$expectedResult'::text AS results, 1 AS user_id" >> $filePath
   rake db:migrate
   echo "[success]"
   verifySearchResults $expectedResult
@@ -97,11 +104,25 @@ main() {
   rails runner "Search.refresh" || exit 1
   echo "[success]"
 
+  echo "add indexes to materialized view"
+  rails runner 'ActiveRecord::Migration.add_index :searches, :results' || exit 1
+  rails runner 'ActiveRecord::Migration.add_index :searches, :user_id' || exit 1
+  echo "[success]"
+
+  echo "update materialized view"
+  rails generate scenic:view search --materialized
+  echo "SELECT 'test'::text AS results" > db/views/searches_v02.sql
+  rake db:migrate
+  verifySearchResults 'test'
+  verifySchemaContains 'add_index "searches"'
+
   echo "rake db:rollback"
   rake db:rollback
+  rake db:rollback
   echo "[success]"
 
-  echo "rails destroy scenic:view search --materialized"
+  echo "rails destroy scenic:model search --materialized"
+  rails destroy scenic:view search --materialized
   rails destroy scenic:model search --materialized
   [[ ! -f app/models/search.rb ]] || exit 1
   [[ ! -f db/views/searches_v01.sql ]] || exit 1

data/spec/spec_helper.rb

@@ -15,4 +15,8 @@ RSpec.configure do |config|
     example.run
     DatabaseCleaner.clean
   end
+
+  if defined? ActiveSupport::Testing::Stream
+    config.include ActiveSupport::Testing::Stream
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scenic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Derek Prior
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +123,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: redcarpet
+  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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -151,13 +193,20 @@ files:
 - ".hound.yml"
 - ".travis.yml"
 - ".yardopts"
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - NEWS.md
 - README.md
 - Rakefile
+- bin/appraisal
 - bin/setup
+- bin/yard
+- gemfiles/rails40.gemfile
+- gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/generators/scenic/generators.rb
 - lib/generators/scenic/materializable.rb
 - lib/generators/scenic/model/USAGE
@@ -169,10 +218,16 @@ files:
 - lib/generators/scenic/view/view_generator.rb
 - lib/scenic.rb
 - lib/scenic/adapters/postgres.rb
+- lib/scenic/adapters/postgres/connection.rb
+- lib/scenic/adapters/postgres/errors.rb
+- lib/scenic/adapters/postgres/index_reapplication.rb
+- lib/scenic/adapters/postgres/indexes.rb
+- lib/scenic/adapters/postgres/views.rb
 - lib/scenic/command_recorder.rb
 - lib/scenic/command_recorder/statement_arguments.rb
 - lib/scenic/configuration.rb
 - lib/scenic/definition.rb
+- lib/scenic/index.rb
 - lib/scenic/railtie.rb
 - lib/scenic/schema_dumper.rb
 - lib/scenic/statements.rb
@@ -189,13 +244,13 @@ files:
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
 - spec/dummy/db/migrate/.keep
 - spec/dummy/db/views/.keep
 - spec/generators/scenic/model/model_generator_spec.rb
 - spec/generators/scenic/view/view_generator_spec.rb
 - spec/integration/revert_spec.rb
+- spec/scenic/adapters/postgres/connection_spec.rb
+- spec/scenic/adapters/postgres/views_spec.rb
 - spec/scenic/adapters/postgres_spec.rb
 - spec/scenic/command_recorder/statement_arguments_spec.rb
 - spec/scenic/command_recorder_spec.rb
@@ -219,7 +274,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -227,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Support for database views in Rails migrations
@@ -242,13 +297,13 @@ test_files:
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
 - spec/dummy/db/migrate/.keep
 - spec/dummy/db/views/.keep
 - spec/generators/scenic/model/model_generator_spec.rb
 - spec/generators/scenic/view/view_generator_spec.rb
 - spec/integration/revert_spec.rb
+- spec/scenic/adapters/postgres/connection_spec.rb
+- spec/scenic/adapters/postgres/views_spec.rb
 - spec/scenic/adapters/postgres_spec.rb
 - spec/scenic/command_recorder/statement_arguments_spec.rb
 - spec/scenic/command_recorder_spec.rb
@@ -260,3 +315,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/generator_spec_setup.rb
 - spec/support/view_definition_helpers.rb
+has_rdoc: 

data/spec/dummy/config/environments/development.rb

@@ -1,6 +0,0 @@
-Rails.application.configure do
-  config.cache_classes = false
-
-  # Do not eager load code on boot.
-  config.eager_load = false
-end

data/spec/dummy/config/environments/test.rb

@@ -1,5 +0,0 @@
-Rails.application.configure do
-  config.cache_classes = true
-  config.eager_load = false
-  config.active_support.deprecation = :stderr
-end