formulate 0.0.3 → 0.0.4

data/lib/formulate/form_builder.rb

@@ -42,12 +42,12 @@ module Formulate
       instructions = options.delete(:instructions)
       errors = errors_on(method)
 
-      style = ['field']
-      style << (options.delete(:required) ? 'required' : 'optional')
-      style << 'checkbox' if type == :check_box
-      style << 'radio' if type == :radio_button
-      style << options.delete(:style) if options[:style]
-      style.uniq!
+      classes = ['field']
+      classes << (options.delete(:required) ? 'required' : 'optional')
+      classes << 'checkbox' if type == :check_box
+      classes << 'radio' if type == :radio_button
+      classes << options.delete(:class) if options[:class]
+      classes.uniq!
 
       input = case type
         when :check_box
@@ -84,20 +84,20 @@ module Formulate
           send(type, method, priority_countries, options, html_options)
         else
           send(type, method, options)
-      end
+      end unless block_given?
 
       label = options[:label] != false ? label(method, options[:label]) : nil
       markup = [label, input].compact
       markup.reverse! if type.in?(:check_box, :radio_button)
 
       markup << @template.capture_haml do
-        yield(self) if block_given?
+        yield(object.send(method)) if block_given?
         errors_list(errors)
         instructions(instructions)
       end
 
       @template.capture_haml do
-        @template.haml_tag(:div, class: style.join(' ')) do
+        @template.haml_tag(:div, class: classes.join(' ')) do
           @template.haml_concat(markup.join)
         end
       end

data/lib/formulate/version.rb

@@ -1,3 +1,3 @@
 module Formulate
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/vendor/assets/stylesheets/formulate/defaults.css.sass

@@ -0,0 +1,35 @@
+$line-height: 1.5 !default
+$spacer-size: 1.5em !default
+$border-width: 0.125em !default
+
+$fieldset-border-color: #EEE !default
+$fieldset-legend-color: #999 !default
+
+$input-background-color: #FFF !default
+$input-border-color: #CCC !default
+$input-disabled-border-color: #EEE !default
+$input-focus-border-color: #666 !default
+
+$button-color: #999 !default
+$button-text-color: #FFF !default
+
+$submit-border-color: #EEE !default
+$submit-button-color: #999 !default
+
+$label-color: #000
+$label-optional-color: #666
+
+$error-color: #F33 !default
+$instructions-color: #666 !default
+
+@mixin button($color: $button-color)
+  -webkit-appearance: none
+  background: $color
+  border: $border-width solid $color
+  color: $button-text-color
+  display: inline-block
+  font-weight: bold
+  line-height: 1.125em
+  margin-right: 0.25em
+  padding: 0.25em 0.5em
+  text-decoration: none

data/vendor/assets/stylesheets/formulate.css.sass

@@ -1,37 +1,4 @@
-$line-height: 1.5 !default
-$spacer-size: 1.5em !default
-$border-width: 0.125em !default
-
-$fieldset-border-color: #EEE !default
-$fieldset-legend-color: #999 !default
-
-$input-border-color: #CCC !default
-$input-readonly-border-color: #EEE !default
-$input-focus-border-color: #666 !default
-
-$button-color: #999 !default
-$button-text-color: #FFF !default
-
-$submit-border-color: #EEE !default
-$submit-button-color: #999 !default
-
-$label-color: #000
-$label-optional-color: #666
-
-$error-color: #F33 !default
-$instructions-color: #666 !default
-
-@mixin button($color: $button-color)
-  -webkit-appearance: none
-  background: $color
-  border: $border-width solid $color
-  color: $button-text-color
-  display: inline-block
-  font-weight: bold
-  line-height: 1.125em
-  margin-right: 0.25em
-  padding: 0.25em 0.5em
-  text-decoration: none
+@import formulate/defaults
 
 form.formulate
   margin: $spacer-size 0
@@ -62,8 +29,8 @@ form.formulate
 
   input,
   select,
-  textarea,
-  p.readonly
+  textarea
+    background: $input-background-color
     border: $border-width solid $input-border-color
     font-family: 'Helvetica', sans-serif
     font-size: 1em
@@ -74,9 +41,8 @@ form.formulate
       border-color: $input-focus-border-color
       outline: none
 
-  p.readonly
-    border-color: $input-readonly-border-color
-    line-height: 1.125em
+  input[disabled]
+    border-color: $input-disabled-border-color
 
   a.button
     @include button

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formulate
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -109,6 +109,7 @@ files:
 - lib/formulate/form_helper.rb
 - lib/formulate/version.rb
 - vendor/assets/stylesheets/formulate.css.sass
+- vendor/assets/stylesheets/formulate/defaults.css.sass
 homepage: http://github.com/tylerhunt/formulate
 licenses: []
 post_install_message: 
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails form builder with flexible markup and styles.