bureaucrat 0.0.2 → 0.0.3

data/lib/bureaucrat/fields.rb

@@ -353,7 +353,7 @@ module Fields
 
     def clean(value)
       case value
-      when true, 'true', '1' then true
+      when true, 'true', '1', 'on' then true
       when false, 'false', '0' then false
       else nil
       end
@@ -393,13 +393,17 @@ module Fields
     end
 
     def valid_value?(value)
-      @choices.any? do |k, v|
-          if v.is_a?(Array) # This is an optgroup, so look inside the group for options
-            v.any? {|k2, v2| value == k2.to_s}
+      @choices.each do |k, v|
+          if v.is_a?(Array)
+            # This is an optgroup, so look inside the group for options
+            v.each do |k2, v2|
+              return true if value == k2.to_s
+            end
           else
-            value == k.to_s
+            return true if value == k.to_s
           end
         end
+      false
     end
   end
 

data/lib/bureaucrat/forms.rb

@@ -116,8 +116,8 @@ module Bureaucrat; module Forms
 
     def initialize(data=nil, options={})
       @is_bound = !data.nil?
-      @data = data ? data.dup : {}
-      @data.each {|k, v| @data[k.to_sym] ||= v}
+      @data = {}
+      data.each {|k, v| @data[k.to_sym] = @data[k] = v} if data
       @files = options.fetch(:files, {})
       @auto_id = options.fetch(:auto_id, 'id_%s')
       @prefix = options[:prefix]

data/lib/bureaucrat/widgets.rb

@@ -133,7 +133,7 @@ module Widgets
     end
 
     def value_from_datahash(data, files, name)
-      return data[name]
+      data[name]
     end
 
     def self.id_for_label(id_)
@@ -250,17 +250,17 @@ module Widgets
   end
 
   class Textarea < Widget
-      def initialize(attrs=nil)
-        # The 'rows' and 'cols' attributes are required for HTML correctness.
-        @attrs = {:cols => '40', :rows => '10'}
-        @attrs.merge!(attrs) if attrs
-      end
+    def initialize(attrs=nil)
+      # The 'rows' and 'cols' attributes are required for HTML correctness.
+      @attrs = {:cols => '40', :rows => '10'}
+      @attrs.merge!(attrs) if attrs
+    end
 
-      def render(name, value, attrs=nil)
-        value ||= ''
-        final_attrs = build_attrs(attrs, :name => name)
-        mark_safe("<textarea#{flatatt(final_attrs)}>#{conditional_escape(value.to_s)}</textarea>")
-      end
+    def render(name, value, attrs=nil)
+      value ||= ''
+      final_attrs = build_attrs(attrs, :name => name)
+      mark_safe("<textarea#{flatatt(final_attrs)}>#{conditional_escape(value.to_s)}</textarea>")
+    end
   end
 
   # DateInput
@@ -275,7 +275,7 @@ module Widgets
 
     def render(name, value, attrs=nil)
       final_attrs = build_attrs(attrs, :type => 'checkbox', :name => name.to_s)
-      result = self.check_test(value) rescue false
+      result = @check_test.call(value) rescue false
       final_attrs[:checked] = 'checked' if result
       final_attrs[:value] = value.to_s unless
         ['', true, false, nil].include?(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bureaucrat
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bruno Deferrari