express_templates 0.3.1 → 0.3.2

data/lib/express_templates/components/table_for.rb

@@ -8,17 +8,19 @@ module ExpressTemplates
     #
     # Example:
     #
-    # ```ruby
+    # ````ruby
     # table_for(:people) do |t|
     #   t.column :name
     #   t.column :email
     #   t.column :phone
+    #   t.column :hourly_rate, header: "Rate",
+    #                          formatter: -> (amount) {'$%0.2f' % amount rescue 'N/A'}
     # end
-    # ```
+    # ````
     #
     # This assumes that a @people variable will exist in the
     # view and that it will be a collection whose members respond to
-    # :name, :email, and :phone
+    # :name, :email, :phone, :hourly_rate
     #
     # This will result in markup like the following:
     #
@@ -28,6 +30,7 @@ module ExpressTemplates
     #           <th class="name">Name</th>
     #           <th class="email">Email</th>
     #           <th class="phone">Phone</th>
+    #           <th class="hourly_rate">Rate</th>
     #         </tr>
     #       </thead>
     #       <tbody>
@@ -35,10 +38,17 @@ module ExpressTemplates
     #           <td class="name">Steven Talcott Smith</td>
     #           <td class="email">steve@aelogica.com</td>
     #           <td class="phone">415-555-1212</td>
+    #           <td class="hourly_rate">$250.00</td>
     #         </tr>
     #       </tbody>
     #     </table>
     #
+    # Note that column options include :formatter and :header.
+    #
+    # :formatter may be a stabby lambda which is passed the value to be formatted.
+    #
+    # :header may be either a string
+    #
     class TableFor < Base
       include Capabilities::Configurable
       include Capabilities::Building
@@ -68,15 +78,21 @@ module ExpressTemplates
             }
           }
           tbody {
-            for_each(my[:id]) {
+            for_each("@#{my[:id]}".to_sym) {
 
-              tr(id: -> {"item-#{item.id}"},
+              tr(id: "#{my[:id].to_s.singularize}-{{#{my[:id].to_s.singularize}.id}}",
                  class: my[:id].to_s.singularize) {
 
                 columns.each do |column|
-                  td(class: column.name) {
-                    column.format(:item)
-                  }
+                  if(column.has_actions?)
+                    td(class: column.name) {
+                      column.show_actions(my[:id].to_s)
+                    }
+                  else
+                    td(class: column.name) {
+                      column.format(my[:id].to_s.singularize)
+                    }
+                  end
                 end
               }
             }
@@ -98,6 +114,12 @@ module ExpressTemplates
           @name = name
           @options = options
           @formatter = options[:formatter]
+          @header = options[:header]
+          @actions = options[:actions] || []
+        end
+
+        def has_actions?
+          @actions.any?
         end
 
         def format(item_name)
@@ -108,12 +130,34 @@ module ExpressTemplates
           end
         end
 
+        def show_actions(item_name)
+          action_links = StringIO.new
+          @actions.each do |action|
+            action_name = action.to_s
+            if action_name.eql?('edit')
+              action_links.puts "<a href='/#{item_name}/{{#{item_name.singularize}.id}}/edit'>Edit</a>"
+            elsif action_name.eql?('delete')
+              action_links.puts "<a href='/#{item_name}/{{#{item_name.singularize}.id}}' data-method='delete' data-confirm='Are you sure?'>Delete</a>"
+            elsif action_name.eql?('show')
+              action_links.puts "<a href='/#{item_name}/{{#{item_name.singularize}.id}}'>Show</a>"
+            end
+          end
+          action_links.string
+        end
+
         def title
-          @name.to_s.try(:titleize)
+          case
+          when @header.nil?
+            @name.to_s.try(:titleize)
+          when @header.kind_of?(String)
+            @header
+          when @header.kind_of?(Proc)
+            "{{(#{@header.source}).call(#{@name})}}"
+          end
         end
       end
 
     end
 
   end
-end
+end

data/lib/express_templates/components/tree_for.rb

@@ -22,20 +22,61 @@ module ExpressTemplates
     #     <ul id="roles" class="roles tree">
     #       <li>SuperAdmin
     #         <ul>
-    #           <li>Admin</li>
+    #           <li>Admin
     #             <ul>
-    #               <li>Publisher</li>
+    #               <li>Publisher
     #                 <ul>
     #                    <li>Author</li>
     #                 </ul>
+    #               </li>
     #               <li>Auditor</li>
-    #             </ol>
+    #             </ul>
     #           </li>
-    #         </ol>
+    #         </ul>
     #       </li>
-    #     </ol>
+    #     </ul>
     #
     class TreeFor < Container
+      def node_renderer
+        return (-> (node, renderer) {
+    ExpressTemplates::Indenter.for(:tree) do |ws, wsnl|
+      "#{wsnl}<li>"+
+      _yield +
+      if node.children.any?
+        ExpressTemplates::Indenter.for(:tree) do |ws, wsnl|
+          "#{wsnl}<ul>" +
+            node.children.map do |child|
+              renderer.call(child, renderer)
+            end.join +
+          "#{wsnl}</ul>"
+        end +
+        "#{wsnl}</li>"
+      else
+        "</li>"
+      end
+    end
+  }).source.sub(/\W_yield\W/, compile_children.lstrip)
+      end
+
+      def compile
+        collection = _variablize(@options[:id])
+        member = @options[:id].to_s.singularize
+        return 'ExpressTemplates::Components::TreeFor.render_in(self) {
+  node_renderer = '+node_renderer.gsub(/node/, member)+'
+  ExpressTemplates::Indenter.for(:tree) do |ws, wsnl|
+    "#{ws}<ul id=\"roles\" class=\"roles tree\">" +
+      '+collection+'.map do |'+member+'|
+        node_renderer.call('+member+', node_renderer)
+      end.join +
+    "#{wsnl}</ul>\n"
+  end
+}'
+      end
+
+      private
+        def _variablize(sym)
+          "@#{sym}"
+        end
     end
   end
 end

data/lib/express_templates/expander.rb

@@ -21,7 +21,7 @@ module ExpressTemplates
     def expand(source=nil, &block)
       case
       when block.nil? && source
-        modified = _wrap_instance_vars( _replace_yield_with_yielder(source) )
+        modified = _replace_yield_with_yielder(source)
         instance_eval(modified, @template.inspect)
       when block
         instance_exec &block
@@ -92,10 +92,6 @@ module ExpressTemplates
         source.gsub(/(\W)(yield)(\([^\)]*\))?/, '\1 (stack << ExpressTemplates::Markup::Yielder.new\3)')
       end
 
-      def _wrap_instance_vars(source)
-        source.gsub(/(\W)(@\w+)(\W)?/, '\1 (stack << ExpressTemplates::Markup::Wrapper.new("\2") )\3')
-      end
-
     class Stack
       def initialize
         @stack = [[]]

data/lib/express_templates/macro.rb

@@ -33,6 +33,7 @@ module ExpressTemplates
                 @options.merge!(child_or_option)
               when child_or_option.kind_of?(Symbol)
                 @options.merge!(id: child_or_option.to_s)
+              when child_or_option.nil?
               else
                 @children << child_or_option
               end

data/lib/express_templates/version.rb

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

data/test/components/container_test.rb

@@ -38,7 +38,7 @@ class ContainerTest < ActiveSupport::TestCase
     child2.verify
   end
 
-  test ".render_with_children renders children in place of _yield" do
+  test "renders children in place of _yield" do
     container = TestContainer.new
     child1, child2 = mock_children
     container.children = [child1, child2]
@@ -46,4 +46,19 @@ class ContainerTest < ActiveSupport::TestCase
     assert_equal "<p>onetwo</p>", eval(container.compile)
   end
 
+  class Context
+    def a_helper
+      "foo"
+    end
+  end
+
+  test "children with interpolations" do
+    markup = ExpressTemplates.render(Context.new) do
+      row {
+        p %q(Should say: {{a_helper}}.)
+      }
+    end
+    assert_equal "<div class=\"row\"><p>Should say: foo.</p></div>", markup
+  end
+
 end

data/test/components/form_for_test.rb

@@ -0,0 +1,197 @@
+require 'test_helper'
+require 'ostruct'
+
+class FormForTest < ActiveSupport::TestCase
+  class Context
+    def initialize(resource)
+      @resource = resource
+    end
+  end
+
+  def resource
+    OpenStruct.new(
+      id: 1,
+      name: 'Foo',
+      body: 'Hello world',
+      email: 'some@email.com',
+      phone: '123123123',
+      url: 'http://someurl.com',
+      number: 123,
+      dropdown: 'yes',
+      gender: 'Male'
+    )
+  end
+
+  def setup
+    @example_compiled = -> {
+    ExpressTemplates::Components::FormFor.render_in(self) {
+"<form action=\"/resources\" method=\"put\" url=\"/yolo\">
+  <div style=\"display:none\">
+"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:post)})+%Q(#{token_tag})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag(:name, "post title")})+%Q(#{text_field_tag(:name, @resource.name, label: "post title")})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag(:body, nil)})+%Q(#{text_field_tag(: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")})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag(:phone, nil)})+%Q(#{phone_field_tag(:phone, @resource.phone, {})})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag(:url, nil)})+%Q(#{url_field_tag(:url, @resource.url, {})})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag(:number, nil)})+%Q(#{number_field_tag(:number, @resource.number, {})})+"
+  </div>
+
+  <div class=\"\">"+%Q(#{submit_tag("Save it!", {})})+"</div>
+</form>
+"
+}
+}
+  end
+
+  def example_compiled_src
+    # necessary because the #source method is not perfect yet
+    # ideally we would have #source_body
+    @example_compiled.source_body
+  end
+
+  def simple_form(resource)
+    ctx = Context.new(resource)
+    fragment = -> {
+      form_for(:resource, method: :put, url: '/yolo') 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.url_field :url
+        f.number_field :number
+        f.submit 'Save it!'
+      end
+    }
+    return ctx, fragment
+  end
+
+  def select_form(resource)
+    ctx = Context.new(resource)
+    fragment = -> {
+      form_for(:resource, method: :put) do |f|
+        f.select :dropdown, ['yes', 'no'], selected: 'yes'
+        f.select :dropdown, '{{ options_from_collection_for_select(@choices, "id", "name") }}'
+      end
+    }
+    return ctx, fragment
+  end
+
+  def radio_form(resource)
+    ctx = Context.new(resource)
+    fragment = -> {
+      form_for(:resource) do |f|
+        f.radio :age, [[1, 'One'],[2, 'Two']], :first, :last
+      end
+    }
+    return ctx, fragment
+  end
+
+  def checkbox_form(resource)
+    ctx = Context.new(resource)
+    fragment = -> {
+      form_for(:resource, method: :put) do |f|
+        f.checkbox :age, [[1, 'One'], [2, 'Two']], :first, :last
+      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)
+    end
+  end
+
+  test "select compiled source is legible and transparent" do
+    @example_compiled = -> {
+    ExpressTemplates::Components::FormFor.render_in(self) {
+"<form action=\"/resources/#{@resource.id}\" method=\"post\">
+  <div style=\"display:none\">
+"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:patch)})+%Q(#{token_tag})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag("resource_dropdown", "Dropdown")})+%Q(#{select_tag("resource[dropdown]", '<option selected=selected>yes</option><option >no</option>'.html_safe, {})})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{label_tag("resource_dropdown", "Dropdown")})+%Q(#{select_tag("resource[dropdown]",  options_from_collection_for_select(@choices, "id", "name") , {})})+"
+  </div>
+</form>
+"
+}
+}
+    ExpressTemplates::Markup::Tag.formatted do
+      ctx, fragment = select_form(resource)
+      assert_equal example_compiled_src, ExpressTemplates.compile(&fragment)
+    end
+  end
+
+  test "radio compiled source is legible and transparent" do
+    @example_compiled = -> {
+      ExpressTemplates::Components::FormFor.render_in(self) {
+"<form action=\"/resources\" method=\"post\">
+  <div style=\"display:none\">
+"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:post)})+%Q(#{token_tag})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{collection_radio_buttons(:resource, :age, [[1, "One"], [2, "Two"]], :first, :last, {}) do |b|
+                  b.label(class: 'radio') { b.radio_button + b.text }
+                end})+"
+  </div>
+</form>
+"
+}
+}
+
+    ExpressTemplates::Markup::Tag.formatted do
+      ctx, fragment = radio_form(resource)
+      assert_equal example_compiled_src, ExpressTemplates.compile(&fragment)
+    end
+  end
+
+  test "checkbox compiled source is legible and transparent" do
+    @example_compiled = -> {
+      ExpressTemplates::Components::FormFor.render_in(self) {
+"<form action=\"/resources/#{@resource.id}\" method=\"post\">
+  <div style=\"display:none\">
+"+%Q(#{utf8_enforcer_tag})+%Q(#{method_tag(:patch)})+%Q(#{token_tag})+"
+  </div>
+
+  <div class=\"\">
+"+%Q(#{collection_check_boxes(:resource, :age, [[1, "One"], [2, "Two"]], :first, :last, {}) do |b|
+                  b.label(class: 'checkbox') { b.check_box + b.text }
+                end})+"
+  </div>
+</form>
+"
+}
+}
+
+    ExpressTemplates::Markup::Tag.formatted do
+      ctx, fragment = checkbox_form(resource)
+      assert_equal example_compiled_src, ExpressTemplates.compile(&fragment)
+    end
+
+  end
+end