express_templates 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77351e951a43fa098f87369232be07e4c7557a08
-  data.tar.gz: e58f2909cae09e642f7e3411fa047acc43f8b0d9
+  metadata.gz: e8864575cad4427903f6f29d98dd7c4b6853033a
+  data.tar.gz: e75fa4c6ca726c66a7cc18797a9c00c54bfd40b4
 SHA512:
-  metadata.gz: 3891a36f53ab4f754338f3d6b0ef2174fa228e2cf58b7f7afd9675df6d79f3b7365c8ab40ac492cdd183a0f729d53ec82e9831c89b407049679de949ec43f1a3
-  data.tar.gz: 52a0c2d8747cb396134ca8df04b7c53779d7ea5e975e740b54018b50c3e39b76aca1b889e7e62bd47f4feed5b006147f57b0caaa589be51d75a7d6aa010d0823
+  metadata.gz: 927d0c3eb74ccdb049b95ed85ed783243b6ad5c0ce5beb379f07a33ddf8e91c297af95fdb5c7c7c075d0b0e134a05e24f9b58c83d999e1f2a6a9d7a146776900
+  data.tar.gz: b21f56f1b31bda2a10b761674d534f5651cedf992765a369f3fee533244ccd7a70a0a9d7ded2541eb550a3de815146338bb05ce63f899a26454a87451195d546

data/lib/express_templates/components/all.rb

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

data/lib/express_templates/components/forms.rb

@@ -10,6 +10,7 @@ require 'express_templates/components/forms/form_component'
 require 'express_templates/components/forms/option_support'
 require 'express_templates/components/forms/submit'
 require 'express_templates/components/forms/select'
+require 'express_templates/components/forms/country_select'
 require 'express_templates/components/forms/select_collection'
 require 'express_templates/components/forms/radio'
 require 'express_templates/components/forms/checkbox'

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

@@ -0,0 +1,23 @@
+require 'countries'
+require_relative 'select'
+
+module ExpressTemplates
+  module Components
+    module Forms
+      class CountrySelect < Select
+
+        def select_options
+          country_options = ISO3166::Country.all.map {|country| [country.name.titleize, country.alpha2]}
+          us = country_options.delete(['United States', 'US'])
+          country_options.unshift us
+          helpers.options_for_select(country_options, selected_value)
+        end
+
+        def select_helper_options
+          add_select2_class( input_attributes.merge(include_blank: false, prompt: "-- Please Select --" ) )
+        end
+
+      end
+    end
+  end
+end

data/lib/express_templates/components/tree_for.rb

@@ -1,85 +1,87 @@
 module ExpressTemplates
   module Components
-    #
-    # Create an html <tt>table</tt> or <tt>ol</tt> (ordered list) for
-    # a model object representing a tree of similar objects.
-    #
-    # The objects must respond to <tt>:children</tt>.
-    #
-    # The block is passed a NodeBuilder which may accept field names.
-    #
-    # Example:
-    #
-    # ```ruby
-    # tree_for(:roles) { |role|
-    #   role.name
-    # }
-    # ```
-    #
-    # If the view has an @roles variable with a Role having children,
-    # this will turn into markup such as the following:
-    #
-    #     <ul id="roles" class="roles tree">
-    #       <li>SuperAdmin
-    #         <ul>
-    #           <li>Admin
-    #             <ul>
-    #               <li>Publisher
-    #                 <ul>
-    #                    <li>Author</li>
-    #                 </ul>
-    #               </li>
-    #               <li>Auditor</li>
-    #             </ul>
-    #           </li>
-    #         </ul>
-    #       </li>
-    #     </ul>
-    #
+    module Presenters
+      #
+      # Create an html <tt>table</tt> or <tt>ol</tt> (ordered list) for
+      # a model object representing a tree of similar objects.
+      #
+      # The objects must respond to <tt>:children</tt>.
+      #
+      # The block is passed a NodeBuilder which may accept field names.
+      #
+      # Example:
+      #
+      # ```ruby
+      # tree_for(:roles) { |role|
+      #   role.name
+      # }
+      # ```
+      #
+      # If the view has an @roles variable with a Role having children,
+      # this will turn into markup such as the following:
+      #
+      #     <ul id="roles" class="roles tree">
+      #       <li>SuperAdmin
+      #         <ul>
+      #           <li>Admin
+      #             <ul>
+      #               <li>Publisher
+      #                 <ul>
+      #                    <li>Author</li>
+      #                 </ul>
+      #               </li>
+      #               <li>Auditor</li>
+      #             </ul>
+      #           </li>
+      #         </ul>
+      #       </li>
+      #     </ul>
+      #
 
-    class TreeFor < Configurable
+      class TreeFor < Configurable
 
-      tag :ul
+        tag :ul
 
-      has_attributes :class => 'tree'
-      has_option :root, "Root of the tree.  Defaults to collection with the same as the id.", type: :proc
+        has_attributes :class => 'tree'
+        has_option :root, "Root of the tree.  Defaults to collection with the same as the id.", type: :proc
 
-      contains -> (&customize_block) {
-        @customize_block = customize_block
-        list_items(root_node)
-      }
+        contains -> (&customize_block) {
+          @customize_block = customize_block
+          list_items(root_node)
+        }
 
-      before_build -> {
-        add_class config[:id]
-      }
+        before_build -> {
+          add_class config[:id]
+        }
 
-      def root_node
-        if config[:root] && config[:root].respond_to?(:call)
-          config[:root].call
-        else
-          send(config[:id])
+        def root_node
+          if config[:root] && config[:root].respond_to?(:call)
+            config[:root].call
+          else
+            send(config[:id])
+          end
         end
-      end
 
-      def list_items(nodes)
-        nodes.each do |node|
-          list_item(node)
+        def list_items(nodes)
+          nodes.each do |node|
+            list_item(node)
+          end
         end
-      end
 
-      def list_item(node)
-        li {
-          if @customize_block
-            @customize_block.call(node)
-          else
-            text_node "#{node.name}#{"\n" if node.children.any?}"
-          end
-          if node.children.any?
-            ul {
-              list_items(node.children)
-            }
-          end
-        }
+        def list_item(node)
+          li {
+            if @customize_block
+              @customize_block.call(node)
+            else
+              text_node "#{node.name}#{"\n" if node.children.any?}"
+            end
+            if node.children.any?
+              ul {
+                list_items(node.children)
+              }
+            end
+          }
+        end
       end
     end
   end

data/lib/express_templates/template/handler.rb

@@ -10,9 +10,10 @@ module ExpressTemplates
       def call(template)
         # call ripper stuff method
 
-        warn_contains_logic("(#{ExpressTemplates.compile(template)}).html_safe")  # pass the source code
         # returns a string to be eval'd
-        "(#{ExpressTemplates.compile(template)}).html_safe"
+        source = "(#{ExpressTemplates.compile(template)}).html_safe"
+        warn_contains_logic(source)  # pass the source code
+        source
       end
 
       def warn_contains_logic(compiled_template)

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/test/components/forms/country_select_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+require 'ostruct'
+class CountrySelectTest < ActiveSupport::TestCase
+
+  def assigns
+    {person: ::Person.new}
+  end
+
+  def helpers
+    mock_action_view do
+      def people_path
+        '/people'
+      end
+    end
+  end
+
+
+  test "country_select renders without an error" do
+    assert arbre {
+      express_form(:person) {
+        country_select :country_code
+      }
+    }
+  end
+
+  test "can change label for country_select" do
+    html = arbre {
+      express_form(:person) {
+        country_select :country_code, label: "Country"
+      }
+    }
+    assert_match(/<label.*Country<\/label>/, html)
+  end
+end

data/test/test_helper.rb

@@ -126,7 +126,7 @@ end
     end
   end
   class ::Person
-    attr :id, :city, :subscribed, :preferred_email_format
+    attr :id, :city, :subscribed, :preferred_email_format, :country_code
     def initialize(id = 1, city = 'San Francisco')
       @id, @city = id, city
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,7 @@ files:
 - 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/country_select.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
@@ -212,6 +227,7 @@ files:
 - test/components/configurable_test.rb
 - test/components/forms/basic_fields_test.rb
 - test/components/forms/checkbox_test.rb
+- test/components/forms/country_select_test.rb
 - test/components/forms/express_form_test.rb
 - test/components/forms/radio_test.rb
 - test/components/forms/select_test.rb
@@ -291,6 +307,7 @@ test_files:
 - test/components/configurable_test.rb
 - test/components/forms/basic_fields_test.rb
 - test/components/forms/checkbox_test.rb
+- test/components/forms/country_select_test.rb
 - test/components/forms/express_form_test.rb
 - test/components/forms/radio_test.rb
 - test/components/forms/select_test.rb