formic 0.2.1 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.5

data/formic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formic}
-  s.version = "0.2.1"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vinh Tran"]

data/lib/formic/helper.rb

@@ -20,6 +20,7 @@ module Formic
       :checkbox,
       :list,
       :list_item,
+      :list_items,
       :tab,
       :form,
       :tab_panel,

data/lib/formic/input.rb

@@ -16,7 +16,7 @@ module Formic
       end
 
       super options, &block
-      @field = name
+      @field = name || options[:name]
 
       if !options[:name]
         if @field && self.form && self.form.model

data/views/formic/default/_form.html.haml

@@ -9,4 +9,4 @@
     %input{:type => "hidden", :name => "_method", :value => _method}
 
   .title= title
-  =capture &content unless content.nil?
+  =capture_haml &content unless content.nil?

data/views/formic/default/_list.html.haml

@@ -1,3 +1,3 @@
 - content = element.content
 %ul{element.options}
-  =capture &content unless content.nil?
+  =capture_haml &content unless content.nil?

data/views/formic/default/_selection.html.haml

@@ -1,5 +1,5 @@
-- selection_options = options.delete(:options)
-- value = options.delete(:value) || ''
+- selection_options = element.options.delete(:options)
+- value = element.options.delete(:value) || ''
 - content = element.content
 
 %label= element.label
@@ -7,7 +7,15 @@
   %span.required *
 
 %select{element.options}
-  - selection_options.each_pair do |option_name, option_value|
-    - selected  = value && option_value == value
-    %option{:value => option_value, :selected => selected}= option_name
-  =capture &content if content.nil?
+  - if selection_options.instance_of Hash
+    - selection_options.each_pair do |option_name, option_value|
+      - selected  = value && option_value == value
+      %option{:value => option_value, :selected => selected}= option_name
+
+  - elsif selection_options.instance_of Array
+    - selection_options.each do | option_name |
+      - selected  = value && option_value == value
+      %option{:value => option_value, :selected => selected}= option_value
+
+  =capture_haml &content if !content.nil?
+

data/views/formic/default/_tab.html.haml

@@ -1,3 +1,3 @@
 - content = element.content
 %div{element.options}
-  =capture &content unless content.nil?
+  =capture_haml &content unless content.nil?

data/views/formic/default/_tab_panel.html.haml

@@ -1,5 +1,5 @@
 - content = element.content
-- content_string = content.nil? ?  '' : capture(&content)
+- content_string = content.nil? ?  '' : capture_haml(&content)
 %div{element.options}
   %ul.panel_headers 
     - element.tabs.each do |tab|

data/views/formic/default/_textarea.html.haml

@@ -1,4 +1,4 @@
-%label= label
+%label= element.label
 - if element.has_class? 'required'
   %span.required *
-%textarea{options}= value
+%textarea{element.options}= element.options[:value]

metadata

@@ -2,7 +2,7 @@
 name: formic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.5
 platform: ruby
 authors: 
 - Vinh Tran
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1315801625866261702
+      hash: -3780060715784344000
       segments: 
       - 0
       version: "0"