draper 2.1.0 → 3.0.0

data/spec/draper/view_context_spec.rb

@@ -7,7 +7,7 @@ module Draper
       let(:controller) { Class.new(base) { include ViewContext } }
 
       it "saves the superclass's view context" do
-        ViewContext.should_receive(:current=).with(:controller_view_context)
+        expect(ViewContext).to receive(:current=).with(:controller_view_context)
         controller.new.view_context
       end
 
@@ -18,7 +18,7 @@ module Draper
 
     describe ".controller" do
       it "returns the stored controller from RequestStore" do
-        RequestStore.stub store: {current_controller: :stored_controller}
+        allow(RequestStore).to receive_messages store: {current_controller: :stored_controller}
 
         expect(ViewContext.controller).to be :stored_controller
       end
@@ -27,34 +27,62 @@ module Draper
     describe ".controller=" do
       it "stores a controller in RequestStore" do
         store = {}
-        RequestStore.stub store: store
+        allow(RequestStore).to receive_messages store: store
 
         ViewContext.controller = :stored_controller
         expect(store[:current_controller]).to be :stored_controller
       end
+
+      it "cleans context when controller changes" do
+        store = {
+          current_controller: :stored_controller,
+          current_view_context: :stored_view_context
+        }
+
+        allow(RequestStore).to receive_messages store: store
+
+        ViewContext.controller = :other_stored_controller
+
+        expect(store).to include(current_controller: :other_stored_controller)
+        expect(store).not_to include(:current_view_context)
+      end
+
+      it "doesn't clean context when controller is the same" do
+        store = {
+          current_controller: :stored_controller,
+          current_view_context: :stored_view_context
+        }
+
+        allow(RequestStore).to receive_messages store: store
+
+        ViewContext.controller = :stored_controller
+
+        expect(store).to include(current_controller: :stored_controller)
+        expect(store).to include(current_view_context: :stored_view_context)
+      end
     end
 
     describe ".current" do
       it "returns the stored view context from RequestStore" do
-        RequestStore.stub store: {current_view_context: :stored_view_context}
+        allow(RequestStore).to receive_messages store: {current_view_context: :stored_view_context}
 
         expect(ViewContext.current).to be :stored_view_context
       end
 
       context "when no view context is stored" do
         it "builds a view context" do
-          RequestStore.stub store: {}
-          ViewContext.stub build_strategy: ->{ :new_view_context }
-          HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+          allow(RequestStore).to receive_messages store: {}
+          allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+          allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
           expect(ViewContext.current).to be :new_helper_proxy
         end
 
         it "stores the built view context" do
           store = {}
-          RequestStore.stub store: store
-          ViewContext.stub build_strategy: ->{ :new_view_context }
-          HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+          allow(RequestStore).to receive_messages store: store
+          allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+          allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
           ViewContext.current
           expect(store[:current_view_context]).to be :new_helper_proxy
@@ -65,8 +93,8 @@ module Draper
     describe ".current=" do
       it "stores a helper proxy for the view context in RequestStore" do
         store = {}
-        RequestStore.stub store: store
-        HelperProxy.stub(:new).with(:stored_view_context).and_return(:stored_helper_proxy)
+        allow(RequestStore).to receive_messages store: store
+        allow(HelperProxy).to receive(:new).with(:stored_view_context).and_return(:stored_helper_proxy)
 
         ViewContext.current = :stored_view_context
         expect(store[:current_view_context]).to be :stored_helper_proxy
@@ -76,7 +104,7 @@ module Draper
     describe ".clear!" do
       it "clears the stored controller and view controller" do
         store = {current_controller: :stored_controller, current_view_context: :stored_view_context}
-        RequestStore.stub store: store
+        allow(RequestStore).to receive_messages store: store
 
         ViewContext.clear!
         expect(store).not_to have_key :current_controller
@@ -86,7 +114,7 @@ module Draper
 
     describe ".build" do
       it "returns a new view context using the build strategy" do
-        ViewContext.stub build_strategy: ->{ :new_view_context }
+        allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
 
         expect(ViewContext.build).to be :new_view_context
       end
@@ -94,17 +122,17 @@ module Draper
 
     describe ".build!" do
       it "returns a helper proxy for the new view context" do
-        ViewContext.stub build_strategy: ->{ :new_view_context }
-        HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+        allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+        allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
         expect(ViewContext.build!).to be :new_helper_proxy
       end
 
       it "stores the helper proxy" do
         store = {}
-        RequestStore.stub store: store
-        ViewContext.stub build_strategy: ->{ :new_view_context }
-        HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+        allow(RequestStore).to receive_messages store: store
+        allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+        allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
         ViewContext.build!
         expect(store[:current_view_context]).to be :new_helper_proxy
@@ -131,7 +159,7 @@ module Draper
         end
 
         it "passes a block to the strategy" do
-          ViewContext::BuildStrategy::Fast.stub(:new) { |&block| block.call }
+          allow(ViewContext::BuildStrategy::Fast).to receive(:new) { |&block| block.call }
 
           expect(ViewContext.test_strategy(:fast){:passed}).to be :passed
         end
@@ -144,7 +172,7 @@ module Draper
         end
 
         it "passes a block to the strategy" do
-          ViewContext::BuildStrategy::Full.stub(:new) { |&block| block.call }
+          allow(ViewContext::BuildStrategy::Full).to receive(:new) { |&block| block.call }
 
           expect(ViewContext.test_strategy(:full){:passed}).to be :passed
         end

data/spec/dummy/app/controllers/base_controller.rb

@@ -0,0 +1,4 @@
+class BaseController < ActionController::Base
+  include LocalizedUrls
+  protect_from_forgery
+end

data/spec/dummy/app/controllers/posts_controller.rb

@@ -1,4 +1,4 @@
-class PostsController < ApplicationController
+class PostsController < BaseController
   decorates_assigned :post
 
   def show
@@ -8,7 +8,7 @@ class PostsController < ApplicationController
   def mail
     post = Post.find(params[:id])
     email = PostMailer.decorated_email(post).deliver
-    render text: email.body
+    render html: email.body.to_s.html_safe
   end
 
   private

data/spec/dummy/app/views/posts/_post.html.erb

@@ -20,14 +20,16 @@
   <dt>Helpers from the controller:</dt>
   <dd id="goodnight_moon"><%= post.goodnight_moon %></dd>
 
-  <dt>Path with decorator:</dt>
-  <dd id="path_with_decorator"><%= post_path(post) %></dd>
+  <% unless defined? mailer %>
+    <dt>Path with decorator:</dt>
+    <dd id="path_with_decorator"><%= post_url(post) %></dd>
 
-  <dt>Path with model:</dt>
-  <dd id="path_with_model"><%= post.path_with_model %></dd>
+    <dt>Path with model:</dt>
+    <dd id="path_with_model"><%= post.path_with_model %></dd>
 
-  <dt>Path with id:</dt>
-  <dd id="path_with_id"><%= post.path_with_id %></dd>
+    <dt>Path with id:</dt>
+    <dd id="path_with_id"><%= post.path_with_id %></dd>
+  <% end %>
 
   <dt>URL with decorator:</dt>
   <dd id="url_with_decorator"><%= post_url(post) %></dd>

data/spec/dummy/config/boot.rb

@@ -2,4 +2,4 @@ require 'rubygems'
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

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

@@ -0,0 +1,3 @@
+Draper.configure do |config|
+  config.default_controller = BaseController
+end

data/spec/dummy/config/mongoid.yml

@@ -1,54 +1,117 @@
 development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
     default:
       # Defines the name of the default database that Mongoid can connect to.
       # (required).
       database: dummy_development
-      # Provides the hosts the default session can connect to. Must be an array
+      # Provides the hosts the default client can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:
         - localhost:27017
       options:
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
-
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :eventual
-
-        # How many times Moped should attempt to retry an operation after
-        # failure. (default: 30)
-        # max_retries: 30
-
-        # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # retry_interval: 1
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+        #   tag_sets:
+        #     - use: web
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
+        # on 2.4 and 2.6 is :plain)
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against. (default: admin)
+        # auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 5)
+        # local_threshold: 5
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
 
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 5)
+        # connect_timeout: 5
 
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether or not to do peer certification validation. (default: true)
+        # ssl_verify: true
+
+        # The file containing a set of concatenated certification authority certifications
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
+
+
+  # Configure Mongoid specific options. (optional)
+  options:
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 
-    # Include the _type field in serializaion. (default: false)
+    # Include the _type field in serialization. (default: false)
     # include_type_for_serialization: false
 
     # Preload all models in development, needed when models use
     # inheritance. (default: false)
     # preload_models: false
 
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
     # Raise an error when performing a #find and the document is not found.
     # (default: true)
     # raise_not_found_error: true
@@ -57,23 +120,23 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
-    # User Active Support's time zone in conversions. (default: true)
+    # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 
     # Ensure all times are UTC in the app side. (default: false)
     # use_utc: false
+
+    # Set the Mongoid and Ruby driver log levels when not in a Rails
+    # environment. The Mongoid logger will be set to the Rails logger
+    # otherwise.(default: :info)
+    # log_level: :info
 test:
-  sessions:
+  clients:
     default:
       database: dummy_test
       hosts:
         - localhost:27017
       options:
-        # In the test environment we lower the retries and retry interval to
-        # low amounts for fast failures.
-        max_retries: 1
-        retry_interval: 0
+        read:
+          mode: :primary
+        max_pool_size: 1

data/spec/dummy/db/schema.rb

@@ -11,11 +11,11 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121019115657) do
+ActiveRecord::Schema.define(version: 20121019115657) do
 
-  create_table "posts", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "posts", force: true do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/spec/dummy/fast_spec/post_decorator_spec.rb

@@ -32,6 +32,6 @@ describe PostDecorator do
   end
 
   it "can't be passed implicitly to url_for" do
-    expect{decorator.link}.to raise_error
+    expect{decorator.link}.to raise_error ArgumentError
   end
 end

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

@@ -13,4 +13,4 @@ RSpec::Core::RakeTask.new :fast_spec do |t|
   t.pattern = "fast_spec/**/*_spec.rb"
 end
 
-task :default => [:test, :spec, :fast_spec]
+task default: [:test, :spec, :fast_spec]

data/spec/dummy/spec/decorators/active_model_serializers_spec.rb

@@ -2,15 +2,11 @@ require 'spec_helper'
 
 describe Draper::CollectionDecorator do
   describe "#active_model_serializer" do
-    it "returns ActiveModel::ArraySerializer" do
-      collection_decorator = Draper::CollectionDecorator.new([])
-      if defined?(ActiveModel::ArraySerializerSupport)
-        collection_serializer = collection_decorator.active_model_serializer
-      else
-        collection_serializer = ActiveModel::Serializer.serializer_for(collection_decorator)
-      end
+    it "returns ActiveModel::Serializer::CollectionSerializer" do
+      collection_decorator  = Draper::CollectionDecorator.new([])
+      collection_serializer = ActiveModel::Serializer.serializer_for(collection_decorator)
 
-      expect(collection_serializer).to be ActiveModel::ArraySerializer
+      expect(collection_serializer).to be ActiveModel::Serializer::CollectionSerializer
     end
   end
 end