erbh 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8caca574751da80b455daa4df29d130877de7a07
-  data.tar.gz: 6bc56863e3765f3c9a92c28e27a9bcaf443cc207
+SHA256:
+  metadata.gz: 681282eede969a0eb48a6d755abfd0629abb1384393d3c8bcecd54d7f881b900
+  data.tar.gz: 8e224624022c5f492ed1b4383d464dad2bfd2f6c83bfa60c7b14383722030922
 SHA512:
-  metadata.gz: b6da8910664803a2ff847991da0f436384ff4ef6d6e9b4d4dcb8b3274e1130d8072c7a355d6be27dc9e43095ffca5abf4bc940ff131127ed332c3d1f667f40d8
-  data.tar.gz: 300ba71c033bd709bb92f612b56c927868f702d95d397cc75cda69a73c8c4486ce2b5f670b11816e1bd7b3828ff0c64c32293d4c3db16a8747ac5bff26f48e53
+  metadata.gz: cc8097ce955d272eb9e77916df23d5e8fdbcd2410395e25e599bf5ac32896b284739799d0dbb62b11a8ca33058d10cedd383203fc3e292ef97d800a47ad36cc7
+  data.tar.gz: e6a5ec3f06cb6c4e6725761e43ac8168650c8ceb645f19fec888df7290e2ced8f1eb79c65ea81de02e0bb35053773bd10f1d2672cb19e9de34c909fa16b2e6a7

data/.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.5"
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: ${{ matrix.env }} bundle exec rake
+        env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}

data/.rubocop.yml

@@ -0,0 +1,12 @@
+AllCops:
+  Exclude:
+    - "gemfiles/**/*"
+    - "vendor/bundle/**/*"
+  TargetRubyVersion: 2.5
+  NewCops: enable
+Metrics/AbcSize:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in erbh.gemspec

data/README.md

@@ -2,7 +2,7 @@
 
 Simple ERB helper.
 
-[![Build Status](https://travis-ci.org/winebarrel/erbh.svg?branch=master)](https://travis-ci.org/winebarrel/erbh)
+[![test](https://github.com/winebarrel/erbh/actions/workflows/test.yml/badge.svg)](https://github.com/winebarrel/erbh/actions/workflows/test.yml)
 
 ## Installation
 
@@ -29,10 +29,34 @@ 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"
 ```
+
+### Define helper method
+
+```ruby
+require 'erbh'
+include ERBh
+
+ERBh.define_method(:concat) {|a, b| a + b }
+
+erbh('<%= concat @foo, @bar %>', foo: 'a', bar: 'b')
+#=> "ab"
+
+ERBh.define_method(:chomp) do |obj|
+  if obj.nil?
+    @_erbout.sub!(/,\s*\z/, '')
+    ''
+  else
+    obj
+  end
+end
+
+erbh('100, <%= chomp @foo %>', foo: nil)
+#=> "100"
+```

data/Rakefile

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new do |task|
+  task.options = %w[-c .rubocop.yml]
+end
+
+task default: %i[rubocop spec]

data/erbh.gemspec

@@ -1,12 +1,13 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 Gem::Specification.new do |spec|
   spec.name          = 'erbh'
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ['Genki Sugawara']
-  spec.email         = ['sugawara@cookpad.com']
+  spec.email         = ['sugawara@winebarrel.jp']
 
-  spec.summary       = %q{Simple ERB helper.}
-  spec.description   = %q{Simple ERB helper.}
+  spec.summary       = 'Simple ERB helper.'
+  spec.description   = 'Simple ERB helper.'
   spec.homepage      = 'https://github.com/winebarrel/erbh'
   spec.license       = 'MIT'
 
@@ -15,7 +16,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.7') # rubocop:disable Gemspec/RequiredRubyVersion
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop', '1.24.1'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
+
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/erbh.rb

@@ -1,22 +1,46 @@
+# frozen_string_literal: true
+
 require 'erb'
 
-module ERBh
-  def erbh(str, variables, options = {})
-    options = {
-      :safe_level => nil,
-      :trim_mode => nil,
-      :eoutvar => '_erbout',
-    }.merge(options)
+module ERBh # rubocop:disable Style/Documentation
+  @methods = {}
+
+  @default_options = {
+    safe_level: nil,
+    trim_mode: '-',
+    eoutvar: '_erbout'
+  }
+
+  def self.define_method(name, &block)
+    @methods[name] = block
+  end
+
+  def self.default_options
+    @default_options
+  end
+
+  def self.erbh_methods
+    @methods
+  end
 
+  def erbh(str, variables = {}, options = {})
+    options = ERBh.default_options.merge(options)
     context = Object.new
 
     variables.each do |name, value|
       context.instance_variable_set("@#{name}", value)
     end
 
+    class << context
+      ERBh.erbh_methods.each do |name, block|
+        define_method(name, block)
+      end
+    end
+
     context.instance_eval do
-      erb = ERB.new(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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erbh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Genki Sugawara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,29 +52,71 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple ERB helper.
 email:
-- sugawara@cookpad.com
+- sugawara@winebarrel.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - erbh.gemspec
 - lib/erbh.rb
 homepage: https://github.com/winebarrel/erbh
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,16 +124,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Simple ERB helper.
 test_files: []

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-before_install:
-  - gem install bundler
-script:
-  - bundle exec rake

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "erbh"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here