opal-haml 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09295c5a78ced0158a3b1fa7e80aa2048fca99ed'
-  data.tar.gz: 1549592bbd08fc4e9ddcaf743e4736413d2f05fd
+SHA256:
+  metadata.gz: f594f01d2d7f69d721a93d23a8fe88466f83505dd99ea2e60706e1106fa41be8
+  data.tar.gz: 92ad9e7fcfa526b3003cc63c7309d4c40875f1dfa884481881d02cd97de2f50c
 SHA512:
-  metadata.gz: 3a1385061b8c9d8e9255cab355fbc84808e21b1545407ed5bb6c3f739805e20fea2d5ff0783299af9412841105b25d7973cdbaaa7f265af4714f22d8c39f854a
-  data.tar.gz: e58fc44ac5ebee247678509248157637c149892413a35d1716a7f13fb0773bf6dbd3d8f6cf7b7c26a71b3e2e6be9f0b741229f82cf4d8e21319c22c55f9253d2
+  metadata.gz: 29c63fb9eec91c9b2c7746ab383a5d9e3a27e1fa2d51667e26335df739f07c2bca1d80abbb6af638d6e94a8ad85816a9fb2e537ab5f5a26052a8adf25427b29d
+  data.tar.gz: e83e0aec5b8e30a403fe52de84b9dd0105a3233bfb5544d36edb05c3f4bec41e62eaa9f1625716200c0cb8ed10cb55849eb4435fbdab48a5a0c54cc58c96b9f5

data/.travis.yml

@@ -6,25 +6,19 @@ rvm: 2.3.4
 env:
   - HAML_VERSION="~> 4.0" OPAL_VERSION='~> 0.10.0'
   - HAML_VERSION="~> 5.0" OPAL_VERSION='~> 0.10.0'
-  - HAML_VERSION="~> 4.0" OPAL_VERSION='~> 0.11.0.rc1'
-  - HAML_VERSION="~> 5.0" OPAL_VERSION='~> 0.11.0.rc1'
+  - HAML_VERSION="~> 5.0" OPAL_VERSION='~> 0.11.0'
+  - HAML_VERSION="~> 5.0" OPAL_VERSION=master
 
 cache:
   bundler: true
   directories:
   - node_modules
-  - phantom20
 
 before_install:
-  # Attempt to work around Travis issues and Ruby 2.3 - https://github.com/vcr/vcr/issues/582
   - gem update --system
-  - "mkdir -p phantom20"
-  - "export PATH=`pwd`/phantom20:$PATH"
-  - "echo $PATH"
-  - "pushd phantom20"
-  - "ls phantomjs || curl -L -O https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
-  - "ls phantomjs || tar xjvf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
-  - "rm -rf phantomjs-2.0.0-ubuntu-12.04.tar.bz2"
-  - "popd"
-
+  - "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"
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.5 2018-03-19
+
+- Avoid warning from Opal v0.11
+
 ## 0.4.4 2017-05-13
 
 - Improve support for the attribute builder

data/Gemfile

@@ -1,3 +1,13 @@
 source 'https://rubygems.org'
 gemspec
 gem 'haml', ENV['HAML_VERSION'] || '> 0'
+
+if ENV['OPAL_VERSION'] == 'master'
+  gem 'opal', github: 'opal', branch: :master
+  gem 'opal-sprockets', github: 'opal/opal-sprockets'
+  gem 'opal-rspec', github: 'opal/opal-rspec', branch: 'elia/opal-master', submodules: true
+elsif ENV['OPAL_VERSION'].to_f >= 0.11
+  gem 'opal-rspec', github: 'opal/opal-rspec', branch: 'elia/opal-master', submodules: true
+else
+  gem 'opal', '~> 0.10.5'
+end

data/Rakefile

@@ -3,4 +3,7 @@ Bundler.require
 Bundler::GemHelper.install_tasks
 
 require 'opal/rspec/rake_task'
-Opal::RSpec::RakeTask.new(:default)
+Opal::RSpec::RakeTask.new(:default) do |server, task|
+  task.pattern = 'spec-opal/**/*_spec.rb'
+  task.default_path = 'spec-opal'
+end

data/config.ru

@@ -1,9 +1,12 @@
 require 'bundler'
 Bundler.require
 
+require 'opal-sprockets'
 require 'opal-rspec'
 
-run Opal::Server.new { |s|
+OPAL_SPROCKETS_SERVER = defined?(Opal::Server) ? Opal::Server : Opal::Sprockets::Server
+
+run OPAL_SPROCKETS_SERVER.new { |s|
   s.main = 'opal/rspec/sprockets_runner'
   s.append_path 'spec'
   s.debug = true

data/{opal → lib-opal}/opal-haml.rb

@@ -68,7 +68,7 @@ class Template
     end
 
     def _attribute_escape(value)
-      value.to_s.gsub /['"&<>]/, '"' => '&quot;', "'" => '&apos;', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;'
+      value.to_s.gsub(/['"&<>]/, '"' => '&quot;', "'" => '&apos;', '&' => '&amp;', '<' => '&lt;', '>' => '&gt;')
     end
   end
 end

data/lib/opal/haml.rb

@@ -35,4 +35,4 @@ module Opal
   end
 end
 
-Opal.append_path File.expand_path('../../../opal', __FILE__).untaint
+Opal.append_path File.expand_path('../../../lib-opal', __FILE__).untaint

data/lib/opal/haml/processor.rb

@@ -1,9 +1,13 @@
 require 'haml'
-require 'sprockets'
+require 'opal-sprockets'
 
 module Opal
   module Haml
-    class Processor < ::Opal::Processor
+    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)
@@ -13,7 +17,7 @@ module Opal
 
       def self.compiler_options
         # otherwise would check current class `attr_accessor`s
-        ::Opal::Processor.compiler_options
+        OPAL_SPROCKETS_PROCESSOR.compiler_options
       end
     end
   end

data/lib/opal/haml/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Haml
-    VERSION = '0.4.4'
+    VERSION = '0.4.5'
   end
 end

data/opal-haml.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |s|
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths  = ['lib']
 
-  s.add_dependency 'opal', '~> 0.10.0'
+  s.add_dependency 'opal', ['~> 0.10', '< 0.12']
+  s.add_dependency 'opal-sprockets', '~> 0.4.1'
   s.add_dependency 'haml'
 
-  s.add_development_dependency 'opal-rspec', '~> 0.6.0'
+  s.add_development_dependency 'opal-rspec'
   s.add_development_dependency 'rake'
 end

data/{spec → spec-opal}/haml_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
-require_tree './fixtures'
+require 'fixtures/simple'
+require 'fixtures/advanced'
+require 'fixtures/html_content'
+require 'fixtures/attributes_helper'
 
 describe "Haml files" do
   let(:simple)            { Template['fixtures/simple'] }

data/spec-opal/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'opal'
+require 'opal-haml'
+
+RSpec.configure do |c|
+  c.color = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-haml
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,14 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: opal-sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +62,16 @@ dependencies:
   name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,21 +100,21 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- lib-opal/haml/attribute_builder.rb
+- lib-opal/opal-haml.rb
 - lib/opal-haml.rb
 - lib/opal/haml.rb
 - lib/opal/haml/builder.rb
 - lib/opal/haml/processor.rb
 - lib/opal/haml/version.rb
 - opal-haml.gemspec
-- opal/haml/attribute_builder.rb
-- opal/opal-haml.rb
-- spec/fixtures/advanced.haml
-- spec/fixtures/attributes_helper.haml
-- spec/fixtures/html_content.haml
-- spec/fixtures/simple.haml
-- spec/haml_spec.rb
-- spec/output_buffer_spec.rb
-- spec/spec_helper.rb
+- spec-opal/fixtures/advanced.haml
+- spec-opal/fixtures/attributes_helper.haml
+- spec-opal/fixtures/html_content.haml
+- spec-opal/fixtures/simple.haml
+- spec-opal/haml_spec.rb
+- spec-opal/output_buffer_spec.rb
+- spec-opal/spec_helper.rb
 homepage: http://opalrb.org
 licenses:
 - MIT
@@ -115,15 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Run Haml templates client-side with Opal
-test_files:
-- spec/fixtures/advanced.haml
-- spec/fixtures/attributes_helper.haml
-- spec/fixtures/html_content.haml
-- spec/fixtures/simple.haml
-- spec/haml_spec.rb
-- spec/output_buffer_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-require 'opal'
-require 'opal-haml'