express_templates 0.9.8 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66b5f8c8493808ff989e22a6423a3446c6a6917
-  data.tar.gz: aa49d8497f8be6e6ee218a861e543f311e3f46b8
+  metadata.gz: 4c9baef818e61dca4af8b2dc58563e052a18dbe6
+  data.tar.gz: 380b2be118607d717bd5c9d7adb5b6bb54cd21d9
 SHA512:
-  metadata.gz: 03f1c7da0070f318dcc5b6ea04a1bb81dd5495f715d89f5e803c5895a3963e1514eb058526a8bdc8bd4920c8438c653451a983c67a2df56b65ca10d2036e3af5
-  data.tar.gz: efe4c4852fc762b52c7d4bc933f29b1e945df699fc8e02e110953283b3547410ba0cca3f0162517a4c4ee6fa2738a725da64f1c76e7e348b011ac99a69cf3196
+  metadata.gz: 300363fd967967329bbc0a4a783d5affce0c83fa522086735be9df12561484c91e3179e668adf933f1660a4894696c8f6229c3811b56f253e26479533ed751c6
+  data.tar.gz: c82fd24eb83f898092ebb731f37c60739d29ec09316038ab6605a27fef4feda4b6ad2053c2d303f127fee8de41f482c81bdf317e792e862bfffebaee87999438

data/lib/express_templates/components/all.rb

@@ -0,0 +1,26 @@
+module ExpressTemplates
+  module Components
+    class All < Container
+
+      has_argument :id, "Name of the collection", as: :collection_name, type: :symbol
+
+      contains -> (&block) {
+        prepended
+        collection.each do |item|
+          assigns[member_name] = item
+          block.call(self) if block
+        end
+        appended
+      }
+
+      def member_name
+        config[:collection_name].to_s.singularize.to_sym
+      end
+
+      def collection
+        self.send(config[:collection_name])
+      end
+
+    end
+  end
+end

data/lib/express_templates/components/base.rb

@@ -32,6 +32,10 @@ module ExpressTemplates
         add_class _default_classes
       end
 
+      def assigns
+        @assigns_with_indifferent_access ||= super.merge(helpers.assigns.with_indifferent_access)
+      end
+
       def self.contains(proc = nil, &block)
         define_method(:_build_body, &(proc || block))
       end

data/lib/express_templates/components/capabilities/resourceful.rb

@@ -38,7 +38,7 @@ module ExpressTemplates
           if namespace
             "#{namespace}/#{resource_name}".classify
           else
-            resource_name.classify
+            resource_name.to_s.classify
           end
         end
 
@@ -120,7 +120,7 @@ module ExpressTemplates
               config[:collection]
             end
           else
-            helpers.collection
+            self.send(collection_name) # should be in view assigns
           end
         end
 
@@ -170,14 +170,10 @@ module ExpressTemplates
             resource_class_name.split("::").first.try(:underscore) : nil
         end
 
-        # accepts boolean to indicate whether to use an ivar or not
-        # and also may accept a resource on which we call to_param
-        def resource_path(ivar_or_resource = nil)
+        def resource_path(object = nil)
           if config[:resource_path]
-            if config[:resource_path].respond_to?(:call) &&
-              ivar_or_resource.respond_to?(:to_param) &&
-              ![true, false].include?(ivar_or_resource)
-              config[:resource_path].call(ivar_or_resource)
+            if config[:resource_path].respond_to?(:call) && object.respond_to?(:to_param)
+              config[:resource_path].call(object)
             else
               config[:resource_path]
             end
@@ -186,11 +182,11 @@ module ExpressTemplates
                helpers.resource.to_param.present? # skip on nil resource
               helpers.resource_path
             else
-              if ivar_or_resource.respond_to?(:to_param) &&
-                ![true, false].include?(ivar_or_resource)
-                helpers.instance_eval("#{resource_path_helper}('#{ivar_or_resource.to_param}')")
+              if resource_path_helper.match(/\w+\.\w+/)
+                namespace, path_helper = resource_path_helper.split('.')
+                helpers.send(namespace).send(path_helper, object)
               else
-                helpers.instance_eval("#{resource_path_helper}(#{ivar_or_resource ? '@' : ''}#{resource_name})")
+                helpers.send(resource_path_helper, object)
               end
             end
           end
@@ -207,6 +203,10 @@ module ExpressTemplates
         def resource_attributes
           resource_class.columns
         end
+
+        def resource
+          self.send(resource_name)
+        end
       end
     end
   end

data/lib/express_templates/components/forms/basic_fields.rb

@@ -11,7 +11,7 @@ module ExpressTemplates
             class #{type.classify} < FormComponent
               contains {
                 label_tag(label_name, label_text)
-                #{type}_field resource_var, field_name.to_sym, input_attributes
+                #{type}_field_tag field_name_attribute, field_value, field_helper_options
               }
             end
 RUBY
@@ -24,20 +24,20 @@ RUBY
       # class Email < FormComponent
       #   contains {
       #      label_tag label_name, label_text
-      #      email_field resource_var, field_name.to_sym, input_attributes
+      #      email_field  field_name_attribute, field_value, field_helper_options
       #   }
       # end
 
       class Textarea < FormComponent
         contains {
           label_tag(label_name, label_text)
-          text_area resource_var, field_name.to_sym, input_attributes
+          text_area_tag field_name_attribute, field_value, field_helper_options
         }
       end
 
       class Hidden < FormComponent
         contains {
-          hidden_field resource_var, field_name.to_sym, input_attributes
+          hidden_field_tag field_name_attribute, field_value, field_helper_options
         }
       end
     end

data/lib/express_templates/components/forms/checkbox.rb

@@ -7,7 +7,7 @@ module ExpressTemplates
 
         contains {
           label_tag(label_name, label_text) if label_before?
-          check_box(resource_var, field_name.to_sym, field_options, checked_value, unchecked_value)
+          check_box(resource_name, field_name.to_sym, field_options, checked_value, unchecked_value)
           label_tag(label_name, label_text) if label_after?
         }
 

data/lib/express_templates/components/forms/express_form.rb

@@ -8,12 +8,16 @@ module ExpressTemplates
 
         has_option :method, 'The form method', default: 'POST', attribute: true #, options: ['PUT', 'POST', 'GET', 'DELETE']
         has_option :action, 'The form action containing the resource path or url.'
+        has_option :on_success, 'Pass a form value indicating where to go on a successful submission.'
+        has_option :on_failure, 'Pass a form value indicating where to go on a failed submission.'
 
         prepends -> {
           div(style: 'display:none') {
             add_child helpers.utf8_enforcer_tag
             add_child helpers.send(:method_tag, resource.persisted? ? :put : :post)
-            helpers.send(:token_tag)
+            add_child helpers.send(:token_tag)
+            hidden_field_tag :on_success, config[:on_success] if config[:on_success]
+            hidden_field_tag :on_failure, config[:on_failure] if config[:on_failure]
           }
         }
 
@@ -28,7 +32,7 @@ module ExpressTemplates
         end
 
         def form_action
-          config[:action] || (resource.try(:persisted?) ? resource_path(true) : collection_path)
+          config[:action] || (resource.try(:persisted?) ? resource_path(resource) : collection_path)
         end
 
       end

data/lib/express_templates/components/forms/form_component.rb

@@ -15,16 +15,16 @@ module ExpressTemplates
         has_option :wrapper_class, 'Override the class of the wrapping div of a form component', default: 'field-wrapper'
         has_option :label, 'Override the inferred label of a form component'
 
+        def resource
+          self.send(resource_name)
+        end
+
         # Lookup the resource_name from the parent ExpressForm.
         def resource_name
           raise "FormComponent must have a parent form" unless parent_form
           parent_form.config[:id].to_s
         end
 
-        def resource_var
-          resource_name.to_sym
-        end
-
         def resource_class
           parent_form.resource_class
         end
@@ -45,12 +45,24 @@ module ExpressTemplates
           (config[:id] || (@args.first.is_a?(String) && @args.first)).to_s
         end
 
+        def field_value
+          resource.send(field_name)
+        end
+
         # Return the field name attribute.  Currently handles only simple attributes
         # on the resource.  Does not handle attributes for associated resources.
         def field_name_attribute
           "#{resource_name.singularize}[#{field_name}]"
         end
 
+        def field_id_attribute
+          "#{resource_name.singularize}_#{field_name}"
+        end
+
+        def field_helper_options
+          {id: field_id_attribute}.merge(input_attributes||nil)
+        end
+
         # Search the parent graph until we find an ExpressForm.  Returns nil if none found.
         def parent_form
           @my_form ||= parent

data/lib/express_templates/components/forms/radio.rb

@@ -17,7 +17,7 @@ module ExpressTemplates
         }
 
         def use_options_from_collection_radio_buttons_helper
-          collection_radio_buttons(resource_var, field_name.to_sym, collection_from_association,
+          collection_radio_buttons(resource_name, field_name.to_sym, collection_from_association,
                                    option_value_method, option_name_method,
                                    input_attributes) do |b|
             b.label(class: "radio") {
@@ -39,14 +39,14 @@ module ExpressTemplates
           when option_collection.kind_of?(Array)
             option_collection.each_with_index do |option, index|
               label(class: config[:label_wrapper_class]) {
-                radio_button(resource_var, field_name.to_sym, option, class: 'radio')
+                radio_button(resource_name, field_name.to_sym, option, class: 'radio')
                 current_arbre_element.add_child option
               }
             end
           when option_collection.kind_of?(Hash)
             option_collection.each_pair do |key, value|
               label(class: config[:label_wrapper_class]) {
-                radio_button(resource_var, field_name.to_sym, key, class: 'radio')
+                radio_button(resource_name, field_name.to_sym, key, class: 'radio')
                 current_arbre_element.add_child  value
               }
             end

data/lib/express_templates/components.rb

@@ -8,3 +8,4 @@ require 'express_templates/components/configurable'
 require 'express_templates/components/container'
 require 'express_templates/components/tree_for'
 require 'express_templates/components/forms'
+require 'express_templates/components/all'

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.9.8"
+  VERSION = "0.10.1"
 end

data/test/components/forms/basic_fields_test.rb

@@ -8,7 +8,15 @@ class BasicFieldsTest < ActiveSupport::TestCase
                     search telephone time url week)
 
   def assigns
-    {resource: resource}
+    {foo: resource}
+  end
+
+  def helpers
+    mock_action_view do
+      def foos_path
+        '/foos'
+      end
+    end
   end
 
   def field_type_map
@@ -67,7 +75,7 @@ class BasicFieldsTest < ActiveSupport::TestCase
       }
     }
     assert_match label_html, html
-    assert_match /<textarea rows="5" class="tinymce form-field" name="foo\[bar\]" id="foo_bar"><\/textarea>/, html.gsub("\n", '') 
+    assert_match /<textarea name="foo\[bar\]" id="foo_bar" rows="5" class="tinymce form-field"><\/textarea>/, html.gsub("\n", '')
   end
 
   test "hidden uses rails hidden_tag helper" do
@@ -87,7 +95,7 @@ class BasicFieldsTest < ActiveSupport::TestCase
       }
     }
     assert_no_match label_html, html
-    assert_match /<input class="hidden form-field" value="ninja" type="hidden" name="foo\[bar\]" id="foo_bar"/, html
+    assert_match /<input type="hidden" name="foo\[bar\]" id="foo_bar" value="ninja" class="hidden form-field"/, html
   end
 
   def resource_with_errors
@@ -113,37 +121,37 @@ class BasicFieldsTest < ActiveSupport::TestCase
   end
 
   test "adds error class if there are errors on a field with no input attributes" do
-    html_with_error = arbre(resource: resource_with_errors) {
+    html_with_error = arbre(foo: resource_with_errors) {
       express_form(:foo) {
        text :name
        text :body
       }
     }
     assert resource_with_errors.errors.any?
-    assert assigns[:resource].errors.any?
+    assert assigns[:foo].errors.any?
     assert has_error_class_on(:name, html_with_error), "name field has no error when expected"
     refute has_error_class_on(:body, html_with_error), "body field has error class when it should not"
   end
 
     test "adds error class if there are errors on a field with no class set" do
-    html_with_error = arbre(resource: resource_with_errors) {
+    html_with_error = arbre(foo: resource_with_errors) {
       express_form(:foo) {
        text :name, value: 'ninja'
       }
     }
     assert resource_with_errors.errors.any?
-    assert assigns[:resource].errors.any?
+    assert assigns[:foo].errors.any?
     assert_match has_error_class, html_with_error
   end
 
     test "adds error to class if there are errors on a field with existing class" do
-    html_with_error = arbre(resource: resource_with_errors) {
+    html_with_error = arbre(foo: resource_with_errors) {
       express_form(:foo) {
        text :name, value: 'ninja', class: 'slug'
       }
     }
     assert resource_with_errors.errors.any?
-    assert assigns[:resource].errors.any?
+    assert assigns[:foo].errors.any?
     assert_match has_error_class, html_with_error
   end
 

data/test/components/forms/checkbox_test.rb

@@ -1,12 +1,25 @@
 require 'test_helper'
 
+class Account
+end
+
 class CheckboxTest < ActiveSupport::TestCase
+
   def assigns
-    {resource: resource}
+    {account: resource}
   end
 
+  def helpers
+    mock_action_view do
+      def accounts_path
+        '/accounts'
+      end
+    end
+  end
+
+
   test "checkbox places the label before the input" do
-    html = arbre {
+    html = arbre(account: resource) {
       express_form(:account) {
         checkbox :eula
       }
@@ -21,7 +34,7 @@ class CheckboxTest < ActiveSupport::TestCase
   end
 
   test "checkbox respects label_after: true " do
-    html = arbre {
+    html = arbre(account: resource) {
       express_form(:account) {
         checkbox :eula, label_after: true
       }

data/test/components/forms/express_form_test.rb

@@ -6,24 +6,28 @@ require 'test_helper'
 
 class ExpressFormTest < ActiveSupport::TestCase
 
-  def assigns
-    {resource: resource}
-  end
-
   def simplest_form
-    arbre {
-      express_form(:resource) {
+    arbre(foo: resource) {
+      express_form(:foo) {
         submit value: 'Save it!'
       }
     }
   end
 
+  def helpers
+    mock_action_view do
+      def foos_path
+        '/foos'
+      end
+    end
+  end
+
   test "simplest form renders" do
     assert simplest_form
   end
 
   test "simplest form will have the proper id" do
-    assert_match /<form.*id="resource_1"/, simplest_form
+    assert_match /<form.*id="foo_1"/, simplest_form
   end
 
   test "simplest form contains form tag" do
@@ -48,7 +52,7 @@ class ExpressFormTest < ActiveSupport::TestCase
 
   test "simplest_form uses form_action for the action" do
     form_open_tag = simplest_form.match(/<form[^>]*>/)[0]
-    assert_match 'action="/resources"', form_open_tag
+    assert_match 'action="/foos"', form_open_tag
   end
 
   test "express_form default method is POST" do

data/test/components/forms/radio_test.rb

@@ -3,7 +3,19 @@ require 'test_helper'
 class RadioTest < ActiveSupport::TestCase
 
   def assigns
-    {resource: resource}
+    {person: ::Person.new}
+  end
+
+  def helpers
+    mock_action_view do
+      def people_path
+        '/people'
+      end
+
+      def employees_path
+        '/employees'
+      end
+    end
   end
 
   test "radio requires a parent component" do
@@ -58,7 +70,7 @@ class RadioTest < ActiveSupport::TestCase
   end
 
   def radio_with_options_omitted
-    html = arbre {
+    html = arbre(employee: resource) {
       express_form(:employee) {
         radio :department_id
       }

data/test/components/forms/select_test.rb

@@ -3,7 +3,15 @@ require 'ostruct'
 class SelectTest < ActiveSupport::TestCase
 
   def assigns
-    {resource: ::Person.new}
+    {person: ::Person.new}
+  end
+
+  def helpers
+    mock_action_view do
+      def people_path
+        '/people'
+      end
+    end
   end
 
 
@@ -112,8 +120,8 @@ class SelectTest < ActiveSupport::TestCase
       }
     }
     assert_match 'tagging_ids', html
-    assert_match /<option value="1">Friend<\/option>/, html
-    assert_match /<option value="2">Enemy<\/option>/, html
+    assert_match /<option selected="selected" value="1">Friend<\/option>/, html
+    assert_match /<option selected="selected" value="2">Enemy<\/option>/, html
     assert_match /<option value="3">Frenemy<\/option>/, html
   end
 

data/test/test_helper.rb

@@ -53,18 +53,14 @@ module ActiveSupport
     def helpers
       mock_action_view
     end
-    def mock_action_view
+    def mock_action_view &block
       controller = ActionView::TestCase::TestController.new
       ActionView::Base.send :include, ActionView::Helpers
       ActionView::Base.send :include, ActionView::Helpers::UrlHelper
       ActionView::Base.send :include, AdditionalHelpers
       view = ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
-      eigenklass = class << view
-        self
-      end
-      assigns.each do |helper_name,value|
-        eigenklass.send(:define_method, helper_name) { value }
-      end
+      eigenklass = class << view; self; end
+      eigenklass.class_eval &block unless block.nil?
       view
     end
 
@@ -86,16 +82,6 @@ module ActiveSupport
 end
 
 
-  class ExpressTemplates::Components::Forms::ExpressForm
-    def resource_path(resource)
-      "/resource/1"
-    end
-
-    def collection_path
-      "/resources"
-    end
-  end
-
 
   class ::Gender
     attr :id, :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.10.1
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -184,6 +184,7 @@ files:
 - lib/express_templates.rb
 - lib/express_templates/compiler.rb
 - lib/express_templates/components.rb
+- lib/express_templates/components/all.rb
 - lib/express_templates/components/base.rb
 - lib/express_templates/components/capabilities/resourceful.rb
 - lib/express_templates/components/configurable.rb