hamlit 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c63183e137f6ac95b74b18913665a72dd93a10
-  data.tar.gz: aa406f516907e362b2f1746636ed9c06b5c81d92
+  metadata.gz: 930fc5e028d874b28cbf4c78e7d9434d3f41d73a
+  data.tar.gz: a8bab06e6c9d0f6af1da12913e843b8582ad778d
 SHA512:
-  metadata.gz: dd0f4d8ca9147def6ea19af310e42ef000626da8b08346644d47ffd38d30b894d6150837ed2a065e141a1b81db6525f6fc184a5dc542cf3653858a96914e5d9d
-  data.tar.gz: fdc76ab6d2b810b8c8b0b7c284bb36fefadbcba42cedd9fc1371bc26b96133342f157945827a7ae821213afdf31c28671954be054f0db8b4bbba81a987377104
+  metadata.gz: 2d7dc13fd325f3586af88a73214afc60f55392d67fa3dfbbe4f13d7a8a639cc2217eba60618c1db6f12eefa1eebaa23756a6ae9f8270df5400d5268b57de98ff
+  data.tar.gz: 8d028d23a2e55d4b3c923bc299a3d4aa02793da3826ad76a37f4b1829c291b62eb49da5f8dc3a0e26e9bc846bb1d99b2177a2493674ca7e1600db475bc45b8de

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.4.3
+
+- Allow `when` to have multiple candidates
+- Allow `rescue` to specify an error variable
+
 ## v1.4.2
 
 - Support `!` operator

data/lib/hamlit/parsers/script.rb

@@ -12,6 +12,10 @@ module Hamlit
 
       INTERNAL_STATEMENTS    = %w[else elsif rescue ensure when].freeze
       DEFAULT_SCRIPT_OPTIONS = { force_escape: false, disable_escape: false }.freeze
+      PREFIX_BY_STATEMENT    = {
+        'when'   => 'case',
+        'rescue' => 'begin',
+      }.freeze
 
       included do
         include Concerns::Escapable
@@ -73,8 +77,11 @@ module Hamlit
       end
 
       def remove_comment(code, comment_check: false)
-        result = ''
+        result       = ''
         with_comment = false
+        prefix       = find_prefix(code)
+        code         = "#{prefix}#{code}"
+
         Ripper.lex(code).each do |(row, col), type, str|
           if type == :on_comment
             with_comment = true
@@ -82,11 +89,21 @@ module Hamlit
           end
           result += str
         end
+        result = result.gsub(/\A#{prefix}/, '') if prefix
 
         return [result, with_comment] if comment_check
         result
       end
 
+      # Code starting with `when` can't be properly understood by Ripper.lex.
+      # This method returns `case;` to fix that.
+      def find_prefix(code)
+        PREFIX_BY_STATEMENT.each do |statement, prefix|
+          return "#{prefix};" if code =~ /\A#{statement} /
+        end
+        nil
+      end
+
       def has_block?
         next_indent == @current_indent + 1
       end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/hamlit/engine/silent_script_spec.rb

@@ -152,6 +152,16 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders case-when with multiple candidates' do
+      assert_render(<<-'HAML', <<-HTML)
+        - case 'a'
+        - when 'a', 'b'
+          ok
+      HAML
+        ok
+      HTML
+    end
+
     it 'renders begin-rescue' do
       assert_render(<<-'HAML', <<-HTML)
         - begin
@@ -166,6 +176,17 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders rescue with error' do
+      assert_render(<<-'HAML', <<-HTML)
+        - begin
+          - raise 'error'
+        - rescue RuntimeError => e
+          hello
+      HAML
+        hello
+      HTML
+    end
+
     it 'joins a next line if a current line ends with ","' do
       assert_render("- foo = [',  \n     ']\n= foo", <<-HTML)
         [&quot;, &quot;]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -569,3 +569,4 @@ test_files:
 - spec/rails/vendor/assets/javascripts/.keep
 - spec/rails/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
+has_rdoc: