cocoon 1.0.8 → 1.0.10

data/Gemfile

@@ -10,6 +10,8 @@ group :development, :test do
   gem "rspec",       ">= 2.6.0"
   gem "actionpack",  ">=3.0.0"
   gem "simplecov", :require => false
+
+  gem "generator_spec"
 end
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)

data/Gemfile.lock

@@ -33,6 +33,9 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    generator_spec (0.8.3)
+      rails (~> 3.0)
+      rspec-rails
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.6.2)
@@ -95,6 +98,7 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack (>= 3.0.0)
+  generator_spec
   jeweler
   json_pure
   rails (>= 3.0.0)

data/History.md

@@ -1,5 +1,15 @@
 # Change History / Release Notes
 
+## Version 1.0.10
+
+* Fuck! Built the gem with 1.9.2 again. Built the gem again with 1.8.7.
+
+## Version 1.0.9
+
+* is now rails 3.1 compatible. If you are not using Rails 3.1 yet, this should have no effect.
+  For rails 3.1 the cocoon.js no longer needs to be installed using the `rails g cocoon:install`. It is
+  automatically used from the gem.
+
 ## Version 1.0.8
 
 * Loosened the gem dependencies.

data/README.markdown

@@ -24,7 +24,7 @@ Inside your `Gemfile` add the following:
 
     gem "cocoon"
 
-Run the installation task:
+If you are using Rails 3.0.x, you need to run the installation task (since rails 3.1 this is no longer needed):
 
     rails g cocoon:install
 

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.10

data/cocoon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cocoon}
-  s.version = "1.0.8"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2011-07-21}
+  s.date = %q{2011-07-24}
   s.description = %q{Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [
@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
+    "app/assets/javascripts/cocoon.js",
     "cocoon.gemspec",
     "lib/cocoon.rb",
     "lib/cocoon/view_helpers.rb",
     "lib/generators/cocoon/install/install_generator.rb",
-    "lib/generators/cocoon/install/templates/cocoon.js",
     "spec/cocoon_spec.rb",
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
     "spec/dummy/public/javascripts/rails.js",
     "spec/dummy/public/stylesheets/.gitkeep",
     "spec/dummy/script/rails",
+    "spec/generators/install_generator_spec.rb",
     "spec/integration/navigation_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -88,6 +89,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
       s.add_development_dependency(%q<actionpack>, [">= 3.0.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<generator_spec>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -98,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 2.6.0"])
       s.add_dependency(%q<actionpack>, [">= 3.0.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<generator_spec>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
     end
   else
@@ -109,6 +112,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 2.6.0"])
     s.add_dependency(%q<actionpack>, [">= 3.0.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<generator_spec>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
   end
 end

data/lib/cocoon.rb

@@ -1,7 +1,7 @@
 require 'cocoon/view_helpers'
 
 module Cocoon
-  class Railtie < ::Rails::Railtie
+  class Engine < ::Rails::Engine
 
     config.before_initialize do
       config.action_view.javascript_expansions[:cocoon] = %w(cocoon)

data/lib/generators/cocoon/install/install_generator.rb

@@ -2,10 +2,14 @@ module Cocoon
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
-      desc "This generator installs the javascript needed for cocoon"
 
+      desc "This generator installs the javascript needed for cocoon"
       def copy_the_javascript
-        copy_file "cocoon.js", "public/javascripts/cocoon.js"
+        if ::Rails.version[0..2].to_f >= 3.1
+          puts "Installing is no longer required since Rails 3.1"
+        else
+          copy_file "../../../../../app/assets/javascripts/cocoon.js", "public/javascripts/cocoon.js"
+        end
       end
 
     end

data/spec/generators/install_generator_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'generator_spec/test_case'
+require 'generators/cocoon/install/install_generator'
+
+describe Cocoon::Generators::InstallGenerator do
+  include GeneratorSpec::TestCase
+
+  destination File.expand_path("../../tmp", __FILE__)
+
+  context "in rails 3.0" do
+    context "with no arguments" do
+      before(:all) do
+        ::Rails.stub(:version) { '3.0.8' }
+        prepare_destination
+        run_generator
+      end
+
+      it "stubs the version correctly" do
+        Rails.version[0..2].should == "3.0"
+      end
+
+      it "stubs the version correctly" do
+        test_version = (Rails.version[0..2].to_f >= 3.1)
+        test_version.should be_false
+      end
+
+      it "copies cocoon.js to the correct folder" do
+        assert_file "public/javascripts/cocoon.js"
+      end
+    end
+  end
+
+  context "in rails 3.1" do
+    context "with no arguments" do
+      before(:all) do
+        ::Rails.stub(:version) { '3.1.0' }
+        prepare_destination
+        run_generator
+      end
+
+      it "does not copy cocoon.js" do
+        assert_no_file "public/javascripts/cocoon.js"
+      end
+    end
+  end
+
+end

metadata

@@ -1,124 +1,182 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cocoon
-version: !ruby/object:Gem::Version
-  version: 1.0.8
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 10
+  version: 1.0.10
 platform: ruby
-authors:
+authors: 
 - Nathan Van der Auwera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 +02:00
+
+date: 2011-07-24 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &13181180 !ruby/object:Gem::Requirement
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :development
+  name: rails
+  version_requirements: *id001
   prerelease: false
-  version_requirements: *13181180
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &13180640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
-  version_requirements: *13180640
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &13180120 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: sqlite3-ruby
+  version_requirements: *id002
   prerelease: false
-  version_requirements: *13180120
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &13179600 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: json_pure
+  version_requirements: *id003
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  version_requirements: *id004
   prerelease: false
-  version_requirements: *13179600
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &13179100 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-  type: :development
+  name: rspec-rails
+  version_requirements: *id005
   prerelease: false
-  version_requirements: *13179100
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &13177320 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-  type: :development
+  name: rspec
+  version_requirements: *id006
   prerelease: false
-  version_requirements: *13177320
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &13176760 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :development
+  name: actionpack
+  version_requirements: *id007
   prerelease: false
-  version_requirements: *13176760
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &13176220 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: simplecov
+  version_requirements: *id008
+  prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: generator_spec
+  version_requirements: *id009
   prerelease: false
-  version_requirements: *13176220
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &13175680 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-  type: :development
+  name: rspec
+  version_requirements: *id010
   prerelease: false
-  version_requirements: *13175680
-description: Unobtrusive nested forms handling, using jQuery. Use this and discover
-  cocoon-heaven.
+description: Unobtrusive nested forms handling, using jQuery. Use this and discover cocoon-heaven.
 email: nathan@dixis.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -127,11 +185,11 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- app/assets/javascripts/cocoon.js
 - cocoon.gemspec
 - lib/cocoon.rb
 - lib/cocoon/view_helpers.rb
 - lib/generators/cocoon/install/install_generator.rb
-- lib/generators/cocoon/install/templates/cocoon.js
 - spec/cocoon_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
@@ -171,35 +229,42 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/generators/install_generator_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nathanvda/cocoon
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4167174110129179782
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: gem that enables easier nested forms with standard forms, formtastic and
-  simple-form
+summary: gem that enables easier nested forms with standard forms, formtastic and simple-form
 test_files: []
+