cells 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76f7af6aa82b7bb25811d8ee4f9234c4dab4e00
-  data.tar.gz: df30cb687c526aeaf05f0569bb977c600d881bd1
+  metadata.gz: 4bee10d6791664dd2d5b07e42007b4f037d977ce
+  data.tar.gz: badeb19dd989fcb7e04ff0ba194392858ad654ed
 SHA512:
-  metadata.gz: efe44290055279cd22f795672004e21764c9b20b6c79634ff6cb4524b4349da0037cc9a5b9b911e9f781f34b194cf7ccbecaaf5deb1c20344363ee958ceb7a05
-  data.tar.gz: 641bb7d1f002bee65738623df08c331506a0fc511ca9b6bb66648b00463ca73ca7b6b99123be04082544b86c76188ef848bc76b9ef5b6c2d089baf6121dfbc08
+  metadata.gz: 455f05a45cf95840609675ed94044f541d0111c0b1d5c0dd2d2cf13516405d8dd666df7d7fa3280fd927fd59711395bf09a7e8b829f515519caa5fef3968f2a5
+  data.tar.gz: 40e74042491c83aefb0ac2a929ca5ed2c0037b489eb27beef1329415730dcd2815ae4dba413c3c74086f56872a952c410f178f995816c767d5d84e4146325a1c

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
-#  - 2.2
+  - ruby-head
+  - 2.2
   - 2.1
   - 2.0.0
   - 1.9.3
@@ -8,14 +9,22 @@ rvm:
 
 sudo: false
 
+cache: bundler
+
 bundler_args: '--without local_development --jobs 3 --retry 3'
 
 script: bundle exec rake
 
-notifications:
-  irc: "irc.freenode.org#cells"
 gemfile:
   - gemfiles/rails4.2.gemfile
   - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.0.gemfile
   - gemfiles/rails3.2.gemfile
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+
+before_install:
+  - gem update bundler

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 4.0.3
+
+* `Cell::Partial` now does _append_ the global partial path to its `view_paths` instead of using `unshift` and thereby removing possible custom paths.
+* Adding `Cell::Translation` which allows using the `#t` helper. Thanks to @johnlane.
+* Performance improvement: when inflecting the view name (90% likely to be done) the `caller` is now limited to the data we need, saving memory. Thanks @timoschilling for implementing this.
+* In the `concept` helper, we no longer use `classify`, which means you can say `concept("comment/data")` and it will instantiate `Comment::Data` and not `Comment::Datum`. Thanks @firedev!
+
 ## 4.0.2
 
 * In Rails, include `ActionView::Helpers::FormHelper` into `ViewModel` so we already have (and pollute our cell with) `UrlHelper` and `FormTagHelper`. Helpers, so much fun.

data/Gemfile

@@ -3,6 +3,6 @@ source "https://rubygems.org"
 gem "railties", "~> 4.2.0"
 gem "activemodel", "~> 4.2.0"
 gem "minitest", "~> 5.2"
-gem "cells-erb", path: "../cells-erb"
+gem "cells-erb"#, path: "../cells-erb"
 
 gemspec

data/README.md

@@ -6,7 +6,7 @@
 
 Cells allow you to encapsulate parts of your UI into components into _view models_. View models, or cells, are simple ruby classes that can render templates.
 
-Nevertheless, a cell gives you more than just a template renderer. They allow proper OOP, polymorphic builders, [nesting](#nested-cells), view inheritance, using Rails helpers, [asset packaging](http://trailblazerb.org/gems/cells/rails.html#asset-pipeline) to bundle JS, CSS or images, simple distribution via gems or Rails engines, encapsulated testing, [caching](#caching), and [integrate with Trailblazer](#concept-cells).
+Nevertheless, a cell gives you more than just a template renderer. They allow proper OOP, polymorphic builders, [nesting](#nested-cells), view inheritance, using Rails helpers, [asset packaging](http://trailblazer.to/gems/cells/rails.html#asset-pipeline) to bundle JS, CSS or images, simple distribution via gems or Rails engines, encapsulated testing, [caching](#caching), and [integrate with Trailblazer](#concept-cells).
 
 ## This is not Cells 3.x!
 
@@ -32,7 +32,7 @@ CommentCell.(@comment).()
 In Rails you have the same helper API for views and controllers.
 
 ```ruby
-class DasboardController < ApplicationController
+class DashboardController < ApplicationController
   def dashboard
     @comments = cell(:comment, collection: Comment.recent)
     @traffic  = cell(:report, TrafficReport.find(1)).()
@@ -97,7 +97,7 @@ The discussed `show` view would reside in `app/cells/comment/show.haml`. However
 
 ## Invocation Styles
 
-In order to make a cell render, you have to call the rendering methods. While you could call the method directly, the prefered way is the _call style_.
+In order to make a cell render, you have to call the rendering methods. While you could call the method directly, the preferred way is the _call style_.
 
 ```ruby
 cell(:comment, @song).()       # calls CommentCell#show.
@@ -138,7 +138,7 @@ Capybara.string(html).must_have_css "h3"
 
 It is completely up to you how you test, whether it's RSpec, MiniTest or whatever. All the cell does is return HTML.
 
-[In Rails, there's support](http://trailblazerb.org/gems/cells/testing.html) for TestUnit, MiniTest and RSpec available, along with Capybara integration.
+[In Rails, there's support](http://trailblazer.to/gems/cells/testing.html) for TestUnit, MiniTest and RSpec available, along with Capybara integration.
 
 ## Properties
 
@@ -169,7 +169,7 @@ song.title                 #=> "<script>Dangerous</script>"
 Comment::Cell.(song).title #=> &lt;script&gt;Dangerous&lt;/script&gt;
 ```
 
-Properties and escaping are [documented here](http://trailblazerb.org/gems/cells/api.html#html-escaping).
+Properties and escaping are [documented here](http://trailblazer.to/gems/cells/api.html#html-escaping).
 
 ## Installation
 
@@ -296,7 +296,7 @@ end
 
 ## Asset Packaging
 
-Cells can easily ship with their own JavaScript, CSS and more and be part of Rails' asset pipeline. Bundling assets into a cell allows you to implement super encapsulated widgets that are stand-alone. Asset pipeline is [documented here](http://trailblazerb.org/gems/cells/rails.html#asset-pipeline).
+Cells can easily ship with their own JavaScript, CSS and more and be part of Rails' asset pipeline. Bundling assets into a cell allows you to implement super encapsulated widgets that are stand-alone. Asset pipeline is [documented here](http://trailblazer.to/gems/cells/rails.html#asset-pipeline).
 
 ## Render API
 
@@ -476,7 +476,7 @@ cache :show, :if => lambda { |*| has_changed? }
 cache :show, :tags: lambda { |model, options| "comment-#{model.id}" }
 ```
 
-Caching is documented [here](http://trailblazerb.org/gems/cells/caching.html) and in chapter 8 of the [Trailblazer book](http://leanpub.com/trailblazer).
+Caching is documented [here](http://trailblazer.to/gems/cells/caching.html) and in chapter 8 of the [Trailblazer book](http://leanpub.com/trailblazer).
 
 
 ## The Book

data/gemfiles/rails3.2.gemfile

@@ -7,3 +7,10 @@ gem "tzinfo"
 gem "minitest", "4.7.5"
 
 gemspec :path => "../"
+
+gem "rack-cache", "< 1.3.0", platform: :ruby_19
+gem "rack-cache", "< 1.3.0", platform: :jruby
+gem "test-unit", "~> 3.0",   platform: :ruby_22
+gem "mime-types", "< 3.0",   platform: :ruby_19
+gem "mime-types", "< 3.0",   platform: :jruby
+

data/gemfiles/rails4.0.gemfile

@@ -7,3 +7,6 @@ gem "activemodel"
 gem "minitest", "4.7.5"
 
 gemspec :path => "../"
+
+gem "mime-types", "< 3.0",   platform: :ruby_19
+gem "mime-types", "< 3.0",   platform: :jruby

data/gemfiles/rails4.1.gemfile

@@ -7,3 +7,6 @@ gem "activemodel", "~> 4.1.0" #, :github => "rails/rails", :branch => "4-1-stabl
 gem "minitest", "~> 5.2"
 
 gemspec :path => "../"
+
+gem "mime-types", "< 3.0",   platform: :ruby_19
+gem "mime-types", "< 3.0",   platform: :jruby

data/gemfiles/rails4.2.gemfile

@@ -4,4 +4,7 @@ gem "railties", "~> 4.2.0"
 gem "activemodel", "~> 4.2.0"
 gem "minitest", "~> 5.2"
 
-gemspec :path => "../"
+gemspec :path => "../"
+
+gem "mime-types", "< 3.0",   platform: :ruby_19
+gem "mime-types", "< 3.0",   platform: :jruby

data/lib/cell/concept.rb

@@ -6,7 +6,7 @@ module Cell
     # TODO: this should be in Helper or something. this should be the only entry point from controller/view.
     class << self
       def class_from_cell_name(name)
-        name.classify.constantize
+        name.camelize.constantize
       end
 
       def controller_path

data/lib/cell/partial.rb

@@ -10,8 +10,8 @@ module Cell::ViewModel::Partial
     view      = parts.pop
     view      = "_#{view}"
     view     += ".#{options[:formats].first}" if options[:formats]
-    prefixes  = self.class.view_paths.collect { |path| parts.unshift(path).join("/") }
+    prefixes  = self.class.view_paths.collect { |path| ([path] + parts).join("/") }
 
     options.merge!(view: view, prefixes: prefixes)
   end
-end
+end

data/lib/cell/rails.rb

@@ -15,7 +15,7 @@ module Cell
       # Returns the cell instance for +name+. You may pass arbitrary options to your
       # cell.
       #
-      #   = cell(:song, title: "Creeping Out Sara").render(:show)
+      #   = cell(:song, title: "Creeping Out Sara").(:show)
       def cell(name, *args, &block)
         controller.cell(name, *args, &block)
       end

data/lib/cell/templates.rb

@@ -27,7 +27,7 @@ module Cell
       template_class.new("#{prefix}/#{view}", options) # Tilt.new()
     end
 
-    # {["comment/row/views", comment/views"][show.haml] => "Tpl:comment/view/show.haml"}
+    # {["comment/row/views", comment/views"]["show.haml"] => "Tpl:comment/view/show.haml"}
     class Cache
       def initialize
         @store = {}
@@ -55,4 +55,4 @@ module Cell
       end
     end
   end
-end
+end

data/lib/cell/translation.rb

@@ -0,0 +1,19 @@
+# NOTE: this will soon be moved to cells-rails.
+module Cell::Translation
+  def self.included(includer)
+    super
+    includer.inheritable_attr :translation_path
+  end
+
+  def initialize(*)
+    super
+    @virtual_path = translation_path
+  end
+
+private
+  # If you override this to change this path, please report it on the trailblazer/chat gitter channel,
+  # so we can find out best practices.
+  def translation_path
+    self.class.translation_path or controller_path.gsub("/", ".")
+  end
+end

data/lib/cell/version.rb

@@ -1,3 +1,3 @@
 module Cell
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

data/lib/cell/view_model.rb

@@ -1,4 +1,3 @@
-# TODO: warn when using ::property but not passing in model in constructor.
 module Cell
   class ViewModel
     extend Abstract
@@ -21,7 +20,6 @@ module Cell
       end
     end
 
-
     include Prefixes
     extend SelfContained
     extend Util
@@ -32,7 +30,6 @@ module Cell
 
     attr_reader :model
 
-
     module Helpers
       # Constantizes name, call builders and returns instance.
       def cell(name, *args, &block) # classic Rails fuzzy API.
@@ -44,12 +41,11 @@ module Cell
       def render_collection(array, options) # private.
         method = options.delete(:method) || :show
         join   = options.delete(:collection_join)
-        array.collect { |model| build(*[model, options]).call(method) }.join(join).html_safe
+        array.collect { |model| build(model, options).call(method) }.join(join).html_safe
       end
     end
     extend Helpers
 
-
     class << self
       def property(*names)
         delegates :model, *names # Uber::Delegates.
@@ -75,7 +71,7 @@ module Cell
 
     private
       def class_from_cell_name(name)
-        "#{name}_cell".classify.constantize
+        "#{name}_cell".camelize.constantize
       end
     end
 
@@ -84,7 +80,6 @@ module Cell
       self.class.cell(name, model, options.merge(controller: parent_controller))
     end
 
-
     def initialize(model=nil, options={}) # in Ruby 2: def m(model: nil, controller:nil, **options) that'll make the controller optional.
       # options            = options.clone # DISCUSS: this could be time consuming when rendering many of em.
       @parent_controller = options[:controller] # TODO: filter out controller in a performant way.
@@ -108,13 +103,13 @@ module Cell
 
       # render :show
       def render(options={})
-        options = normalize_options(options, caller) # TODO: call render methods with call(:show), call(:comments) instead of directly #comments?
+        options = normalize_options(options)
         render_to_string(options)
       end
 
     private
       def render_to_string(options)
-        template = find_template(options) # TODO: cache template with path/lookup keys.
+        template = find_template(options)
 
         content  = render_template(template, options)
 
@@ -123,7 +118,7 @@ module Cell
       end
 
       def render_state(*args)
-        send(*args)
+        __send__(*args)
       end
 
       def with_layout(options, content)
@@ -140,7 +135,7 @@ module Cell
     end
 
     include Rendering
-    # alias_method :to_s, :call # FIXME: why doesn't this work?
+
     def to_s
       call
     end
@@ -174,7 +169,6 @@ module Cell
       OutputBuffer.new # don't cache output_buffer, for every #render call we get a fresh one.
     end
 
-
     module TemplateFor
       def find_template(options)
         template_options = template_options_for(options) # imported by Erb, Haml, etc.
@@ -196,11 +190,10 @@ module Cell
     end
     include TemplateFor
 
-
-    def normalize_options(options, caller) # TODO: rename to #setup_options! to be inline with Trb.
+    def normalize_options(options)
       options = if options.is_a?(Hash)
-        # TODO: speedup by not doing state_for_implicit_render.
-        {view: state_for_implicit_render(caller)}.merge(options)
+        options[:view] ||= state_for_implicit_render(options)
+        options
       else
         {view: options.to_s}
       end
@@ -218,9 +211,10 @@ module Cell
     end
     include ProcessOptions
 
-
-    def state_for_implicit_render(caller)
-      caller[0].match(/`(\w+)/)[1]
+    # Computes the view name from the call stack in which `render` was invoked.
+    def state_for_implicit_render(options)
+      _caller = RUBY_VERSION < "2.0" ? caller(3) : caller(3, 1) # TODO: remove case in 5.0 when dropping 1.9.
+      _caller[0].match(/`(\w+)/)[1]
     end
 
     include Layout

data/test/partial_test.rb

@@ -21,7 +21,15 @@ class PartialTest < MiniTest::Spec
     end
   end
 
+  class WithPartialAndManyViewPaths < WithPartial
+    self.view_paths << ['app/views']
+  end
+
   it { WithPartial.new(nil).show.must_equal "I Am Wrong And I Am Right" }
   it { WithPartial.new(nil).show_with_format.must_equal "<xml>I Am Wrong And I Am Right</xml>" }
   it { WithPartial.new(nil).show_without_partial.must_equal "Adenosine Breakdown" }
-end
+
+  it { WithPartialAndManyViewPaths.new(nil).show.must_equal "I Am Wrong And I Am Right" }
+  it { WithPartialAndManyViewPaths.new(nil).show_with_format.must_equal "<xml>I Am Wrong And I Am Right</xml>" }
+  it { WithPartialAndManyViewPaths.new(nil).show_without_partial.must_equal "Adenosine Breakdown" }
+end

data/test/public_test.rb

@@ -16,9 +16,15 @@ class PublicTest < MiniTest::Spec
     end
   end
 
+    class Songs < Cell::Concept
+    end
+
   # ViewModel.cell returns the cell instance.
   it { Cell::ViewModel.cell("public_test/song").must_be_instance_of SongCell }
 
+  # Concept.cell simply camelizes the string before constantizing.
+  it { Cell::Concept.cell("public_test/songs").must_be_instance_of Songs }
+
   # ViewModel.cell passes options to cell.
   it { Cell::ViewModel.cell("public_test/song", Object, genre: "Metal").initialize_args.must_equal [Object, {genre:"Metal"}] }
 

data/test/rails/translation_test.rb

@@ -0,0 +1,45 @@
+require "test_helper"
+require "cells/translation"
+
+class TranslationTest < MiniTest::Spec
+  class I18nCell < Cell::ViewModel
+    include ActionView::Helpers::TranslationHelper
+    include Translation
+
+    def greet_relative
+      t(".greeting") # gets appended to translation_test.i18n.
+    end
+
+    def greet_absolute
+      t("translation_test.i18n.greeting")
+    end
+  end
+
+  I18n.backend = I18n::Backend::KeyValue.new({})
+  I18n.backend.store_translations(:en,
+                                  { "translation_test.i18n.greeting" => "Translated!",
+                                    "cell.friendly.greeting" => "Hello you!" },
+                                  escape: false)
+
+  # Translate text specified by an absolute path
+  it { I18nCell.new.greet_absolute.must_equal "Translated!" }
+
+  # Translate text specified by an relative path
+  it { I18nCell.new.greet_relative.must_equal "Translated!" }
+
+
+  describe "::translation_path" do
+      class ExplicitI18NCell < Cell::ViewModel
+      include ActionView::Helpers::TranslationHelper
+      include Translation
+
+      self.translation_path = "cell.friendly"
+
+      def show
+        t(".greeting")
+      end
+    end
+
+    it { ExplicitI18NCell.new.().must_equal "Hello you!" }
+  end
+end

data/test/rails4.2/app/cells/formtastic_cell.rb

@@ -1,6 +1,7 @@
 class FormtasticCell < Cell::ViewModel
   include ActionView::RecordIdentifier
   include Formtastic::Helpers::FormHelper
+  include ActionView::Helpers::FormOptionsHelper
 
   def show
     render

data/test/rails_extensions_test.rb

@@ -19,33 +19,33 @@ class ViewExtensionsTest < ActionController::TestCase
   # #concept is available in controller views.
   test "concept(..).show" do
     get :view_with_concept_with_show
-    @response.body.must_equal "&lt;b&gt;Up For Breakfast&lt;/b&gt;" # TODO: test options/with twin.
+    assert_equal "&lt;b&gt;Up For Breakfast&lt;/b&gt;", @response.body # TODO: test options/with twin.
   end
 
   test "concept(..).call" do
     get :view_with_concept_with_call
-    @response.body.must_equal "<b>A Tale That Wasn't Right</b>" # TODO: test options/with twin.
+    assert_equal "<b>A Tale That Wasn't Right</b>", @response.body # TODO: test options/with twin.
   end
 
   test "concept(..) without #call" do
     get :view_with_concept_without_call
-    @response.body.must_equal "<b>A Tale That Wasn't Right</b>"
+    assert_equal "<b>A Tale That Wasn't Right</b>", @response.body
   end
 
   test "cell(..) with #call" do
     get :view_with_cell_with_call
-    @response.body.must_equal "<b>A Tale That Wasn't Right</b>"
+    assert_equal "<b>A Tale That Wasn't Right</b>", @response.body
   end
 
   # Controller#concept
   test "Controller#concept(..).call" do
     get :action_with_concept_with_call
-    @response.body.must_equal "<b>A Tale That Wasn't Right</b>" # TODO: test options/with twin.
+    assert_equal "<b>A Tale That Wasn't Right</b>", @response.body # TODO: test options/with twin.
   end
 
   # Controller#cell
   test "Controller#cell(..).call" do
     get :action_with_cell_with_call
-    @response.body.must_equal "<b>A Tale That Wasn't Right</b>" # TODO: test options/with twin.
+    assert_equal "<b>A Tale That Wasn't Right</b>", @response.body # TODO: test options/with twin.
   end
-end
+end

data/test/render_test.rb

@@ -43,6 +43,10 @@ class SongCell < Cell::ViewModel
     render
   end
 
+  def send
+    "send"
+  end
+
 private
   def title
     "Papertiger"
@@ -65,6 +69,9 @@ class RenderTest < MiniTest::Spec
   # call(:form) renders :form
   it { SongCell.new(nil).call(:with_view_name).must_equal "Man Of Steel\n" }
 
+  # works with state called `send`
+  it { SongCell.new(nil).call(:send).must_equal "send" }
+
   # #call returns html_safe.
   it { SongCell.new(nil).call.must_be_instance_of ActiveSupport::SafeBuffer }
 
@@ -95,4 +102,10 @@ class RenderTest < MiniTest::Spec
 end
 
 # test inheritance
-# with layout and locals.
+
+# test view: :bla and :bla
+# with layout and locals.
+# with layout and :text
+
+# render with format (e.g. when using ERB for one view)
+# should we allow changing the format "per run", so a cell can do .js and .haml? or should that be configurable on class level?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -136,6 +136,7 @@ files:
 - lib/cell/templates.rb
 - lib/cell/test_case.rb
 - lib/cell/testing.rb
+- lib/cell/translation.rb
 - lib/cell/twin.rb
 - lib/cell/util.rb
 - lib/cell/version.rb
@@ -212,6 +213,7 @@ files:
 - test/prefixes_test.rb
 - test/property_test.rb
 - test/public_test.rb
+- test/rails/translation_test.rb
 - test/rails4.2/.gitignore
 - test/rails4.2/Gemfile
 - test/rails4.2/README.rdoc
@@ -330,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: View Models for Ruby and Rails.