acts_as_multipart_form 0.0.13 → 0.0.14

data/CHANGELOG

@@ -1,5 +1,9 @@
 == unreleased changes
 
+== 0.0.14
+
+* Added support for multipart forms that start with a new record.
+
 == 0.0.13
 
 * Major documentation updates

data/README.rdoc

@@ -55,7 +55,8 @@ This is currently only used for validations.  If this is set, you can use a vali
 == Add the route
 
     resources :people do
-      match 'edit', to: 'people#hire_form', :via => [:get, :post]
+      match 'edit/:id', to: 'people#hire_form', :via => [:get, :post]
+      match 'new', to: 'people#hire_form', :via => [:get, :post] # optional
 
 == Setting up your form
 

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/acts_as_multipart_form.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_multipart_form"
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremiah Hemphill", "Ethan Pemble"]
-  s.date = "2012-05-09"
+  s.date = "2012-05-16"
   s.description = "Multipart forms using custom routes"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [

data/app/models/multipart_form/in_progress_form.rb

@@ -14,7 +14,8 @@ module MultipartForm
 
     attr_accessible :form_subject, :form_subject_id, :form_subject_type, :form_name, :last_completed_step, :completed
 
-    validates_presence_of :form_subject
+    validates_presence_of :form_subject_id
+    validates_presence_of :form_subject_type
     validates_presence_of :form_name
     validates_presence_of :last_completed_step
     validates_inclusion_of :completed, :in => [true, false]

data/lib/acts_as_multipart_form/multipart_form_in_controller.rb

@@ -93,7 +93,7 @@ module ActsAsMultipartForm
       def load_multipart_form_index_links(form_name, form_subjects)
         @multipart_form_index_parts = {}
         form_subjects.each do |form_subject|
-          in_progress_form = find_or_create_multipart_in_progress_form(form_name, form_subject)
+          in_progress_form = find_or_initialize_multipart_in_progress_form(form_name, form_subject)
           @multipart_form_index_parts[form_subject.id] = {}
           @multipart_form_index_parts[form_subject.id][:parts] = get_available_multipart_form_parts(form_name, in_progress_form.last_completed_step)
           @multipart_form_index_parts[form_subject.id][:completed] = in_progress_form.completed
@@ -110,10 +110,10 @@ module ActsAsMultipartForm
         form_name = params[:action].to_sym
         form_subject_id = params[:id]
 
-        @form_subject = find_or_create_multipart_form_subject(form_name, form_subject_id)
+        @form_subject = find_or_initialize_multipart_form_subject(form_name, form_subject_id)
         params[:id] = @form_subject.id
 
-        in_progress_form = find_or_create_multipart_in_progress_form(form_name, @form_subject)
+        in_progress_form = find_or_initialize_multipart_in_progress_form(form_name, @form_subject)
 
         # set the part based on the params or in progress form
         if params[:multipart_form_part]
@@ -131,7 +131,12 @@ module ActsAsMultipartForm
           if(part.match(/_update$/))
             if(result && result[:valid])
               completed = redirect_to_next_multipart_form_part(form_name, @form_subject, part)
-              in_progress_form.update_attributes(:last_completed_step => part, :completed => completed)
+              # added form_subject_id in case it was not set when the in_progress_form was created (JH 5-15-2012)
+              # this would happen on a new page, but not an edit page
+              in_progress_form.update_attributes({
+                :form_subject_id => @form_subject.id, 
+                :last_completed_step => part, 
+                :completed => completed })
             else
               # render the previous page but stay on this page so we keep the errors
               part = get_previous_multipart_form_part(form_name, part)
@@ -231,39 +236,41 @@ module ActsAsMultipartForm
       # Given a form name and a form subject id, it creates the form subject
       # The form subject is defined by the id and the multipart form's model attribute
       #
-      # The subject is created with no values and saved without validations (this might change in the future)
-      # This is not a good situation but I don't know how to ensure the form subject gets saved otherwise
+      # The subject is initialized with no values and it is not saved
       #
       # @param [Symbol] form_name The name of the multipart form
       # @param [Integer] form_dubject_id The id of the form subject (could be nil)
-      # @return [FormSubject] The form subject object based on the multipart form's model or nil if the id is set and not found
-      def find_or_create_multipart_form_subject(form_name, form_subject_id)
+      # @return [FormSubject] The form subject in the database or a new form subject instance
+      def find_or_initialize_multipart_form_subject(form_name, form_subject_id)
         # find or create the form subject
         model = self.multipart_forms[form_name][:model]
         if form_subject_id
           form_subject = model.constantize.find(form_subject_id)
         else
           form_subject = model.constantize.new()
-          form_subject.save(:validate => false)
         end
         return form_subject
       end
 
       # Returns the InProgressForm object when given the form name and subject
-      # Creates the InPorgressForm object if it doesn't exist for the given form name/form subject pair
+      #
+      # Initializes but does not asve the InPorgressForm object if it doesn't exist for the given form name/form subject pair
       #
       # @param [Symbol] form_name The name of the multipart form
       # @param [FormSubject] form_subject The multipart form's subject
       # @returns [InProgressForm] The associated or new in progress form object
-      def find_or_create_multipart_in_progress_form(form_name, form_subject)
+      def find_or_initialize_multipart_in_progress_form(form_name, form_subject)
         # find or create the in progress form
         # not sure why the polymorphic relationship isn't working here
         in_progress_form = MultipartForm::InProgressForm.where(
           :form_subject_id => form_subject.id, 
           :form_subject_type => form_subject.class.to_s, 
           :form_name => form_name.to_s).first
-        if !in_progress_form
-          in_progress_form = MultipartForm::InProgressForm.create(
+
+        # if the form subject is a new_record, in_progress_form should be nil
+        # trying to stop weird edge cases from killing me (JH 5-15-2012)
+        if form_subject.new_record? || !in_progress_form
+          in_progress_form = MultipartForm::InProgressForm.new(
             :form_subject_id => form_subject.id, 
             :form_subject_type => form_subject.class.to_s, 
             :form_name => form_name.to_s, 

data/spec/in_progress_form_spec.rb

@@ -25,7 +25,8 @@ describe MultipartForm::InProgressForm do
     end
 
     it "should require a form subject" do
-      @ip_form.should have(1).error_on(:form_subject)
+      @ip_form.should have(1).error_on(:form_subject_id)
+      @ip_form.should have(1).error_on(:form_subject_type)
     end
 
     it "should require a form name" do

data/spec/multipart_form_in_controller_spec.rb

@@ -155,11 +155,11 @@ describe ActsAsMultipartForm::MultipartFormInController do
       @ipf = mock_model(MultipartForm::InProgressForm)
       @ipf.stub!(:last_completed_step)
       @ipf.stub!(:completed).and_return(true)
-      @controller.stub!(:find_or_create_multipart_in_progress_form).and_return(@ipf)
+      @controller.stub!(:find_or_initialize_multipart_in_progress_form).and_return(@ipf)
     end
 
-    it "should call find_or_create_multipart_in_progress_form" do
-      @controller.should_receive(:find_or_create_multipart_in_progress_form)
+    it "should call find_or_initialize_multipart_in_progress_form" do
+      @controller.should_receive(:find_or_initialize_multipart_in_progress_form)
       @controller.load_multipart_form_index_links(@form_name, @form_subjects)
     end
 
@@ -216,8 +216,8 @@ describe ActsAsMultipartForm::MultipartFormInController do
         :in_progress_form_id => ipf.id
       }
       @controller.stub!(:params).and_return(params)
-      @controller.stub!(:find_or_create_multipart_form_subect)
-      @controller.stub!(:find_or_create_multipart_in_progress_form).and_return(ipf)
+      @controller.stub!(:find_or_initialize_multipart_form_subect)
+      @controller.stub!(:find_or_initialize_multipart_in_progress_form).and_return(ipf)
       @controller.should_receive(:job_info)
       @controller.multipart_form_handler
     end
@@ -240,16 +240,16 @@ describe ActsAsMultipartForm::MultipartFormInController do
       }
       @controller.stub!(:params).and_return(params)
       ipf = MultipartForm::InProgressForm.new
-      @controller.stub!(:find_or_create_multipart_in_progress_form).and_return(ipf)
+      @controller.stub!(:find_or_initialize_multipart_in_progress_form).and_return(ipf)
       @controller.stub!(:person_info_update).and_return({:valid => true})
       @controller.stub!(:redirect_to_next_multipart_form_part).and_return(false)
-      ipf.should_receive(:update_attributes).with(:completed => false, :last_completed_step => :person_info_update)
+      ipf.should_receive(:update_attributes).with(:form_subject_id => nil, :completed => false, :last_completed_step => :person_info_update)
 
       @controller.multipart_form_handler
     end
   end
 
-  describe "find_or_create_multipart_form_subject method" do
+  describe "find_or_initialize_multipart_form_subject method" do
     before(:each) do
       @controller = PeopleController.new
       @controller.multipart_forms[:hire_form][:model] = "Person"
@@ -257,23 +257,22 @@ describe ActsAsMultipartForm::MultipartFormInController do
 
     it "should find the form subject on a valid id" do
       Person.should_receive(:find)
-      @controller.find_or_create_multipart_form_subject(:hire_form, 1)
+      @controller.find_or_initialize_multipart_form_subject(:hire_form, 1)
     end
 
     it "should create the form subject if there is no id given" do
       p = mock_model(Person)
       Person.should_receive(:new).and_return(p)
-      p.should_receive(:save).with(:validate => false)
-      @controller.find_or_create_multipart_form_subject(:hire_form, nil)
+      @controller.find_or_initialize_multipart_form_subject(:hire_form, nil)
     end
 
     it "should return an error or nil if the id is invalid" do
       Person.should_receive(:find).and_return(nil)
-      @controller.find_or_create_multipart_form_subject(:hire_form, 1).should be_nil
+      @controller.find_or_initialize_multipart_form_subject(:hire_form, 1).should be_nil
     end
   end
 
-  describe "find_or_create_multipart_in_progress_form method" do
+  describe "find_or_initialize_multipart_in_progress_form method" do
     before(:each) do
       @controller = PeopleController.new
       @form_subject = mock_model(Person)
@@ -282,17 +281,17 @@ describe ActsAsMultipartForm::MultipartFormInController do
 
     it "should find the in progress form if it exists" do
       MultipartForm::InProgressForm.should_receive(:where).and_return([@ipf])
-      @controller.find_or_create_multipart_in_progress_form(:hire_form, @form_subject).should == @ipf
+      @controller.find_or_initialize_multipart_in_progress_form(:hire_form, @form_subject).should == @ipf
     end
     
     it "should create an in progress form if it doesn't exist" do
-      MultipartForm::InProgressForm.should_receive(:create).and_return(@ipf)
-      @controller.find_or_create_multipart_in_progress_form(:hire_form, @form_subject).should == @ipf
+      MultipartForm::InProgressForm.should_receive(:new).and_return(@ipf)
+      @controller.find_or_initialize_multipart_in_progress_form(:hire_form, @form_subject).should == @ipf
     end
     
     # maybe refactor so it doesn't hit the database
     it "should create an in progress form with a last_completed_step initially set to 'none'" do
-      @controller.find_or_create_multipart_in_progress_form(:hire_form, @form_subject).last_completed_step.should == "none"
+      @controller.find_or_initialize_multipart_in_progress_form(:hire_form, @form_subject).last_completed_step.should == "none"
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: acts_as_multipart_form
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 Z
+date: 2012-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -258,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1196884223902992685
+      hash: 1464765102833044920
       segments: 
       - 0
       version: "0"