draper 0.18.0 → 1.0.0.beta1

data/spec/support/{samples → decorators}/products_decorator.rb

@@ -1,4 +1,4 @@
-class ProductsDecorator < Draper::DecoratedEnumerableProxy
+class ProductsDecorator < Draper::CollectionDecorator
 
   def link_to
     h.link_to 'sample', "#"

data/spec/support/decorators/some_thing_decorator.rb

@@ -0,0 +1,2 @@
+class SomeThingDecorator < Draper::Decorator
+end

data/spec/support/{samples → decorators}/specific_product_decorator.rb

@@ -1,4 +1,2 @@
-require './spec/support/samples/product_decorator'
-
 class SpecificProductDecorator < ProductDecorator
 end

data/spec/support/dummy_app.rb

@@ -0,0 +1,84 @@
+require 'socket'
+require 'net/http'
+
+# Adapted from code by Jon Leighton
+# https://github.com/jonleighton/focused_controller/blob/ec7ccf1/test/acceptance/app_test.rb
+
+class DummyApp
+
+  def initialize(environment)
+    raise ArgumentError, "Environment must be development or production" unless ["development", "production"].include?(environment.to_s)
+    @environment = environment
+  end
+
+  attr_reader :environment
+
+  def url
+    "http://#{localhost}:#{port}"
+  end
+
+  def get(path)
+    Net::HTTP.get(URI(url + path))
+  end
+
+  def within_app(&block)
+    Dir.chdir(root, &block)
+  end
+
+  def start_server
+    within_app do
+      IO.popen("bundle exec rails s -e #{@environment} -p #{port} 2>&1") do |out|
+        start   = Time.now
+        started = false
+        output  = ""
+        timeout = 60.0
+
+        while !started && !out.eof? && Time.now - start <= timeout
+          output << read_output(out)
+          sleep 0.1
+
+          begin
+            TCPSocket.new(localhost, port)
+          rescue Errno::ECONNREFUSED
+          else
+            started = true
+          end
+        end
+
+        raise "Server failed to start:\n#{output}" unless started
+
+        yield
+
+        Process.kill('KILL', out.pid)
+      end
+    end
+  end
+
+  private
+
+  def root
+    File.expand_path('../../dummy', __FILE__)
+  end
+
+  def localhost
+    '127.0.0.1'
+  end
+
+  def port
+    @port ||= begin
+      server = TCPServer.new(localhost, 0)
+      server.addr[1]
+    ensure
+      server.close if server
+    end
+  end
+
+  def read_output(stream)
+    read = IO.select([stream], [], [stream], 0.1)
+    output = ""
+    loop { output << stream.read_nonblock(1024) } if read
+    output
+  rescue Errno::EAGAIN, Errno::EWOULDBLOCK, EOFError
+    output
+  end
+end

data/spec/support/matchers/have_text.rb

@@ -0,0 +1,50 @@
+require 'capybara'
+
+module HaveTextMatcher
+  def have_text(text)
+    HaveText.new(text)
+  end
+
+  class HaveText
+    def initialize(text)
+      @text = text
+    end
+
+    def in(css)
+      @css = css
+      self
+    end
+
+    def matches?(subject)
+      @subject = Capybara.string(subject)
+
+      @subject.has_css?(@css || "*", text: @text)
+    end
+
+    def failure_message_for_should
+      "expected to find #{@text.inspect} #{within}"
+    end
+
+    def failure_message_for_should_not
+      "expected not to find #{@text.inspect} #{within}"
+    end
+
+    private
+
+    def within
+      if @css && @subject.has_css?(@css)
+        "within\n#{@subject.find(@css).native}"
+      else
+        "#{inside} within\n#{@subject.native}"
+      end
+    end
+
+    def inside
+      @css ? "inside #{@css.inspect}" : "anywhere"
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include HaveTextMatcher
+end

data/spec/support/{samples → models}/namespaced_product.rb

@@ -1,8 +1,6 @@
-require './spec/support/samples/product'
-
 module Namespace
   class Product < ActiveRecord::Base
-    include Draper::ModelSupport
+    include Draper::Decoratable
 
     def self.first
       @@first ||= Namespace::Product.new

data/spec/support/{samples → models}/non_active_model_product.rb

@@ -1,2 +1,3 @@
 class NonActiveModelProduct
+  include Draper::Decoratable
 end

data/spec/support/{samples → models}/product.rb

@@ -1,5 +1,8 @@
 class Product < ActiveRecord::Base
-  include Draper::ModelSupport
+  include Draper::Decoratable
+  include ActiveModel::Serialization
+
+  delegate :delegated_method, to: :thing
 
   def self.find_by_name(name)
     @@dummy ||= Product.new
@@ -22,7 +25,7 @@ class Product < ActiveRecord::Base
   end
 
   def self.model_name
-    "Product"
+    name
   end
 
   def self.find(id)
@@ -77,4 +80,12 @@ class Product < ActiveRecord::Base
     Product.new
   end
 
+  def overridable
+    :overridable
+  end
+
+  private
+
+  def private_title
+  end
 end

data/spec/support/models/some_thing.rb

@@ -0,0 +1,5 @@
+class SomeThing < Product
+  def delegated_method
+    'Yay, delegation'
+  end
+end

data/spec/support/models/uninferrable_decorator_model.rb

@@ -0,0 +1,3 @@
+class UninferrableDecoratorModel
+  include Draper::Decoratable
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 0.18.0
-  prerelease: 
+  version: 1.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Jeff Casimir
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  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'
 description: Draper implements a decorator or presenter pattern for Rails applications.
 email:
 - jeff@casimircreative.com
@@ -143,19 +159,23 @@ files:
 - Readme.markdown
 - draper.gemspec
 - lib/draper.rb
-- lib/draper/active_model_support.rb
-- lib/draper/base.rb
-- lib/draper/decorated_enumerable_proxy.rb
+- lib/draper/collection_decorator.rb
+- lib/draper/decoratable.rb
+- lib/draper/decorated_association.rb
+- lib/draper/decorator.rb
+- lib/draper/finders.rb
+- lib/draper/helper_proxy.rb
 - lib/draper/helper_support.rb
 - lib/draper/lazy_helpers.rb
-- lib/draper/model_support.rb
 - lib/draper/railtie.rb
-- lib/draper/rspec_integration.rb
-- lib/draper/system.rb
+- lib/draper/security.rb
+- lib/draper/tasks/tu.rake
 - lib/draper/test/minitest_integration.rb
 - lib/draper/test/rspec_integration.rb
+- lib/draper/test/test_unit_integration.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/resource_override.rb
@@ -163,38 +183,86 @@ files:
 - lib/generators/rspec/templates/decorator_spec.rb
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
-- performance/active_record.rb
-- performance/bechmark.rb
-- performance/decorators.rb
-- performance/models.rb
-- spec/draper/base_spec.rb
-- spec/draper/decorated_enumerable_proxy_spec.rb
-- spec/draper/model_support_spec.rb
+- spec/draper/collection_decorator_spec.rb
+- spec/draper/decoratable_spec.rb
+- spec/draper/decorated_association_spec.rb
+- 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
+- spec/dummy/Rakefile
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/localized_urls.rb
+- spec/dummy/app/controllers/posts_controller.rb
+- spec/dummy/app/decorators/post_decorator.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/mailers/post_mailer.rb
+- spec/dummy/app/models/post.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/post_mailer/decorated_email.html.erb
+- spec/dummy/app/views/posts/_post.html.erb
+- spec/dummy/app/views/posts/show.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- 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/log/.gitkeep
+- 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/mailers/post_mailer_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
+- spec/performance/models.rb
 - spec/spec_helper.rb
-- spec/support/samples/active_record.rb
-- spec/support/samples/decorator.rb
-- spec/support/samples/decorator_with_allows.rb
-- spec/support/samples/decorator_with_application_helper.rb
-- spec/support/samples/decorator_with_denies.rb
-- spec/support/samples/decorator_with_denies_all.rb
-- spec/support/samples/decorator_with_multiple_allows.rb
-- spec/support/samples/decorator_with_special_methods.rb
-- spec/support/samples/enumerable_proxy.rb
-- spec/support/samples/namespaced_product.rb
-- spec/support/samples/namespaced_product_decorator.rb
-- spec/support/samples/non_active_model_product.rb
-- spec/support/samples/product.rb
-- spec/support/samples/product_decorator.rb
-- spec/support/samples/products_decorator.rb
-- spec/support/samples/sequel_product.rb
-- spec/support/samples/some_thing.rb
-- spec/support/samples/some_thing_decorator.rb
-- spec/support/samples/specific_product_decorator.rb
-- spec/support/samples/widget.rb
-- spec/support/samples/widget_decorator.rb
-homepage: http://github.com/jcasimir/draper
+- spec/support/action_controller.rb
+- spec/support/active_model.rb
+- spec/support/active_record.rb
+- spec/support/decorators/decorator_with_application_helper.rb
+- spec/support/decorators/namespaced_product_decorator.rb
+- spec/support/decorators/non_active_model_product_decorator.rb
+- spec/support/decorators/product_decorator.rb
+- spec/support/decorators/products_decorator.rb
+- spec/support/decorators/some_thing_decorator.rb
+- spec/support/decorators/specific_product_decorator.rb
+- spec/support/decorators/widget_decorator.rb
+- spec/support/dummy_app.rb
+- spec/support/matchers/have_text.rb
+- spec/support/models/namespaced_product.rb
+- spec/support/models/non_active_model_product.rb
+- spec/support/models/product.rb
+- spec/support/models/some_thing.rb
+- spec/support/models/uninferrable_decorator_model.rb
+- spec/support/models/widget.rb
+homepage: http://github.com/drapergem/draper
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -208,16 +276,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3407414068195492297
+      hash: -4120022348081627788
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3407414068195492297
+      version: 1.3.1
 requirements: []
 rubyforge_project: draper
 rubygems_version: 1.8.24
@@ -225,31 +290,83 @@ signing_key:
 specification_version: 3
 summary: Decorator pattern implementation for Rails.
 test_files:
-- spec/draper/base_spec.rb
-- spec/draper/decorated_enumerable_proxy_spec.rb
-- spec/draper/model_support_spec.rb
+- spec/draper/collection_decorator_spec.rb
+- spec/draper/decoratable_spec.rb
+- spec/draper/decorated_association_spec.rb
+- 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
+- spec/dummy/Rakefile
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/localized_urls.rb
+- spec/dummy/app/controllers/posts_controller.rb
+- spec/dummy/app/decorators/post_decorator.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/application_mailer.rb
+- spec/dummy/app/mailers/post_mailer.rb
+- spec/dummy/app/models/post.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/post_mailer/decorated_email.html.erb
+- spec/dummy/app/views/posts/_post.html.erb
+- spec/dummy/app/views/posts/show.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- 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/log/.gitkeep
+- 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/mailers/post_mailer_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
+- spec/performance/models.rb
 - spec/spec_helper.rb
-- spec/support/samples/active_record.rb
-- spec/support/samples/decorator.rb
-- spec/support/samples/decorator_with_allows.rb
-- spec/support/samples/decorator_with_application_helper.rb
-- spec/support/samples/decorator_with_denies.rb
-- spec/support/samples/decorator_with_denies_all.rb
-- spec/support/samples/decorator_with_multiple_allows.rb
-- spec/support/samples/decorator_with_special_methods.rb
-- spec/support/samples/enumerable_proxy.rb
-- spec/support/samples/namespaced_product.rb
-- spec/support/samples/namespaced_product_decorator.rb
-- spec/support/samples/non_active_model_product.rb
-- spec/support/samples/product.rb
-- spec/support/samples/product_decorator.rb
-- spec/support/samples/products_decorator.rb
-- spec/support/samples/sequel_product.rb
-- spec/support/samples/some_thing.rb
-- spec/support/samples/some_thing_decorator.rb
-- spec/support/samples/specific_product_decorator.rb
-- spec/support/samples/widget.rb
-- spec/support/samples/widget_decorator.rb
+- spec/support/action_controller.rb
+- spec/support/active_model.rb
+- spec/support/active_record.rb
+- spec/support/decorators/decorator_with_application_helper.rb
+- spec/support/decorators/namespaced_product_decorator.rb
+- spec/support/decorators/non_active_model_product_decorator.rb
+- spec/support/decorators/product_decorator.rb
+- spec/support/decorators/products_decorator.rb
+- spec/support/decorators/some_thing_decorator.rb
+- spec/support/decorators/specific_product_decorator.rb
+- spec/support/decorators/widget_decorator.rb
+- spec/support/dummy_app.rb
+- spec/support/matchers/have_text.rb
+- spec/support/models/namespaced_product.rb
+- spec/support/models/non_active_model_product.rb
+- spec/support/models/product.rb
+- spec/support/models/some_thing.rb
+- spec/support/models/uninferrable_decorator_model.rb
+- spec/support/models/widget.rb
 has_rdoc: