draper 0.18.0 → 1.0.0

data/spec/spec_helper.rb

@@ -3,52 +3,27 @@ require 'ammeter/init'
 require 'rails'
 
 require 'action_view'
-Bundler.require
-
-require './spec/support/samples/active_record'
-require './spec/support/samples/decorator'
-require './spec/support/samples/decorator_with_allows'
-require './spec/support/samples/decorator_with_multiple_allows'
-require './spec/support/samples/decorator_with_application_helper'
-require './spec/support/samples/decorator_with_denies'
-require './spec/support/samples/decorator_with_denies_all'
-require './spec/support/samples/decorator_with_special_methods'
-require './spec/support/samples/enumerable_proxy'
-require './spec/support/samples/namespaced_product'
-require './spec/support/samples/namespaced_product_decorator'
-require './spec/support/samples/non_active_model_product'
-require './spec/support/samples/product'
-require './spec/support/samples/product_decorator'
-require './spec/support/samples/products_decorator'
-require './spec/support/samples/sequel_product'
-require './spec/support/samples/specific_product_decorator'
-require './spec/support/samples/some_thing'
-require './spec/support/samples/some_thing_decorator'
-require './spec/support/samples/widget'
-require './spec/support/samples/widget_decorator'
-
 require 'action_controller'
 require 'action_controller/test_case'
 
-module ActionController
-  class Base
-    Draper::System.setup_action_controller(self)
-  end
-end
-
-module ActiveRecord
-  class Relation
-  end
-end
-
-class ApplicationController < ActionController::Base
-  def hello_world
-    "Hello, World!"
-  end
-  helper_method :hello_world
-end
-
+Bundler.require
 
-class << Rails
-  undef application # Avoid silly Rails bug: https://github.com/rails/rails/pull/6429
-end
+require 'support/active_model'
+require 'support/active_record'
+require 'support/action_controller'
+
+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 '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/action_controller.rb

@@ -0,0 +1,12 @@
+module ActionController
+  class Base
+    Draper.setup_action_controller(self)
+  end
+end
+
+class ApplicationController < ActionController::Base
+  def hello_world
+    "Hello, World!"
+  end
+  helper_method :hello_world
+end

data/spec/support/active_model.rb

@@ -0,0 +1,7 @@
+module ActiveModel
+  module Serialization
+    def serializable_hash
+      {overridable: send(:overridable)}
+    end
+  end
+end

data/spec/support/active_record.rb

@@ -0,0 +1,9 @@
+module ActiveRecord
+  class Base
+  end
+end
+
+module ActiveRecord
+  class Relation
+  end
+end

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

@@ -1,4 +1,4 @@
-class DecoratorWithApplicationHelper < Draper::Base
+class DecoratorWithApplicationHelper < Draper::Decorator
   def uses_hello_world
     h.hello_world
   end

data/spec/support/decorators/namespaced_product_decorator.rb

@@ -0,0 +1,5 @@
+module Namespace
+  class ProductDecorator < Draper::Decorator
+    decorates_finders
+  end
+end

data/spec/support/decorators/non_active_model_product_decorator.rb

@@ -0,0 +1,2 @@
+class NonActiveModelProductDecorator
+end

data/spec/support/decorators/product_decorator.rb

@@ -0,0 +1,23 @@
+class ProductDecorator < Draper::Decorator
+  decorates_finders
+
+  def awesome_title
+    "Awesome Title"
+  end
+
+  def overridable
+    :overridden
+  end
+
+  def self.overridable
+    :overridden
+  end
+
+  def self.my_class_method
+  end
+
+  private
+
+  def awesome_private_title
+  end
+end

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,85 @@
+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)
+        File.delete("tmp/pids/server.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,16 @@ class Product < ActiveRecord::Base
     Product.new
   end
 
+  def overridable
+    :overridable
+  end
+
+  def self.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