dejavu 0.2.1 → 0.3.0

data/lib/dejavu/version.rb

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

data/lib/dejavu.rb

@@ -39,14 +39,21 @@ module Dejavu
 
   module ControllerMethods
     def save_for_dejavu(obj, opts = {})
-      attrs = obj.attributes
+      attrs = if opts[:only] && opts[:only].is_a?(Array)
+        obj.attributes.slice(*opts[:only].map(&:to_s))
+      else
+        obj.attributes
+      end
 
-      missing_keys = obj.errors.keys.map(&:to_sym).select{|x| obj.respond_to?(x)} - attrs.keys.map(&:to_sym)
+      missing_keys = []
 
       if keys = opts[:nested]
-        keys = [keys] unless keys.is_a? Array
+        keys = [keys].flatten
         keys.each { |key| attrs = save_nested_for_dejavu(obj, key, attrs) }
-        missing_keys -= keys.map(&:to_sym)
+      end
+
+      if virtual = opts[:virtual]
+        missing_keys += [virtual].flatten
       end
 
       missing_keys.each do |key|

data/spec/integration/dejavu_spec.rb

@@ -71,15 +71,45 @@ describe "Dejavu" do
       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
+    it "should be prefilled on errors" do
+      click_button "Create Product"
       field_should_have "product_virtual", "ou"
     end
 
+    it "should be prefilled if the virtual attribute is ok but there is an error in the form" do
+      fill_in "Virtual", :with => "correct"
+      click_button "Create Product"
+      field_should_have "product_virtual", "correct"
+    end
+
     it "should show existing errors" do
+      click_button "Create Product"
       page.should have_content("Virtual is too short")
     end
   end
+
+  describe "only option" do
+    it "should not remember errors on code" do
+      visit new_only_name_products_path
+
+      fill_in "Create only: name", :with => "Mug"
+      fill_in "Create only: code", :with => "PT"
+      click_button "Create only name"
+
+      # Blank error is still there because we don't reset the PT
+      page.should have_content("Code can't be blank")
+    end
+
+    it "should remember errors on name" do
+      visit new_only_name_products_path
+
+      fill_in "Create only: name", :with => "pt"
+      fill_in "Create only: code", :with => "PTujarsa"
+      click_button "Create only name"
+
+      page.should have_no_content("Name can't be blank")
+    end
+  end
 end

data/test_app/app/controllers/products_controller.rb

@@ -34,6 +34,15 @@ class ProductsController < ApplicationController
     end
   end
 
+  def new_only_name
+    @product = Product.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @product }
+    end
+  end
+
   # GET /products/1/edit
   def edit
     @product = Product.find(params[:id])
@@ -49,13 +58,28 @@ class ProductsController < ApplicationController
         format.html { redirect_to @product, notice: 'Product was successfully created.' }
         format.json { render json: @product, status: :created, location: @product }
       else
-        save_for_dejavu @product, :nested => [:category, :colors]
+        save_for_dejavu @product, :nested => [:category, :colors], :virtual => :virtual
         format.html { redirect_to new_product_url }
         format.json { render json: @product.errors, status: :unprocessable_entity }
       end
     end
   end
 
+  def create_only_name
+    @product = Product.new(params[:product])
+
+    respond_to do |format|
+      if @product.save
+        format.html { redirect_to :back, notice: 'Product was successfully created.' }
+        format.json { render json: @product, status: :created, location: @product }
+      else
+        save_for_dejavu @product, :only => [:name]
+        format.html { redirect_to :back }
+        format.json { render json: @product.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
   # PUT /products/1
   # PUT /products/1.json
   def update

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

@@ -39,3 +39,4 @@
     <%= f.submit %>
   </div>
 <% end %>
+

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

@@ -0,0 +1,26 @@
+<%= form_for(get_dejavu_for(@product), :url => create_only_name_products_path) do |f| %>
+  <% if @product.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@product.errors.count, "error") %> prohibited this product from being saved:</h2>
+
+      <ul>
+      <% @product.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name, "Create only: name" %><br />
+    <%= f.text_field :name %>
+  </div>
+  <div class="field">
+    <%= f.label :code, "Create only: code" %><br />
+    <%= f.text_field :code %>
+  </div>
+  <div class="actions">
+    <%= f.submit "Create only name" %>
+  </div>
+<% end %>
+

data/test_app/config/routes.rb

@@ -1,5 +1,8 @@
 TestApp::Application.routes.draw do
-  resources :products
+  resources :products do
+    post :create_only_name, :on => :collection
+    get :new_only_name, :on => :collection
+  end
 
   root :to => "products#index"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dejavu
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79605650 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *79605650
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &79605170 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *79605170
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &79604600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *79604600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: Remember your object after a redirect
 email:
 - roger@itnig.net
@@ -87,6 +102,7 @@ files:
 - test_app/app/views/products/edit.html.erb
 - test_app/app/views/products/index.html.erb
 - test_app/app/views/products/new.html.erb
+- test_app/app/views/products/new_only_name.html.erb
 - test_app/app/views/products/show.html.erb
 - test_app/config.ru
 - test_app/config/application.rb
@@ -148,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 730709121
+      hash: 995488367
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,10 +173,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 730709121
+      hash: 995488367
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Remember your object after a redirect