cells 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10248a40af9eca0d333368d6df675d88f77be026
-  data.tar.gz: b4fb151ae10270795f57f5a418d3e552424a2631
+  metadata.gz: b76f7af6aa82b7bb25811d8ee4f9234c4dab4e00
+  data.tar.gz: df30cb687c526aeaf05f0569bb977c600d881bd1
 SHA512:
-  metadata.gz: bc18a9d14431f421008e3b758d2ac9e567c09cde38330fb0be8264c33682f98e3d32b38f96d1efce0111ff0b3981e60e8262d02ade5d0c5ac83573b6fe675dbc
-  data.tar.gz: 3ba936fe9fa477efdf3504c6d2682f8251479b9cacf894bff4b5b95bac5025cc39c67bbc2fd005bf32febd6d519a833d366d299387336db9b281f996ae5cab8a
+  metadata.gz: efe44290055279cd22f795672004e21764c9b20b6c79634ff6cb4524b4349da0037cc9a5b9b911e9f781f34b194cf7ccbecaaf5deb1c20344363ee958ceb7a05
+  data.tar.gz: 641bb7d1f002bee65738623df08c331506a0fc511ca9b6bb66648b00463ca73ca7b6b99123be04082544b86c76188ef848bc76b9ef5b6c2d089baf6121dfbc08

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 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.
+* Concept cells will now infer their name properly even if the string `Cell` appears twice.
+
 ## 4.0.1
 
 * Support forgery protection in `form_tag`.

data/Gemfile

@@ -5,4 +5,4 @@ gem "activemodel", "~> 4.2.0"
 gem "minitest", "~> 5.2"
 gem "cells-erb", path: "../cells-erb"
 
-gemspec
+gemspec

data/lib/cell/concept.rb

@@ -10,7 +10,7 @@ module Cell
       end
 
       def controller_path
-        @controller_path ||= util.underscore(name.sub(/::Cell/, ''))
+        @controller_path ||= util.underscore(name.sub(/(::Cell$|Cell::)/, ''))
       end
     end
 
@@ -23,4 +23,4 @@ module Cell
 
     self_contained!
   end
-end
+end

data/lib/cell/railtie.rb

@@ -36,11 +36,10 @@ module Cell
     initializer "cells.include_default_helpers" do
       # include asset helpers (image_path, font_path, ect)
       ViewModel.class_eval do
-        include ActionView::Helpers::UrlHelper
+        include ActionView::Helpers::FormHelper # includes ActionView::Helpers::UrlHelper, ActionView::Helpers::FormTagHelper
         include ::Cell::RailsExtensions::HelpersAreShit
 
         include ActionView::Helpers::AssetTagHelper
-        include ActionView::Helpers::FormTagHelper
       end
 
       # set VM#cache_store, etc.

data/lib/cell/version.rb

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

data/test/concept_test.rb

@@ -6,7 +6,7 @@ end
 
 # Trailblazer style:
 module Record
-  class Cell < Cell::Concept # cell("record")
+  class Cell < ::Cell::Concept # cell("record")
     include ::Cell::Erb
 
     def show
@@ -32,6 +32,15 @@ module Record
   end
 end
 
+module Record
+  module Cells
+    class Cell < ::Cell::Concept
+      class Song < ::Cell::Concept
+      end
+    end
+  end
+end
+
 # app/cells/comment/views
 # app/cells/comment/form/views
 # app/cells/comment/views/form inherit_views Comment::Cell, render form/show
@@ -41,6 +50,8 @@ class ConceptTest < MiniTest::Spec
   describe "::controller_path" do
     it { Record::Cell.new.controller_path.must_equal "record" }
     it { Record::Cell::Song.new.controller_path.must_equal "record/song" }
+    it { Record::Cells::Cell.new.controller_path.must_equal "record/cells" }
+    it { Record::Cells::Cell::Song.new.controller_path.must_equal "record/cells/song" }
   end
 
 

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

@@ -1,8 +1,7 @@
 class FormForCell < Cell::ViewModel
   include ActionView::RecordIdentifier
-  include ActionView::Helpers::FormHelper
 
   def show
     render
   end
-end
+end

data/test/rails4.2/app/cells/form_tag/show.erb

@@ -0,0 +1,5 @@
+<%= form_tag songs_path do %>
+  Second
+  <%= text_field_tag :id %>
+  <%= submit_tag "Save" %>
+<% end %>

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

@@ -0,0 +1,5 @@
+class FormTagCell < Cell::ViewModel
+  def show
+    render
+  end
+end

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

@@ -1,9 +1,8 @@
 class FormtasticCell < Cell::ViewModel
   include ActionView::RecordIdentifier
-  include ActionView::Helpers::FormHelper
   include Formtastic::Helpers::FormHelper
 
   def show
     render
   end
-end
+end

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

@@ -1,6 +1,5 @@
 class SimpleFormCell < Cell::ViewModel
   include ActionView::RecordIdentifier
-  include ActionView::Helpers::FormHelper
   include SimpleForm::ActionViewExtensions::FormHelper
 
   # include ActiveSupport::Configurable
@@ -9,4 +8,4 @@ class SimpleFormCell < Cell::ViewModel
   def show
     render
   end
-end
+end

data/test/rails4.2/config/initializers/formtastic.rb

@@ -0,0 +1,2 @@
+Formtastic::FormBuilder.action_class_finder = Formtastic::ActionClassFinder
+Formtastic::FormBuilder.input_class_finder = Formtastic::InputClassFinder

data/test/rails4.2/engines/my_engine/my_engine.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |s|
   s.version     = MyEngine::VERSION
   s.authors     = ["Alexander Huber"]
   s.email       = ["alih83@gmx.de"]
-  s.homepage    = "TODO"
-  s.summary     = "TODO: Summary of MyEngine."
-  s.description = "TODO: Description of MyEngine."
+  s.homepage    = "https://github.com/apotonick/cells"
+  s.summary     = "Summary of MyEngine."
+  s.description = "Description of MyEngine."
   s.license     = "MIT"
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]

data/test/rails4.2/test/integration/form_tag_test.rb

@@ -0,0 +1,11 @@
+require "test_helper"
+
+class FormTagTestTest < MiniTest::Spec
+  include Cell::Testing
+  controller SongsController
+
+  it do
+    cell("form_tag").().gsub(/\s\s/, "").must_equal %{<form action=\"/songs\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /> Second <input type=\"text\" name=\"id\" id=\"id\" /> <input type=\"submit\" name=\"commit\" value=\"Save\" />
+</form>}
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -220,6 +220,8 @@ files:
 - test/rails4.2/app/assets/stylesheets/application.css.erb
 - test/rails4.2/app/cells/form_for/show.erb
 - test/rails4.2/app/cells/form_for_cell.rb
+- test/rails4.2/app/cells/form_tag/show.erb
+- test/rails4.2/app/cells/form_tag_cell.rb
 - test/rails4.2/app/cells/formtastic/show.erb
 - test/rails4.2/app/cells/formtastic_cell.rb
 - test/rails4.2/app/cells/simple_form/show.erb
@@ -255,6 +257,7 @@ files:
 - test/rails4.2/config/initializers/backtrace_silencers.rb
 - test/rails4.2/config/initializers/cookies_serializer.rb
 - test/rails4.2/config/initializers/filter_parameter_logging.rb
+- test/rails4.2/config/initializers/formtastic.rb
 - test/rails4.2/config/initializers/inflections.rb
 - test/rails4.2/config/initializers/mime_types.rb
 - test/rails4.2/config/initializers/session_store.rb
@@ -295,6 +298,7 @@ files:
 - test/rails4.2/test/integration/asset_pipeline_test.rb
 - test/rails4.2/test/integration/controller_test.rb
 - test/rails4.2/test/integration/form_for_test.rb
+- test/rails4.2/test/integration/form_tag_test.rb
 - test/rails4.2/test/integration/formtastic_test.rb
 - test/rails4.2/test/integration/simple_form_test.rb
 - test/rails4.2/test/integration/url_helper_test.rb