schema_plus 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd63024eb3b8a4b7bb36531835ff82f9d12a460c
-  data.tar.gz: 562ec9f5158688f44dbab8684447072901d28353
+  metadata.gz: 14f770e20ed8fc7090ddc3fd58e95976e6a6ae13
+  data.tar.gz: 999f0ad6bd7a1346dda3ebc152ec2a0f7a430488
 SHA512:
-  metadata.gz: 4861cf3dce2acd2d90955fbce6afe974c3bff1f999d0412b0a11d09beb301bff4843d703ec647772c101cadd3529fa0267e874a1d19ec476c0fefca68780a72f
-  data.tar.gz: 8463ee8647ba6a48a90f2c896e016191092d368518c0fa883ca256316d53a15def6b9bff3408b7067d8383dc9634440ce051fb4b62f50390dbbb62a428ffc101
+  metadata.gz: 33fdfaee05d32853f87112adc5d156970f4d5bddec6c2f8379a283ad16cf6e9eb3e5adfb84dbf60af476e340f51c15ab6f53d2336877226e670602bbf141d35e
+  data.tar.gz: 3ff056bfd48ea22a5004f3f6760d4bec52127bde7040b65082f2de86fcf00b1353be1a1f46a6b1d37dc04ab87ef0cb6f8146578d985cb126d118b77a670dc124

data/README.md

@@ -76,7 +76,7 @@ You can also create multi-column indexes, for example:
 
     t.string :country_code
     t.string :area_code
-    t.string :local_number      index: { with: [:country_code, :area_code], unique: true }
+    t.string :local_number,      index: { with: [:country_code, :area_code], unique: true }
 
 And you can specify index orders:
 
@@ -298,6 +298,11 @@ of foreign key constraints, you can re-enable it:
 
 * *nothing currently waiting to be released*
 
+
+### 1.5.1
+
+* Now respects ActiveRecord::SchemaDumper.ignore_tables for views (issue #153)
+
 ### 1.5.0
 * Can now be used with activerecord standalone, doesn't need all of rails.
 * `views` ignores postgres internal views, thanks to [@everplays](https://github.com/everplays) (issue #147)

data/lib/schema_plus/active_record/schema_dumper.rb

@@ -52,6 +52,7 @@ module SchemaPlus
         tables_without_schema_plus(nil)
 
         @connection.views.each do |view_name|
+          next if Array.wrap(::ActiveRecord::SchemaDumper.ignore_tables).any? {|pattern| view_name.match pattern}
           definition = @connection.view_definition(view_name)
           @table_dumps[view_name] = "  create_view #{view_name.inspect}, #{definition.inspect}, :force => true\n"
         end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/views_spec.rb

@@ -17,13 +17,6 @@ describe ActiveRecord do
 
   let(:connection) { ActiveRecord::Base.connection }
 
-  let (:dump) {
-    StringIO.open { |stream|
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      stream.string
-    }
-  }
-
   context "views" do
 
     around (:each) do |example|
@@ -59,6 +52,14 @@ describe ActiveRecord do
       dump.should match(%r{create_table "items".*create_view "a_ones".*create_view "ab_ones"}m) 
     end
 
+    it "should not be included in schema if listed in ignore_tables" do
+      dump(ignore_tables: /b_/) do |dump|
+        dump.should match(%r{create_view "a_ones", "SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}i)
+        dump.should_not match(%r{"ab_ones"})
+      end
+    end
+
+
     it "dump should not reference current database" do
       # why check this?  mysql default to providing the view definition
       # with tables explicitly scoped to the current database, which
@@ -164,9 +165,11 @@ describe ActiveRecord do
     end
   end
 
-  def dump
+  def dump(opts={})
     StringIO.open { |stream|
+      ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore_tables])
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+      yield stream.string if block_given?
       stream.string
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord