opal-haml 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc6eff881eee7f0547abedbe1ced796b247ebfe766ff1fb8a12e2534d05f7cc
-  data.tar.gz: 60937e8f9424a9b7b2bb0dbb1ff463a58ec82802611028ed6c94302831f385a3
+  metadata.gz: caaa43696ff138938744b1bc2ebe269cee1db4eb9dfd786fa188434fa8a151e4
+  data.tar.gz: 12cea5167029244a89459504f4bc62f4ceb06ffce92d19d81a42d64b6ba0210c
 SHA512:
-  metadata.gz: 4c87b4b2c50b813ef922a0a8ebc432efad3a4e9f6f016efd96e748f09824a6dc6b13d39c167692b3235d006f461cf7e1754963e7bb1cd4113ce4a0ec6907d21c
-  data.tar.gz: 1132bf23069a58109c1a6a4525fe92f642f1637e488bcfcb1113f0b64838c408d86257457f87526084332295a9c17e100b7dfbcc861d3397424784dbec6c4f37
+  metadata.gz: 488af893b673e34f9cb9cb44e4f3764addc4f18607ee63fdab08a42ea2da59c6a9628a66601ac9f4d52283eaf987304be7b196850419cdc9c912f8fd34e196f7
+  data.tar.gz: 4bcc5f1cab067d59cc6c8757a4c1fe3d98e875f04b36fabb1a150c35aad087b6fe891a903b8d7c0685342fa3251e5a217d035bf59a66c0242f6ee8828e942607

data/.github/workflows/build.yml

@@ -0,0 +1,29 @@
+name: Tests
+on:
+  push:
+    branches:
+      - master
+      - "*-stable"
+      - "*/ci-check"
+  pull_request:
+
+jobs:
+  tests:
+    name: Tests
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7, 3.0]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rake

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0.4.6 unreleased
+## 0.5.0 2021-12-01
+
+- Compatibility for Haml v5.2
+
+- Support Sprockets 4.0
+
+## 0.4.6 2019-07-13
 
 - Add support for Opal v1.0
 

data/Gemfile

@@ -3,12 +3,17 @@ gemspec
 
 github = -> repo { "https://github.com/#{repo}" }
 version = -> rs { -> vs { Gem::Requirement.new(rs) === Gem::Version.new(vs) } }
-haml_version = ENV['HAML_VERSION'] || 0
+haml_version = ENV['HAML_VERSION'] ? "~> #{ENV['HAML_VERSION']}" : ">= 0"
 
-gem 'haml', "~> #{haml_version}"
+gem 'haml', haml_version
 
 case ENV['OPAL_VERSION']
 
+when 'local'
+  gem 'opal', path: '../opal'
+  gem 'opal-sprockets', path: '../opal-sprockets'
+  gem 'opal-rspec', path: '../opal-rspec'
+
 when 'master'
   gem 'opal', git: github['opal/opal'], branch: :master
   gem 'opal-sprockets', git: github['opal/opal-sprockets']

data/README.md

@@ -81,7 +81,7 @@ $ bundle exec rackup
 
 (The MIT License)
 
-Copyright (C) 2013 by Adam Beynon
+Copyright (C) 2013 by Adam Beynon, 2015 Elia Schito
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/config.ru

@@ -4,10 +4,16 @@ Bundler.require
 require 'opal-sprockets'
 require 'opal-rspec'
 
-OPAL_SPROCKETS_SERVER = defined?(Opal::Server) ? Opal::Server : Opal::Sprockets::Server
+OPAL_SPROCKETS_SERVER = defined?(Opal::Sprockets::Server) ? Opal::Sprockets::Server : Opal::Server
 
-run OPAL_SPROCKETS_SERVER.new { |s|
+sprockets_env = Opal::RSpec::SprocketsEnvironment.new(
+  spec_pattern         = 'spec-opal/**/*_spec.{rb,opal}',
+  spec_exclude_pattern = nil,
+  spec_files           = nil,
+  default_path         = 'spec-opal')
+
+run OPAL_SPROCKETS_SERVER.new(sprockets: sprockets_env) { |s|
   s.main = 'opal/rspec/sprockets_runner'
-  s.append_path 'spec'
+  s.append_path 'spec-opal'
   s.debug = true
 }

data/lib/opal/haml/builder.rb

@@ -7,6 +7,7 @@ module Opal
 
       def initialize(*args)
         super
+        @filename = ::Opal::Compiler.module_name(@filename)
         @source = prepare(@source, @filename)
       end
 

data/lib/opal/haml/processor.rb

@@ -3,30 +3,15 @@ require 'opal-sprockets'
 
 module Opal
   module Haml
-    OPAL_SPROCKETS_PROCESSOR = defined?(Opal::Processor) ?
-      ::Opal::Processor :
-      ::Opal::Sprockets::Processor
-
-    class Processor < OPAL_SPROCKETS_PROCESSOR
-      self.default_mime_type = 'application/javascript'
-
-      def evaluate(context, locals, &block)
-        @data = Opal::Haml.compile_haml @data, context.logical_path.sub(/^templates\//, '')
+    class Processor < ::Opal::Sprockets::Processor
+      def call
+        @data = Opal::Haml.compile_haml @data, context.logical_path.sub(/#{Opal::REGEXP_START}templates\//, '')
         super
       end
-
-      def self.compiler_options
-        # otherwise would check current class `attr_accessor`s
-        OPAL_SPROCKETS_PROCESSOR.compiler_options
-      end
     end
   end
 end
 
-if Sprockets.respond_to? :register_transformer
-  extra_args = [{mime_type: 'application/javascript', silence_deprecation: true}]
-else
-  extra_args = []
-end
-
-Sprockets.register_engine '.haml', Opal::Haml::Processor, *extra_args
+Sprockets.register_mime_type 'application/html+haml', extensions: ['.haml', '.html.haml']
+Sprockets.register_transformer 'application/html+haml', 'application/javascript', Opal::Haml::Processor
+Opal::Sprockets.register_mime_type 'application/html+haml'

data/lib/opal/haml/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Haml
-    VERSION = '0.4.6'
+    VERSION = '0.5.0'
   end
 end

data/lib-opal/opal-haml.rb

@@ -27,6 +27,8 @@ module Haml
             .replace(/[\r\n]/g, '
');
       }
     end
+
+    singleton_class.alias_method :html_escape_without_haml_xss, :html_escape
   end
 end
 

data/opal-haml.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths  = ['lib']
 
   s.add_dependency 'opal', ['>= 0.10', '< 2']
-  s.add_dependency 'opal-sprockets', '~> 0.4.1'
+  s.add_dependency 'opal-sprockets', '>= 0.5.0'
   s.add_dependency 'haml'
 
   s.add_development_dependency 'opal-rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-haml
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Beynon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-13 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -34,16 +34,16 @@ dependencies:
   name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -92,8 +92,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -119,7 +119,7 @@ homepage: https://github.com/opal/opal-haml#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Run Haml templates client-side with Opal
 test_files: []

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-sudo: false
-rvm: 2.6.2
-
-env:
-  - HAML_VERSION="4.0" OPAL_VERSION="0.10"
-  - HAML_VERSION="5.0" OPAL_VERSION="0.10"
-  - HAML_VERSION="4.0" OPAL_VERSION="0.11"
-  - HAML_VERSION="5.0" OPAL_VERSION="0.11"
-  - HAML_VERSION="4.0" OPAL_VERSION="1.0"
-  - HAML_VERSION="5.0" OPAL_VERSION="1.0"
-  - HAML_VERSION="4.0" OPAL_VERSION=master
-  - HAML_VERSION="5.0" OPAL_VERSION=master
-
-cache:
-  bundler: true
-  directories:
-  - node_modules
-
-before_install:
-  - gem update --system
-  - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
-  - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
-  - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
-  - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
-  - "phantomjs --version"
-