conjoin 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197761960ad7e57de9136dd8b7a90f57afca8dc6
-  data.tar.gz: f07bf31b11057f3775c73c10157c15b9baef2e3e
+  metadata.gz: 5cc0d0a83c0d27db16e3f86a206e475be6ca121a
+  data.tar.gz: 8b07d5de0b60e050dc50a6cc309dc3a833f9bbe4
 SHA512:
-  metadata.gz: 18638d895149acf5f8c63b31f9118d1fdb2ef6151b310baa311844d858ea99844b3bc9c3fa229e2316b03087dce281784c8289f78f97fd067535dbbf5fbd0eb9
-  data.tar.gz: e49f5d89ccf1550d9cdf3826c9a0dda1c6584bb1eb0ef6855d5c4e630fbed5a202a7aa98a530a00e87d1797affcebcf3ea8304aa1cced02400ab86194e87cbb2
+  metadata.gz: 4366ee9f8bdc0996862e7a2a85c14cd548a7ebe2323a62f23d5f8bc80b977bfa282e437492bcdb40484372c63f06b4896f9588f6552622639ab62ccfdd8f8182
+  data.tar.gz: 89fd0081fed32841af612c46c539cae374ffc0706075c4428014557d645a09136322de7e5e9a1a0be93e8e76712155e720727ee41fe2f33bec32cb9f199975f4

data/lib/conjoin/form_builder.rb

@@ -91,7 +91,7 @@ module Conjoin
       end
 
       def input_field field_name, options = {}
-        options[:wrapper] = false
+        options[:label] = false
         input field_name, options
       end
 
@@ -115,6 +115,8 @@ module Conjoin
           and mini_column = record_class.mini_record_columns[field_name] \
           and input_as = mini_column[:input_as]
             record_type = input_as.to_s.classify
+        elsif record_class.respond_to?(field_name) && record_class.send(field_name).is_a?(Enumerize::Attribute)
+          record_type = 'Select'
         else
           record_type = record_class.columns_hash[field_name.to_s].type.to_s.classify
         end
@@ -131,14 +133,20 @@ module Conjoin
           value: record.send(field_name),
           options: options,
           errors: record.errors.messages[field_name],
-          names: names
+          names: names,
+          field_name: field_name,
+          record_class: record_class
         })
 
         new_input = input_class.new data, app, record
 
         if record_type != 'Hidden' \
         and not options.key(:wrapper) and options[:wrapper] != false
-          wrapper field_name.to_s, nested_name, new_input, options
+          if !options.key(:label) and options[:label] != false
+            wrapper field_name.to_s, nested_name, new_input, options
+          else
+            new_input.render
+          end
         else
           new_input.render
         end

data/lib/conjoin/inputs/select.rb

@@ -1,6 +1,17 @@
 module Conjoin
   module FormBuilder
     class SelectInput < Input
+      def select_options
+        values_select = {}
+        values        = data.record_class.send(data.field_name).values
+
+        values.each do |value|
+          values_select[value] = value
+        end
+
+        values_select
+      end
+
       def display
         append_button = options.delete :append_button
         if options[:multiple]

data/lib/conjoin/nav.rb

@@ -26,33 +26,44 @@ module Conjoin
         self.instance_eval(&block)
       end
 
-      def add_menu name, links
+      def nav name, links
         config.navs[name] ||= []
         config.navs[name].concat links
       end
 
       def load_nav name
         if links = config.navs[name]
-          loaded_links = []
+          loaded_links = load_links links
+        else
+          raise "There isn't a nav called: #{name}"
+        end
+
+        block.call loaded_links
+      end
 
-          links.each do |link|
-            link = OpenStruct.new(link)
+      def load_links links
+        loaded_links = []
 
-            if !link.if or app.instance_exec(&link.if)
-              link.icon         = config.icon_class + '-' + link.icon if link.icon
-              link.active       = app.req.env['REQUEST_PATH'][link.path]
-              link.active_class = link.active ? config.active_class : false
+        links.each do |link|
+          link = OpenStruct.new(link)
 
-              if link.active_class or !link.hidden
-                loaded_links << link
-              end
+          if !link.if or app.instance_exec(&link.if)
+            link.icon         = config.icon_class + '-' + link.icon if link.icon
+            link.active       = app.req.env['REQUEST_PATH'][link.path]
+            link.active_class = link.active ? config.active_class : false
+            link.id           = "nav-#{link.text.underscore}"
+
+            if link.subs
+              link.subs = load_links link.subs
+            end
+
+            if link.active_class or !link.hidden
+              loaded_links << link
             end
           end
-        else
-          raise "There isn't a nav called: #{name}"
         end
 
-        block.call loaded_links
+        loaded_links
       end
 
       def config

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba