slimi 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12b1a25a767a9ca17da4d9d99cf520d857131cd9d28acaf73d18a7696354c694
-  data.tar.gz: fee58aeb65387fd4846e74ce6885bb96e97dca9db3f2f95578693e20752249a6
+  metadata.gz: '09a450cbc4d4a536b55bee031d9b76345aee45e82d112563d83cdadc1476a82c'
+  data.tar.gz: 781931ba445275b0bc24157df457dde36e49f74b7c48afedcbfa8cb279c6a401
 SHA512:
-  metadata.gz: d97004ce75686f701d0a27bb8ac200e56956d5556fe4dbc874e523870d4c0467ee6eba5d5a1d7e34fc6d792d6df17ec85df689a297e94be56d44dadd33902c66
-  data.tar.gz: d719cc21f5288051ae6e7be83cb1f85e82000dc0e7345160d0087f3d61d9aab9a17ce45978437ceefa6d47ce063034022170e2062fd5404ee4182f245edf0792
+  metadata.gz: 3810040838f6d5eaf636326eaa4021edd62a810d508b41efe7f27a29702c444a783cd2f0bfbd9dedc535d52738bc2446c55df08e6a6e0acee3cb3743ae7798f8
+  data.tar.gz: 625e3d9bd3be61d376364388f6ef86f555fe9065a73d802e907fcb1a6238d4707d42a5d4597acc05794d6e46d4623ebb01007836b2b8bb5ae2884158e3d16ad1

data/.rubocop.yml

@@ -24,12 +24,14 @@ RSpec/ImplicitSubject:
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 RSpec/NamedSubject:
   Enabled: false
 
 Security/Eval:
-  Exclude:
-    - 'spec/**/*.rb'
+  Enabled: false
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## 0.7.0 - 2022-01-04
+
+### Added
+
+- Add `slimi` executable.
+
+### Fixed
+
+- Remove preceding white spaces from HTML comment.
+- Fix bug that :generator option was not working.
+- Fix bug that Ruby code in nested line can be problem on compilation.
+
 ## 0.6.0 - 2022-01-03
 
 ### Added

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    slimi (0.6.0)
+    slimi (0.7.0)
       temple
+      thor
       tilt
 
 GEM
@@ -74,6 +75,7 @@ GEM
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     temple (0.8.2)
+    thor (1.1.0)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)

data/README.md

@@ -15,12 +15,16 @@ It uses Slimi to apply `rubocop --auto-correct` to embedded Ruby codes in Slim t
 
 ## Usage
 
-Just replace `gem 'slim'` with `gem 'slimi'` in your application's Gemfile.
+### Rails
+
+Add this line to your application's Gemfile.
 
 ```ruby
 gem 'slimi'
 ```
 
+This will cause `app/views/**/*.slim` files to be rendered by Slimi.
+
 ## Compatibility
 
 - Line indicators
@@ -53,8 +57,11 @@ gem 'slimi'
     - [ ] Translator/I18n
     - [ ] Logic-less mode
     - [ ] Smart text mode
-- Etc.
-    - [ ] CLI tools
+- CLI
+    - [x] Convert Slim to Ruby
+    - [x] Convert Slim to HTML
+    - [x] Convert Slim to ERB
 - Slimi-only features
     - [x] Embedded Ruby code location
-    - [x] annotate_rendered_view_with_filenames
+    - [x] Support for annotate_rendered_view_with_filenames
+    - [x] Convert Slim to Temple expression by CLI

data/exe/slimi

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+require 'slimi'
+
+Slimi::Cli.start

data/lib/slimi/cli.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'thor'
+
+module Slimi
+  # Provide CLI features.
+  class Cli < ::Thor
+    desc 'compile', 'Convert Slim into Ruby'
+    def compile
+      slim = $stdin.read
+      ruby = Engine.new.call(slim)
+      puts ruby
+    end
+
+    desc 'erb', 'Convert Slim into ERB'
+    def erb
+      slim = $stdin.read
+      expression = ErbConverter.new.call(slim)
+      puts expression
+    end
+
+    desc 'parse', 'Convert Slim into Temple expression'
+    def parse
+      slim = $stdin.read
+      expression = Parser.new.call(slim)
+      pp expression
+    end
+
+    desc 'render', 'Convert Slim into HTML'
+    def render
+      slim = $stdin.read
+      ruby = Engine.new.call(slim)
+      result = eval(ruby)
+      puts result
+    end
+  end
+end

data/lib/slimi/engine.rb

@@ -3,7 +3,7 @@
 require 'temple'
 
 module Slimi
-  # Convert Slim code into Ruby code.
+  # Convert Slim into Ruby.
   class Engine < ::Temple::Engine
     define_options(
       attr_quote: '"',
@@ -16,9 +16,9 @@ module Slimi
     )
 
     use Parser
-    use Filters::Unposition
     use Filters::Embedded
     use Filters::Interpolation
+    use Filters::Unposition
     use Filters::DoInserter
     use Filters::EndInserter
     use Filters::Control
@@ -34,6 +34,6 @@ module Slimi
     filter :ControlFlow
     filter :MultiFlattener
     filter :StaticMerger
-    generator :StringBuffer
+    use(:Generator) { options[:generator] }
   end
 end

data/lib/slimi/erb_converter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Slimi
+  # Convert Slim into ERB.
+  class ErbConverter < Engine
+    replace :StaticMerger, ::Temple::Filters::CodeMerger
+    replace :Generator, Temple::Generators::ERB
+  end
+end

data/lib/slimi/filters/base.rb

@@ -30,6 +30,14 @@ module Slimi
         [:slimi, :output, escape, code, compile(expression)]
       end
 
+      # @param [Integer] begin_
+      # @param [Integer] end_
+      # @param [Array] expression
+      # @return [Array]
+      def on_slimi_position(begin_, end_, expression)
+        [:slimi, :position, begin_, end_, compile(expression)]
+      end
+
       # @param [String] type
       # @param [Array] expression
       # @return [Array]

data/lib/slimi/filters/embedded.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'tilt'
+
 module Slimi
   module Filters
     # @api private

data/lib/slimi/parser.rb

@@ -332,7 +332,7 @@ module Slimi
 
     # @return [Boolean]
     def parse_html_comment
-      if @scanner.skip(%r{/!})
+      if @scanner.skip(%r{/![ \t]*})
         text_block = parse_text_block
         text = [:slimi, :text, :verbatim, text_block]
         @stacks.last << [:html, :comment, text]

data/lib/slimi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Slimi
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/slimi.rb

@@ -3,7 +3,9 @@
 require_relative 'slimi/version'
 
 module Slimi
+  autoload :Cli, 'slimi/cli'
   autoload :Engine, 'slimi/engine'
+  autoload :ErbConverter, 'slimi/erb_converter'
   autoload :Errors, 'slimi/errors'
   autoload :Filters, 'slimi/filters'
   autoload :Parser, 'slimi/parser'

data/slimi.gemspec

@@ -32,5 +32,6 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_dependency 'temple'
+  spec.add_dependency 'thor'
   spec.add_dependency 'tilt'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -41,7 +55,8 @@ dependencies:
 description: 
 email:
 - r7kamura@gmail.com
-executables: []
+executables:
+- slimi
 extensions: []
 extra_rdoc_files: []
 files:
@@ -56,8 +71,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/slimi
 - lib/slimi.rb
+- lib/slimi/cli.rb
 - lib/slimi/engine.rb
+- lib/slimi/erb_converter.rb
 - lib/slimi/errors.rb
 - lib/slimi/filters.rb
 - lib/slimi/filters/amble.rb