express_templates 0.3.6 → 0.4.0

data/test/markup/tag_test.rb

@@ -134,7 +134,7 @@ class TagTest < ActiveSupport::TestCase
   test "markup is indented" do
     ExpressTemplates::Markup::Tag.formatted do
       code = ExpressTemplates.compile &-> {ul { li { "*"*36 }}}
-      assert_equal "<ul>\n  <li>#{"*"*36}</li>\n</ul>\n", eval(code)
+      assert_equal "\n<ul>\n  <li>#{"*"*36}</li>\n</ul>\n", eval(code)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,6 +155,7 @@ files:
 - lib/express_templates/compiler.rb
 - lib/express_templates/components.rb
 - lib/express_templates/components/base.rb
+- lib/express_templates/components/capabilities/adoptable.rb
 - lib/express_templates/components/capabilities/building.rb
 - lib/express_templates/components/capabilities/conditionality.rb
 - lib/express_templates/components/capabilities/configurable.rb
@@ -167,8 +168,16 @@ files:
 - lib/express_templates/components/container.rb
 - lib/express_templates/components/content_for.rb
 - lib/express_templates/components/for_each.rb
-- lib/express_templates/components/form_for.rb
 - lib/express_templates/components/form_rails_support.rb
+- lib/express_templates/components/forms.rb
+- lib/express_templates/components/forms/basic_fields.rb
+- lib/express_templates/components/forms/checkbox.rb
+- lib/express_templates/components/forms/express_form.rb
+- lib/express_templates/components/forms/form_component.rb
+- lib/express_templates/components/forms/option_support.rb
+- lib/express_templates/components/forms/radio.rb
+- lib/express_templates/components/forms/select.rb
+- lib/express_templates/components/forms/submit.rb
 - lib/express_templates/components/null_wrap.rb
 - lib/express_templates/components/row.rb
 - lib/express_templates/components/table_for.rb
@@ -194,8 +203,14 @@ files:
 - test/components/configurable_test.rb
 - test/components/container_test.rb
 - test/components/content_for_test.rb
-- test/components/form_for_test.rb
+- test/components/forms/basic_fields_test.rb
+- test/components/forms/checkbox_test.rb
+- test/components/forms/express_form_test.rb
+- test/components/forms/radio_test.rb
+- test/components/forms/select_test.rb
+- test/components/forms/submit_test.rb
 - test/components/iterating_test.rb
+- test/components/null_wrap_test.rb
 - test/components/row_test.rb
 - test/components/table_for_test.rb
 - test/components/tree_for_test.rb
@@ -292,8 +307,14 @@ test_files:
 - test/components/configurable_test.rb
 - test/components/container_test.rb
 - test/components/content_for_test.rb
-- test/components/form_for_test.rb
+- test/components/forms/basic_fields_test.rb
+- test/components/forms/checkbox_test.rb
+- test/components/forms/express_form_test.rb
+- test/components/forms/radio_test.rb
+- test/components/forms/select_test.rb
+- test/components/forms/submit_test.rb
 - test/components/iterating_test.rb
+- test/components/null_wrap_test.rb
 - test/components/row_test.rb
 - test/components/table_for_test.rb
 - test/components/tree_for_test.rb

data/lib/express_templates/components/form_for.rb

@@ -1,469 +0,0 @@
-module ExpressTemplates
-  module Components
-    #
-    # Create an html <tt>form</tt> for a model object.
-    #
-    # Example:
-    #
-    # ````
-    # form_for(:people) do |f|
-    #   f.text_field  :name
-    #   f.email_field :email
-    #   f.phone_field :phone, wrapper_class: 'field phone'
-    #   f.submit 'Save'
-    # end
-    # ````
-    #
-    # This assumes that @people variable will exist in the
-    # view and that it will be a collection whose members respond to :name, :email etc.
-    #
-    # This will result in markup like the following:
-    #
-    # ````
-    # <form action="/people" method="post">
-    #   <div style="display:none">
-    #     <input name="utf8" type="hidden" value="✓">
-    #     <input type="hidden" name="_method" value="post">
-    #     <input type="hidden" name="authenticity_token" value="5ZDztTe1N4tc03QSjmMdSVqAw==">
-    #   </div>
-    #
-    #   <div>
-    #     <label for="person_name">Name</label>
-    #     <input type="text" name="person[name]" id="person_name" />
-    #   </div>
-    #
-    #   <div>
-    #     <label for="person_email">Email</label>
-    #     <input type="email" name="person[email]" id="person_email" />
-    #   </div>
-    #
-    #   <div class="field phone">
-    #     <label for="person_phone">Phone</label>
-    #     <input type="tel" name="person[phone]" id="person_phone" />
-    #   </div>
-    #
-    #   <div>
-    #     <input type="submit" name="commit" value="Save" />
-    #   </div>
-    # </form>
-    # ````
-    #
-    # As seen above, each field is accompanied by a label and is wrapped by a div.
-    # The div can be further styled by adding css classes to it via the `wrapper_class` option.
-    #
-    # Example:
-    #
-    # ````
-    # form_for(:posts) do
-    #   f.text_field :title, wrapped_class: 'string optional'
-    # end
-    #
-    # Will result to generating HTML like so:
-    #
-    # ````
-    #   ...
-    #   <div class='string optional'>
-    #     <label for='post_title'>Title</label>
-    #     <input type="text" name="post[title]" id="post_title" />
-    #   </div>
-    #   ...
-    # ````
-    #
-    # In addition to this, label text can also be customized using the `label` option:
-    #
-    # ````
-    #   f.email_field :email_address, label: 'Your Email'
-    # ````
-    #
-    # Compiles to;
-    # ````
-    #   <label for='user_email'>Your Email</label>
-    #   <input type='email' name='user[email]' id='user_email' />
-    # ````
-    class FormFor < Base
-      include Capabilities::Configurable
-      include Capabilities::Building
-
-      def initialize(*args)
-        # TODO: need a better way to select the form options
-        if @form_options = args.find { |x| x.is_a?(Hash) }
-          @_method = @form_options.delete :method
-        end
-
-        super(*args)
-        _process_args!(args) # from Configurable
-        yield(self) if block_given?
-      end
-
-      attr :fields
-
-      # Express Templates uses Rails' form helpers to generate the fields with labels
-      #
-      # Example:
-      #
-      # ````
-      # form_for(:people) do |f|
-      #   f.phone_field :phone
-      # end
-      # ````
-      #
-      # This will precompile as
-      #
-      # ````
-      #    ...
-      #    phone_field_tag :phone, @people.phone, {}
-      #    ...
-      # ````
-      #
-      # You can also add html options to the form (add classes, id, etc)
-      #
-      # ````
-      # form_for(:people, html_options: {class: 'edit_form', id: 'people_form'}) do |f|
-      #    f.phone_field :phone
-      # end
-      # ````
-      #
-      #   # <form action='/people' method='post' id='people_form' class='edit_form'>
-      #
-      # Fields can also have custom classes via the `class` option:
-      #
-      # Example:
-      #
-      # ````
-      #    f.url_field :website_url, class: 'url-string'
-      # ````
-      #
-      # Compiles to:
-      #
-      # ````
-      #    <input type='url' name='post[website_url]' id='post_website_url' class='url-string' />
-      # ````
-      #
-      # You can also add in the basic options supported by the
-      # phone_field_tag [here](http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-phone_field_tag)
-      #
-      # This applies to all the other '_field_tags' listed
-      # [here](http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html)
-      #
-      #
-      # = Fields
-      # ````
-      # f.text_field :name
-      # #   <div>
-      # #    <label for="person_name">Name</label>
-      # #    <input type="text" name="person[name]" id="person_name" />
-      # #   </div>
-      #
-      # f.text_field :name, label: 'post title'
-      # #   <div>
-      # #    <label for="person_name">Post Title</label>
-      # #    <input type="text" name="person[name]" id="person_name" />
-      # #   </div>
-      #
-      # f.text_field :name, class: 'string'
-      # #   <div>
-      # #    <label for="person_name">Name</label>
-      # #    <input type="text" name="person[name]" class='string' id="person_name" />
-      # #   </div>
-      #
-      # f.text_field :name, wrapper_class: 'field input'
-      # #   <div class="field input">
-      # #    <label for="person_name">Name</label>
-      # #    <input type="text" name="person[name]" id="person_name" />
-      # #   </div>
-      #
-      # ````
-      %w(email phone text password color date datetime
-        datetime_local hidden number range
-        search telephone time url week).each do |type|
-        define_method("#{type}_field") do |name, options={}|
-          @fields ||= []
-          @fields << Field.new(name, options, type.to_sym)
-        end
-      end
-
-      # ==== Examples
-      #   f.select :gender, ['Male', 'Female'], selected: 'Male'
-      #   # <div>
-      #   #   <label for="person_gender">Gender</label>
-      #   #   <select id="person_gender" name="person[gender]">
-      #   #     <option selected="selected" value="Male">Male</option>
-      #   #     <option selected="selected" value="Female">Female</option>
-      #   #   </select>
-      #   # </div>
-      #   f.select :name, options_from_collection_for_select(@people, "id", "name")
-      #   # <div>
-      #   #   <label for="person_name">Name</label>
-      #   #   <select id="people_name" name="people[name]"><option value="1">David</option></select>
-      #   # </div>
-      #
-      def select(name, select_options, options = {})
-        @fields ||= []
-        @fields << Select.new(name, options.merge!(select_options: select_options))
-      end
-
-      # ==== Examples
-      #   f.radio :card, [[1, 'One'], [2, 'Two']], :first, :last
-      #   # <div>
-      #   #   <label class="radio" for="user_age_1"><input type="radio" value="1" name="user[age]" id="user_age_1">One</label>
-      #   #   <label class="radio" for="user_age_2"><input type="radio" value="2" name="user[age]" id="user_age_2">Two</label>
-      #   # </div>
-      #
-      #   f.radio :enable_something, :boolean
-      #   # <div>
-      #   #   <label class="radio"><input type="radio" value="1" name="user[age]" id="user_age_1">One</label>
-      #   #   <label class="radio"><input type="radio" value="2" name="user[age]" id="user_age_2">Two</label>
-      #   # </div>
-      def radio(name, collection, value_method = :first, text_method = :last, options = {})
-        @fields ||= []
-        if collection == :boolean
-          collection = [[true, 'True'], [false, 'False']]
-        end
-        @fields << Radio.new(name, options.merge!(collection: collection, value_method: value_method, text_method: text_method))
-      end
-
-      # ==== Examples
-      #   f.checkbox :age, [[1, 'One'], [2, 'Two']], :first, :last
-      #   # <div>
-      #   #   <label class="checkbox">
-      #   #     <input type="checkbox" value="1" name="user[age][]" id="user_age_1">
-      #   #     "One"
-      #   #   </label>
-      #   #   <label class="checkbox">
-      #   #     <input type="checkbox" value="2" name="user[age][]" id="user_age_2">
-      #   #     "Two"
-      #   #   </label>
-      #   # </div>
-      #
-      def checkbox(name, collection, value_method, text_method, options = {})
-        @fields ||= []
-        @fields << Checkbox.new(name, options.merge!(collection: collection, value_method: value_method, text_method: text_method))
-      end
-
-      # ==== Examples
-      #   f.text_area :name
-      #   # <div>
-      #   #   <label for="user_name">Name</label>
-      #   #   <textarea name="user[name]" id="user_name" >
-      #   # </div>
-      #   f.text_area :name, label: 'post title'
-      #   # <div>
-      #   #   <label for="user_name">Post Title</label>
-      #   #   <textarea name="user[name]" id="user_name" >
-      #   # </div>
-      #   f.text_area :name, wrapper_class: 'field input'
-      #   # <div class="field input">
-      #   #   <label for="user_name">Name</label>
-      #   #   <textarea name="user[name]" id="user_name" >
-      #   # </div>
-      #   f.text_area :name, class: 'string'
-      #   # <div>
-      #   #   <label for="user_name>Name</label>
-      #   #   <textarea name="user[name] id="user_name" class="string" >
-      #   # </div>
-      #
-      def text_area(name, options = {})
-        @fields ||= []
-        @fields << TextArea.new(name, options)
-      end
-
-      # ==== Examples
-      #   f.submit "Save Changes"
-      #   # <div>
-      #   #   <input type="submit" name="commit" value="Save Changes" />
-      #   # </div>
-      #
-      def submit(name = 'Submit Changes', options = {})
-        @fields ||=[]
-        @fields << Field.new(name, options, :submit)
-      end
-
-      # You can add extra actions to a form instead of just submit
-      # ==== Examples
-      #   f.actions({submit: ['Save', {class: 'submit primary'}], cancel: ['Cancel it', class: 'cancel secondary']})
-      #   # <div>
-      #   #   <input type="submit" name="submit primary" value: "Save" />
-      #   #   <a href="#" onclick="return false;" class="cancel secondary">Cancel it</a>
-      #   # </div>
-      #
-      # You can also add extra wrapper div classes for more customization
-      # ==== Examples
-      #   f.actions({submit: ['Save', {class: 'submit primary'}], cancel: ['Cancel it', class: 'cancel secondary']}, wrapper_class: 'form-group')
-      #   # <div class='form-group'>
-      #   #   <input type="submit" name="submit primary" value: "Save" />
-      #   #   <a href="#" onclick="return false;" class="cancel secondary">Cancel it</a>
-      #   # </div>
-      def actions(extra_actions, options)
-        @fields ||= []
-        @fields << Actions.new(extra_actions, options)
-      end
-
-      emits -> {
-        form(form_args) {
-          form_rails_support form_method
-          fields.each do |field|
-            field_name = field.name
-            field_type = field.type.to_s
-            resource_field_name = "#{resource_name.singularize}[#{field_name}]"
-            label_name = "#{resource_name.singularize}_#{field_name}"
-            field_label = field.label || field_name.to_s.titleize
-
-            div(class: field.wrapper_class) {
-              if field_type == 'select'
-                label_tag(label_name, field_label)
-                select_tag(resource_field_name, field.options_html, field.options)
-              elsif field_type == 'radio'
-                label_tag(label_name, field_label)
-                collection_radio_buttons(my[:id], field_name, field.collection,
-                                         field.value_method, field.text_method, field.options) do |b|
-                  b.label(class: 'radio') { b.radio_button + b.text }
-                end
-              elsif field_type == 'checkbox'
-                label_tag(label_name, field_label)
-                collection_check_boxes(my[:id], field_name, field.collection,
-                                       field.value_method, field.text_method, field.options) do |b|
-                  b.label(class: 'checkbox') { b.check_box + b.text }
-                end
-              elsif field_type == 'submit'
-                submit_tag(field_name, field.options)
-              elsif field_type == 'actions'
-                field.extra_actions.each do |action|
-                  action_type = action.first
-                  action_options = action.last
-
-                  if action_type == :submit
-                    submit_tag(action_options.first, action_options.last)
-                  elsif action_type == :cancel
-                    default_opts = {href: '#', onclick: 'return false;'}.merge!(action_options.last)
-                    a(default_opts) { action_options.first }
-                  end
-                end
-              else
-                label_tag(label_name, field_label) unless field_type == 'hidden'
-                args = [resource_field_name, "{{@#{resource_name.singularize}.#{field_name}}}", field.options]
-                tag_string = if field_type == 'text_area'
-                                 'text_area_tag'
-                               else
-                                 "#{field_type}_field_tag"
-                               end
-
-                self.send(tag_string.to_sym, *args)
-              end
-            }
-          end
-        }
-      }
-
-      def wrap_for_stack_trace(body)
-        "ExpressTemplates::Components::FormFor.render_in(self) {\n#{body}\n}"
-      end
-
-      def compile
-        wrap_for_stack_trace(lookup(:markup))
-      end
-
-      private
-
-      def form_method
-        if @_method == :put
-          :patch
-        else
-          @form_options.present? ?  @form_options[:method] : :post
-        end
-      end
-
-      def _action(resource_name)
-        base_url = %Q(/#{resource_name.pluralize})
-        if form_method == :patch
-          %Q(#{base_url}/{{@#{resource_name}.id}})
-        else
-          base_url
-        end
-      end
-
-      def form_args
-        default_args = {action: _action(resource_name), method: :post}
-
-        if @form_options.nil?
-          default_args
-        else
-          if html_options = @form_options.delete(:html_options)
-            @form_options.merge!(html_options)
-          end
-          default_args.merge!(@form_options)
-        end
-      end
-
-      def resource_name
-        my[:id].to_s
-      end
-
-      class Field
-        attr :name, :options, :label, :type, :wrapper_class
-        def initialize(name, options = {}, type=:text)
-          @name = name
-          @options = options
-          @label = @options.delete(:label)
-          @wrapper_class = @options.delete(:wrapper_class)
-          @type = type
-        end
-      end
-
-      class TextArea < Field
-        def initialize(name, options={})
-          super(name, options, :text_area)
-        end
-      end
-
-      class Radio < Field
-        attr :collection, :value_method, :text_method
-        def initialize(name, options = {})
-          @collection = options.delete :collection
-          @value_method = options.delete :value_method
-          @text_method = options.delete :text_method
-          super(name, options, :radio)
-        end
-      end
-
-      class Checkbox < Radio
-        def initialize(name, options = {})
-          super(name, options)
-          @type = :checkbox
-        end
-      end
-
-      class Select < Field
-        attr :choices
-        def initialize(name, options = {})
-          @choices = options.delete :select_options
-          @selected = options.delete :selected
-          super(name, options, :select)
-        end
-
-        def options_html
-          choice_string = ""
-          if @choices.is_a?(String)
-            choice_string = @choices
-          else
-            @choices.map do |choice|
-              selected_string = (@selected != nil && choice == @selected) ? 'selected=selected' : nil
-              choice_string << "<option #{selected_string}>#{choice}</option>"
-            end
-            "{{'#{choice_string}'.html_safe}}"
-          end
-        end
-      end
-
-      # need to fix this some day (actions doesn't need to inherit from field)
-      class Actions < Field
-        attr :extra_actions
-        def initialize(extra_actions, options = {})
-          @name = ''
-          @label = ''
-          @extra_actions = extra_actions
-          super(@name, options, :actions)
-        end
-      end
-    end
-  end
-end