acts_as_multipart_form 0.0.6 → 0.0.7

data/.rspec

@@ -0,0 +1 @@
+--colour --profile

data/CHANGELOG

@@ -1,5 +1,10 @@
 == unreleased changes
 
+== 0.0.7
+
+* Updated future work in readme
+* Updated the behavior of the previous and next links to skip update pages
+
 == 0.0.6
 
 * Added indices to the migration

data/README.rdoc

@@ -60,10 +60,7 @@ Creates links to each form part for the given form subject.  The load_multipart_
 == Future work
 
 * Fix the index links loading so that the user does not have to explicitly call a method when they are needed
-* Improve the behavior of the previous and next links in the breadcrumb
-* Add A controller and views generator to generate the files in the rails project so they can be edited for project specific needs
 * Improve code quality of the mixin where it makes variables available to views
-* Move the logic in the multipart_form partials to heleprs
 * Find a fix for having to explicitly create the form subject in the code.  The current system pushes us towards models that only hold the form subject id.  The problem is that it is possible to use a multipart form without a specific form model.  This leads to orphaned or blank records.
 
 == Contributing to acts_as_multipart_form

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

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.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremiah Hemphill", "Ethan Pemble"]
-  s.date = "2012-02-29"
+  s.date = "2012-03-14"
   s.description = "Multipart forms using custom routes"
   s.email = "jeremiah@cloudspace.com"
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".rspec",
     "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",

data/app/views/multipart_form/_breadcrumb.html.erb

@@ -1,7 +1,7 @@
 <div class='multipart_form_breadcrumb'>
   <% if ActsAsMultipartForm.config.show_previous_next_links %>
     <div class='multipart_form_breadcrumb_previous'>
-      <%= link_to "Previous", send(@multipart_form_path, :id => @form_subject.id, :multipart_form_part => @previous_multipart_form_part ) %>
+      <%= link_to "Previous", send(@multipart_form_path, :id => @form_subject.id, :multipart_form_part => @breadcrumb_links[:previous] ) %>
     </div>
   <% end %>
   <div class='multipart_form_breadcrumb_parts'>
@@ -15,7 +15,7 @@
   </div>
   <% if ActsAsMultipartForm.config.show_previous_next_links %>
     <div class='multipart_form_breadcrumb_next'>
-      <%= link_to "Next", send(@multipart_form_path, :id => @form_subject.id, :multipart_form_part => @next_multipart_form_part ) %>
+      <%= link_to "Next", send(@multipart_form_path, :id => @form_subject.id, :multipart_form_part => @breadcrumb_links[:next] ) %>
     </div>
   <% end %>
 </div>

data/app/views/multipart_form/_index_links.html.erb

@@ -1,6 +1,5 @@
 <div class='multipart_form_index_links'>
   <div class='multipart_form_index_links_links'>
-    <% debugger %>
     <% @multipart_form_index_parts[form_subject.id][:parts].each do |part| %>
       <% if ActsAsMultipartForm.config.use_numbered_parts_on_index %>
         <%= link_to part[:number].to_s, send(@multipart_form_path, :id => form_subject.id, :multipart_form_part => part[:name]) %>

data/lib/acts_as_multipart_form/multipart_form_in_controller.rb

@@ -137,12 +137,17 @@ module ActsAsMultipartForm
               part = get_previous_multipart_form_part(form_name, part)
             end
           end
-          # get two previous parts so the previous link works
-          previous_part = get_previous_multipart_form_part(form_name, part)
-          @previous_multipart_form_part = get_previous_multipart_form_part(form_name, previous_part).to_s
+
+          # move forward or backwards 2 parts for the previous and next links on the bredcrumb
+          skip_update_part = true
+          @breadcrumb_links= {
+            :previous => get_previous_multipart_form_part(form_name, part, skip_update_part).to_s,
+            :next => get_next_multipart_form_part(form_name, part, skip_update_part).to_s,
+          }
+
           # needs to be a string so that the view can read it
-          @multipart_form_part = part.to_s
           @next_multipart_form_part = get_next_multipart_form_part(form_name, part).to_s
+          @multipart_form_part = part.to_s
           @form_subject = form_subject
           @available_multipart_form_parts = get_available_multipart_form_parts(form_name, in_progress_form.last_completed_step)
           @multipart_form_path = (self.multipart_forms[form_name][:form_route] + "_path").to_sym
@@ -158,29 +163,45 @@ module ActsAsMultipartForm
         self.multipart_forms.keys.include?(sym)
       end
 
-      # Gets the next multipart form part for the form or returns the current part if it is first
+      # Gets the previous multipart form part for the form or returns the current part if it is first
       #
       # @param [Symbol] form The name of the multipart form
       # @param [Symbol] part The name of the current part
+      # @param [Boolean] skip_update_part If set to true, moves back two parts instead of one
       # @returns [Symbol] The name of the next part
-      def get_previous_multipart_form_part(form, part)
+      def get_previous_multipart_form_part(form, part, skip_update_part = false)
         part_index = self.multipart_forms[form][:parts].index(part)
-        if part_index > 0
-          return self.multipart_forms[form][:parts][part_index - 1]
+
+        if skip_update_part
+          prev_part_distance = 2
         else
-          return part
+          prev_part_distance = 1
+        end
+
+        if part_index - prev_part_distance >= 0
+          return self.multipart_forms[form][:parts][part_index - prev_part_distance]
+        else
+          return self.multipart_forms[form][:parts].first
         end
       end
 
-      # Gets the previous multipart form part for the form or returns the current part if it is first
+      # Gets the next multipart form part for the form or returns the current part if it is first
       #
       # @param [Symbol] form The name of the multipart form
       # @param [Symbol] part The name of the current part
+      # @param [Boolean] skip_update_part If set to true, moves forward two parts instead of one
       # @returns [Symbol] The name of the previous part
-      def get_next_multipart_form_part(form, part)
+      def get_next_multipart_form_part(form, part, skip_update_part = false)
         part_index = self.multipart_forms[form][:parts].index(part)
-        if part_index < self.multipart_forms[form][:parts].length - 1
-          return self.multipart_forms[form][:parts][part_index + 1]
+
+        if skip_update_part
+          next_part_distance = 2
+        else
+          next_part_distance = 1
+        end
+
+        if part_index < self.multipart_forms[form][:parts].length - next_part_distance
+          return self.multipart_forms[form][:parts][part_index + next_part_distance]
         else
           return part
         end

data/spec/multipart_form_in_controller_spec.rb

@@ -34,7 +34,7 @@ describe ActsAsMultipartForm::MultipartFormInController do
   describe "get_next_multipart_form_part method" do
     before(:each) do
       @controller = PeopleController.new
-      @controller.multipart_forms[:hire_form][:parts] = [:person_info, :job_info]
+      @controller.multipart_forms[:hire_form][:parts] = [:person_info, :person_info_update, :job_info, :job_info_update]
     end
 
     it "should respond to get_next_multipart_form_part" do
@@ -42,18 +42,27 @@ describe ActsAsMultipartForm::MultipartFormInController do
     end
 
     it "should return the next part" do
-      @controller.get_next_multipart_form_part(:hire_form, :person_info).should == :job_info
+      @controller.get_next_multipart_form_part(:hire_form, :person_info).should == :person_info_update
     end
 
     it "should return the current part if on the last part" do
-      @controller.get_next_multipart_form_part(:hire_form, :job_info).should == :job_info
+      @controller.get_next_multipart_form_part(:hire_form, :job_info_update).should == :job_info_update
+    end
+
+    it "should return the second next part if skip_update_part is set to true" do
+      @controller.get_next_multipart_form_part(:hire_form, :person_info, true).should == :job_info
+    end
+
+    it "should return the current part if skip update part is set and on the last or second to last part" do
+      @controller.get_next_multipart_form_part(:hire_form, :job_info_update, true).should == :job_info_update
+      @controller.get_next_multipart_form_part(:hire_form, :job_info, true).should == :job_info
     end
   end
 
   describe "get_previous_multipart_form_part method" do
     before(:each) do
       @controller = PeopleController.new
-      @controller.multipart_forms[:hire_form][:parts] = [:person_info, :job_info]
+      @controller.multipart_forms[:hire_form][:parts] = [:person_info, :person_info_update, :job_info, :job_info_update]
     end
 
     it "should respond to get_previous_multipart_form_part" do
@@ -61,12 +70,21 @@ describe ActsAsMultipartForm::MultipartFormInController do
     end
 
     it "should return the previous part" do
-      @controller.get_previous_multipart_form_part(:hire_form, :job_info).should == :person_info
+      @controller.get_previous_multipart_form_part(:hire_form, :job_info).should == :person_info_update
     end
 
     it "Should return the current part if on the first part" do
       @controller.get_previous_multipart_form_part(:hire_form, :person_info).should == :person_info
     end
+
+    it "should return the second previous part if skip_update_part is set to true" do
+      @controller.get_previous_multipart_form_part(:hire_form, :job_info, true).should == :person_info
+    end
+
+    it "should return the first part if skip update part is set to true and on the first or second part" do
+      @controller.get_previous_multipart_form_part(:hire_form, :person_info, true).should == :person_info
+      @controller.get_previous_multipart_form_part(:hire_form, :person_info_update, true).should == :person_info
+    end
   end
 
   describe "last_multipart_form_part? method" do

metadata

@@ -2,7 +2,7 @@
 name: acts_as_multipart_form
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 Z
+date: 2012-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -155,6 +155,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
+- .rspec
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -257,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3542899139585014364
+      hash: 3192784938124864737
       segments: 
       - 0
       version: "0"