schema_plus_views 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a5ea547ab99bca7ef7d039c784b580065ef142
-  data.tar.gz: b1dc65dab6140a1c68de87da4c2d6eb54620879b
+  metadata.gz: 7fc4b60cc9309357c2da20cbc1f47c1f70a84b7b
+  data.tar.gz: 373a4c477a67f60bf0eabe36c0091dcdb395123d
 SHA512:
-  metadata.gz: f5e60a51b299a09aa1429f1da508a217c9306bb7a126ad0f499849255b1d7942edac5b2b905e3c82abc4cc2aeb3fc261451882f8786b30d5c981004c6e199725
-  data.tar.gz: 01eb9ee07f00334652b549e81bd20a280ba6d9b0b5ac48d806d1eafe7dde63273817078566aa06245775f7a38322355884cb2e5296c1ceae857b09d56b2669fd
+  metadata.gz: bc62d9dcaf074c67a6c8541a1e148b9a0c1ae52ef364521f53ece17c872ebb65d5cc6ea8e4a3035ba7d9018d0854e0ba1f1c71924e4c3059f18d56f06244d746
+  data.tar.gz: ae3921d2c5749cbdc8d298729b9973cc3dd4fcebcebd15e03fb54e7c8b2d1fffeb4fa40957ec57415ce15c06bad0ac7dd20983e588a9d77a064fd8acb78a3eec

data/README.md

@@ -109,6 +109,7 @@ This returns just the body of the definition, i.e. the part after the `CREATE VI
 
 ## History
 
+* 0.2.2 - Prettier dumps: use heredoc for definition string
 * 0.2.1 - Fix db:rollback
 * 0.2.0 - Added :allow_replace option (thanks to [@hcarver](https://github.com/hcarver))
 * 0.1.0 - Initial release, extracted from schema_plus 1.x

data/lib/schema_plus/views/middleware.rb

@@ -18,7 +18,10 @@ module SchemaPlus::Views
         # quacks like a SchemaMonkey Dump::Table
         class View < KeyStruct[:name, :definition]
           def assemble(stream)
-            stream.puts("  create_view #{name.inspect}, #{definition.inspect}, :force => true\n")
+            heredelim = "END_VIEW_#{name.upcase}"
+            stream.puts "  create_view #{name.to_json}, <<-#{heredelim}, :force => true\n"
+            definition.split("\n").each { |line| stream.puts line.to_json[1...-1] + "\n" }
+            stream.puts "  #{heredelim}\n\n"
           end
         end
       end

data/lib/schema_plus/views/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Views
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/dumper_spec.rb

@@ -16,8 +16,9 @@ describe "Dumper" do
   end
 
   it "should include view definitions" do
-    expect(dump).to match(%r{create_view "a_ones", " ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}mi)
-    expect(dump).to match(%r{create_view "ab_ones", " ?SELECT .*s.* FROM .*a_ones.* WHERE .*b.* = 1.*, :force => true}mi)
+    puts dump
+    expect(dump).to match(view_re("a_ones", /SELECT .*b.*,.*s.* FROM .*items.* WHERE \(?.*a.* = 1\)?/mi))
+    expect(dump).to match(view_re("ab_ones", /SELECT .*s.* FROM .*a_ones.* WHERE \(?.*b.* = 1\)?/mi))
   end
 
   it "should include views in dependency order" do
@@ -26,7 +27,7 @@ describe "Dumper" do
 
   it "should not include views listed in ignore_tables" do
     dump(ignore_tables: /b_/) do |dump|
-      expect(dump).to match(%r{create_view "a_ones", " ?SELECT .*b.*,.*s.* FROM .*items.* WHERE .*a.* = 1.*, :force => true}mi)
+      expect(dump).to match(view_re("a_ones", /SELECT .*b.*,.*s.* FROM .*items.* WHERE \(?.*a.* = 1\)?/mi))
       expect(dump).not_to match(%r{"ab_ones"})
     end
   end
@@ -45,6 +46,11 @@ describe "Dumper" do
 
   protected
 
+  def view_re(name, re)
+    heredelim = "END_VIEW_#{name.upcase}"
+    %r{create_view "#{name}", <<-#{heredelim}, :force => true\n\s*#{re}\s*\n *#{heredelim}$}mi
+  end
+
   def define_schema_and_data
     connection.views.each do |view| connection.drop_view view end
     connection.tables.each do |table| connection.drop_table table, cascade: true end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_views
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord