cells-erb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecccac2e02b519577101d4cc7d1a47ec5e3adbd
-  data.tar.gz: 0b07c8d7cdf54580331dc50b0c355fecb4e721f2
+  metadata.gz: 15a81cb8e550deade32a9dd5311062296927e306
+  data.tar.gz: ecbea4577de1b3059769b6d56cae6ded988eebfb
 SHA512:
-  metadata.gz: 77f655994403ebfb181fd4ea7aa5d99612d04ebf36973d45954ed82ae2e0f41d212a565828974a93970671b283655663db37f828330481a096d998361c9031f0
-  data.tar.gz: 16590351dea6d55b5a994f27cf8af1ec91e6bcc06a9b5e1ee76329b2a8957e5e142495d12f59509993a691bd08b8bef00a7bace841cfa56849818a5801a4d566
+  metadata.gz: 553a21f3119347d5be6e0e18fd7e30d8b7cc8344cfe5f22c2ded2a9d21b86ebbfd536567d8384627997d9915b422c3b3b2515f52851b4998da57f92956144efa
+  data.tar.gz: 15322a3fe3e5dcc825723fc06806577d591f1657972117cc09053b06a1d002963dd47ac77b4c06b294899499d48d881861a4d34d835c3dc0ea5c242e84dd399a

data/.travis.yml

@@ -0,0 +1,4 @@
+gemfile:
+  - gemfiles/rails4.2-tilt-1.4.gemfile
+  - gemfiles/rails4.2-tilt-2.0.gemfile
+  - gemfiles/rails3.2-tilt-1.4.gemfile

data/Appraisals

@@ -1,23 +1,23 @@
 appraise 'rails-3.2' do
-    gem 'railties', github: 'rails/rails', branch: '3-2-stable'
+    gem 'railties', '~> 3.2'
     gem 'tzinfo'
     gem 'minitest', '4.7.5'
 end
 
 appraise "rails-4.0" do
-    gem 'railties', github: 'rails/rails', branch: '4-0-stable'
-    gem 'activemodel', github: 'rails/rails', branch: '4-0-stable'
+    gem 'railties', '~> 4.0.0'
+    gem 'activemodel'
     gem 'minitest', '4.7.5'
 end
 
 appraise "rails-4.1" do
-    gem 'railties', github: 'rails/rails', branch: '4-1-stable'
-    gem 'activemodel', github: 'rails/rails', branch: '4-1-stable'
+    gem 'railties', '~> 4.1.0'
+    gem 'activemodel'
     gem 'minitest', '~> 5.2'
 end
 
 appraise "rails-4.2" do
-    gem 'railties', github: 'rails/rails', branch: '4-2-stable'
-    gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
+    gem 'railties', '~> 4.2.0'
+    gem 'activemodel'
     gem 'minitest', '~> 5.2'
 end

data/README.md

@@ -1,6 +1,6 @@
 # Cells::Erb
 
-TODO: Write a gem description
+Proper ERB support for Cells using [Erbse](https://github.com/apotonick/erbse).
 
 ## Installation
 
@@ -10,22 +10,10 @@ Add this line to your application's Gemfile:
 gem 'cells-erb'
 ```
 
-And then execute:
+This will register the `Erbse::Template` engine with Tilt for `.erb` files.
 
-    $ bundle
+And that's all you need to do.
 
-Or install it yourself as:
+## Dependencies
 
-    $ gem install cells-erb
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it ( https://github.com/trailblazer/cells-erb/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+This gem works with Tilt 1.4 and 2.0, and hence allows you to use it from Rails 3.2 upwards.

data/cells-erb.gemspec

@@ -1,15 +1,16 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+
+require 'cell/erb/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'cells-erb'
-  spec.version       = '0.0.1'
+  spec.version       = Cell::Erb::VERSION
   spec.authors       = ['Abdelkader Boudih','Nick Sutterer']
   spec.email         = %w(terminale@gmail.com apotonick@gmail.com)
-  spec.summary       = 'Add block support to Erubis for cells 4'
-  spec.description   = 'Add block support to Erubis for cells 4
-'
+  spec.summary       = 'Tilt binding for Erbse.'
+  spec.description   = 'Tilt binding for Erbse. Erbse is a modern Erubis implementation with block support.'
   spec.homepage      = 'https://github.com/trailblazer/cells-erb'
   spec.license       = 'MIT'
 
@@ -17,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'cells', '~> 4.0.0.beta'
-  spec.add_runtime_dependency 'erubis', '~> 2.7.0'
-  spec.add_development_dependency 'bundler', '>= 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_runtime_dependency "cells", "~> 4.0.0.beta"
+  spec.add_runtime_dependency "tilt", ">= 1.4", "< 3"
+  spec.add_runtime_dependency "erbse", ">= 0.0.2"
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/gemfiles/rails_4.2-tilt-1.4.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "cells", :github => "apotonick/cells"
+#gem "cells", path: "../../cells"
+gem "appraisal"
+gem "railties", "~> 4.2.0"
+gem "activemodel"
+gem "minitest", "~> 5.2"
+gem "tilt", "~> 1.4"
+
+gemspec :path => "../"
+
+# gem "erbse", path: "../../erbse"

data/gemfiles/rails_4.2-tilt-2.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "cells", :github => "apotonick/cells"
+#gem "cells", path: "../../cells"
+gem "appraisal"
+gem "railties", "~> 4.2.0"
+gem "activemodel"
+gem "minitest", "~> 5.2"
+gem "tilt", "~> 2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2-tilt-3.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "cells", :github => "apotonick/cells"
+#gem "cells", path: "../../cells"
+gem "appraisal"
+gem "railties", "~> 4.2.0"
+gem "activemodel"
+gem "minitest", "~> 5.2"
+gem "tilt", "~> 3.0"
+
+gemspec :path => "../"

data/lib/cell/erb/template.rb

@@ -0,0 +1,30 @@
+require "erbse"
+
+module Cell::Erb
+  # Erbse-Tilt binding. This should be bundled with tilt. # 1.4. OR should be tilt-erbse.
+  class Template < Tilt::Template
+    def self.engine_initialized?
+      defined? ::Erbse::Template
+    end
+
+    def initialize_engine
+      require_template_library 'erbse'
+    end
+
+    # :engine_class can be passed via
+    #
+    #   Tilt.new("#{base}/#{prefix}/#{view}", engine_class: Erbse::Eruby)
+    def prepare
+      engine_class = options.delete(:engine_class)
+      # engine_class = ::Erubis::EscapedEruby if options.delete(:escape_html)
+      @template = (engine_class || ::Erbse::Template).new(data, options)
+    end
+
+    def precompiled_template(locals)
+      @template.call
+    end
+  end
+end
+
+Tilt.register Cell::Erb::Template, "erb"
+# Tilt.prefer Cell::Erb::Template

data/lib/cell/erb/version.rb

@@ -0,0 +1,5 @@
+module Cell
+  module Erb
+    VERSION = "0.0.2"
+  end
+end

data/lib/cells-erb.rb

@@ -0,0 +1 @@
+require "cell/erb/template"

data/test/dummy/app/cells/song/with_content_tag.erb

@@ -1,6 +1 @@
-<%= content_tag :span do %>
-    Title:
-    <%= content_tag :div do %>
-        Still Knee Deep
-    <% end %>
-<% end %>
+<%= content_tag(:div) { "Beachparty" } %>

data/test/dummy/app/cells/song/with_content_tag_and_content_tag.erb

@@ -0,0 +1,6 @@
+<%= content_tag :span do %>
+    Title:
+    <%= content_tag :div do %>
+        Still Knee Deep
+    <% end %>
+<% end %>

data/test/dummy/app/cells/song/with_form_tag_and_content_tag.erb

@@ -0,0 +1,12 @@
+Word.
+
+<%= form_tag "/erubis/is/horribly/outdated" do %>
+  <%= link_to "/rails/sucks" do %>
+    hallo
+  <% end %>
+
+  <%= content_tag( :ul) do %>
+   Hallo
+  <% end %>
+
+<% end %>

data/test/dummy/app/cells/song_cell.rb

@@ -1,5 +1,13 @@
 class SongCell < Cell::ViewModel
-  def edit
+  self.view_paths = ["test/dummy/app/cells"]
+
+  include ActionView::Helpers::FormHelper
+
+  def with_form_tag_and_content_tag
+    render
+  end
+
+  def with_content_tag_and_content_tag
     render
   end
 

data/test/erb_test.rb

@@ -1,16 +1,44 @@
 require 'test_helper'
 
-
 class ErbTest < MiniTest::Spec
   let (:controller) { ApplicationController.new.tap { |ctl| ctl.send("request=", ActionDispatch::Request.new({})) } }
-  let (:cellule) { SongCell.new(controller) }
+  let (:song_cell) { SongCell.new(controller) }
 
 
   # URL helpers work in cell instance.
-  it { cellule.songs_path.must_equal "/songs" }
+  it { song_cell.songs_path.must_equal "/songs" }
+
+  # content_tag { }
+  it { song_cell.(:with_content_tag).must_equal "<div>Beachparty</div>" }
+
+  # content_tag { content_tag { } }
+  it do song_cell.(:with_content_tag_and_content_tag).must_equal %{<span>
+    Title:
+    <div>
+        Still Knee Deep
+</div></span>}
+  end
+
+  # form_tag { content_tag { } }
+  it( "xxx") do
+    form_tag = "<form action=\"/erubis/is/horribly/outdated\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" />"
+    form_tag = "<form accept-charset=\"UTF-8\" action=\"/erubis/is/horribly/outdated\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div>" if ActionPack::VERSION::MAJOR == 3
+
+    song_cell.(:with_form_tag_and_content_tag).must_equal %{Word.
+
+#{form_tag}
+  <a href=\"/rails/sucks\">
+    hallo
+</a>
+  <ul>
+   Hallo
+</ul>
+</form>}
+end
+    # song_cell.(:with_form_tag_and_content_tag).must_equal_xml_structure "<form><div><input/></div><label/><input/><ul><li/></ul></form>" }
+
+
 
-  # content_tag with ERB.
-  it { cellule.with_content_tag.must_equal "<span>Title:\n<div>Still Knee Deep\n</div>\n</span>\n" }
   #
   # # form_tag with block in block work.
   # it { cellule.edit.must_equal "<form><div><input/></div><label/><input/><ul><li/></ul></form>" }

data/test/test_helper.rb

@@ -1,12 +1,10 @@
-begin
-  require 'byebug'
-rescue LoadError
-end
-require 'minitest/reporters'
-Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new]
+require "pp"
 require 'minitest/autorun'
 
 ENV['RAILS_ENV'] = 'test'
 
-require 'cell/erb'
+
+require "cells"
 require_relative 'dummy/config/environment'
+
+require "cells-erb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-erb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
@@ -26,49 +26,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0.beta
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: erbse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-description: |
-  Add block support to Erubis for cells 4
+        version: '0'
+description: Tilt binding for Erbse. Erbse is a modern Erubis implementation with
+  block support.
 email:
 - terminale@gmail.com
 - apotonick@gmail.com
@@ -77,21 +97,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - cells-erb.gemspec
-- gemfiles/rails_3.2.gemfile
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- lib/cell/erb.rb
-- lib/cells/erb.rb
+- gemfiles/rails_4.2-tilt-1.4.gemfile
+- gemfiles/rails_4.2-tilt-2.0.gemfile
+- gemfiles/rails_4.2-tilt-3.0.gemfile
+- lib/cell/erb/template.rb
+- lib/cell/erb/version.rb
+- lib/cells-erb.rb
 - test/dummy/Rakefile
 - test/dummy/app/cells/song/with_content_tag.erb
+- test/dummy/app/cells/song/with_content_tag_and_content_tag.erb
 - test/dummy/app/cells/song/with_form_for_block.erb
+- test/dummy/app/cells/song/with_form_tag_and_content_tag.erb
 - test/dummy/app/cells/song_cell.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru
@@ -123,14 +146,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Add block support to Erubis for cells 4
+summary: Tilt binding for Erbse.
 test_files:
 - test/dummy/Rakefile
 - test/dummy/app/cells/song/with_content_tag.erb
+- test/dummy/app/cells/song/with_content_tag_and_content_tag.erb
 - test/dummy/app/cells/song/with_form_for_block.erb
+- test/dummy/app/cells/song/with_form_tag_and_content_tag.erb
 - test/dummy/app/cells/song_cell.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru
@@ -142,4 +167,3 @@ test_files:
 - test/dummy/config/routes.rb
 - test/erb_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/gemfiles/rails_3.2.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cells", :github => "apotonick/cells"
-gem "appraisal"
-gem "minitest-reporters"
-gem "railties", :github => "rails/rails", :branch => "3-2-stable"
-gem "tzinfo"
-gem "minitest", "4.7.5"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cells", :github => "apotonick/cells"
-gem "appraisal"
-gem "minitest-reporters"
-gem "railties", :github => "rails/rails", :branch => "4-0-stable"
-gem "activemodel", :github => "rails/rails", :branch => "4-0-stable"
-gem "minitest", "4.7.5"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cells", :github => "apotonick/cells"
-gem "appraisal"
-gem "minitest-reporters"
-gem "railties", :github => "rails/rails", :branch => "4-1-stable"
-gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
-gem "minitest", "~> 5.2"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cells", :github => "apotonick/cells"
-gem "appraisal"
-gem "minitest-reporters"
-gem "railties", :github => "rails/rails", :branch => "4-2-stable"
-gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
-gem "minitest", "~> 5.2"
-
-platforms :mri_20, :mri_21 do
-  gem "pry-byebug"
-end
-
-gemspec :path => "../"

data/lib/cell/erb.rb

@@ -1,72 +0,0 @@
-require 'cells'
-require 'erubis/engine/eruby'
-require 'tilt/erb'
-
-# The original ERB implementation in Ruby doesn't support blocks like
-#   <%= form_for do %>
-# which is fixed with this monkey-patch.
-#
-# TODO: don't monkey-patch, use this in cells/tilt, only!
-module Erubis
-  module RubyGenerator
-    def init_generator(properties={})
-      super
-      @in_block = 0
-      @block_ignore = 0
-    end
-
-    def escaped_expr(code)
-      return "#{@escapefunc} #{code}"
-    end
-
-    def add_stmt(src, code)
-      if block_start? code
-        block_ignore
-      elsif block_end? code
-        src << @bufvar << ?;
-        block_end
-      end
-
-      src << "#{code};"
-    end
-
-    def add_expr_literal(src, code)
-      if block_start? code
-        src << "#@bufvar << #{code};"
-        block_start
-        src << "#@bufvar = '';"
-      else
-        src << "#{@bufvar} << (#{code}).to_s;"
-      end
-    end
-
-    private
-
-    def block_start? code
-      res = code =~ /\b(do|\{)(\s*\|[^|]*\|)?\s*\Z/
-    end
-
-    def block_start
-      @in_block += 1
-      @bufvar << '_tmp'
-    end
-
-    def block_ignore
-      @block_ignore += 1
-    end
-
-    def block_end? code
-      res = @in_block != 0 && code =~ /\bend\b|}/
-      if res && @block_ignore != 0
-        @block_ignore -= 1
-        return false
-      end
-      res
-    end
-
-    def block_end
-      @in_block -= 1
-      @bufvar.sub! /_tmp\Z/, ''
-    end
-  end
-end

data/lib/cells/erb.rb

@@ -1,2 +0,0 @@
-# Autorequired by bundler
-require 'cells/erb'