scenic 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88bfc7421d9fff9dabb78192437422bff78a008
-  data.tar.gz: 707fd7687db5ad21240ee8d3f0b8eafa16db4b01
+  metadata.gz: e1617d9008cabf9f0117f71f812735e8f89bf932
+  data.tar.gz: 31babdfa7c8fc2bc200f9457bc6f8fcab9f16a8e
 SHA512:
-  metadata.gz: d1dc5196a72602f964093cbbd1b2976de5d31d73f887e8d21b8938262b6b15cffdc8e536073a482cb988da653d022be850f052727bc62d932738676d4ca42a4a
-  data.tar.gz: 0ef40094617d1adde567078bc066887afb92ae3102925358450a05bd3a4beafd05f7d116929ccbcc25577337bdcdb437abf92cd5bd4a9855ef2b47f0daf28333
+  metadata.gz: aebbd7f6d99c20b35420a68977a4231849543393c01d2a37487cfcde775cc26b33af792d13b61a4618db12dfe4eef0fc0a581ad27a5b76842d4701c0452302db
+  data.tar.gz: 05ea1809e4c4777903a297a9ee1e8c83d59ac3550aa455a82ef2d0e52f0a5f715211ed721e1f425aa87f4d08e7f04c7e7c9b1bec284861ab667e555eefe226c0

data/Appraisals

@@ -13,13 +13,14 @@ appraise "rails42" do
   gem "railties", "~> 4.2.0"
 end
 
-appraise "rails50" do
-  gem "activerecord", "~> 5.0.0.beta1"
-  gem "railties", "~> 5.0.0.beta1"
-  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"
+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"
+  end
 end

data/NEWS.md

@@ -5,6 +5,26 @@ changelog, see the [CHANGELOG] for each version via the version links.
 
 [CHANGELOG]: https://github.com/thoughtbot/scenic/commits/master
 
+## [1.2.0] - February 5, 2016
+
+### Added
+- The generators now accept namespaced view definitions. For example: `rails
+  generate scenic:view my_app.users`.
+
+### Fixed
+- Materialized view indexes are now properly dumped to `db/schema.rb`. This was
+  an oversight in previous releases, meaning `rake db:schema:load` was missing
+  indexes.
+- Calling `update_view` for a materialized view now properly finds associated
+  indexes for automatic reapplication. An issue in the previous index query was
+  returning no indexes.
+
+**Note**: Dumping materialized view indexes will produce an invalid
+`db/schema.rb` file  under Rails 5 beta 1 and beta 2. This is fixed on Rails
+master.
+
+[1.2.0]: https://github.com/thoughtbot/scenic/compare/v1.1.1...v1.2.0
+
 ## [1.1.1] - January 29, 2016
 
 ### Fixed

data/gemfiles/rails50.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0.beta1"
-gem "railties", "~> 5.0.0.beta1"
+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"

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

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

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

@@ -1,12 +1,12 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
   <%- if materialized? -%>
-    update_view :<%= plural_name %>,
+    update_view <%= formatted_plural_name %>,
       version: <%= version %>,
       revert_to_version: <%= previous_version %>,
       materialized: true
   <%- else -%>
-    update_view :<%= plural_name %>, version: <%= version %>, revert_to_version: <%= previous_version %>
+    update_view <%= formatted_plural_name %>, version: <%= version %>, revert_to_version: <%= previous_version %>
   <%- end -%>
   end
 end

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

@@ -56,7 +56,7 @@ module Scenic
 
         def migration_class_name
           if creating_new_view?
-            super
+            "Create#{class_name.gsub('.', '').pluralize}"
           else
             "Update#{class_name.pluralize}ToVersion#{version}"
           end
@@ -85,10 +85,22 @@ module Scenic
         Scenic::Definition.new(plural_file_name, previous_version)
       end
 
+      def plural_file_name
+        @plural_file_name ||= file_name.pluralize.gsub(".", "_")
+      end
+
       def destroying?
         behavior == :revoke
       end
 
+      def formatted_plural_name
+        if plural_name.include?(".")
+          "\"#{plural_name}\""
+        else
+          ":#{plural_name}"
+        end
+      end
+
       def destroying_initial_view?
         destroying? && version == 1
       end

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

@@ -34,7 +34,7 @@ module Scenic
             LEFT JOIN pg_namespace n ON n.oid = i.relnamespace
             WHERE i.relkind = 'i'
               AND d.indisprimary = 'f'
-              AND t.relname = '#{quote_table_name(name)}'
+              AND t.relname = '#{name}'
               AND n.nspname = ANY (current_schemas(false))
             ORDER BY i.relname
           SQL

data/lib/scenic/schema_dumper.rb

@@ -9,17 +9,24 @@ module Scenic
     end
 
     def views(stream)
-      views_in_database.select { |view| !ignored?(view.name) }.each do |view|
-        stream.puts(view.to_schema)
+      if dumpable_views_in_database.any?
+        stream.puts
       end
-    end
 
-    def views_in_database
-      @views_in_database ||= Scenic.database.views
+      dumpable_views_in_database.each do |view|
+        stream.puts(view.to_schema)
+        indexes(view.name, stream)
+      end
     end
 
     private
 
+    def dumpable_views_in_database
+      @dumpable_views_in_database ||= Scenic.database.views.reject do |view|
+        ignored?(view.name)
+      end
+    end
+
     unless ActiveRecord::SchemaDumper.instance_methods(false).include?(:ignored?)
       # This method will be present in Rails 4.2.0 and can be removed then.
       def ignored?(table_name)

data/lib/scenic/version.rb

@@ -1,3 +1,3 @@
 module Scenic
-  VERSION = "1.1.1"
+  VERSION = "1.2.0".freeze
 end

data/lib/scenic/view.rb

@@ -44,10 +44,10 @@ module Scenic
     def to_schema
       materialized_option = materialized ? "materialized: true, " : ""
       <<-DEFINITION
-
   create_view :#{name}, #{materialized_option} sql_definition: <<-\SQL
     #{definition.indent(2)}
   SQL
+
       DEFINITION
     end
   end

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

@@ -36,4 +36,16 @@ describe Scenic::Generators::ViewGenerator, :generator do
       expect(migration).to contain "materialized: true"
     end
   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")
+      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
+  end
 end

data/spec/smoke

@@ -26,6 +26,13 @@ verifySearchResults() {
   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
@@ -98,8 +105,8 @@ main() {
   echo "[success]"
 
   echo "add indexes to materialized view"
-  rails runner "ActiveRecord::Base.connection.execute 'CREATE INDEX searches_test_1 ON searches USING btree (results);'" || exit 1
-  rails runner "ActiveRecord::Base.connection.execute 'CREATE INDEX searches_test_2 ON searches USING btree (user_id);'" || exit 1
+  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"
@@ -107,6 +114,7 @@ main() {
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scenic
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Derek Prior
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -282,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