dejavu 0.2.0 → 0.2.1

data/lib/dejavu/version.rb

@@ -1,3 +1,3 @@
 module Dejavu
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/dejavu.rb

@@ -40,10 +40,19 @@ module Dejavu
   module ControllerMethods
     def save_for_dejavu(obj, opts = {})
       attrs = obj.attributes
+
+      missing_keys = obj.errors.keys.map(&:to_sym).select{|x| obj.respond_to?(x)} - attrs.keys.map(&:to_sym)
+
       if keys = opts[:nested]
         keys = [keys] unless keys.is_a? Array
         keys.each { |key| attrs = save_nested_for_dejavu(obj, key, attrs) }
+        missing_keys -= keys.map(&:to_sym)
       end
+
+      missing_keys.each do |key|
+        attrs[key] = obj.send(key)
+      end
+
       flash[:"saved_#{obj.class.model_name.underscore}_for_redisplay"] = attrs
     end
 

data/spec/integration/dejavu_spec.rb

@@ -35,7 +35,7 @@ describe "Dejavu" do
 
   describe "update" do
     before do
-      @p = Product.create! :name => "A mug", :code => "PX54", :category => (Category.create! :name => "Mugs")
+      @p = Product.create! :virtual => "foo", :name => "A mug", :code => "PX54", :category => (Category.create! :name => "Mugs")
       Color.create! :name => "Blue", :product => @p
 
       visit edit_product_path(@p)
@@ -64,4 +64,22 @@ describe "Dejavu" do
       field_should_have "product_colors_attributes_0_name", "Blue"
     end
   end
+
+  describe "virtual attributes" do
+    before do
+      visit new_product_path
+      fill_in "Name", :with => "Mug"
+      fill_in "Code", :with => "PT"
+      fill_in "Virtual", :with => "ou"
+      click_button "Create Product"
+    end
+
+    it "should be prefilled" do
+      field_should_have "product_virtual", "ou"
+    end
+
+    it "should show existing errors" do
+      page.should have_content("Virtual is too short")
+    end
+  end
 end

data/test_app/app/models/product.rb

@@ -6,6 +6,9 @@ class Product < ActiveRecord::Base
   validates_presence_of :name, :code
   validates_length_of :name, :in => 3..10
   validates_length_of :code, :in => 3..10
+  validates_length_of :virtual, :in => 3..10
 
   accepts_nested_attributes_for :category, :colors
+
+  attr_accessor :virtual
 end

data/test_app/app/views/products/_form.html.erb

@@ -19,6 +19,10 @@
     <%= f.label :code %><br />
     <%= f.text_field :code %>
   </div>
+  <div class="field">
+    <%= f.label :virtual %><br />
+    <%= f.text_field :virtual %>
+  </div>
   <div>
     <%= f.fields_for :category do |ctf| %>
       <%= ctf.label :category_name %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dejavu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &75307960 !ruby/object:Gem::Requirement
+  requirement: &79605650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *75307960
+  version_requirements: *79605650
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &75307000 !ruby/object:Gem::Requirement
+  requirement: &79605170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *75307000
+  version_requirements: *79605170
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &75306270 !ruby/object:Gem::Requirement
+  requirement: &79604600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *75306270
+  version_requirements: *79604600
 description: Remember your object after a redirect
 email:
 - roger@itnig.net
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 848035681
+      hash: 730709121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 848035681
+      hash: 730709121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15