faml 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c14024dd27014d4d1b41a1313b1e85f2ba2d4be2
-  data.tar.gz: 1125ce25dca9c6daafe7fc42d04be96057ad9ba6
+  metadata.gz: 5c1985c1c33828570eb9a4e6ce654e873d2c14d2
+  data.tar.gz: ff0d4c7edf3e8d35afaafc6724d4ae1d93e1a252
 SHA512:
-  metadata.gz: 0b39519a1514a4eb09800291310e7be514a70f8d51ec1eff80f048baafa7fe8237b93ae2cba8ff4ea400a1a0559a89ad4574bd3e12e031684ac34579095982e6
-  data.tar.gz: 2f0f94f8ee613989a4476d0d7165e1712259be33cb679834f1f2eb9a625c384bd26dc49fdb1ec2c713519531d4107a2b8d5dd70d8227264c20463c72c9a108d5
+  metadata.gz: a1d921fc14f34d6f885d4d0d6d13d82a8a6713274dc93d534b0ba5853d95019f486e569c3c23dd0cd56db991c4ce1cd3375ca30538ac7562caa89d50a4396a0a
+  data.tar.gz: ce97e6f0f4f989fa04d754b0635dc2852cfa538b73df19fb737bfa076c21ec42297c6b6f1bcbbbc71ddcdd95b593fb143c4d8b04cd22494c115a64d1f5ee6900

data/.rubocop.yml

@@ -46,7 +46,13 @@ Style/RaiseArgs:
 Style/SignalException:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
+  Enabled: false
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+
+Style/ConditionalAssignment:
   Enabled: false
 
 Style/TrailingWhitespace:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.3 (2016-01-22)
+- Fix build error when `$CXXFLAGS` is unavailable
+- Fix StaticHashParser for parser 2.3.0.0
+
 ## 0.7.2 (2015-12-13)
 - Improve AttributeBuilder performance
     - Replace std::ostringstream with std::string

data/ext/attribute_builder/extconf.rb

@@ -2,7 +2,11 @@
 require 'mkmf'
 
 $CFLAGS << ' -Wall -W'
-$CXXFLAGS << ' -Wall -W'
+if $CXXFLAGS
+  # $CXXFLAGS might be undefined
+  # https://github.com/ruby/ruby/pull/492
+  $CXXFLAGS << ' -Wall -W'
+end
 houdini_dir = File.expand_path('../../vendor/houdini', __dir__)
 $INCFLAGS << " -I#{houdini_dir}"
 

data/faml.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'rspec', '>= 3.3'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '>= 0.36.0'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'simplecov', '>= 0.9.0'
   spec.add_development_dependency 'slim' # for benchmark

data/lib/faml/compiler.rb

@@ -14,8 +14,8 @@ module Faml
     DEFAULT_AUTO_CLOSE_TAGS = %w[
       area base basefont br col command embed frame hr img input isindex keygen
       link menuitem meta param source track wbr
-    ]
-    DEFAULT_PRESERVE_TAGS = %w[pre textarea code]
+    ].freeze
+    DEFAULT_PRESERVE_TAGS = %w[pre textarea code].freeze
 
     define_options(
       autoclose: DEFAULT_AUTO_CLOSE_TAGS,

data/lib/faml/helpers.rb

@@ -5,7 +5,7 @@ module Faml
   module Helpers
     def self.preserve(input)
       # Taken from the original haml code
-      input.to_s.chomp("\n").gsub(/\n/, '
').gsub(/\r/, '')
+      input.to_s.chomp("\n").gsub(/\n/, '
').delete("\r")
     end
 
     def preserve(input)

data/lib/faml/static_hash_parser.rb

@@ -15,9 +15,8 @@ module Faml
     end
 
     def parse(text)
-      builder = ::Parser::Builders::Default.new
-      builder.emit_file_line_as_literals = false
-      parser = ::Parser::CurrentRuby.new(builder)
+      parser = ::Parser::CurrentRuby.default_parser
+      parser.builder.emit_file_line_as_literals = false
       parser.diagnostics.consumer = nil
       buffer = ::Parser::Source::Buffer.new('(faml)')
       buffer.source = text

data/lib/faml/stats.rb

@@ -117,16 +117,14 @@ module Faml
         if static_hash_parser.parse("{#{ast.new_attributes}#{ast.old_attributes}}")
           if static_hash_parser.dynamic_attributes.empty?
             info.static_attribute_count += 1
+          elsif static_hash_parser.dynamic_attributes.key?('data') || static_hash_parser.dynamic_attributes.key?(:data)
+            info.dynamic_attribute_with_data_count += 1
+          elsif ast.old_attributes && ast.old_attributes.include?("\n")
+            info.dynamic_attribute_with_newline_count += 1
+          elsif ast.new_attributes && ast.new_attributes.include?("\n")
+            info.dynamic_attribute_with_newline_count += 1
           else
-            if static_hash_parser.dynamic_attributes.key?('data') || static_hash_parser.dynamic_attributes.key?(:data)
-              info.dynamic_attribute_with_data_count += 1
-            elsif ast.old_attributes && ast.old_attributes.include?("\n")
-              info.dynamic_attribute_with_newline_count += 1
-            elsif ast.new_attributes && ast.new_attributes.include?("\n")
-              info.dynamic_attribute_with_newline_count += 1
-            else
-              info.dynamic_attribute_count += 1
-            end
+            info.dynamic_attribute_count += 1
           end
         else
           call_ast = Parser::CurrentRuby.parse("call(#{ast.new_attributes}#{ast.old_attributes})")

data/lib/faml/version.rb

@@ -1,4 +1,4 @@
 # frozen-string-literal: true
 module Faml
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -240,14 +240,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -521,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.