express_templates 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a671ca52fa5c3475e144928f8b50e4e70b03baa
-  data.tar.gz: 832c78019d3a9d8ed40d41e11884a7d13170af45
+  metadata.gz: e66b5f8c8493808ff989e22a6423a3446c6a6917
+  data.tar.gz: aa49d8497f8be6e6ee218a861e543f311e3f46b8
 SHA512:
-  metadata.gz: e425677ed8d6c52de583baf250f290588c00e33aff56a6b3f3c48978dc4248fdb4bb41925152741756a2b6cd21f355ed4c0e6d9879fe2cfc9979a69faaa13cd1
-  data.tar.gz: 4eeba931463b330588f1d41926f688dbbcf8a7d2dc9358a954649bb4926ae3ffcac140b4dd3c7a464314155f564bceadd640684242e3f9c0948974971c817612
+  metadata.gz: 03f1c7da0070f318dcc5b6ea04a1bb81dd5495f715d89f5e803c5895a3963e1514eb058526a8bdc8bd4920c8438c653451a983c67a2df56b65ca10d2036e3af5
+  data.tar.gz: efe4c4852fc762b52c7d4bc933f29b1e945df699fc8e02e110953283b3547410ba0cca3f0162517a4c4ee6fa2738a725da64f1c76e7e348b011ac99a69cf3196

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

@@ -60,10 +60,14 @@ module ExpressTemplates
 
         def options_from_supplied_or_field_values
           if select_options_supplied?
-            helpers.options_for_select(
-                normalize_for_helper(use_supplied_options),
-                selected_value
-            )
+            supplied_options = use_supplied_options
+            if supplied_options.respond_to?(:map)
+              helpers.options_for_select(
+                  normalize_for_helper(supplied_options),
+                  selected_value)
+            else
+              supplied_options
+            end
           else
             generate_options_from_field_values
           end

data/lib/express_templates/components/tree_for.rb

@@ -42,16 +42,25 @@ module ExpressTemplates
       tag :ul
 
       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(send(config[:id]))
+        list_items(root_node)
       }
 
       before_build -> {
         add_class config[:id]
       }
 
+      def root_node
+        if config[:root] && config[:root].respond_to?(:call)
+          config[:root].call
+        else
+          send(config[:id])
+        end
+      end
+
       def list_items(nodes)
         nodes.each do |node|
           list_item(node)

data/lib/express_templates/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport