selections 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,20 +1,25 @@
-## 0.0.1
+## 0.1.7
 
-* Initial release
+* https://github.com/nigelr/selections/issues/5 - issue with forgetting selected item when page was invalid
 
-## 0.1.1
+## 0.1.6
 
-* Clean up of specs and readme
+* Fixed issue with options and html_options order
+
+## 0.1.3
+
+* Fixing issue with dependencies on Rubygems
 
 ## 0.1.2
 
 * Fixing issues with readme
 
-## 0.1.3
+## 0.1.1
 
-* Fixing issue with dependencies on Rubygems
+* Clean up of specs and readme
 
-## 0.1.6
+## 0.0.1
+
+* Initial release
 
-* Fixed issue with options and html_options order
 

data/lib/selections/form_builder_extensions.rb

@@ -64,8 +64,8 @@ module Selections
       end
 
       def selected_item
-        if object.new_record?
-          default_item
+        if object.new_record? && object.send(field_id).blank?
+           default_item
         else
           object.send(field_id).to_s
         end

data/lib/selections/version.rb

@@ -1,3 +1,3 @@
 module Selections
-  VERSION = "0.1.6"
+  VERSION = '0.1.7'
 end

data/spec/selections/selections_tag_spec.rb

@@ -13,7 +13,7 @@ def new_form args = {}
 end
 
 def common_form args = {}
-  args[:form]   ||= form
+  args[:form] ||= form
   args[:field] ||= :priority
   args[:html_options] ||= {}
   args[:options] ||= {}
@@ -45,13 +45,13 @@ describe SelectionTag do
         before { model_parent }
         it("should find more explicit route of model parent") { expect(edit_form.system_code).to eq(model_parent) }
         it "should use priority system_code when model is not ticket" do
-          expect(edit_form(form: ActionView::Helpers::FormBuilder.new(:user, :user, ActionView::Base.new, {}, Proc.new {}) ).system_code).to eq(parent)
+          expect(edit_form(form: ActionView::Helpers::FormBuilder.new(:user, :user, ActionView::Base.new, {}, Proc.new {})).system_code).to eq(parent)
         end
       end
     end
 
     context "system_code override" do
-      it "meme" do
+      it 'passes through system code' do
         hello = Selection.create(name: "hello")
         parent
         expect(new_form(options: {system_code: :hello} ).system_code).to eq hello
@@ -174,21 +174,54 @@ describe SelectionTag do
     before { all_selections }
 
     context "when default not set" do
-      it("when new form") { expect(new_form.selected_item).to eq("") }
-      it "when edit form with ticket.priority_id set" do
-        ticket.update_attribute(:priority_id, selection_3.id)
-        expect(edit_form.selected_item).to eq(selection_3.id.to_s)
+      context "when new form" do
+        it 'has no value' do
+          expect(new_form.selected_item).to eq("")
+        end
+        it 'priority value is already set (simulating a failed validation)' do
+          expect(new_form(object: Ticket.new(priority_id: selection_3.id)).selected_item).to eq(selection_3.id.to_s)
+        end
+      end
+      context "when edit form" do
+        context "ticket.priority_id set" do
+          before { ticket.update_attribute(:priority_id, selection_3.id) }
+
+          it { expect(edit_form.selected_item).to eq(selection_3.id.to_s) }
+          it 'priority value is changed (simulating a failed validation)' do
+            expect(edit_form(object: ticket.assign_attributes(priority_id: selection_2.id)).selected_item).to eq(selection_2.id.to_s)
+          end
+        end
+        context 'no ticket.priority_id set' do
+          it { expect(edit_form.selected_item).to eq("") }
+          it 'priority value is changed (simulating a failed validation)' do
+            expect(edit_form(object: ticket.assign_attributes(priority_id: selection_2.id)).selected_item).to eq(selection_2.id.to_s)
+          end
+        end
       end
-      it("when edit form with no ticket.priority_id set") { expect(edit_form.selected_item).to eq("") }
     end
     context "when default is set" do
       before { selection_2.update_attribute(:is_default, true) }
-      it("when new form") { expect(new_form.selected_item).to eq(selection_2.id.to_s) }
-      it "when edit form with ticket.priority_id set" do
-        ticket.update_attribute(:priority_id, selection_3.id)
-        expect(edit_form.selected_item).to eq(selection_3.id.to_s)
+
+      context 'new form' do
+        it { expect(new_form.selected_item).to eq(selection_2.id.to_s) }
+        it 'priority value is already set (simulating a failed validation)' do
+          expect(new_form(object: Ticket.new(priority_id: selection_3.id)).selected_item).to eq(selection_3.id.to_s)
+        end
+      end
+
+      context 'edit form' do
+        it('has no ticket.priority_id set') { expect(edit_form.selected_item).to eq("") }
+        context 'has ticket.priority_id set' do
+          before { ticket.update_attribute(:priority_id, selection_3.id) }
+
+          it 'should not change' do
+            expect(edit_form.selected_item).to eq(selection_3.id.to_s)
+          end
+          it 'priority value is changed (simulating a failed validation)' do
+            expect(edit_form(object: ticket.assign_attributes(priority_id: selection_2.id)).selected_item).to eq(selection_2.id.to_s)
+          end
+        end
       end
-      it("when edit form with no ticket.priority_id set") { expect(edit_form.selected_item).to eq("") }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selections
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord