cells 3.11.0 → 3.11.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c53e5fa8e782efe252f69d45eb54744307783f3
+  data.tar.gz: 011cdedbdaacfed0a06b8cdbddbec0e7d2cd8745
+SHA512:
+  metadata.gz: 69598d8a734a02879d669d80a0c992eb112f4fb93b09acb7ab6825a2239e802510fa0a32a81cc83956963c838eda5859610cce115b67b8a6aea14d387f55c2f7
+  data.tar.gz: 425bd7009da186564e92bb54cfeec06d950be7704947c66a5a4cb113f957807a482ef54eaab399bc3872e2ddb1480cfaa876cb4c314053f3512dcba061e38370

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 3.11.1
+
+* Override `ActionView::Helpers::UrlHelper#url_for` in Rails 4.x as it is troublesome. That removes the annoying
+    `arguments passed to url_for can't be handled. Please require routes or provide your own implementation`
+    exception when using simple_form, form_for, etc with a view model.
+
+
 ## 3.11.0
 
 * Deprecated `Cell::Rails::ViewModel`, please inherit: `class SongCell < Cell::ViewModel`.
@@ -15,6 +22,7 @@
 ### Concept
 * `#concept` helper is mixed into all views as an alternative to `#cell` and `#render_cell`. Let us know if we should do that conditionally, only.
 * Concept cells look for layouts in their self-contained views directory.
+* Add generator for Concept cells: `rails g concept Comment`
 
 ## 3.10.1
 

data/README.md

@@ -472,7 +472,7 @@ The `render` call will render the cell's `show` view.
 = author_box
 ```
 
-We strongly recommend to invoke methods, only, in views and not to use instance variables and locals. In a view model template (or, view), methods are called on the view model instance itself, meaning you can easily expose "helpers" by defining instance methods.
+We strongly recommend to only invoke _methods_ in views and _not_ to use instance variables and locals. In a view model template (or, view), methods are called on the view model instance itself, meaning you can easily expose "helpers" by defining instance methods.
 
 ### Helpers
 

data/lib/cell/concept.rb

@@ -1,6 +1,7 @@
 # TODO: deprecate parent_controller, ViewModel
 class Cell::Concept < Cell::ViewModel
   abstract!
+  self.view_paths = "app/concepts"
 
   # TODO: this should be in Helper or something. this should be the only entry point from controller/view.
   class << self

data/lib/cell/view_model.rb

@@ -6,6 +6,7 @@
 
 # TODO: warn when using ::property but not passing in model in constructor.
 
+# ViewModel is only supported in Rails +3.1. If you need it in Rails 3.0, let me know.
 class Cell::ViewModel < Cell::Rails
   abstract!
 
@@ -86,64 +87,25 @@ private
 
   # FIXME: this module is to fix a design flaw in Rails 4.0. the problem is that AV::UrlHelper mixes in the wrong #url_for.
   # if we could mix in everything else from the helper except for the #url_for, it would be fine.
-  module LinkToHelper
-    include ActionView::Helpers::TagHelper
-
-    def link_to(name = nil, options = nil, html_options = nil, &block)
-      html_options, options, name = options, name, block if block_given?
-      options ||= {}
-
-      html_options = convert_options_to_data_attributes(options, html_options)
-
-      url = url_for(options)
-      html_options['href'] ||= url
-
-      content_tag(:a, name || url, html_options, &block)
-    end
-
-    def convert_options_to_data_attributes(options, html_options)
-      if html_options
-        html_options = html_options.stringify_keys
-        html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
-
-        disable_with = html_options.delete("disable_with")
-        confirm = html_options.delete('confirm')
-        method  = html_options.delete('method')
-
-        if confirm
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { confirm: \'Text\' }' instead."
-          ActiveSupport::Deprecation.warn message
-
-          html_options["data-confirm"] = confirm
-        end
-
-        add_method_to_attributes!(html_options, method) if method
-
-        if disable_with
-          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { disable_with: \'Text\' }' instead."
-          ActiveSupport::Deprecation.warn message
-
-          html_options["data-disable-with"] = disable_with
-        end
-
-        html_options
+  # FIXME: fix that in rails core.
+  if Cell.rails_version.~("4.0", "4.1")
+    include ActionView::Helpers::UrlHelper # gives us breaking #url_for.
+
+    def url_for(options = nil) # from ActionDispatch:R:UrlFor.
+      case options
+      when nil
+        _routes.url_for(url_options.symbolize_keys)
+      when Hash
+        _routes.url_for(options.symbolize_keys.reverse_merge!(url_options))
+      when String
+        options
+      when Array
+        polymorphic_url(options, options.extract_options!)
       else
-        link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
+        polymorphic_url(options)
       end
     end
-
-    def link_to_remote_options?(options)
-      if options.is_a?(Hash)
-        options.delete('remote') || options.delete(:remote)
-      end
-    end
-  end
-
-  # FIXME: fix that in rails core.
-  if Cell.rails_version.~("4.0", "4.1")
-    include LinkToHelper
+    public :url_for
   else
     include ActionView::Helpers::UrlHelper
   end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.11.0'
+  VERSION = '3.11.1'
 end

data/lib/generators/templates/concept/cell.rb

@@ -1,6 +1,4 @@
-class <%= class_name %>::Cell < <%= options.base_cell_class %>
-  include Concept
-
+class <%= class_name %>::Cell < Cell::Concept
 <% for action in actions -%>
   def <%= action %>
     render

data/test/concept_generator_test.rb

@@ -9,8 +9,7 @@ class ConceptGeneratorTest < Rails::Generators::TestCase
   test "[erb] standard assets, show view" do
     run_generator %w(Song)
 
-    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Rails/
-    assert_file "app/concepts/song/cell.rb", /include Concept/
+    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Concept/
     assert_file "app/concepts/song/cell.rb", /def show/
     assert_file "app/concepts/song/views/show.erb", %r(app/concepts/song/views/show\.erb)
   end
@@ -18,8 +17,7 @@ class ConceptGeneratorTest < Rails::Generators::TestCase
   test "[haml] standard assets, show view" do
     run_generator %w(Song -e haml)
 
-    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Rails/
-    assert_file "app/concepts/song/cell.rb", /include Concept/
+    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Concept/
     assert_file "app/concepts/song/cell.rb", /def show/
     assert_file "app/concepts/song/views/show.haml", %r(app/concepts/song/views/show\.haml)
   end

data/test/concept_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
 if Cell.rails_version >= 3.1
+  Cell::Concept.class_eval do
+    self.append_view_path "test/app/concepts"
+  end
+
   # Trailblazer style:
   module Record
     class Cell < Cell::Concept # cell("record")
@@ -23,6 +27,15 @@ if Cell.rails_version >= 3.1
       class Hit < ::Cell::Concept
         inherit_views Record::Cell
       end
+
+      class Track < ::Cell::Concept
+        inherit_views Song
+
+        layout "layout"
+        def show
+          render :song
+        end
+      end
     end
   end
 
@@ -62,6 +75,9 @@ if Cell.rails_version >= 3.1
     describe "#render with :layout" do
       it { Cell::Concept.cell("record/cell/song", @controller).show_with_layout.must_equal "<p>\nLalala\n</p>\n" }
     end
+    describe "#render with ::layout" do
+      it { Cell::Concept.cell("record/cell/track", @controller).show.must_equal "<p>\nLalala\n</p>\n" }
+    end
     describe "#render" do
       it { Cell::Concept.cell("record/cell/song", @controller).show.must_equal "Lalala" }
     end

data/test/rails/asset_pipeline_test.rb

@@ -11,7 +11,7 @@ if Cell.rails_version >= 3.1
     register_spec_type(/integration$/, self)
 
     it "what" do
-      visit "assets/application.js"
+      visit "/assets/application.js"
       page.text.must_include 'var Album = {};'
       page.text.must_include 'var Songs = [];'
     end

data/test/test_helper.rb

@@ -35,7 +35,6 @@ require File.join(test_app_dir, 'cells', 'trumpeter_cell')
 require File.join(test_app_dir, 'cells', 'bad_guitarist_cell')
 
 require "haml"
-require "haml/template" # Thanks, Nathan!
 
 ActiveSupport::TestCase.class_eval do # this is only needed in integration tests (AC::TestCase).
   def fix_relative_url_root

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 3.11.0
-  prerelease: 
+  version: 3.11.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,129 +55,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Cells are view components for Rails. They are lightweight controllers,
@@ -286,9 +263,6 @@ files:
 - test/app/cells/layouts/b.erb
 - test/app/cells/layouts/metal.html.erb
 - test/app/cells/rails_helper_api_test/bassist/edit.html.erb
-- test/app/cells/record/views/layout.haml
-- test/app/cells/record/views/show.erb
-- test/app/cells/record/views/song.erb
 - test/app/cells/shouter/sing.html.erb
 - test/app/cells/song/dashboard.haml
 - test/app/cells/song/details.html.haml
@@ -301,6 +275,9 @@ files:
 - test/app/cells/trumpeter/promote.html.erb
 - test/app/cells/trumpeter_cell.rb
 - test/app/cells/view_model_test/comments/show.haml
+- test/app/concepts/record/views/layout.haml
+- test/app/concepts/record/views/show.erb
+- test/app/concepts/record/views/song.erb
 - test/app/views/shared/_dong.html.erb
 - test/cell_generator_test.rb
 - test/cell_module_test.rb
@@ -362,128 +339,25 @@ files:
 homepage: http://cells.rubyforge.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: View Components for Rails.
-test_files:
-- test/app/cells/album/views/cover.haml
-- test/app/cells/bad_guitarist/_dii.html.erb
-- test/app/cells/bad_guitarist_cell.rb
-- test/app/cells/bassist/_dii.html.erb
-- test/app/cells/bassist/ahem.html.erb
-- test/app/cells/bassist/compose.html.erb
-- test/app/cells/bassist/contact_form.html.erb
-- test/app/cells/bassist/form_for.erb
-- test/app/cells/bassist/form_for_in_haml.haml
-- test/app/cells/bassist/jam.html.erb
-- test/app/cells/bassist/play.html.erb
-- test/app/cells/bassist/play.js.erb
-- test/app/cells/bassist/pose.html.erb
-- test/app/cells/bassist/promote.html.erb
-- test/app/cells/bassist/provoke.html.erb
-- test/app/cells/bassist/shout.html.erb
-- test/app/cells/bassist/sing.html.haml
-- test/app/cells/bassist/slap.html.erb
-- test/app/cells/bassist/yell.en.html.erb
-- test/app/cells/bassist_cell.rb
-- test/app/cells/club_security.rb
-- test/app/cells/club_security/guard/help.html.erb
-- test/app/cells/club_security/guard_cell.rb
-- test/app/cells/club_security/medic/help.html.erb
-- test/app/cells/club_security/medic_cell.rb
-- test/app/cells/layouts/b.erb
-- test/app/cells/layouts/metal.html.erb
-- test/app/cells/rails_helper_api_test/bassist/edit.html.erb
-- test/app/cells/record/views/layout.haml
-- test/app/cells/record/views/show.erb
-- test/app/cells/record/views/song.erb
-- test/app/cells/shouter/sing.html.erb
-- test/app/cells/song/dashboard.haml
-- test/app/cells/song/details.html.haml
-- test/app/cells/song/info.html.haml
-- test/app/cells/song/lyrics.html.haml
-- test/app/cells/song/plays.haml
-- test/app/cells/song/scale.haml
-- test/app/cells/song/show.html.haml
-- test/app/cells/song/title.html.haml
-- test/app/cells/trumpeter/promote.html.erb
-- test/app/cells/trumpeter_cell.rb
-- test/app/cells/view_model_test/comments/show.haml
-- test/app/views/shared/_dong.html.erb
-- test/cell_generator_test.rb
-- test/cell_module_test.rb
-- test/cell_test.rb
-- test/cells_module_test.rb
-- test/concept_generator_test.rb
-- test/concept_test.rb
-- test/deprecations_test.rb
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/cells/album/assets/album.js
-- test/dummy/app/concepts/song/assets/songs.js
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/musician/featured.html.erb
-- test/dummy/app/views/musician/featured_with_block.html.erb
-- test/dummy/app/views/musician/hamlet.html.haml
-- test/dummy/app/views/musician/title.erb
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/label/app/cells/label/show.erb
-- test/dummy/label/app/cells/label_cell.rb
-- test/dummy/label/label.gemspec
-- test/dummy/label/lib/label.rb
-- test/dummy/label/lib/label/version.rb
-- test/dummy/log/production.log
-- test/dummy/log/server.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/stylesheets/.gitkeep
-- test/dummy/script/rails
-- test/helper_test.rb
-- test/prefixes_test.rb
-- test/rack_test.rb
-- test/rails/asset_pipeline_test.rb
-- test/rails/caching_test.rb
-- test/rails/cells_test.rb
-- test/rails/forms_test.rb
-- test/rails/integration_test.rb
-- test/rails/render_test.rb
-- test/rails/view_model_test.rb
-- test/rails/view_test.rb
-- test/rails_helper_api_test.rb
-- test/self_contained_test.rb
-- test/test_case_test.rb
-- test/test_helper.rb
-has_rdoc: 
+test_files: []