faml 0.6.0 → 0.6.1

data/lib/faml/stats.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'find'
 require 'pathname'
 require 'haml_parser/parser'

data/lib/faml/text_compiler.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'haml_parser/utils'
 require 'strscan'
 require_relative 'error'

data/lib/faml/tilt.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'tilt'
 # Load tilt/haml only when haml is available
 begin

data/lib/faml/version.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 module Faml
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/compiler_newline_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 class LineVerifier < StandardError

data/spec/rails/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.

data/spec/rails/app/controllers/books_controller.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 class BooksController < ApplicationController
   def hello
   end

data/spec/rails/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
+# frozen-string-literal: true
 module ApplicationHelper
 end

data/spec/rails/app/models/book.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 class Book
   include ActiveModel::Model
 

data/spec/rails/config/application.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'

data/spec/rails/config/boot.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/rails/config/environment.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Load the Rails application.
 require File.expand_path('../application', __FILE__)
 

data/spec/rails/config/environments/development.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/rails/config/environments/production.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/rails/config/environments/test.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 TestApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/rails/config/initializers/assets.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

data/spec/rails/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/spec/rails/config/initializers/cookies_serializer.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/rails/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/spec/rails/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/spec/rails/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/rails/config/initializers/secret_key_base.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 version = [Rails::VERSION::MAJOR, Rails::VERSION::MINOR]
 if version == [4, 0]
   TestApp::Application.configure do

data/spec/rails/config/initializers/session_store.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_test_app_session'

data/spec/rails/config/initializers/wrap_parameters.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/rails/config/routes.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 Rails.application.routes.draw do
   namespace :books do
     get :hello

data/spec/rails/db/seeds.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #

data/spec/rails/spec/requests/faml_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'rails_helper'
 
 RSpec.describe 'Faml with Rails', type: :request do

data/spec/rails_helper.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 ENV['RAILS_ENV'] ||= 'test'
 require 'spec_helper'
 require File.expand_path('../rails/config/environment', __FILE__)

data/spec/render/attribute_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Attributes rendering', type: :render do
@@ -228,4 +229,36 @@ HAML
       expect(render_string('%span#baz[Faml::TestStruct.new(123)]{id: "foo"} hello')).to eq("<span class='faml_test_struct' id='baz_foo_faml_test_struct_123'>hello</span>\n")
     end
   end
+
+  context 'when old attributes and new attributes have the same key' do
+    it 'prefers old attributes' do
+      aggregate_failures do
+        expect(render_string('%span{foo: 1}(foo=2)')).to eq("<span foo='1'></span>\n")
+        expect(render_string('%span(foo=2){foo: 1}')).to eq("<span foo='1'></span>\n")
+        expect(render_string("- v = 2\n%span{foo: v-1}(foo=v)")).to eq("<span foo='1'></span>\n")
+        expect(render_string("- v = 2\n%span(foo=v){foo: v-1}")).to eq("<span foo='1'></span>\n")
+        expect(render_string("- h = {foo: 1}\n%span{h}(foo=2)")).to eq("<span foo='1'></span>\n")
+        expect(render_string("- h = {foo: 1}\n%span(foo=2){h}")).to eq("<span foo='1'></span>\n")
+      end
+    end
+
+    it 'merges class attribute' do
+      aggregate_failures do
+        expect(render_string('%span{class: 1}(class=2)')).to eq("<span class='1 2'></span>\n")
+        expect(render_string("- v = 2\n%span{class: v-1}(class=v)")).to eq("<span class='1 2'></span>\n")
+        expect(render_string("- h = {class: 1}\n%span{h}(class=2)")).to eq("<span class='1 2'></span>\n")
+      end
+    end
+
+    it 'merges id attribute' do
+      aggregate_failures do
+        expect(render_string('%span{id: 1}(id=2)')).to eq("<span id='2_1'></span>\n")
+        expect(render_string('%span(id=2){id: 1}')).to eq("<span id='2_1'></span>\n")
+        expect(render_string("- v = 2\n%span{id: v-1}(id=v)")).to eq("<span id='2_1'></span>\n")
+        expect(render_string("- v = 2\n%span(id=v){id: v-1}")).to eq("<span id='2_1'></span>\n")
+        expect(render_string("- h = {id: 1}\n%span{h}(id=2)")).to eq("<span id='2_1'></span>\n")
+        expect(render_string("- h = {id: 1}\n%span(id=2){h}")).to eq("<span id='2_1'></span>\n")
+      end
+    end
+  end
 end

data/spec/render/comment_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Comment rendering', type: :render do

data/spec/render/doctype_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Doctype rendering', type: :render do

data/spec/render/element_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Element rendering', type: :render do

data/spec/render/filters/cdata_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'CDATA filter rendering', type: :render do

data/spec/render/filters/coffee_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'CoffeeScript filter rendering', type: :render do

data/spec/render/filters/css_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'CSS filter rendering', type: :render do

data/spec/render/filters/escaped_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Escaped filter rendering', type: :render do

data/spec/render/filters/javascript_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'JavaScript filter rendering', type: :render do

data/spec/render/filters/markdown_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Markdown filter rendering', type: :render do

data/spec/render/filters/plain_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Plain filter rendering', type: :render do

data/spec/render/filters/preserve_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Preserve filter rendering', type: :render do

data/spec/render/filters/ruby_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Ruby filter rendering', type: :render do

data/spec/render/filters/sass_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'SASS filter rendering', type: :render do

data/spec/render/filters/scss_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'SCSS filter rendering', type: :render do

data/spec/render/filters_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'filter rendering', type: :render do

data/spec/render/haml_comment_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Haml comment rendering', type: :render do

data/spec/render/helpers_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe Faml::Helpers, type: :render do

data/spec/render/multiline_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Multiline rendering', type: :render do

data/spec/render/newline_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Newline with > and <', type: :render do

data/spec/render/plain_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Plain rendering', type: :render do

data/spec/render/preserve_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Preserve rendering', type: :render do

data/spec/render/sanitize_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Sanitize rendering', type: :render do

data/spec/render/script_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Script rendering', type: :render do

data/spec/render/silent_script_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'SilentScript rendering', type: :render do

data/spec/render/unescape_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Unescape rendering', type: :render do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'simplecov'
 require 'coveralls'
 

data/spec/support/incompatibilities_generator.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'pathname'
 require 'singleton'
 require 'hamlit/engine'
@@ -100,7 +101,7 @@ EOS
   def render_input_title(options)
     title = 'Input'
     unless options.empty?
-      title << " (with options=#{options.inspect})"
+      title += " (with options=#{options.inspect})"
     end
     title
   end

data/spec/tilt_spec.rb

@@ -1,3 +1,4 @@
+# frozen-string-literal: true
 require 'spec_helper'
 
 RSpec.describe 'Tilt integration' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement