monkey_forms 0.0.18 → 0.0.19

data/README.md

@@ -1,8 +1,3 @@
-NOTE!  If you use the cookie serialization feature, you 
-need to use this version of deep_merge for now.
-https://github.com/joevandyk/deep_merge
-
-
 MonkeyForms::Form is an ActiveModel-compliant interface
 between your controllers and models (or whatever you are 
 saving the data to).

data/lib/monkey_forms/version.rb

@@ -1,3 +1,3 @@
 module MonkeyForms
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/monkey_forms.rb

@@ -1,5 +1,7 @@
 $: << File.expand_path('monkey_forms/vendor/grouped_validations/lib', File.dirname(__FILE__))
 $: << File.expand_path('monkey_forms/vendor/deep_merge/lib', File.dirname(__FILE__))
+
+# Warning: This code is atrocious.
 module MonkeyForms
   require 'monkey_forms/serializers'
   require 'active_model'
@@ -69,7 +71,13 @@ module MonkeyForms
           self.class.attributes.each do |a|
             @attributes[a] ||= ""
             if self.class.strip_attributes?
-              @attributes[a].strip! if @attributes[a].class == String
+              if @attributes[a].class == String
+                @attributes[a].strip!
+              #elsif @attributes[a].class == Array
+                #@attributes[a].each do |v|
+                  #v.strip! if v.class == String
+                #end
+              end
             end
           end
         end

data/test/forms/order_form.rb

@@ -5,7 +5,7 @@ class OrderForm
   attr_reader :an_attribute
 
   # Declares a few attributes on the form.
-  form_attributes :name, :email, :city, :state, :line_items
+  form_attributes :name, :email, :city, :state, :line_items, :upload
   custom_attributes :user_id
   form_name :cart
 

data/test/sinatra/sample_sinatra.rb

@@ -23,6 +23,10 @@ class SampleSinatra < Sinatra::Base
     haml :form
   end
 
+  post "/upload" do
+    @form.upload[:tempfile].read.size.to_s
+  end
+
   post "/haml_form" do
     # We could probably do something with the form object here, maybe
     # Tells the form to serialize itself.

data/test/sinatra/views/form.haml

@@ -14,7 +14,7 @@
   As you click from page to page, note that your form
   values are saved. They are saved in a cookie!
 
-%form{:action => '/haml_form', :method => 'post'}
+%form{:action => '/haml_form', :method => 'post', :enctype => 'multipart/form-data'}
   - @form.class.attributes.each do |name|
     %input{:type => 'text', :id => "form_#{name}", :name => "form[#{name}]", :value => @form.send(name)}
     %label{:for => "form_#{name}"}= name

data/test/test_monkey_forms.rb

@@ -1,5 +1,4 @@
 require 'minitest/autorun'
-require 'minitest/pride'
 require 'rack/test'
 
 require 'sinatra/sample_sinatra'
@@ -24,6 +23,12 @@ class TestMonkeyForms < MiniTest::Unit::TestCase
     assert_equal "Joe <joe@tanga.com>", last_response.body
   end
 
+  def test_file_upload
+    file = Rack::Test::UploadedFile.new(__FILE__)
+    post "https://test.domain.com/upload", :form => { :upload => file }
+    assert_equal File.read(__FILE__).size.to_s, last_response.body
+  end
+
   def test_form_post_with_bad_cookie
     post "https://test.domain.com/form", :form => { :name => "Joe" }
     set_cookie "order_cookie=bad_value; path=/; domain=test.domain.com; secure"
@@ -71,7 +76,7 @@ class TestMonkeyForms < MiniTest::Unit::TestCase
     assert_equal "Joe", o.name
     assert_equal "joe@tanga.com", o.email
     assert_equal "", o.city
-    assert_equal 5, o.attributes.size
+    assert_equal 6, o.attributes.size
     assert_equal "Joe", o.attributes[:name]
     assert_equal "Joe", o.attributes["name"]
   end
@@ -131,6 +136,10 @@ class TestMonkeyForms < MiniTest::Unit::TestCase
     assert_equal "Joe <joe@tanga.com>", o.person
   end
 
+  def test_that_values_in_arrays_are_stripped
+    skip "FIX ME!"
+  end
+
   def test_array
     submit_form(:line_items => [ {:id => "previous"}])
     attributes = submit_form(:line_items => [ {:id => "new"}])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monkey_forms
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70272335220300 !ruby/object:Gem::Requirement
+  requirement: &70253403801120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272335220300
+  version_requirements: *70253403801120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70272335219740 !ruby/object:Gem::Requirement
+  requirement: &70253403800640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335219740
+  version_requirements: *70253403800640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70272335219240 !ruby/object:Gem::Requirement
+  requirement: &70253403800200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335219240
+  version_requirements: *70253403800200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70272335218620 !ruby/object:Gem::Requirement
+  requirement: &70253403799740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335218620
+  version_requirements: *70253403799740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70272335217960 !ruby/object:Gem::Requirement
+  requirement: &70253403799160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335217960
+  version_requirements: *70253403799160
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70272335217120 !ruby/object:Gem::Requirement
+  requirement: &70253403798560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335217120
+  version_requirements: *70253403798560
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70272335216360 !ruby/object:Gem::Requirement
+  requirement: &70253403798100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335216360
+  version_requirements: *70253403798100
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70272335215640 !ruby/object:Gem::Requirement
+  requirement: &70253403797580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272335215640
+  version_requirements: *70253403797580
 description: Helps make complex forms
 email:
 - joe@tanga.com
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1638740973580231578
+      hash: -3949275010352210581
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1638740973580231578
+      hash: -3949275010352210581
 requirements: []
 rubyforge_project: monkey_forms
 rubygems_version: 1.8.10