easy_form 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02cba32ef48ed1cc6db1ef51a876e6459155a2f5
-  data.tar.gz: 079e69b5b4c9f5e11b510d7bc76d8bbe60dfe1cf
+  metadata.gz: 2fa14fbe176b390c07eab88e248eeca2bb5ab76f
+  data.tar.gz: b384c21f8383fc4cc31064dc96bfb53f229ba8b8
 SHA512:
-  metadata.gz: 38c5036a790bac5d9d23f77f620dca1f8a900cc3822e62e27c45665f32dc31c2e15913ac7fd321739e23a613dfd63bd5b449b20e3d664d11533cfedead19da3e
-  data.tar.gz: 724a28a852eb858323f87f560f3f77e2a3deb9b2314d187135af0f2e556a6b4b29f11359ec6f3173a1401f364e3c9029113ac5e67f1c0e787a6c071c5022c264
+  metadata.gz: 3a08b99ca55f1e92109380abab52559449d5326e9a3d828dcd48031a68e639fca5a3a877607674df03c7ac3e0aac1489dabb1982dd0e1fd315434f11398883e8
+  data.tar.gz: 29c6266c8d9c3c861480ba20f35498553518952e550246959beef16711b5d8d0808e2e9bfb831428827abf03f67cb7fd8a5707fd2864e15dda1689a358576491

data/lib/easy_form/field.rb

@@ -17,7 +17,7 @@ module EasyForm
     end
 
     def input(options={})
-      builder.send(*args, @options.merge(options), &@block)
+      builder.send(*args, self.class.class_merge(@options, options), &@block)
     end
 
     def required?
@@ -35,5 +35,12 @@ module EasyForm
     def template_name
       builder.options[:template] || options[:template] || :default
     end
+
+    def self.class_merge(h1, h2)
+      if h2[:class]
+        h2[:class] << ' ' <<  h1[:class].to_s
+      end
+      h1.merge(h2)
+    end
   end
 end

data/lib/easy_form/version.rb

@@ -1,3 +1,3 @@
 module EasyForm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_form
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kikyous