hamlit 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 587d2b8d01739c5529f342f9f316b9d13dcec5c9ba4ca693072e83da857fdf20
-  data.tar.gz: 91372701c50b63c2acbcc0f259987da4200a444c33371b1908670edc4c02493f
+SHA1:
+  metadata.gz: bc45e545339c68fa4be81ef0dade7e48023f2529
+  data.tar.gz: c78dad0eb8daeceed3aaca230a3587dd39207a02
 SHA512:
-  metadata.gz: 19f57ff4a0c28e5c6759c54120b37104ae3e4eff9e92cde062da1f195b8c39e3ef38a1f1eef4276fff22bd0961dd1cac126c3bdc38ca03137475ff5cc101fdb9
-  data.tar.gz: 418735e4c178d9a7bf96d6bbc432a0f00da2fd4068df1bee01254a864f2675c9ebe05c5a391a78c9912095f17b666cb9e688b24e30f33b8390bb86741d9228b5
+  metadata.gz: 9f2ae53cc63fc0c3a081d776dc156b5e6fa0138d598b4981030ea98117ef14633bc2c04c5e1d94aca8a7f610ba59d8990a920c87a57c8c11ee5052ffc67a2300
+  data.tar.gz: 51ddf158f1e3fefa9d3e338ea4b72a65065d7c46b3be992685e605950ac1cfceef21f1487b4f87a55c9ed8f0e2affb37a80d5413ced67e8b61db827c8459b734

data/.travis.yml

@@ -17,6 +17,8 @@ matrix:
       env: TASK=test
     - rvm: ruby-head
       env: TASK=test
+    - rvm: jruby-9.1.9.0
+      env: TASK=test
     - rvm: 2.4.0
       env: TASK=bench TEMPLATE=benchmark/boolean_attribute.haml,benchmark/class_attribute.haml,benchmark/id_attribute.haml,benchmark/data_attribute.haml,benchmark/common_attribute.haml
     - rvm: 2.4.0

data/CHANGELOG.md

@@ -4,11 +4,15 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.9.1](https://github.com/k0kubun/hamlit/compare/v2.9.0...v2.9.1) - 2018-11-01
+
+- Start supporting JRuby [#100](https://github.com/k0kubun/hamlit/issues/100).
+
 ## [2.9.0](https://github.com/k0kubun/hamlit/compare/v2.8.10...v2.9.0) - 2018-10-16
 
 ### Added
 
-- Consider aria attribute as another attribute that supports hyphenation and boolean like data attribute.
+- Consider aria attribute as another attribute that supports hyphenation and boolean like data attribute
   [#57](https://github.com/k0kubun/hamlit/pull/57). *Thanks to @francesco-loreti*
 
 ## [2.8.10](https://github.com/k0kubun/hamlit/compare/v2.8.9...v2.8.10) - 2018-09-05

data/Gemfile

@@ -14,12 +14,15 @@ end
 
 gem 'benchmark-ips', '2.3.0'
 gem 'maxitest'
-gem 'pry-byebug'
 
-# To resolve circular require warning
-gem 'redcarpet', github: 'vmg/redcarpet'
+if /java/ === RUBY_PLATFORM # JRuby
+  gem 'pandoc-ruby'
+else
+  gem 'pry-byebug'
+  gem 'redcarpet', github: 'vmg/redcarpet' # To resolve circular require warning
 
-if RUBY_PLATFORM !~ /mswin|mingw|bccwin|wince/
-  gem 'faml'
-  gem 'stackprof'
+  if RUBY_PLATFORM !~ /mswin|mingw/
+    gem 'faml'
+    gem 'stackprof'
+  end
 end

data/Rakefile

@@ -17,7 +17,22 @@ if Gem.win_platform?
 end
 
 require 'rake/testtask'
-require 'rake/extensiontask'
+if /java/ === RUBY_PLATFORM
+  # require 'rake/javaextensiontask'
+  # Rake::JavaExtensionTask.new(:hamlit) do |ext|
+  #   ext.ext_dir = 'ext/java'
+  #   ext.lib_dir = 'lib/hamlit'
+  # end
+
+  task :compile do
+    # dummy for now
+  end
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new(:hamlit) do |ext|
+    ext.lib_dir = 'lib/hamlit'
+  end
+end
 
 Dir['benchmark/*.rake'].each { |b| import(b) }
 
@@ -88,10 +103,6 @@ namespace :test do
   end
 end
 
-Rake::ExtensionTask.new(:hamlit) do |ext|
-  ext.lib_dir = 'lib/hamlit'
-end
-
 desc 'bench task for CI'
 task bench: :compile do
   if ENV['SLIM_BENCH'] == '1'

data/hamlit.gemspec

@@ -17,9 +17,14 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.extensions    = ['ext/hamlit/extconf.rb']
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.1.0'
+
+  if /java/ === RUBY_PLATFORM
+    # spec.platform = 'java'
+  else
+    spec.extensions = ['ext/hamlit/extconf.rb']
+    spec.required_ruby_version = '>= 2.1.0'
+  end
 
   spec.add_dependency 'temple', '>= 0.8.0'
   spec.add_dependency 'thor'
@@ -34,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rails', '>= 4.0.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rake-compiler'
-  spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'slim'
   spec.add_development_dependency 'unindent'

data/lib/hamlit/attribute_builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-require 'hamlit/hamlit'
 require 'hamlit/object_ref'
-require 'hamlit/utils'
 
 module Hamlit::AttributeBuilder
   BOOLEAN_ATTRIBUTES = %w[disabled readonly multiple checked autobuffer
@@ -10,4 +8,166 @@ module Hamlit::AttributeBuilder
                        autofocus novalidate formnovalidate open pubdate
                        itemscope allowfullscreen default inert sortable
                        truespeed typemustmatch download].freeze
+
+  if /java/ === RUBY_PLATFORM # JRuby
+    class << self
+      def build(escape_attrs, quote, format, object_ref, *hashes)
+        hashes << Hamlit::ObjectRef.parse(object_ref) if object_ref
+        buf  = []
+        hash = merge_all_attrs(hashes)
+
+        keys = hash.keys.sort!
+        keys.each do |key|
+          case key
+          when 'id'.freeze
+            buf << " id=#{quote}#{build_id(escape_attrs, *hash[key])}#{quote}"
+          when 'class'.freeze
+            buf << " class=#{quote}#{build_class(escape_attrs, *hash[key])}#{quote}"
+          when 'data'.freeze
+            buf << build_data(escape_attrs, quote, *hash[key])
+          when *BOOLEAN_ATTRIBUTES, /\Adata-/
+            build_boolean!(escape_attrs, quote, format, buf, key, hash[key])
+          else
+            buf << " #{key}=#{quote}#{escape_html(escape_attrs, hash[key].to_s)}#{quote}"
+          end
+        end
+        buf.join
+      end
+
+      def build_id(escape_attrs, *values)
+        escape_html(escape_attrs, values.flatten.select { |v| v }.join('_'))
+      end
+
+      def build_class(escape_attrs, *values)
+        if values.size == 1
+          value = values.first
+          case
+          when value.is_a?(String)
+            # noop
+          when value.is_a?(Array)
+            value = value.flatten.select { |v| v }.map(&:to_s).sort.uniq.join(' ')
+          when value
+            value = value.to_s
+          else
+            return ''
+          end
+          return escape_html(escape_attrs, value)
+        end
+
+        classes = []
+        values.each do |value|
+          case
+          when value.is_a?(String)
+            classes += value.split(' ')
+          when value.is_a?(Array)
+            classes += value.select { |v| v }
+          when value
+            classes << value.to_s
+          end
+        end
+        escape_html(escape_attrs, classes.map(&:to_s).sort.uniq.join(' '))
+      end
+
+      def build_data(escape_attrs, quote, *hashes)
+        build_data_attribute(:data, escape_attrs, quote, *hashes)
+      end
+
+      def build_aria(escape_attrs, quote, *hashes)
+        build_data_attribute(:aria, escape_attrs, quote, *hashes)
+      end
+
+      private
+
+      def build_data_attribute(key, escape_attrs, quote, *hashes)
+        attrs = []
+        if hashes.size > 1 && hashes.all? { |h| h.is_a?(Hash) }
+          data_value = merge_all_attrs(hashes)
+        else
+          data_value = hashes.last
+        end
+        hash = flatten_attributes(key => data_value)
+
+        hash.sort_by(&:first).each do |key, value|
+          case value
+          when true
+            attrs << " #{key}"
+          when nil, false
+            # noop
+          else
+            attrs << " #{key}=#{quote}#{escape_html(escape_attrs, value.to_s)}#{quote}"
+          end
+        end
+        attrs.join
+      end
+
+      def flatten_attributes(attributes)
+        flattened = {}
+
+        attributes.each do |key, value|
+          case value
+          when attributes
+          when Hash
+            flatten_attributes(value).each do |k, v|
+              if k.nil?
+                flattened[key] = v
+              else
+                flattened["#{key}-#{k.to_s.gsub(/_/, '-')}"] = v
+              end
+            end
+          else
+            flattened[key] = value if value
+          end
+        end
+        flattened
+      end
+
+      def merge_all_attrs(hashes)
+        merged = {}
+        hashes.each do |hash|
+          hash.each do |key, value|
+            key = key.to_s
+            case key
+            when 'id'.freeze, 'class'.freeze, 'data'.freeze
+              merged[key] ||= []
+              merged[key] << value
+            else
+              merged[key] = value
+            end
+          end
+        end
+        merged
+      end
+
+      def build_boolean!(escape_attrs, quote, format, buf, key, value)
+        case value
+        when true
+          case format
+          when :xhtml
+            buf << " #{key}=#{quote}#{key}#{quote}"
+          else
+            buf << " #{key}"
+          end
+        when false, nil
+          # omitted
+        else
+          buf << " #{key}=#{quote}#{escape_html(escape_attrs, value)}#{quote}"
+        end
+      end
+
+      def escape_html(escape_attrs, str)
+        if escape_attrs
+          Hamlit::Utils.escape_html(str)
+        else
+          str
+        end
+      end
+    end
+  else
+    # Hamlit::AttributeBuilder.build
+    # Hamlit::AttributeBuilder.build_id
+    # Hamlit::AttributeBuilder.build_class
+    # Hamlit::AttributeBuilder.build_data
+    # Hamlit::AttributeBuilder.build_aria
+    require 'hamlit/hamlit'
+  end
 end

data/lib/hamlit/utils.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
-require 'hamlit/hamlit'
-
 module Hamlit
   module Utils
+    if /java/ === RUBY_PLATFORM # JRuby
+      require 'cgi/escape'
+
+      def self.escape_html(html)
+        CGI.escapeHTML(html.to_s)
+      end
+    else
+      require 'hamlit/hamlit' # Hamlit::Utils.escape_html
+    end
+
     def self.escape_html_safe(html)
       html.html_safe? ? html : escape_html(html)
     end

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.9.0'
+  VERSION = '2.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  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: sass
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: High Performance Haml Implementation