dejavu 0.1.2 → 0.2.0

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+
+env: "RAILS_ENV=test DISPLAY=:99.0"
+
+before_script:
+  - "sh -c 'cd test_app && bundle && bundle exec rake db:drop db:migrate'"
+  - "sh -e /etc/init.d/xvfb start"

data/README.md

@@ -1,5 +1,6 @@
 Dejavu
 ======
+[![Build Status](https://secure.travis-ci.org/rogercampos/dejavu.png)](http://travis-ci.org/rogercampos/dejavu)
 
 Dejavu is a very small piece of software which lets you remember your object
 state after a failed POST action using redirect. A typical Rails controller
@@ -68,14 +69,15 @@ Then, in the view load the object in the form usign the `get_dejavu_for`:
 Nested Attributes
 -----------------
 
-You can also use dejavu to recreate a one-to-one associated model in your
-form. To do so you must tell dejavu which association to save in the
-controller:
+You can also use dejavu to recreate any associated model in your form. This associated model can come from a one-to-one, many-to-one or one-to-many association. To do so you must tell dejavu which association to save in the controller:
 
     save_for_dejavu @product, :nested => :prices
 
-This will assume you have a `Product` class which has a `:has_one` association
-to a `Price` class.
+You can even use dejavu for multiple associations:
+
+    save_for_dejavu @product, :nested => [:category, :colors]
+
+This will assume you have a `Product` class which has a simple association (with an element of the `Price` class) or a multiple association (with elements of the `Price` class).
 
 
 Excluding some errors

data/Rakefile

@@ -1,2 +1,8 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/dejavu.rb

@@ -40,11 +40,26 @@ module Dejavu
   module ControllerMethods
     def save_for_dejavu(obj, opts = {})
       attrs = obj.attributes
-      if opts[:nested]
-        attrs["#{opts[:nested]}_attributes"] = obj.send(opts[:nested]).attributes
+      if keys = opts[:nested]
+        keys = [keys] unless keys.is_a? Array
+        keys.each { |key| attrs = save_nested_for_dejavu(obj, key, attrs) }
       end
       flash[:"saved_#{obj.class.model_name.underscore}_for_redisplay"] = attrs
     end
+
+    private
+
+    def save_nested_for_dejavu(obj, key, attrs)
+      value = obj.send(key)
+
+      attrs["#{key}_attributes"] = if value.is_a? Array
+                                     value.map(&:attributes)
+                                   else
+                                     value.attributes
+                                   end
+
+      attrs
+    end
   end
 end
 

data/lib/dejavu/version.rb

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

data/spec/integration/dejavu_spec.rb

@@ -6,6 +6,8 @@ describe "Dejavu" do
       visit new_product_path
       fill_in "Name", :with => "Mug"
       fill_in "Code", :with => "PT"
+      fill_in "product_category_attributes_name", :with => "Mugs"
+      fill_in "product_colors_attributes_0_name", :with => "Blue"
       click_button "Create Product"
     end
 
@@ -21,11 +23,20 @@ describe "Dejavu" do
       field_should_have "product_name", "Mug"
       field_should_have "product_code", "PT"
     end
+
+    it "should have the many-to-one association prefilled with the previously entered values" do
+      field_should_have "product_category_attributes_name", "Mugs"
+    end
+
+    it "should have the one-to-many association prefilled with the previously entered values" do
+      field_should_have "product_colors_attributes_1_name", "Blue"
+    end
   end
 
   describe "update" do
     before do
-      @p = Product.create! :name => "A mug", :code => "PX54"
+      @p = Product.create! :name => "A mug", :code => "PX54", :category => (Category.create! :name => "Mugs")
+      Color.create! :name => "Blue", :product => @p
 
       visit edit_product_path(@p)
       fill_in "Name", :with => "UA"
@@ -44,5 +55,13 @@ describe "Dejavu" do
       field_should_have "product_name", "UA"
       field_should_have "product_code", "PX54"
     end
+
+    it "should have the many-to-one association prefilled with the previously entered values" do
+      field_should_have "product_category_attributes_name", "Mugs"
+    end
+
+    it "should have the one-to-many association prefilled with the previously entered values" do
+      field_should_have "product_colors_attributes_0_name", "Blue"
+    end
   end
 end

data/test_app/app/controllers/products_controller.rb

@@ -25,6 +25,8 @@ class ProductsController < ApplicationController
   # GET /products/new.json
   def new
     @product = Product.new
+    @product.category = Category.new
+    @product.colors.build
 
     respond_to do |format|
       format.html # new.html.erb
@@ -47,7 +49,7 @@ 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
+        save_for_dejavu @product, :nested => [:category, :colors]
         format.html { redirect_to new_product_url }
         format.json { render json: @product.errors, status: :unprocessable_entity }
       end

data/test_app/app/models/category.rb

@@ -0,0 +1,7 @@
+class Category < ActiveRecord::Base
+  has_many :products
+
+  def to_s
+    name
+  end
+end

data/test_app/app/models/color.rb

@@ -0,0 +1,5 @@
+class Color < ActiveRecord::Base
+  belongs_to :product
+
+  validates_presence_of :product
+end

data/test_app/app/models/product.rb

@@ -1,5 +1,11 @@
 class Product < ActiveRecord::Base
+  belongs_to :category
+  has_many :colors
+
+  validates_presence_of :category
   validates_presence_of :name, :code
   validates_length_of :name, :in => 3..10
   validates_length_of :code, :in => 3..10
+
+  accepts_nested_attributes_for :category, :colors
 end

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

@@ -19,6 +19,18 @@
     <%= f.label :code %><br />
     <%= f.text_field :code %>
   </div>
+  <div>
+    <%= f.fields_for :category do |ctf| %>
+      <%= ctf.label :category_name %>
+      <%= ctf.text_field :name %>
+    <% end %>
+  </div>
+  <div>
+    <%= f.fields_for :colors do |clf| %>
+      <%= clf.label :color_name %>
+      <%= clf.text_field :name %>
+    <% end %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

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

@@ -4,6 +4,7 @@
   <tr>
     <th>Name</th>
     <th>Code</th>
+    <th>Category</th>
     <th></th>
     <th></th>
     <th></th>
@@ -13,6 +14,7 @@
   <tr>
     <td><%= product.name %></td>
     <td><%= product.code %></td>
+    <td><%= product.category %></td>
     <td><%= link_to 'Show', product %></td>
     <td><%= link_to 'Edit', edit_product_path(product) %></td>
     <td><%= link_to 'Destroy', product, confirm: 'Are you sure?', method: :delete %></td>

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

@@ -10,6 +10,10 @@
   <%= @product.code %>
 </p>
 
+<p>
+  <b>Category name:</b>
+  <%= @product.category %>
+</p>
 
 <%= link_to 'Edit', edit_product_path(@product) %> |
 <%= link_to 'Back', products_path %>

data/test_app/db/migrate/20120211125006_create_categories.rb

@@ -0,0 +1,11 @@
+class CreateCategories < ActiveRecord::Migration
+  def change
+    create_table :categories do |t|
+      t.string :name
+
+      t.timestamps
+    end
+
+    add_column :products, :category_id, :integer
+  end
+end

data/test_app/db/migrate/20120211132313_create_colors.rb

@@ -0,0 +1,10 @@
+class CreateColors < ActiveRecord::Migration
+  def change
+    create_table :colors do |t|
+      t.string :name
+      t.integer :product_id
+
+      t.timestamps
+    end
+  end
+end

data/test_app/db/schema.rb

@@ -11,13 +11,27 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111227135944) do
+ActiveRecord::Schema.define(:version => 20120211132313) do
+
+  create_table "categories", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "colors", :force => true do |t|
+    t.string   "name"
+    t.integer  "product_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
   create_table "products", :force => true do |t|
     t.string   "name"
     t.string   "code"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "category_id"
   end
 
 end

data/test_app/test/fixtures/categories.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString

data/test_app/test/fixtures/colors.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  name: MyString
+  product_id: 1
+
+two:
+  name: MyString
+  product_id: 1

data/test_app/test/unit/category_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/test_app/test/unit/color_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ColorTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dejavu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79465570 !ruby/object:Gem::Requirement
+  requirement: &75307960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *79465570
+  version_requirements: *75307960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &79499400 !ruby/object:Gem::Requirement
+  requirement: &75307000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *79499400
+  version_requirements: *75307000
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &79498830 !ruby/object:Gem::Requirement
+  requirement: &75306270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *79498830
+  version_requirements: *75306270
 description: Remember your object after a redirect
 email:
 - roger@itnig.net
@@ -53,6 +53,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -78,6 +79,8 @@ files:
 - test_app/app/helpers/products_helper.rb
 - test_app/app/mailers/.gitkeep
 - test_app/app/models/.gitkeep
+- test_app/app/models/category.rb
+- test_app/app/models/color.rb
 - test_app/app/models/product.rb
 - test_app/app/views/layouts/application.html.erb
 - test_app/app/views/products/_form.html.erb
@@ -102,6 +105,8 @@ files:
 - test_app/config/locales/en.yml
 - test_app/config/routes.rb
 - test_app/db/migrate/20111227135944_create_products.rb
+- test_app/db/migrate/20120211125006_create_categories.rb
+- test_app/db/migrate/20120211132313_create_colors.rb
 - test_app/db/schema.rb
 - test_app/db/seeds.rb
 - test_app/lib/assets/.gitkeep
@@ -114,6 +119,8 @@ files:
 - test_app/public/robots.txt
 - test_app/script/rails
 - test_app/test/fixtures/.gitkeep
+- test_app/test/fixtures/categories.yml
+- test_app/test/fixtures/colors.yml
 - test_app/test/fixtures/products.yml
 - test_app/test/functional/.gitkeep
 - test_app/test/functional/products_controller_test.rb
@@ -121,6 +128,8 @@ files:
 - test_app/test/performance/browsing_test.rb
 - test_app/test/test_helper.rb
 - test_app/test/unit/.gitkeep
+- test_app/test/unit/category_test.rb
+- test_app/test/unit/color_test.rb
 - test_app/test/unit/helpers/products_helper_test.rb
 - test_app/test/unit/product_test.rb
 - test_app/vendor/assets/stylesheets/.gitkeep
@@ -139,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 139276129
+      hash: 848035681
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 139276129
+      hash: 848035681
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15