express_templates 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 833fc8181d87deb3b99763fb91dfdad3b48c6c9e
-  data.tar.gz: cb4037d2a9bcd7c2e3084ea9ec2026693f71da5e
+  metadata.gz: e5d21da31290cc55f88dced62806bcda510084f7
+  data.tar.gz: 9dd96eb7a6c1cf233d0bf11c65511f1515c7fb30
 SHA512:
-  metadata.gz: e2040b7bf2a3fb485bd6d454532c41b3467700efaac36f50333fcd9d8c16d0055f77bd3888640f11f9dc972540504697cf9e92818aaab8ba19c24ecbcc9cd71b
-  data.tar.gz: 79e23baf7ea8315fbd06f85b6433b658c233847973de3ddc07d20ddc7cb086c183aee8858bc856e1d24a7c3dd9e2ad234a6151715c096245b8223217f76994aa
+  metadata.gz: b091217942e9c4ccc1e92e250f7dab0623e23bd204e3c965301eee2da6b0ff6aff9457362c087f661d2f66bbf9abd25603df29dc6d2c8f67ea6896b765fd3d50
+  data.tar.gz: 97561ff9e8624760dc595d96a873ef56d0893669460cc16f2a59517ac9672934f4bb1e89f6a056fc4331da95eb8426bdc9632746081e55e16d43d3508b27836d

data/lib/express_templates/components/form_for.rb

@@ -5,7 +5,7 @@ module ExpressTemplates
     #
     # Example:
     #
-    # ````ruby
+    # ````
     # form_for(:people) do |f|
     #   f.text_field  :name
     #   f.email_field :email
@@ -53,7 +53,7 @@ module ExpressTemplates
     #
     # Example:
     #
-    # ````ruby
+    # ````
     # form_for(:posts) do
     #   f.text_field :title, wrapped_class: 'string optional'
     # end
@@ -71,7 +71,7 @@ module ExpressTemplates
     #
     # In addition to this, label text can also be customized using the `label` option:
     #
-    # ````ruby
+    # ````
     #   f.email_field :email_address, label: 'Your Email'
     # ````
     #
@@ -86,7 +86,10 @@ module ExpressTemplates
 
       def initialize(*args)
         # TODO: need a better way to select the form options
-        @form_options = args.select { |x| x.is_a?(Hash) }
+        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?
@@ -98,7 +101,7 @@ module ExpressTemplates
       #
       # Example:
       #
-      # ````ruby
+      # ````
       # form_for(:people) do |f|
       #   f.phone_field :phone
       # end
@@ -106,17 +109,27 @@ module ExpressTemplates
       #
       # This will precompile as
       #
-      # ````ruby
+      # ````
       #    ...
       #    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:
       #
-      # ````ruby
+      # ````
       #    f.url_field :website_url, class: 'url-string'
       # ````
       #
@@ -134,7 +147,7 @@ module ExpressTemplates
       #
       #
       # = Fields
-      # ````ruby
+      # ````
       # f.text_field :name
       # #   <div>
       # #    <label for="person_name">Name</label>
@@ -257,26 +270,19 @@ module ExpressTemplates
         @fields << Field.new(name, options, :submit)
       end
 
-      emits -> {
-        resource_name = my[:id].to_s
-        form_options = @form_options.first
-        form_method = form_options.delete :method if form_options
-
-        form_method = if form_method == :put
-                        :patch
-                      else
-                        form_options.present? ?  form_options[:method] : :post
-                      end
-
-        form_action  = if form_method == :patch
-                       %Q(/#{resource_name.pluralize}/{{@#{resource_name}.id}})
-                       else
-                       %Q(/#{resource_name.pluralize})
-                     end
-
-        form_args = {action: form_action, method: :post}
-        form_args.merge!(form_options) unless form_options.nil?
+      # 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>
+      def actions(extra_actions)
+        @fields ||= []
+        @fields << Actions.new(extra_actions)
+      end
 
+      emits -> {
         form(form_args) {
           form_rails_support form_method
           fields.each do |field|
@@ -284,7 +290,7 @@ module ExpressTemplates
             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.capitalize
+            field_label = field.label || field_name.to_s.titleize
 
             div(class: field.wrapper_class) {
               if field_type == 'select'
@@ -302,6 +308,18 @@ module ExpressTemplates
                 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]
@@ -326,6 +344,42 @@ module ExpressTemplates
         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)
@@ -381,6 +435,17 @@ module ExpressTemplates
           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)
+          @type = :actions
+          @name = ''
+          @label = ''
+          @extra_actions = extra_actions
+        end
+      end
     end
   end
 end

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/test/components/form_for_test.rb

@@ -25,33 +25,33 @@ class FormForTest < ActiveSupport::TestCase
   def setup
     @example_compiled = -> {
     ExpressTemplates::Components::FormFor.render_in(self) {
-"<form action=\"/resources\" method=\"put\" url=\"/yolo\">
+"<form action=\"/resources/#{@resource.id}\" method=\"post\" url=\"/posts\" id=\"post_form\">
   <div style=\"display:none\">
-"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:post)})+%Q(#{token_tag})+"
+"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:patch)})+%Q(#{token_tag})+"
   </div>
 
   <div class=\"\">
-"+%Q(#{label_tag(:name, "post title")})+%Q(#{text_field_tag(:name, @resource.name, label: "post title")})+"
+"+%Q(#{label_tag("resource_name", "post title")})+%Q(#{text_field_tag("resource[name]", @resource.name, label: "post title")})+"
   </div>
 
   <div class=\"\">
-"+%Q(#{label_tag(:body, nil)})+%Q(#{text_field_tag(:body, @resource.body, class: "string")})+"
+"+%Q(#{label_tag("resource_body", "Body")})+%Q(#{text_field_tag("resource[body]", @resource.body, class: "string")})+"
   </div>
 
   <div class=\"field input\">
-"+%Q(#{label_tag(:email, nil)})+%Q(#{email_field_tag(:email, @resource.email, wrapper_class: "field input")})+"
+"+%Q(#{label_tag("resource_email", "Email")})+%Q(#{email_field_tag("resource[email]", @resource.email, {})})+"
   </div>
 
   <div class=\"\">
-"+%Q(#{label_tag(:phone, nil)})+%Q(#{phone_field_tag(:phone, @resource.phone, {})})+"
+"+%Q(#{label_tag("resource_mobile_phone", "Mobile Phone")})+%Q(#{phone_field_tag("resource[mobile_phone]", @resource.mobile_phone, {})})+"
   </div>
 
   <div class=\"\">
-"+%Q(#{label_tag(:url, nil)})+%Q(#{url_field_tag(:url, @resource.url, {})})+"
+"+%Q(#{label_tag("resource_url", "Url")})+%Q(#{url_field_tag("resource[url]", @resource.url, {})})+"
   </div>
 
   <div class=\"\">
-"+%Q(#{label_tag(:number, nil)})+%Q(#{number_field_tag(:number, @resource.number, {})})+"
+"+%Q(#{label_tag("resource_number", "Number")})+%Q(#{number_field_tag("resource[number]", @resource.number, {})})+"
   </div>
 
   <div class=\"\">"+%Q(#{submit_tag("Save it!", {})})+"</div>
@@ -70,11 +70,11 @@ class FormForTest < ActiveSupport::TestCase
   def simple_form(resource)
     ctx = Context.new(resource)
     fragment = -> {
-      form_for(:resource, method: :put, url: '/yolo') do |f|
+      form_for(:resource, method: :put, url: '/posts', html_options: {id: 'post_form'}) do |f|
         f.text_field :name, label: 'post title'
         f.text_field :body, class: 'string'
         f.email_field :email, wrapper_class: 'field input'
-        f.phone_field :phone
+        f.phone_field :mobile_phone
         f.url_field :url
         f.number_field :number
         f.submit 'Save it!'
@@ -114,10 +114,52 @@ class FormForTest < ActiveSupport::TestCase
     return ctx, fragment
   end
 
+  def advanced_form(resource)
+    ctx = Context.new(resource)
+    fragment = -> {
+      form_for(:resource, method: :put, url: '/posts') do |f|
+        f.text_field :name, label: 'post title'
+        f.text_field :body, class: 'string'
+        f.actions({submit: ['Save', {class: 'submit primary'}], cancel: ['Cancel it', class: 'cancel secondary']})
+      end
+    }
+    return ctx, fragment
+  end
+
   test "fields compiled source is legible and transparent" do
     ExpressTemplates::Markup::Tag.formatted do
-      # ctx, fragment = simple_form(resource)
-      # assert_equal example_compiled_src, ExpressTemplates.compile(&fragment)
+      ctx, fragment = simple_form(resource)
+      assert_equal example_compiled_src, ExpressTemplates.compile(&fragment)
+    end
+  end
+
+  test 'advanced form can have additional actions' do
+    @example_compiled = -> {
+    ExpressTemplates::Components::FormFor.render_in(self) {
+"<form action=\"/resources/#{@resource.id}\" method=\"post\" url=\"/posts\">
+  <div style=\"display:none\">
+"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:patch)})+%Q(#{token_tag})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag("resource_name", "post title")})+%Q(#{text_field_tag("resource[name]", @resource.name, label: "post title")})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag("resource_body", "Body")})+%Q(#{text_field_tag("resource[body]", @resource.body, class: "string")})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{submit_tag("Save", class: "submit primary")})+"
+    <a href=\"#\" onclick=\"return false;\" class=\"cancel secondary\">Cancel it</a>
+  </div>
+</form>
+"
+}
+}
+    ExpressTemplates::Markup::Tag.formatted do
+      ctx, fragment = advanced_form(resource)
+      assert_equal example_compiled_src, ExpressTemplates.compile(&fragment)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Write HTML templates in declarative Ruby.  Create reusable view components.