masamune 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49cf069b1b8b08d4564094cbf3893fd9a5a96d6d
-  data.tar.gz: eae59d5b26dcc4b78db6e4024841b53bc48cac6b
+  metadata.gz: 18fd59e8bd668c7efc320ad374ef1bc96c384184
+  data.tar.gz: f12fa656c4136942e1d4a5a917788c2d692b7e8f
 SHA512:
-  metadata.gz: 05f7ebbb93c6eeae7b5ede63c098da7d08fb1a5cc616cc0cf31ebfd7eaca7447b70e29d5f9b5e7c54b5217e8689d8270660e349a4e35fb4d4f26467da01aeac0
-  data.tar.gz: cd36f48081410e820ed5485820b186b6455ecf456eeec364830f53cd9eb0ff53b1500ac85fbc2dc03d964bd97bfd2f577a064939777a121f573b939b910c2b04
+  metadata.gz: f83bd5adbc40df655a01e4a390d6435fd5bc6e26eeae21ea13898a31931ee6b878540988a0c2de02b082f7e5f86e21e53152e9f704df396f1cda7e8dba1a3cd2
+  data.tar.gz: af6239a670e87aa6757b6dea3c96c467b4243b7b86cbd3ce35ae46dd5e7ff1362751ede5cb1c7a9e686716ef410e5e976fe2ebe65e5c948717de24713ed44445

data/lib/masamune/schema/catalog.rb

@@ -202,9 +202,9 @@ module Masamune::Schema
       case file
       when /\.rb\Z/
         instance_eval(File.read(file), file)
-      when /\.psql\Z/
+      when /\.psql(\.erb)?\Z/
         @stores[:postgres].extra << file
-      when /\.hql\Z/
+      when /\.hql(\.erb)?\Z/
         @stores[:hive].extra << file
       end
     end

data/lib/masamune/transform/operator.rb

@@ -74,8 +74,9 @@ module Masamune::Transform
     end
 
     def template_eval(template)
-      return File.read(template) if File.exists?(template.to_s)
-      Masamune::Template.render_to_string(template_file(template), @locals.merge(source: source, target: target))
+      return File.read(template) if File.exists?(template.to_s) && template.to_s !~ /erb\Z/
+      template_file = File.exists?(template.to_s) ? template : template_file(template)
+      Masamune::Template.render_to_string(template_file, @locals.merge(source: source, target: target))
     end
 
     def template_file(template_prefix)

data/lib/masamune/version.rb

@@ -21,5 +21,5 @@
 #  THE SOFTWARE.
 
 module Masamune
-  VERSION = '0.12.2'
+  VERSION = '0.12.3'
 end

data/spec/masamune/schema/catalog_spec.rb

@@ -57,8 +57,8 @@ describe Masamune::Schema::Catalog do
   end
 
   context '#load' do
-    let(:postgres_extra) { %w(/tmp/schema.psql /tmp/00_schema.psql /tmp/20_schema.psql) }
-    let(:hive_extra) { %w(/tmp/schema.hql /tmp/00_schema.hql /tmp/20_schema.hql) }
+    let(:postgres_extra) { %w(/tmp/schema.psql /tmp/00_schema.psql /tmp/20_schema.psql /tmp/40_schema.psql.erb) }
+    let(:hive_extra) { %w(/tmp/schema.hql /tmp/00_schema.hql /tmp/20_schema.hql /tmp/40_schema.hql.erb) }
     let(:extra) { postgres_extra + hive_extra }
 
     before do
@@ -70,13 +70,13 @@ describe Masamune::Schema::Catalog do
     it 'should load postgres extra in order' do
       expect(instance.postgres.extra).to eq(postgres_extra)
       expect(instance.postgres.extra(:pre).size).to eq(2)
-      expect(instance.postgres.extra(:post).size).to eq(1)
+      expect(instance.postgres.extra(:post).size).to eq(2)
     end
 
     it 'should load hive extra in order' do
       expect(instance.hive.extra).to eq(hive_extra)
       expect(instance.hive.extra(:pre).size).to eq(2)
-      expect(instance.hive.extra(:post).size).to eq(1)
+      expect(instance.hive.extra(:post).size).to eq(2)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Michael Andrews
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor