cocoon 1.1.2 → 1.2.0

data/spec/dummy/app/models/comment.rb

@@ -1,5 +1,7 @@
 class Comment < ActiveRecord::Base
   belongs_to :post
 
-  attr_protected :author
+  unless Rails.rails4?
+    attr_protected :author
+  end
 end

data/spec/dummy/app/models/post.rb

@@ -1,5 +1,9 @@
 class Post < ActiveRecord::Base
   has_many :comments
-  has_many :admin_comments, :class_name => "Comment", :conditions => { :author => "Admin" }
+  if Rails.rails4?
+    has_many :admin_comments, -> { where author: "Admin" }, :class_name => "Comment"
+  else
+    has_many :admin_comments, :class_name => "Comment", :conditions => { :author => "Admin" }
+  end
   has_many :people
 end

data/spec/dummy/config/environments/development.rb

@@ -11,7 +11,7 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+  #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/spec/dummy/config/initializers/rails_version_helper.rb

@@ -0,0 +1,6 @@
+module Rails
+
+  def self.rails4?
+    Rails.version.start_with? '4'
+  end
+end

data/spec/dummy/config/initializers/secret_token.rb

@@ -1,7 +1,8 @@
-# Be sure to restart your server when you modify this file.
+config = Rails.application.config
 
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '58698a8f83e3ccc8e503d18280e17a23008a8f08a6813472dca7873ad0b497428dc00f62ee2225f94bce0d8e04c4befa922e4372772a2e1de89cebaa98a18c0a'
+if Rails.rails4?
+  config.secret_key_base = '58698a8f83e3ccc8e503d18280e17a23008a8f08a6813472dca7873ad0b497428dc00f62ee2225f94bce0d8e04c4befa922e4372772a2e1de89cebaa98a18c0a'
+else
+  config.secret_token    = '58698a8f83e3ccc8e503d18280e17a23008a8f08a6813472dca7873ad0b497428dc00f62ee2225f94bce0d8e04c4befa922e4372772a2e1de89cebaa98a18c0a'
+  config.session_store :cookie_store, :key => "dummy"
+end

data/spec/support/rails_version_helper.rb

@@ -0,0 +1,3 @@
+def rails4?
+  Rails.version.start_with? '4'
+end

data/spec/support/shared_examples.rb

@@ -0,0 +1,73 @@
+# -*- encoding : utf-8 -*-
+shared_examples_for "a correctly rendered add link" do |options|
+  context "the rendered link" do
+    before do
+      default_options = {
+          href: '#',
+          class: 'add_fields',
+          template: "form<tag>",
+          association: 'comment',
+          associations: 'comments',
+          text: 'add something',
+          extra_attributes: {}
+      }
+      @options = default_options.merge options
+
+      doc = Nokogiri::HTML(@html)
+      @link = doc.at('a')
+    end
+    it 'has a correct href' do
+      @link.attribute('href').value.should == @options[:href]
+    end
+    it 'has a correct class' do
+      @link.attribute('class').value.should == @options[:class]
+    end
+    it 'has a correct template' do
+      @link.attribute('data-association-insertion-template').value.should == @options[:template]
+    end
+    it 'has a correct associations' do
+      @link.attribute('data-association').value.should == @options[:association]
+      @link.attribute('data-associations').value.should == @options[:associations]
+    end
+    it 'has the correct text' do
+      @link.text.should == @options[:text]
+    end
+    it 'sets extra attributes correctly' do
+      @options[:extra_attributes].each do |key, value|
+        @link.attribute(key).value.should == value
+      end
+    end
+
+  end
+end
+
+shared_examples_for "a correctly rendered remove link" do |options|
+  context "the rendered link" do
+    before do
+      default_options = {
+          href: '#',
+          class: 'remove_fields dynamic',
+          text: 'remove something',
+          extra_attributes: {}
+      }
+      @options = default_options.merge options
+
+      doc = Nokogiri::HTML(@html)
+      @link = doc.at('a')
+    end
+    it 'has a correct href' do
+      @link.attribute('href').value.should == @options[:href]
+    end
+    it 'has a correct class' do
+      @link.attribute('class').value.should == @options[:class]
+    end
+    it 'has the correct text' do
+      @link.text.should == @options[:text]
+    end
+    it 'sets extra attributes correctly' do
+      @options[:extra_attributes].each do |key, value|
+        @link.attribute(key).value.should == value
+      end
+    end
+  end
+end

metadata

@@ -1,176 +1,192 @@
 --- !ruby/object:Gem::Specification
 name: cocoon
 version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  version: 1.1.2
 platform: ruby
 authors:
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 4.0.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
-  name: sqlite3-ruby
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
-    none: false
+        version: 2.8.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
-    none: false
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
-    none: false
+        version: 2.8.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
-    none: false
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 4.0.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
 description: Unobtrusive nested forms handling, using jQuery. Use this and discover
   cocoon-heaven.
 email: nathan@dixis.com
@@ -181,6 +197,7 @@ extra_rdoc_files:
 files:
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - History.md
 - MIT-LICENSE
 - README.markdown
@@ -188,6 +205,8 @@ files:
 - VERSION
 - app/assets/javascripts/cocoon.js
 - cocoon.gemspec
+- gemfiles/Gemfile.rails-3.2.13
+- gemfiles/Gemfile.rails-3.2.13.lock
 - lib/cocoon.rb
 - lib/cocoon/view_helpers.rb
 - lib/generators/cocoon/install/install_generator.rb
@@ -211,6 +230,7 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/rails_version_helper.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
@@ -234,6 +254,8 @@ files:
 - spec/generators/install_generator_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/spec_helper.rb
+- spec/support/rails_version_helper.rb
+- spec/support/shared_examples.rb
 homepage: http://github.com/nathanvda/cocoon
 licenses: []
 post_install_message: 
@@ -241,23 +263,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 2461844246300875574
-  none: false
+      hash: 171754953178404834
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: gem that enables easier nested forms with standard forms, formtastic and