cells-hamlit2 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b36ce2958e1d643066ca1afd006812ca44b07cd5643ac790549f2216e18dd7fe
-  data.tar.gz: 8baeaa3ec13f760c3c3d3b1a1ddd447114f896c6490a7f13dc0c88577bf5ac37
+  metadata.gz: 07404bf091e84e30f38162a22a53eb332f8a231af1e75d1a784d43834d5ba42f
+  data.tar.gz: 4eee65966f4cdfb1f94379c63781db2ab7c84a3e7c99448aa4d38f8c1ce43cd9
 SHA512:
-  metadata.gz: 050da4421b37a809c9d3f293ed860cd058748a413006b181ac1ddbdf903f51d29654e18c5d37c2b42dcf2de3eeabe7fe81ad808d983743127754715f7ec6a61a
-  data.tar.gz: 3433dd16695d0028a1700b4351bbaadd55797c47457c605ae5c12080f8f60b51a8c8db00a49e41eefd8ee225cadcac2fd1d98c53953a4204f707b82372ce837e
+  metadata.gz: e40971e2eba5c61cc6597eb2a254f65cea075de577bbaa6aba4519576c2912e6ee77222e37371ceded70b755a409091569270d2d765ef2f0296da908afac46a0
+  data.tar.gz: d4d0cebf20419cd532ccc6d49e9f92610f80434a1a5d3ba3eef892bfe7a5f17a993bbd5d296b61441d4115391d5fcc6a50770c8bae6c8b0de9355421c388e26a

data/.travis.yml

@@ -1,8 +1,13 @@
+language: ruby
 cache: bundler
+branches:
+  only:
+    - master
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
 gemfile:
   - gemfiles/rails_4.2-tilt-1.4.gemfile
   - gemfiles/rails_4.2-tilt-2.0.gemfile

data/CHANGES.md

@@ -1,6 +1,10 @@
+# 0.2.0
+
+* Fix `surround` helper
+
 # 0.1.1
 
-* Now using `hamlit-block` for capturing.
+* Make initial cells-hamlit2 release
 
 # 0.1.0
 

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cells-haml.gemspec
 gemspec
 
-gem 'cells', github: 'apotonick/cells'
 gem 'railties'
 gem 'actionpack'
 gem 'actionview'
 
-gem "minitest-line"
+gem 'minitest-line'
+gem 'pry'

data/README.md

@@ -1,4 +1,4 @@
-# cells-hamlit2
+# cells-hamlit2 [![Build Status](https://travis-ci.org/hamlit/cells-hamlit2.svg?branch=master)](https://travis-ci.org/hamlit/cells-hamlit2)
 
 Temporary workaround version of [cells-hamlit](https://github.com/trailblazer/cells-hamlit) until https://github.com/trailblazer/cells-hamlit/issues/6 is closed.
 

data/cells-hamlit.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "cells", "~> 4.0"
+  spec.add_dependency "cells", ">= 4.0.1", "< 6.0.0"
+  spec.add_dependency "cells-rails"
   spec.add_dependency "hamlit"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

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

@@ -2,13 +2,11 @@
 
 source "https://rubygems.org"
 
-# gem "cells", :github => "apotonick/cells"
-#gem "cells", path: "../../cells"
-gem "railties", "~> 4.2.0"
+gem "railties", "~> 4.2"
 gem "activemodel"
 gem "minitest", "~> 5.2"
 gem "tilt", "~> 1.4"
 
 gemspec :path => "../"
 
-gem "hamlit"
+gem "hamlit"

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

@@ -2,14 +2,11 @@
 
 source "https://rubygems.org"
 
-# gem "cells", :github => "apotonick/cells"
-# gem "cells", path: "../../cells"
-gem "cells", github: "apotonick/cells"
-gem "railties", "~> 4.2.0"
+gem "railties", "~> 4.2"
 gem "activemodel"
 gem "minitest", "~> 5.2"
 gem "tilt", "~> 2.0"
 
 gemspec :path => "../"
 
-gem "hamlit"
+gem "hamlit"

data/lib/cell/hamlit.rb

@@ -2,6 +2,15 @@ require "hamlit"
 
 module Cell
   module Hamlit
+    def self.included(base)
+      begin
+        require "hamlit/rails_helpers"
+      rescue LoadError
+      else
+        base.include ::Hamlit::RailsHelpers
+      end
+    end
+
     def template_options_for(options)
       {
         escape_html:    false,
@@ -34,11 +43,15 @@ module Cell
     def capture(*args)
       value = nil
       buffer = with_output_buffer { value = yield(*args) }
-      buffer.to_s if buffer.size > 0
-      value
+      if buffer.size > 0
+        buffer.to_s
+      else
+        value
+      end
     end
 
     def render_template(*)
+      @output_buffer ||= nil # suppress uninitialized instance variable warning
       old_output_buffer = @output_buffer
       super
     ensure

data/lib/cell/hamlit/version.rb

@@ -1,5 +1,5 @@
 module Cell
   module Hamlit
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/test/dummy/.gitignore

@@ -0,0 +1 @@
+/log/*.log

data/test/dummy/app/cells/song/with_capture.haml

@@ -1,6 +1,6 @@
 Hallo
 
-- bla = 1
+- _ = 1
 
 - hidden = capture do
   Hidden!

data/test/dummy/app/cells/song/with_surround.haml

@@ -0,0 +1,9 @@
+Hallo
+
+- _ = 1
+
+%p
+  More
+
+= surround "(", ")" do
+  Hidden!

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

@@ -1,8 +1,7 @@
 class SongCell < Cell::ViewModel
   self.view_paths = ["test/dummy/app/cells"]
 
-
-  include Cell::Hamlit
+  include ::Cell::Hamlit
 
   def protect_against_forgery?
     false
@@ -24,10 +23,6 @@ class SongCell < Cell::ViewModel
     render
   end
 
-  def with_capture
-    render
-  end
-
   def with_form_tag
     form_tag("/songs") + content_tag(:span) + "</form>"
   end
@@ -52,6 +47,10 @@ class SongCell < Cell::ViewModel
     render
   end
 
+  def with_surround
+    render
+  end
+
 private
   def cap
     "yay, #{with_output_buffer { yield } }"

data/test/dummy/config/application.rb

@@ -14,8 +14,8 @@ module Dummy
     config.secret_key_base = SecureRandom.uuid
 
     # enable asset pipeline as in development.
-    config.assets.enabled = true
-    config.assets.compile = true
+    # config.assets.enabled = true
+    # config.assets.compile = true
     config.cache_classes = true
 
     # Show full error reports and disable caching

data/test/hamlit_test.rb

@@ -11,7 +11,7 @@ class HamlitTest < MiniTest::Spec
   it { song_cell.(:render_inside_block).must_equal "0\n1\n2\n" }
 
   # URL helpers work in cell instance.
-  it { song_cell.songs_path.must_equal "/songs" }
+  it { skip; song_cell.songs_path.must_equal "/songs" }
 
   # content_tag { }
   it { song_cell.(:with_content_tag).must_equal "<div>Beachparty</div>\n" }
@@ -68,6 +68,17 @@ More
 </p>
 Hidden!
 
+}
+    end
+  end
+
+  describe "block surround" do
+    it do
+      song_cell.(:with_surround).must_equal %{Hallo
+<p>
+More
+</p>
+(Hidden!)
 }
     end
   end

data/test/test_helper.rb

@@ -7,4 +7,4 @@ ENV['RAILS_ENV'] = 'test'
 require "cells"
 require_relative 'dummy/config/environment'
 
-require "cells-hamlit"
+require "cells-hamlit2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cells-hamlit2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,22 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: cells-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hamlit
   requirement: !ruby/object:Gem::Requirement
@@ -83,15 +103,13 @@ files:
 - README.md
 - Rakefile
 - cells-hamlit.gemspec
-- gemfiles/rails_3.2-tilt-1.4.gemfile
-- gemfiles/rails_4.0-tilt-1.4.gemfile
 - 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/hamlit.rb
 - lib/cell/hamlit/version.rb
 - lib/cells-hamlit2.rb
 - test/cell_generator_test.rb
+- test/dummy/.gitignore
 - test/dummy/Rakefile
 - test/dummy/app/cells/song/render_in_render.haml
 - test/dummy/app/cells/song/render_in_render_2.haml
@@ -100,6 +118,7 @@ files:
 - test/dummy/app/cells/song/with_content_tag.haml
 - test/dummy/app/cells/song/with_content_tag_and_content_tag.haml
 - test/dummy/app/cells/song/with_form_tag_and_content_tag.haml
+- test/dummy/app/cells/song/with_surround.haml
 - test/dummy/app/cells/song_cell.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru
@@ -132,12 +151,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Temporary Hamlit integration for Cells
 test_files:
 - test/cell_generator_test.rb
+- test/dummy/.gitignore
 - test/dummy/Rakefile
 - test/dummy/app/cells/song/render_in_render.haml
 - test/dummy/app/cells/song/render_in_render_2.haml
@@ -146,6 +166,7 @@ test_files:
 - test/dummy/app/cells/song/with_content_tag.haml
 - test/dummy/app/cells/song/with_content_tag_and_content_tag.haml
 - test/dummy/app/cells/song/with_form_tag_and_content_tag.haml
+- test/dummy/app/cells/song/with_surround.haml
 - test/dummy/app/cells/song_cell.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/config.ru

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

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

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

@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-#gem "cells", :github => "apotonick/cells"
-# gem "cells", path: "../../cells"
-gem "railties", "~> 4.0.0"
-gem "activemodel"
-gem "minitest", "~> 4.0"
-gem "tilt", "~> 1.4"
-
-gemspec :path => "../"
-
-gem "hamlit"

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

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