erbh 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3365c9260853a05f9f9e69d4c1aee71475705608
-  data.tar.gz: 5d8499f8c432d2fffe5ce2add7a4ac23b9ce7514
+  metadata.gz: 5d1f0a5b16f1f85c4fa063b2f80d8f7c0a94781d
+  data.tar.gz: 2f78a4bebef506c055f360018308dc4b12cf4cda
 SHA512:
-  metadata.gz: 18fc7f6b4249c8229adc6c90b0b9fb99404432e9d8c88eb68fbb7b0bb666815d365b44f5e565fa3325610532fecf7297c53cac0865f192b65a72f06d14c3d971
-  data.tar.gz: dc219ac729cbd8af9c80206895b272070358a6185a5e1093a7b90ce07ae2032ea8c659918b7837130b602c8dfaab7104cf9ce6fcdf2e8a51404641857fc9bb28
+  metadata.gz: 01a3096428b66899b8bc42d1738b64e550a31b8aa076ab8c84f06f7b0c79087207ce05d8cab5da224c39b28853dbb3c89012b77e98a03edd92855035006e6922
+  data.tar.gz: 016b7e7cdf9ad90590d783589ed85797f1cb6716519be49f3994ea92119d6c6af9627a9c7c7ae2d7dda4457e36adbd34afbea287bf18c8935218fad0735c4d79

data/README.md

@@ -29,10 +29,10 @@ include ERBh
 erbh('<%= @foo %>, <%= @bar %>', foo: 100, bar: 'zoo')
 #=> "100, zoo"
 
-erbh(<<-EOS, {foo: 1..3}, trim_mode: '-')
-<%- @foo.each do |i| -%>
+erbh(<<-EOS, {foo: 1..3}, trim_mode: '%')
+% @foo.each do |i|
 <%= i %>
-<%- end -%>
+% end
 EOS
 #=> "1\n2\n3\n"
 ```

data/erbh.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'erbh'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
 

data/lib/erbh.rb

@@ -3,17 +3,22 @@ require 'erb'
 module ERBh
   @@methods = {}
 
+  @@default_options = {
+    :safe_level => nil,
+    :trim_mode => '-',
+    :eoutvar => '_erbout',
+  }
+
   def self.define_method(name, &block)
     @@methods[name] = block
   end
 
-  def erbh(str, variables = {}, options = {})
-    options = {
-      :safe_level => nil,
-      :trim_mode => nil,
-      :eoutvar => '_erbout',
-    }.merge(options)
+  def self.default_options
+    @@default_options
+  end
 
+  def erbh(str, variables = {}, options = {})
+    options = @@default_options.merge(options)
     context = Object.new
 
     variables.each do |name, value|
@@ -27,8 +32,8 @@ module ERBh
     end
 
     context.instance_eval do
-      erb = ERB.new("<% @#{options[:eoutvar]} = #{options[:eoutvar]} %>" + str, *options.values_at(:safe_level, :trim_mode, :eoutvar))
-      erb.result(binding)
+      erb = ERB.new("<% @#{options[:eoutvar]} = #{options[:eoutvar]} %>\n" + str, *options.values_at(:safe_level, :trim_mode, :eoutvar))
+      erb.result(binding).sub(/\A\n/, '')
     end
   end
   module_function :erbh

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erbh
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara