opal-haml 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0af2dad04a9fd95b530e40a2a9d9881c606d41
-  data.tar.gz: 9707c8f743296cd31e73fe52d3a7458f1bd9c7fd
+  metadata.gz: 305b113a6fa5548f1271669bd052274214b8f7f9
+  data.tar.gz: 6cc024e7ba8431aefb07c7c9626f83602e2cd951
 SHA512:
-  metadata.gz: 5c6e3a530c8e0447680380024e732e69818dd6d62b4d55ba9fd8bfc884a363c042e33c1bdaa69a0b2348c66eb84c48f59b579ef9d34cd19cd96590a83e62d7fd
-  data.tar.gz: 546cc1182c53f4f2d4b723ff4c6a6597e24df0f97be32d6d535d028997de8039ab519d4b6f486a8c86d688d24cf0d71392bccaed775bfcc9198bc20e4399cdd1
+  metadata.gz: bd48d21852e5aacb70297f5377e6703fdd1df259b6f94b4e8d14a092e854ab9d43aa35a15689bc51ea96f024eef9d37fc575664215c5a621e94b4ede7dadafb7
+  data.tar.gz: 186b45f6dff3b65a3bbfdf83375d56497b195a868314ece2b6de7a125f099ce2262fd22651f2b4052f7a9e4ed03cff2a8a5c7713f53e76070c00bdd9d4657165

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+## 0.3.0 2015-02-03
+
+*   Add support for new opal Builder processors.
+
+*   Implicitly require `opal-haml` when any haml template is required
+
+*   Cleanup generated code to be use Opal ERB runtime directly
+
 ## 0.2.0 2013-12-17
 
-* Remove opal-sprockets dependency
+*   Remove opal-sprockets dependency
 
 ## 0.1.0 2013-12-17
 
-* Initial release
+*   Initial release

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-gem 'opal', '~> 0.5.0'

data/README.md

@@ -1,6 +1,19 @@
-# opal-haml
+# opal-haml: Haml templates for opal
 
-Haml templates for opal
+This gem adds `.haml` files to sprockets to precompile templates for opal. This
+gem does not make the haml compiler available under opal, just the result of
+pre-compiling a haml template.
+
+A small runtime is included to handle dynamic attributes, as well as allowing
+content to be rendered.
+
+All haml templates become available under the `Template` constant in Opal,
+which allows a template to be easily rendered in a context:
+
+```ruby
+Template['user'].render(my_user)
+# => <div>..</div>
+```
 
 ## Usage
 
@@ -30,11 +43,11 @@ class User
   attr_accessor :name, :age
 
   def initialize(name, age)
-    @name, @age = name age
+    @name, @age = name, age
   end
 end
 
-user = User.new('Ford Perfect', 42)
+user = User.new('Ford Prefect', 42)
 html = Template['user_template'].render(user)
 puts html
 # => <div class="row">...</div>
@@ -54,6 +67,12 @@ Run tests using opal-rspec:
 $ bundle exec rake
 ```
 
+Run specs in the browser:
+
+```
+$ bundle exec rackup
+```
+
 ## License
 
 (The MIT License)

data/lib/opal/haml/builder.rb

@@ -0,0 +1,25 @@
+require 'opal/builder_processors'
+
+module Opal
+  module Haml
+    class HamlProcessor < Opal::BuilderProcessors::RubyProcessor
+      handles :haml
+
+      def initialize(*args)
+        super
+        @source = prepare(@source, @filename)
+      end
+
+      def requires
+        ['opal-haml'] + super
+      end
+
+      def prepare(source, path)
+        haml = ::Haml::Engine.new(source, :ugly => true).precompiled
+        haml = haml.gsub('_hamlout.buffer', '_hamlout')
+
+        ::Opal::Haml.wrap haml, path
+      end
+    end
+  end
+end

data/lib/opal/haml/processor.rb

@@ -17,8 +17,9 @@ module Opal
       def prepare
       end
 
-      def evaluate(scope, locals, &block)
-        Opal::Haml.compile data, scope.logical_path.sub(/^templates\//, '')
+      def evaluate(context, locals, &block)
+        context.require_asset 'opal-haml'
+        Opal::Haml.compile data, context.logical_path.sub(/^templates\//, '')
       end
     end
   end

data/lib/opal/haml/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Haml
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/opal/haml.rb

@@ -1,4 +1,5 @@
 require 'opal'
+require 'opal/haml/builder'
 require 'opal/haml/processor'
 require 'opal/haml/version'
 
@@ -6,11 +7,17 @@ module Opal
   module Haml
     def self.compile(source, file = '(haml)')
       haml = ::Haml::Engine.new(source, :ugly => true).precompiled
+      haml = haml.gsub('_hamlout.buffer', '_hamlout')
       Opal.compile(wrap(haml, file))
     end
 
     def self.wrap(haml, file)
-      "Template.new('#{file}') do |_hamlout|\n#{haml}\n_hamlout.join\nend\n"
+      <<-EOS
+        Template.new('#{file}') do |_hamlout|
+          #{haml}
+          _hamlout.join
+        end
+      EOS
     end
   end
 end

data/opal/opal-haml.rb

@@ -2,10 +2,6 @@ require 'template'
 
 class Template
   class OutputBuffer
-    def buffer
-      self
-    end
-
     alias << append
 
     # allow tags in haml to have dynamic attributes

data/opal-haml.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'opal', ['>= 0.5.0', '< 1.0.0']
   s.add_dependency 'haml'
 
-  s.add_development_dependency 'opal-rspec', '>= 0.2.1'
+  s.add_development_dependency 'opal-rspec', '~> 0.4.0'
   s.add_development_dependency 'rake'
 end

data/spec/haml_spec.rb

@@ -1,5 +1,4 @@
-require 'opal-haml'
-
+require 'spec_helper'
 require File.expand_path('../simple', __FILE__)
 require File.expand_path('../advanced', __FILE__)
 require File.expand_path('../html_content', __FILE__)

data/spec/output_buffer_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'template'
+
+describe Template::OutputBuffer do
+  describe "#attributes" do
+    it "compiles an empty attribute set as ''" do
+      attributes({}).should == ""
+    end
+
+    it "can compile simple attributes" do
+      result = attributes(name: 'foo', height: '100')
+      expect(result).to include("name='foo'", "height='100'")
+    end
+
+    it "skips the attribute for false values" do
+      result = attributes(name: false)
+      expect(result).to_not include('name')
+    end
+
+    it "generates a simple named attribute for true values" do
+      result = attributes(closable: true)
+      expect(result).to include('closable')
+      expect(result).to_not include('closable=')
+    end
+
+    def attributes(attrs)
+      subject.attributes({}, nil, attrs)
+    end
+  end
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: opal-haml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 description: Run Haml templates client-side with Opal.
@@ -78,7 +78,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -87,6 +87,7 @@ files:
 - config.ru
 - 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
@@ -94,7 +95,9 @@ files:
 - spec/advanced.haml
 - spec/haml_spec.rb
 - spec/html_content.haml
+- spec/output_buffer_spec.rb
 - spec/simple.haml
+- spec/spec_helper.rb
 homepage: http://opalrb.org
 licenses:
 - MIT
@@ -105,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Run Haml templates client-side with Opal
@@ -123,4 +126,7 @@ test_files:
 - spec/advanced.haml
 - spec/haml_spec.rb
 - spec/html_content.haml
+- spec/output_buffer_spec.rb
 - spec/simple.haml
+- spec/spec_helper.rb
+has_rdoc: