draper 1.0.0.beta6 → 1.0.0

data/spec/dummy/config/application.rb

@@ -47,13 +47,13 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    # config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
-    config.assets.enabled = true
+    # config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # config.assets.version = '1.0'
 
     # Tell Action Mailer not to deliver emails to the real world.
     # The :test delivery method accumulates sent emails in the

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

@@ -20,15 +20,15 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
-  config.assets.compress = false
+  # config.assets.compress = false
 
   # Expands the lines which load the assets
-  config.assets.debug = true
+  # config.assets.debug = true
 end

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

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  # config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
@@ -25,7 +25,7 @@ Dummy::Application.configure do
   config.action_controller.allow_forgery_protection    = false
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummy/lib/tasks/test.rake

@@ -0,0 +1,10 @@
+require 'rspec/core/rake_task'
+require 'rake/testtask'
+
+RSpec::Core::RakeTask.new :rspec
+
+Rake::TestTask.new :mini_test do |t|
+  t.test_files = ["mini_test/mini_test_integration_test.rb"]
+end
+
+task :default => [:rspec, :mini_test]

data/spec/dummy/mini_test/mini_test_integration_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../../config/environment', __FILE__)
+require 'minitest/autorun'
+require 'minitest/rails'
+
+def it_is_a_decorator_test
+  it "is a decorator test" do
+    assert_kind_of Draper::TestCase, self
+  end
+end
+
+def it_is_not_a_decorator_test
+  it "is not a decorator test" do
+    refute_kind_of Draper::TestCase, self
+  end
+end
+
+ProductDecorator = Class.new(Draper::Decorator)
+ProductsDecorator = Class.new(Draper::CollectionDecorator)
+
+describe ProductDecorator do
+  it_is_a_decorator_test
+end
+
+describe ProductsDecorator do
+  it_is_a_decorator_test
+end
+
+describe "ProductDecorator" do
+  it_is_a_decorator_test
+end
+
+describe "AnyDecorator" do
+  it_is_a_decorator_test
+end
+
+describe "Any decorator test" do
+  it_is_a_decorator_test
+end
+
+describe Object do
+  it_is_not_a_decorator_test
+end
+
+describe "Nope" do
+  it_is_not_a_decorator_test
+end

data/spec/dummy/spec/decorators/post_decorator_spec.rb

@@ -13,11 +13,11 @@ describe PostDecorator do
   end
 
   it "can use url helpers with its model" do
-    subject.url_with_model.should == "http://www.example.com/en/posts/#{source.id}"
+    subject.url_with_model.should == "http://www.example.com:12345/en/posts/#{source.id}"
   end
 
   it "can use url helpers with its id" do
-    subject.url_with_id.should == "http://www.example.com/en/posts/#{source.id}"
+    subject.url_with_id.should == "http://www.example.com:12345/en/posts/#{source.id}"
   end
 
   it "can be passed implicitly to url_for" do

data/spec/dummy/spec/decorators/rspec_integration_spec.rb

@@ -0,0 +1,19 @@
+describe "A spec in this folder" do
+  it "is a decorator spec" do
+    example.metadata[:type].should be :decorator
+  end
+end
+
+describe "A decorator spec" do
+  it "can access helpers through `helper`" do
+    helper.content_tag(:p, "Help!").should == "<p>Help!</p>"
+  end
+
+  it "can access helpers through `helpers`" do
+    helpers.content_tag(:p, "Help!").should == "<p>Help!</p>"
+  end
+
+  it "can access helpers through `h`" do
+    h.content_tag(:p, "Help!").should == "<p>Help!</p>"
+  end
+end

data/spec/dummy/spec/mailers/post_mailer_spec.rb

@@ -19,11 +19,11 @@ describe PostMailer do
     end
 
     it "can use url helpers with a model" do
-      subject.should have_css "#url_with_model", text: "http://www.example.com/en/posts/#{post.id}"
+      subject.should have_css "#url_with_model", text: "http://www.example.com:12345/en/posts/#{post.id}"
     end
 
     it "can use url helpers with an id" do
-      subject.should have_css "#url_with_id", text: "http://www.example.com/en/posts/#{post.id}"
+      subject.should have_css "#url_with_id", text: "http://www.example.com:12345/en/posts/#{post.id}"
     end
   end
 end

data/spec/dummy/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
-require 'draper/test/rspec_integration'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -80,7 +80,7 @@ describe Rails::Generators::DecoratorGenerator do
     describe 'test/decorators/YourModel_decorator_test.rb' do
       subject { file('test/decorators/your_model_decorator_test.rb') }
       it { should exist }
-      it { should contain "class YourModelDecoratorTest < ActiveSupport::TestCase" }
+      it { should contain "class YourModelDecoratorTest < Draper::TestCase" }
     end
   end
 
@@ -90,7 +90,48 @@ describe Rails::Generators::DecoratorGenerator do
     describe 'test/decorators/your_model_decorator_test.rb' do
       subject { file('test/decorators/namespace/your_model_decorator_test.rb') }
       it { should exist }
-      it { should contain "class Namespace::YourModelDecoratorTest < ActiveSupport::TestCase" }
+      it { should contain "class Namespace::YourModelDecoratorTest < Draper::TestCase" }
     end
   end
+
+  context 'using minitest-rails' do
+    before { run_generator ["YourModel", "-t=mini_test"] }
+
+    describe 'test/decorators/your_model_decorator_test.rb' do
+      subject { file('test/decorators/your_model_decorator_test.rb') }
+      it { should exist }
+      it { should contain "class YourModelDecoratorTest < Draper::TestCase" }
+    end
+  end
+
+  context 'using minitest-rails with namespaced model' do
+    before { run_generator ["Namespace::YourModel", "-t=mini_test"] }
+
+    describe 'test/decorators/your_model_decorator_test.rb' do
+      subject { file('test/decorators/namespace/your_model_decorator_test.rb') }
+      it { should exist }
+      it { should contain "class Namespace::YourModelDecoratorTest < Draper::TestCase" }
+    end
+  end
+
+  context 'using minitest-rails with spec syntax' do
+    before { run_generator ["YourModel", "-t=mini_test", "--spec"] }
+
+    describe 'test/decorators/your_model_decorator_test.rb' do
+      subject { file('test/decorators/your_model_decorator_test.rb') }
+      it { should exist }
+      it { should contain "describe YourModelDecorator" }
+    end
+  end
+
+  context 'using minitest-rails with spec syntax with namespaced model' do
+    before { run_generator ["Namespace::YourModel", "-t=mini_test", "--spec"] }
+
+    describe 'test/decorators/your_model_decorator_test.rb' do
+      subject { file('test/decorators/namespace/your_model_decorator_test.rb') }
+      it { should exist }
+      it { should contain "describe Namespace::YourModelDecorator" }
+    end
+  end
+
 end

data/spec/integration/integration_spec.rb

@@ -22,11 +22,11 @@ app.start_server do
       end
 
       it "can use url helpers with a model" do
-        page.should have_text("http://www.example.com/en/posts/1").in("#url_with_model")
+        page.should have_text("http://www.example.com:12345/en/posts/1").in("#url_with_model")
       end
 
       it "can use url helpers with an id" do
-        page.should have_text("http://www.example.com/en/posts/1").in("#url_with_id")
+        page.should have_text("http://www.example.com:12345/en/posts/1").in("#url_with_id")
       end
     end
   end

data/spec/spec_helper.rb

@@ -8,26 +8,22 @@ require 'action_controller/test_case'
 
 Bundler.require
 
-require './spec/support/active_model'
-require './spec/support/active_record'
-require './spec/support/action_controller'
+require 'support/active_model'
+require 'support/active_record'
+require 'support/action_controller'
 
-require './spec/support/models/product'
-require './spec/support/models/namespaced_product'
-require './spec/support/models/non_active_model_product'
-require './spec/support/models/widget'
-require './spec/support/models/some_thing'
-require './spec/support/models/uninferrable_decorator_model'
+require 'support/models/product'
+require 'support/models/namespaced_product'
+require 'support/models/non_active_model_product'
+require 'support/models/widget'
+require 'support/models/some_thing'
+require 'support/models/uninferrable_decorator_model'
 
-require './spec/support/decorators/product_decorator'
-require './spec/support/decorators/namespaced_product_decorator'
-require './spec/support/decorators/non_active_model_product_decorator'
-require './spec/support/decorators/widget_decorator'
-require './spec/support/decorators/specific_product_decorator'
-require './spec/support/decorators/products_decorator'
-require './spec/support/decorators/some_thing_decorator'
-require './spec/support/decorators/decorator_with_application_helper'
-
-class << Rails
-  undef application # Avoid silly Rails bug: https://github.com/rails/rails/pull/6429
-end
+require 'support/decorators/product_decorator'
+require 'support/decorators/namespaced_product_decorator'
+require 'support/decorators/non_active_model_product_decorator'
+require 'support/decorators/widget_decorator'
+require 'support/decorators/specific_product_decorator'
+require 'support/decorators/products_decorator'
+require 'support/decorators/some_thing_decorator'
+require 'support/decorators/decorator_with_application_helper'

data/spec/support/active_record.rb

@@ -1,18 +1,5 @@
 module ActiveRecord
   class Base
-    include ActiveModel::Validations
-    include ActiveModel::Conversion
-
-    attr_reader :errors, :to_model
-
-    def initialize
-      @errors = ActiveModel::Errors.new(self)
-    end
-
-    def self.limit
-      self
-    end
-
   end
 end
 

data/spec/support/dummy_app.rb

@@ -49,7 +49,8 @@ class DummyApp
 
         yield
 
-        Process.kill('KILL', out.pid)
+        Process.kill("KILL", out.pid)
+        File.delete("tmp/pids/server.pid")
       end
     end
   end
@@ -57,11 +58,11 @@ class DummyApp
   private
 
   def root
-    File.expand_path('../../dummy', __FILE__)
+    File.expand_path("../../dummy", __FILE__)
   end
 
   def localhost
-    '127.0.0.1'
+    "127.0.0.1"
   end
 
   def port

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta6
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Jeff Casimir
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,7 +81,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
@@ -89,7 +89,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
@@ -125,21 +125,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
@@ -194,25 +194,30 @@ files:
 - Rakefile
 - draper.gemspec
 - lib/draper.rb
+- lib/draper/automatic_delegation.rb
 - lib/draper/collection_decorator.rb
 - lib/draper/decoratable.rb
 - lib/draper/decorated_association.rb
 - lib/draper/decorator.rb
+- lib/draper/delegation.rb
 - lib/draper/finders.rb
 - lib/draper/helper_proxy.rb
 - lib/draper/helper_support.rb
 - lib/draper/lazy_helpers.rb
 - lib/draper/railtie.rb
-- lib/draper/security.rb
-- lib/draper/tasks/tu.rake
+- lib/draper/tasks/test.rake
+- lib/draper/test/devise_helper.rb
 - lib/draper/test/minitest_integration.rb
 - lib/draper/test/rspec_integration.rb
-- lib/draper/test/test_unit_integration.rb
+- lib/draper/test_case.rb
 - lib/draper/version.rb
 - lib/draper/view_context.rb
 - lib/draper/view_helpers.rb
 - lib/generators/decorator/decorator_generator.rb
 - lib/generators/decorator/templates/decorator.rb
+- lib/generators/mini_test/decorator_generator.rb
+- lib/generators/mini_test/templates/decorator_spec.rb
+- lib/generators/mini_test/templates/decorator_test.rb
 - lib/generators/resource_override.rb
 - lib/generators/rspec/decorator_generator.rb
 - lib/generators/rspec/templates/decorator_spec.rb
@@ -224,7 +229,6 @@ files:
 - spec/draper/decorator_spec.rb
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
-- spec/draper/security_spec.rb
 - spec/draper/view_helpers_spec.rb
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
@@ -254,26 +258,26 @@ files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121019115657_create_posts.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/lib/tasks/spec.rake
+- spec/dummy/lib/tasks/test.rake
 - spec/dummy/log/.gitkeep
+- spec/dummy/mini_test/mini_test_integration_test.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/dummy/spec/decorators/post_decorator_spec.rb
+- spec/dummy/spec/decorators/rspec_integration_spec.rb
 - spec/dummy/spec/mailers/post_mailer_spec.rb
 - spec/dummy/spec/models/post_spec.rb
 - spec/dummy/spec/spec_helper.rb
 - spec/generators/decorator/decorator_generator_spec.rb
 - spec/integration/integration_spec.rb
-- spec/minitest-rails/spec_type_spec.rb
 - spec/performance/active_record.rb
 - spec/performance/benchmark.rb
 - spec/performance/decorators.rb
@@ -313,9 +317,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: draper
 rubygems_version: 1.8.23
@@ -329,7 +333,6 @@ test_files:
 - spec/draper/decorator_spec.rb
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
-- spec/draper/security_spec.rb
 - spec/draper/view_helpers_spec.rb
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
@@ -359,26 +362,26 @@ test_files:
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121019115657_create_posts.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/lib/tasks/spec.rake
+- spec/dummy/lib/tasks/test.rake
 - spec/dummy/log/.gitkeep
+- spec/dummy/mini_test/mini_test_integration_test.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/dummy/spec/decorators/post_decorator_spec.rb
+- spec/dummy/spec/decorators/rspec_integration_spec.rb
 - spec/dummy/spec/mailers/post_mailer_spec.rb
 - spec/dummy/spec/models/post_spec.rb
 - spec/dummy/spec/spec_helper.rb
 - spec/generators/decorator/decorator_generator_spec.rb
 - spec/integration/integration_spec.rb
-- spec/minitest-rails/spec_type_spec.rb
 - spec/performance/active_record.rb
 - spec/performance/benchmark.rb
 - spec/performance/decorators.rb