cells 4.0.0.beta2 → 4.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d87f07c5656008a50a7a2386344a1517f311bfa
-  data.tar.gz: af694d3c7ce83a603481c49ccb7bf13d1f101347
+  metadata.gz: 442134126a42a17ae056d6fea0138663b6868801
+  data.tar.gz: 78b1ebe96cb15081e067f62a10208648a71388b4
 SHA512:
-  metadata.gz: 53a3d21440e92afd599d99e5c551be02c3684b970be815ad9a36f6570bd367c864286196a9756402bc3e0b134e4dbdec234cc7151f6f48dfdb86366e8309c7ee
-  data.tar.gz: 291658a9ee8cacc3c50656f68c46028fb6bd0c38e4914664ae8ce20ce7d281ea1d4e423e97597ad86ddda4c145c920cfa7ae5eacd12ad8cee040a44301fe527f
+  metadata.gz: 8278561d5102e21559df5a51c852d74c6bc2b017db2d35d933a504ec8d5c521851c1179f5c5ac0d2f8f950be764233c4b4bf26750b59103639c2da96c2b36886
+  data.tar.gz: a3ee11a160976a710b93ed9e2ca1705ef64d34c1bc1d0b8c303932cd6a2f22a62898814a25e5897ce757664fae84c9d9da070e5dcc4fe9e55a89b9e9ad8d0b42

data/CHANGES.md

@@ -18,6 +18,10 @@
 
 * When using HAML, we do not use any of HAML's helper hacks to "fix" ActionView and XSS. While you might not note this, it removes tons of code from our stack.
 
+## 4.0.0.beta3
+
+* Introduce `Cell::Testing` for Rspec and MiniTest.
+* Add ViewModel::OutputBuffer to be used in Erbse and soon in Haml.
 
 ## 3.11.2
 

data/README.md

@@ -20,9 +20,9 @@ Cells is part of the [Trailblazer project](https://github.com/apotonick/trailbla
 ![](https://raw.githubusercontent.com/apotonick/trailblazer/master/doc/trb.jpg)
 </a>
 
-* Basic view models, replacing helpers, and how to structure your view into cell components (chapter 2 and 3).
-* Advanced Cells API (chapter 3 and 6).
-* Testing Cells (chapter 3 and 6).
+* Basic view models, replacing helpers, and how to structure your view into cell components (chapter 2 and 4).
+* Advanced Cells API (chapter 4 and 6).
+* Testing Cells (chapter 4 and 6).
 * Cells Pagination with AJAX (chapter 6).
 * View Caching and Expiring (chapter 7).
 
@@ -862,7 +862,7 @@ This was mainly added to provide compatibility with 3rd-party gems like [Kaminar
 
 ## LICENSE
 
-Copyright (c) 2007-2014, Nick Sutterer
+Copyright (c) 2007-2015, Nick Sutterer
 
 Copyright (c) 2007-2008, Solide ICT by Peter Bex and Bob Leers
 

data/cells.gemspec

@@ -23,4 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "uber",        "~> 0.0.9"
   spec.add_dependency 'tilt', '>= 1.4', '< 3'
   spec.add_dependency 'disposable', '~> 0.0.8'
+
+  spec.add_dependency "capybara"
+
+  spec.add_development_dependency "cells-erb", ">= 0.0.2"
 end

data/gemfiles/rails3.2.gemfile

@@ -7,7 +7,7 @@ gem "pry-byebug", :platforms => [:mri_20, :mri_21]
 gem "appraisal"
 gem "rake"
 gem "test_xml"
-gem "railties", :github => "rails/rails", :branch => "3-2-stable"
+gem "railties", "~> 3.2.0"
 gem "tzinfo"
 gem "minitest", "4.7.5"
 

data/gemfiles/rails4.2.gemfile

@@ -7,8 +7,8 @@ gem "pry-byebug", :platforms => [:mri_20, :mri_21]
 gem "appraisal"
 gem "rake"
 gem "test_xml"
-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", "~> 4.2.0"
 gem "minitest", "~> 5.2"
 
-gemspec :path => "../"
+gemspec :path => "../"

data/lib/cell/test_case.rb

@@ -8,3 +8,5 @@ module Cell
     include Testing
   end
 end
+
+Cell::Testing.capybara = true if Object.const_defined?(:"Capybara")

data/lib/cell/testing.rb

@@ -1,14 +1,44 @@
-# Used in rspec-cells, etc.
 module Cell
+  # Builder methods and Capybara support.
+  # This gets included into Test::Unit, MiniTest::Spec, etc.
   module Testing
     def cell(name, *args)
-      ViewModel.cell_for(name, controller, *args)
+      cell_for(ViewModel, name, *args)
     end
 
     def concept(name, *args)
-      Concept.cell_for(name, controller, *args)
+      cell_for(Concept, name, *args)
     end
 
+  private
+    def cell_for(baseclass, name, *args)
+      cell = baseclass.cell(name, controller, *args)
+      cell.extend(Capybara) if Cell::Testing.capybara? # leaving this here as most people use Capybara.
+      cell
+    end
+
+
+    # Set this to true if you have Capybara loaded. Happens automatically in Cell::TestCase.
+    def self.capybara=(value)
+      @capybara = value
+    end
+
+    def self.capybara?
+      @capybara
+    end
+
+    # Extends ViewModel#call by injecting Capybara support.
+    module Capybara
+      module ToS
+        def to_s
+          native.to_s
+        end
+      end
+
+      def call(*)
+        ::Capybara.string(super).extend(ToS)
+      end
+    end
 
 
     # Rails specific.

data/lib/cell/version.rb

@@ -3,7 +3,7 @@ module Cell
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "beta3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/cell/view_model.rb

@@ -146,10 +146,27 @@ module Cell
     include Rendering
     include Caching
 
-    def output_buffer
-      @output_buffer ||= []
+
+    class OutputBuffer < Array
+      def encoding
+        "UTF-8"
+      end
+
+      def <<(string)
+        super
+      end
+      alias_method :safe_append=, :<<
+      alias_method :append=, :<<
+
+      def to_s # output_buffer is returned at the end of the precompiled template.
+        join
+      end
     end
-    attr_writer :output_buffer # TODO: test that, this breaks in MM.
+    def output_buffer # called from the precompiled template. FIXME: this is currently not used in Haml.
+      @output_buffer ||= OutputBuffer.new
+    end
+    attr_writer :output_buffer # FIXME: where is that used? definitely not in Erbse.
+
 
     module TemplateFor
       def template_for(options)

data/test/test_case_test.rb

@@ -2,6 +2,9 @@ require 'test_helper'
 
 class TestCaseTest < MiniTest::Spec
   class SongCell < Cell::ViewModel
+    def show
+      "Give It All!"
+    end
   end
 
   class Song
@@ -11,11 +14,14 @@ class TestCaseTest < MiniTest::Spec
 
   let (:song) { Object.new }
 
+  # #cell returns the instance
   describe "#cell" do
     subject { cell("test_case_test/song", song) }
 
     it { subject.must_be_instance_of SongCell }
     it { subject.model.must_equal song }
+
+    it { cell("test_case_test/song", collection: [song, song]).must_equal "Give It All!Give It All!" }
   end
 
 
@@ -25,9 +31,12 @@ class TestCaseTest < MiniTest::Spec
     it { subject.must_be_instance_of Song::Cell }
     it { subject.model.must_equal song }
   end
+end
 
+# capybara support
+require "capybara"
 
-  # capybara support
+class CapybaraTest < MiniTest::Spec
   class CapybaraCell < Cell::ViewModel
     def show
       "<b>Grunt</b>"
@@ -35,8 +44,14 @@ class TestCaseTest < MiniTest::Spec
   end
 
   describe "capybara support" do
-    subject { cell("test_case_test/capybara", nil) }
+    subject { cell("capybara_test/capybara", nil) }
+
+    before { Cell::Testing.capybara = true  } # yes, a global switch!
+    after  { Cell::Testing.capybara = false }
+
+    it { subject.(:show).has_selector?('b').must_equal true }
 
-    it { subject.call } # add capybara tests here, @seuros.
+    # FIXME: this kinda sucks, what if you want the string in a Capybara environment?
+    it { subject.(:show).to_s.must_match "<b>Grunt</b>" }
   end
 end

data/test/test_helper.rb

@@ -4,9 +4,7 @@ rescue LoadError
 end
 
 ENV['RAILS_ENV'] = 'test'
-
 require_relative 'dummy/config/environment'
-require 'tilt/erubis'   if Gem::Version.new(ActiveSupport::VERSION::STRING) >= Gem::Version.new('4.2.0')
 
 require 'minitest/autorun'
 require 'test_xml/mini_test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,6 +72,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: capybara
+  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: cells-erb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Cells replace partials and helpers with OOP view models, giving you proper
   encapsulation, inheritance, testability and a cleaner view architecture.
 email: