scenic 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d319d2791defb8c1025c78605b3003c0275664ba
-  data.tar.gz: 0c79eb3cb32bf171ec085987b83ac89df8bd4ffe
+  metadata.gz: 5bf3b09e1e09c0e1256111963adf6345e7c48a95
+  data.tar.gz: e3a945e6bb156e49837cc945c120096c9664cda9
 SHA512:
-  metadata.gz: f858662b6d60d851a0aa402401c750da7a9c482d018e49e6fcdde39cd5672bd4d8cbd5593f422afa7541c0867805f28e0a73cb1add550c0742552851f67359a3
-  data.tar.gz: 81c7ec7accf60272ff77476c73b31ed7b332334874d150b655b5933a4546be4a009a75c9dcd4a2d93a623de702c34c6e6f80bb76d5f3f8665ff65a56dc2ca896
+  metadata.gz: 64fee8693cc22dd425049c19efde6f47ca19cf42a3002dd1a3b89f511e6fd9801a1f5d040988819457551e8db54e7b4d03662af373489bad2b442e3078ddaff0
+  data.tar.gz: bf1ca04759e648a4422289e1c2b84b13598956c5470518b354a114b802c2b8aff5788d65a34d2fefb5d5a7339ed9f06b185615efda273ba12f42902b093911df

data/.travis.yml

@@ -17,15 +17,28 @@ notifications:
     - false
 sudo: false
 rvm:
-  - 2.3.0
-  - 2.2.4
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
   - 2.1.8
 gemfile:
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
   - gemfiles/rails50.gemfile
+  - gemfiles/rails51.gemfile
+  - gemfiles/rails_edge.gemfile
 matrix:
   exclude:
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails41.gemfile
     - rvm: 2.1.8
       gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails51.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails_edge.gemfile
+  allow_failures:
+    - gemfile: gemfiles/rails_edge.gemfile

data/Appraisals

@@ -1,11 +1,13 @@
-appraise "rails40" do
-  gem "activerecord", "~> 4.0.0"
-  gem "railties", "~> 4.0.0"
-end
+if RUBY_VERSION < "2.4.0"
+  appraise "rails40" do
+    gem "activerecord", "~> 4.0.0"
+    gem "railties", "~> 4.0.0"
+  end
 
-appraise "rails41" do
-  gem "activerecord", "~> 4.1.0"
-  gem "railties", "~> 4.1.0"
+  appraise "rails41" do
+    gem "activerecord", "~> 4.1.0"
+    gem "railties", "~> 4.1.0"
+  end
 end
 
 appraise "rails42" do
@@ -15,12 +17,17 @@ end
 
 if RUBY_VERSION > "2.2.0"
   appraise "rails50" do
-    gem "rails", github: "rails/rails"
-    gem "rspec-rails", github: "rspec/rspec-rails"
-    gem "rspec-support", github: "rspec/rspec-support"
-    gem "rspec-core", github: "rspec/rspec-core"
-    gem "rspec-mocks", github: "rspec/rspec-mocks"
-    gem "rspec-expectations", github: "rspec/rspec-expectations"
-    gem "rspec", github: "rspec/rspec"
+    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 "rails-edge" do
+    gem "rails", git: "https://github.com/rails/rails"
+    gem "arel", git: "https://github.com/rails/arel"
   end
 end

data/NEWS.md

@@ -5,6 +5,40 @@ changelog, see the [CHANGELOG] for each version via the version links.
 
 [CHANGELOG]: https://github.com/thoughtbot/scenic/commits/master
 
+## [1.4.0] - May 11, 2017
+
+### Added
+
+- `refresh_materialized_view` now accepts a `cascade` option, which defaults to
+  `false`. Setting this option to `true` will refresh any materialized views the
+  current view depends on first, ensuring the view being refreshed has the most
+  up-to-date information.
+- `sql_definition` argument is now supported when using `update_view`.
+
+### Fixed
+
+- View migrations created under Rails 5 and newer will no longer result in
+  warnings.
+- `ar_internal_metadata` is no longer included in the schema dump for Rails 5
+  and newer apps.
+- Using the `scenic:model` generator will no longer create a fixture or factory.
+
+## [1.3.0] - May 27, 2016
+
+### Added
+- Add `replace_view` migration statement, which issues `CREATE OR REPLACE
+  VIEW` rather than `CREATE VIEW` or `DROP VIEW` and `CREATE VIEW`.
+- Schema-qualify views outside the 'public' namespace, such as
+  `scenic.searches`
+
+### Fixed
+* Singularize generated model name when injecting into class.
+  Previously, pluralized names would issue a warning and Scenic would
+  attempt to insert model code into the pluralized model file.
+* Convert shell-based smoke tests to RSpec syntax.
+
+[1.3.0]: https://github.com/thoughtbot/scenic/compare/v1.2.0...v1.3.0
+
 ## [1.2.0] - February 5, 2016
 
 ### Added

data/README.md

@@ -173,14 +173,23 @@ refreshes:
 
 ```ruby
 def self.refresh
-  Scenic.database.refresh_materialized_view(table_name, concurrently: false)
+  Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
 end
 ```
 
 This will perform a non-concurrent refresh, locking the view for selects until
 the refresh is complete. You can avoid locking the view by passing
 `concurrently: true` but this requires both PostgreSQL 9.4 and your view to have
-at least one unique index that covers all rows.
+at least one unique index that covers all rows. You can add or update indexes for
+materialized views using table migration methods (e.g. `add_index table_name`)
+and these will be automatically re-applied when views are updated.
+
+The `cascade` option is to refresh materialized views that depend on other
+materialized views. For example, say you have materialized view A, which selects
+data from materialized view B. To get the most up to date information in view A
+you would need to refresh view B first, then right after refresh view A. If you
+would like this cascading refresh of materialized views, set `cascade: true`
+when you refresh your materialized view.
 
 ## I don't need this view anymore. Make it go away.
 
@@ -243,7 +252,7 @@ thoughtbot, inc.
 [Derek Prior]: http://prioritized.net
 [Caleb Thompson]: http://calebthompson.io
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 We love open source software!  See [our other projects][community] or [hire
 us][hire] to help build your product.

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/rspec

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -9,4 +9,5 @@ if [ -z "$CI" ]; then
   bundle exec appraisal install
 fi
 
+bundle exec rake dummy:db:drop
 bundle exec rake dummy:db:create

data/gemfiles/rails42_with_fg_rails.gemfile

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

data/gemfiles/rails50.gemfile

@@ -2,12 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", :github => "rails/rails"
-gem "rspec-rails", :github => "rspec/rspec-rails"
-gem "rspec-support", :github => "rspec/rspec-support"
-gem "rspec-core", :github => "rspec/rspec-core"
-gem "rspec-mocks", :github => "rspec/rspec-mocks"
-gem "rspec-expectations", :github => "rspec/rspec-expectations"
-gem "rspec", :github => "rspec/rspec"
+gem "activerecord", "~> 5.0.0"
+gem "railties", "~> 5.0.0"
 
 gemspec :path => "../"

data/gemfiles/rails51.gemfile

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

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", :git => "https://github.com/rails/rails"
+gem "arel", :git => "https://github.com/rails/arel"
+
+gemspec :path => "../"

data/lib/generators/scenic/model/model_generator.rb

@@ -11,7 +11,12 @@ module Scenic
       source_root File.expand_path("../templates", __FILE__)
 
       def invoke_rails_model_generator
-        invoke "model", [file_path.singularize], options.merge(migration: false)
+        invoke "model",
+          [file_path.singularize],
+          options.merge(
+            fixture_replacement: false,
+            migration: false,
+          )
       end
 
       def inject_model_methods

data/lib/generators/scenic/model/templates/model.erb

@@ -1,3 +1,3 @@
   def self.refresh
-    Scenic.database.refresh_materialized_view(table_name, concurrently: false)
+    Scenic.database.refresh_materialized_view(table_name, concurrently: false, cascade: false)
   end

data/lib/generators/scenic/view/templates/db/migrate/create_view.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
     create_view <%= formatted_plural_name %><%= ", materialized: true" if materialized? %>
   end

data/lib/generators/scenic/view/templates/db/migrate/update_view.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= activerecord_migration_class %>
   def change
   <%- if materialized? -%>
     update_view <%= formatted_plural_name %>,

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

@@ -61,6 +61,14 @@ module Scenic
             "Update#{class_name.pluralize}ToVersion#{version}"
           end
         end
+
+        def activerecord_migration_class
+          if ActiveRecord::Migration.respond_to?(:current_version)
+            "ActiveRecord::Migration[5.0]"
+          else
+            "ActiveRecord::Migration"
+          end
+        end
       end
 
       private

data/lib/scenic/adapters/postgres.rb

@@ -3,6 +3,7 @@ require_relative "postgres/errors"
 require_relative "postgres/index_reapplication"
 require_relative "postgres/indexes"
 require_relative "postgres/views"
+require_relative "postgres/refresh_dependencies"
 
 module Scenic
   # Scenic database adapters.
@@ -192,11 +193,14 @@ module Scenic
       # @example Non-concurrent refresh
       #   Scenic.database.refresh_materialized_view(:search_results)
       # @example Concurrent refresh
-      #   Scenic.database.refresh_materialized_view(:posts, concurrent: true)
+      #   Scenic.database.refresh_materialized_view(:posts, concurrently: true)
       #
       # @return [void]
-      def refresh_materialized_view(name, concurrently: false)
+      def refresh_materialized_view(name, concurrently: false, cascade: false)
         raise_unless_materialized_views_supported
+        if cascade
+          refresh_dependencies_for(name)
+        end
 
         if concurrently
           raise_unless_concurrent_refresh_supported
@@ -226,6 +230,14 @@ module Scenic
           raise ConcurrentRefreshesNotSupportedError
         end
       end
+
+      def refresh_dependencies_for(name)
+        Scenic::Adapters::Postgres::RefreshDependencies.call(
+          name,
+          self,
+          connection,
+        )
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Scenic
   module Adapters
     class Postgres
-      # Updatine a materialized view causes the view to be dropped and
+      # Updating a materialized view causes the view to be dropped and
       # recreated. This causes any associated indexes to be dropped as well.
       # This object can be used to capture the existing indexes before the drop
       # and then reapply appropriate indexes following the create.

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

@@ -0,0 +1,102 @@
+module Scenic
+  module Adapters
+    class Postgres
+      class RefreshDependencies
+        def self.call(name, adapter, connection)
+          new(name, adapter, connection).call
+        end
+
+        def initialize(name, adapter, connection)
+          @name = name
+          @adapter = adapter
+          @connection = connection
+        end
+
+        def call
+          dependencies.each do |dependency|
+            adapter.refresh_materialized_view(dependency)
+          end
+        end
+
+        private
+
+        attr_reader :name, :adapter, :connection
+
+        class DependencyParser
+          def initialize(raw_dependencies, view_to_refresh)
+            @raw_dependencies = raw_dependencies
+            @view_to_refresh = view_to_refresh
+          end
+
+          # We're given an array from the SQL query that looks kind of like this
+          # [["view_name", "{'dependency_1', 'dependency_2'}"]]
+          #
+          # We need to parse that into a more easy to understand data type so we
+          # can use the Tsort module from the Standard Library to topologically
+          # sort those out so we can refresh in the correct order, so we parse
+          # that raw data into a hash.
+          #
+          # Then, once Tsort has worked it magic, we're given a sorted 1-D array
+          # ["dependency_1", "dependency_2", "view_name"]
+          #
+          # So we then need to slice off just the bit leading up to the view
+          # that we're refreshing, so we find where in the topologically sorted
+          # array our given view is, and return all the dependencies up to that
+          # point.
+          def to_sorted_array
+            dependency_hash = parse_to_hash(raw_dependencies)
+            sorted_arr = tsort(dependency_hash)
+            idx = sorted_arr.find_index do |dep|
+              dep.include?(view_to_refresh.to_s)
+            end
+            sorted_arr[0...idx]
+          end
+
+          private
+
+          attr_reader :raw_dependencies, :view_to_refresh
+
+          def parse_to_hash(dependency_rows)
+            dependency_rows.each_with_object({}) do |row, hash|
+              formatted_dependencies = row.last.tr("{}", "").split(",")
+              formatted_dependencies.each do |dependency|
+                hash[dependency] = [] unless hash[dependency]
+              end
+              hash[row.first] = formatted_dependencies
+            end
+          end
+
+          def tsort(hash)
+            each_node = lambda { |&b| hash.each_key(&b) }
+            each_child = lambda { |n, &b| hash[n].each(&b) }
+            TSort.tsort(each_node, each_child)
+          end
+        end
+
+        DEPENDENCY_SQL = <<-SQL.freeze
+          SELECT rewrite_namespace.nspname || '.' || class_for_rewrite.relname AS materialized_view,
+          array_agg(depend_namespace.nspname || '.' || class_for_depend.relname) AS depends_on
+          FROM pg_rewrite AS rewrite
+          JOIN pg_class AS class_for_rewrite ON rewrite.ev_class = class_for_rewrite.oid
+          JOIN pg_depend AS depend ON rewrite.oid = depend.objid
+          JOIN pg_class AS class_for_depend ON depend.refobjid = class_for_depend.oid
+          JOIN pg_namespace AS rewrite_namespace ON rewrite_namespace.oid = class_for_rewrite.relnamespace
+          JOIN pg_namespace AS depend_namespace ON depend_namespace.oid = class_for_depend.relnamespace
+          WHERE class_for_depend.relkind = 'm'
+          AND class_for_rewrite.relkind = 'm'
+          AND class_for_depend.relname != class_for_rewrite.relname
+          GROUP BY class_for_rewrite.relname, rewrite_namespace.nspname
+          ORDER BY class_for_rewrite.relname;
+        SQL
+
+        private_constant "DependencyParser"
+        private_constant "DEPENDENCY_SQL"
+
+        def dependencies
+          raw_dependency_info = connection.select_rows(DEPENDENCY_SQL)
+          DependencyParser.new(raw_dependency_info, name).to_sorted_array
+        end
+      end
+    end
+  end
+end

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

@@ -43,9 +43,9 @@ module Scenic
           namespace, viewname = result.values_at "namespace", "viewname"
 
           if namespace != "public"
-            namespaced_viewname = "#{namespace}.#{viewname}"
+            namespaced_viewname = "#{pg_identifier(namespace)}.#{pg_identifier(viewname)}"
           else
-            namespaced_viewname = viewname
+            namespaced_viewname = pg_identifier(viewname)
           end
 
           Scenic::View.new(
@@ -54,6 +54,11 @@ module Scenic
             materialized: result["kind"] == "m",
           )
         end
+
+        def pg_identifier(name)
+          return name if name =~ /^[a-zA-Z_][a-zA-Z0-9_]*$/
+          PGconn.quote_ident(name)
+        end
       end
     end
   end

data/lib/scenic/schema_dumper.rb

@@ -27,7 +27,7 @@ module Scenic
       end
     end
 
-    unless ActiveRecord::SchemaDumper.instance_methods(false).include?(:ignored?)
+    unless ActiveRecord::SchemaDumper.private_instance_methods(false).include?(:ignored?)
       # This method will be present in Rails 4.2.0 and can be removed then.
       def ignored?(table_name)
         ["schema_migrations", ignore_tables].flatten.any? do |ignored|

data/lib/scenic/statements.rb

@@ -6,9 +6,9 @@ module Scenic
     # @param name [String, Symbol] The name of the database view.
     # @param version [Fixnum] The version number of the view, used to find the
     #   definition file in `db/views`. This defaults to `1` if not provided.
-    # @param sql_definition [String] The SQL query for the view schema. If both
-    #   `sql_defintiion` and `version` are provided, `sql_definition` takes
-    #   prescedence.
+    # @param sql_definition [String] The SQL query for the view schema. An error
+    #   will be raised if `sql_definition` and `version` are both set,
+    #   as they are mutually exclusive.
     # @param materialized [Boolean] Set to true to create a materialized view.
     #   Defaults to false.
     # @return The database response from executing the create statement.
@@ -21,14 +21,18 @@ module Scenic
     #     SELECT * FROM users WHERE users.active = 't'
     #   SQL
     #
-    def create_view(name, version: 1, sql_definition: nil, materialized: false)
-      if version.blank? && sql_definition.nil?
+    def create_view(name, version: nil, sql_definition: nil, materialized: false)
+      if version.present? && sql_definition.present?
         raise(
           ArgumentError,
-          "view_definition or version_number must be specified"
+          "sql_definition and version cannot both be set",
         )
       end
 
+      if version.blank? && sql_definition.blank?
+        version = 1
+      end
+
       sql_definition ||= definition(name, version)
 
       if materialized
@@ -66,6 +70,9 @@ module Scenic
     #
     # @param name [String, Symbol] The name of the database view.
     # @param version [Fixnum] The version number of the view.
+    # @param sql_definition [String] The SQL query for the view schema. An error
+    #   will be raised if `sql_definition` and `version` are both set,
+    #   as they are mutually exclusive.
     # @param revert_to_version [Fixnum] The version number to rollback to on
     #   `rake db rollback`
     # @param materialized [Boolean] True if updating a materialized view.
@@ -75,12 +82,22 @@ module Scenic
     # @example
     #   update_view :engagement_reports, version: 3, revert_to_version: 2
     #
-    def update_view(name, version: nil, revert_to_version: nil, materialized: false)
-      if version.blank?
-        raise ArgumentError, "version is required"
+    def update_view(name, version: nil, sql_definition: nil, revert_to_version: nil, materialized: false)
+      if version.blank? && sql_definition.blank?
+        raise(
+          ArgumentError,
+          "sql_definition or version must be specified",
+        )
       end
 
-      sql_definition = definition(name, version)
+      if version.present? && sql_definition.present?
+        raise(
+          ArgumentError,
+          "sql_definition and version cannot both be set",
+        )
+      end
+
+      sql_definition ||= definition(name, version)
 
       if materialized
         Scenic.database.update_materialized_view(name, sql_definition)

data/lib/scenic/version.rb

@@ -1,3 +1,3 @@
 module Scenic
-  VERSION = "1.3.0".freeze
+  VERSION = "1.4.0".freeze
 end

data/lib/scenic/view.rb

@@ -43,10 +43,9 @@ module Scenic
     # @api private
     def to_schema
       materialized_option = materialized ? "materialized: true, " : ""
-      safe_to_symbolize_name = name.include?(".") ? "'#{name}'" : name
 
       <<-DEFINITION
-  create_view :#{safe_to_symbolize_name}, #{materialized_option} sql_definition: <<-\SQL
+  create_view #{name.inspect}, #{materialized_option} sql_definition: <<-\SQL
     #{definition.indent(2)}
   SQL
 

data/spec/acceptance/user_manages_views_spec.rb

@@ -51,6 +51,7 @@ describe "User manages views" do
 
   it "handles plural view names gracefully during generation" do
     successfully "rails generate scenic:model search_results --materialized"
+    successfully "rails destroy scenic:model search_results --materialized"
   end
 
   def successfully(command)

data/spec/acceptance_helper.rb

@@ -22,7 +22,8 @@ RSpec.configure do |config|
   config.after(:suite) do
     Dir.chdir("spec/dummy") do
       system <<-CMD
-        rake db:drop db:create &&
+        echo &&
+        rake db:environment:set db:drop db:create &&
         git add -A &&
         git reset --hard HEAD 1>/dev/null &&
         rm -rf .git/ 1>/dev/null

data/spec/dummy/Rakefile

@@ -4,3 +4,10 @@
 require File.expand_path('../config/application', __FILE__)
 
 Rails.application.load_tasks
+
+unless Rake::Task.task_defined?('db:environment:set')
+  desc 'dummy task for rails versions where this task does not exist'
+  task 'db:environment:set' do
+    #no op
+  end
+end

data/spec/integration/revert_spec.rb

@@ -29,7 +29,7 @@ describe "Reverting scenic schema statements", :db do
   end
 
   def migration_for_create
-    Class.new(::ActiveRecord::Migration) do
+    Class.new(migration_class) do
       def change
         create_view :greetings
       end
@@ -37,7 +37,7 @@ describe "Reverting scenic schema statements", :db do
   end
 
   def migration_for_drop
-    Class.new(::ActiveRecord::Migration) do
+    Class.new(migration_class) do
       def change
         drop_view :greetings, revert_to_version: 1
       end
@@ -45,13 +45,21 @@ describe "Reverting scenic schema statements", :db do
   end
 
   def migration_for_update
-    Class.new(::ActiveRecord::Migration) do
+    Class.new(migration_class) do
       def change
         update_view :greetings, version: 2, revert_to_version: 1
       end
     end
   end
 
+  def migration_class
+    if Rails::VERSION::MAJOR >= 5
+      ::ActiveRecord::Migration[5.0]
+    else
+      ::ActiveRecord::Migration
+    end
+  end
+
   def run_migration(migration, directions)
     silence_stream(STDOUT) do
       Array.wrap(directions).each do |direction|

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

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+module Scenic
+  module Adapters
+    describe Postgres::RefreshDependencies, :db do
+      it "refreshes dependecies in the correct order" do
+        adapter = Postgres.new
+
+        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",
+          "SELECT * from third",
+        )
+
+        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
+
+        described_class.call(:fourth, adapter, ActiveRecord::Base.connection)
+      end
+    end
+  end
+end

data/spec/scenic/adapters/postgres_spec.rb

@@ -100,6 +100,15 @@ module Scenic
             .to raise_error err
         end
 
+        it "can refresh the views dependencies first" do
+          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)
+          adapter.refresh_materialized_view(:tests, cascade: true)
+        end
+
         context "refreshing concurrently" do
           it "raises descriptive error if concurrent refresh is not possible" do
             adapter = Postgres.new

data/spec/scenic/schema_dumper_spec.rb

@@ -2,6 +2,10 @@ require "spec_helper"
 
 class Search < ActiveRecord::Base; end
 
+class SearchInAHaystack < ActiveRecord::Base
+  self.table_name = '"search in a haystack"'
+end
+
 describe Scenic::SchemaDumper, :db do
   it "dumps a create_view for a view in the database" do
     view_definition = "SELECT 'needle'::text AS haystack"
@@ -11,7 +15,7 @@ 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"'
     expect(output).to include view_definition
 
     Search.connection.drop_view :searches
@@ -31,9 +35,66 @@ describe Scenic::SchemaDumper, :db do
       ActiveRecord::SchemaDumper.dump(Search.connection, stream)
 
       output = stream.string
-      expect(output).to include "create_view :'scenic.searches',"
+      expect(output).to include 'create_view "scenic.searches",'
 
       Search.connection.drop_view :'scenic.searches'
     end
   end
+
+  it "ignores tables internal to Rails" do
+    view_definition = "SELECT 'needle'::text AS haystack"
+    Search.connection.create_view :searches, sql_definition: view_definition
+    stream = StringIO.new
+
+    ActiveRecord::SchemaDumper.dump(Search.connection, stream)
+
+    output = stream.string
+
+    expect(output).to include 'create_view "searches"'
+    expect(output).not_to include "ar_internal_metadata"
+    expect(output).not_to include "schema_migrations"
+  end
+
+  context "with views using unexpected characters in name" do
+    it "dumps a create_view for a view in the database" do
+      view_definition = "SELECT 'needle'::text AS haystack"
+      Search.connection.create_view '"search in a haystack"', sql_definition: view_definition
+      stream = StringIO.new
+
+      ActiveRecord::SchemaDumper.dump(Search.connection, stream)
+
+      output = stream.string
+      expect(output).to include 'create_view "\"search in a haystack\"",'
+      expect(output).to include view_definition
+
+      Search.connection.drop_view :'"search in a haystack"'
+
+      silence_stream(STDOUT) { eval(output) }
+
+      expect(SearchInAHaystack.take.haystack).to eq "needle"
+    end
+  end
+
+  context "with views using unexpected characters, name including namespace" 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")
+      Search.connection.create_view 'scenic."search in a haystack"',
+        sql_definition: view_definition
+      stream = StringIO.new
+
+      ActiveRecord::SchemaDumper.dump(Search.connection, stream)
+
+      output = stream.string
+      expect(output).to include 'create_view "scenic.\"search in a haystack\"",'
+      expect(output).to include view_definition
+
+      Search.connection.drop_view :'scenic."search in a haystack"'
+
+      silence_stream(STDOUT) { eval(output) }
+
+      expect(SearchInAHaystack.take.haystack).to eq "needle"
+    end
+  end
 end

data/spec/scenic/statements_spec.rb

@@ -30,9 +30,22 @@ module Scenic
           .with(:views, sql_definition)
       end
 
-      it "raises an error if neither version nor sql_defintion are provided" do
+      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)
+
+        connection.create_view :views
+
+        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
         expect do
-          connection.create_view :foo, version: nil, sql_definition: nil
+          connection.create_view :foo, version: 1, sql_definition: "a defintion"
         end.to raise_error ArgumentError
       end
     end
@@ -77,6 +90,15 @@ module Scenic
           .with(:name, definition.to_sql)
       end
 
+      it "updates a view from a text definition" do
+        sql_definition = "a defintion"
+
+        connection.update_view(:name, sql_definition: sql_definition)
+
+        expect(Scenic.database).to have_received(:update_view).
+          with(:name, sql_definition)
+      end
+
       it "updates the materialized view in the database" do
         definition = instance_double("Definition", to_sql: "definition")
         allow(Definition).to receive(:new)
@@ -85,13 +107,23 @@ 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)
       end
 
-      it "raises an error if not supplied a version" do
-        expect { connection.update_view :views }
-          .to raise_error(ArgumentError, /version is required/)
+      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/)
+      end
+
+      it "raises an error if both version and sql_defintion are provided" do
+        expect do
+          connection.update_view(
+            :views,
+            version: 1,
+            sql_definition: "a defintion")
+        end.to raise_error ArgumentError, /cannot both be set/
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scenic
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Derek Prior
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -201,12 +201,17 @@ files:
 - README.md
 - Rakefile
 - bin/appraisal
+- bin/rake
+- bin/rspec
 - bin/setup
 - bin/yard
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails42_with_fg_rails.gemfile
 - gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
+- gemfiles/rails_edge.gemfile
 - lib/generators/scenic/generators.rb
 - lib/generators/scenic/materializable.rb
 - lib/generators/scenic/model/USAGE
@@ -222,6 +227,7 @@ files:
 - lib/scenic/adapters/postgres/errors.rb
 - lib/scenic/adapters/postgres/index_reapplication.rb
 - lib/scenic/adapters/postgres/indexes.rb
+- lib/scenic/adapters/postgres/refresh_dependencies.rb
 - lib/scenic/adapters/postgres/views.rb
 - lib/scenic/command_recorder.rb
 - lib/scenic/command_recorder/statement_arguments.rb
@@ -252,6 +258,7 @@ files:
 - spec/generators/scenic/view/view_generator_spec.rb
 - spec/integration/revert_spec.rb
 - spec/scenic/adapters/postgres/connection_spec.rb
+- spec/scenic/adapters/postgres/refresh_dependencies_spec.rb
 - spec/scenic/adapters/postgres/views_spec.rb
 - spec/scenic/adapters/postgres_spec.rb
 - spec/scenic/command_recorder/statement_arguments_spec.rb
@@ -283,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Support for database views in Rails migrations
@@ -306,6 +313,7 @@ test_files:
 - spec/generators/scenic/view/view_generator_spec.rb
 - spec/integration/revert_spec.rb
 - spec/scenic/adapters/postgres/connection_spec.rb
+- spec/scenic/adapters/postgres/refresh_dependencies_spec.rb
 - spec/scenic/adapters/postgres/views_spec.rb
 - spec/scenic/adapters/postgres_spec.rb
 - spec/scenic/command_recorder/statement_arguments_spec.rb
@@ -317,4 +325,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/generator_spec_setup.rb
 - spec/support/view_definition_helpers.rb
-has_rdoc: