fine_print 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcbddbda8f319b3de8575f7606cdea1e33ac4f61
-  data.tar.gz: 22e477666c2247c00cd047b2bfbc00e5e7a0af2b
+  metadata.gz: bb595ef06e5a4534032ca5b53a451bf643d55057
+  data.tar.gz: 448f987e0838f6db8ee5ceca70b94b292d2583d1
 SHA512:
-  metadata.gz: 2d172b728f2da71023fcfb7d2baa41cc4eb9df1300b6cda372703c45e173d45c0b32289d7a380ec39edec6e4eaf01523c0c2103e62d5961f33786fd87832bbb5
-  data.tar.gz: 8bf001080b71e4b603613207519360ed3245fd395f9371ad84e3eadcb4d0a7b8cfb64c11c0674863c5f72600c7c0d173fbae5c50f68904a1cb1d57db17a543cb
+  metadata.gz: 0a4d7b6f294854009c55012c8045fbb1f48ae9809cd1c5f6e3acb106f8d268de6473aa1aa6755598ff5003f4b56ed3b7fe358f3933e2c3bd25b82b02656b6e1b
+  data.tar.gz: b0ee996920455b6354e66eafb088fc34ab10ffbbe282a6323a4b02644594b5ec652534e32168f4e1eeb21bc7c80f666b78e72c3674a69cf3dddb70b50725618b

data/app/controllers/fine_print/application_controller.rb

@@ -1,3 +1,5 @@
+require 'responders'
+
 module FinePrint
   class ApplicationController < ActionController::Base
     respond_to :html
@@ -15,7 +17,7 @@ module FinePrint
     end
 
     def can_manage
-      with_interceptor { instance_exec @user, &FinePrint.can_manage_proc }
+      instance_exec @user, &FinePrint.can_manage_proc
     end
   end
 end

data/app/controllers/fine_print/signatures_controller.rb

@@ -2,8 +2,6 @@ module FinePrint
   class SignaturesController < FinePrint::ApplicationController
     include FinePrint::ApplicationHelper
 
-    acts_as_interceptor :override_url_options => true
-
     skip_before_filter :can_manage, :only => [:new, :create]
     before_filter :can_sign, :only => [:new, :create]
     before_filter :get_contract, :only => [:index, :new, :create]
@@ -29,7 +27,7 @@ module FinePrint
       @signature.contract = @contract
   
       if @signature.save
-        redirect_back
+        fine_print_return
       else
         render :action => 'new', :alert => merge_errors_for(@signature)
       end
@@ -46,7 +44,7 @@ module FinePrint
     protected
 
     def can_sign
-      with_interceptor { instance_exec @user, &FinePrint.can_sign_proc }
+      instance_exec @user, &FinePrint.can_sign_proc
     end
 
     def get_contract

data/config/initializers/fine_print.rb

@@ -45,9 +45,13 @@ FinePrint.configure do |config|
   # The `contract_ids` variable contains the contract ids that need to be signed.
   # The default redirects users to FinePrint's contract signing views.
   # The `fine_print_return` method can be used to return from a redirect made here.
-  # Default: lambda { |user, contract_ids| with_interceptor { redirect_to(
-  #   fine_print.new_contract_signature_path(:contract_id => contract_ids.first)) } }
+  # Default: lambda { |user, contract_ids|
+  #            redirect_to(fine_print.new_contract_signature_path(
+  #              :contract_id => contract_ids.first
+  #            ))
+  #          }
   config.must_sign_proc = lambda { |user, contract_ids| redirect_to(
-    fine_print.new_contract_signature_path(:contract_id => contract_ids.first)) }
+    fine_print.new_contract_signature_path(:contract_id => contract_ids.first)
+  ) }
 
 end

data/lib/fine_print/controller_includes.rb

@@ -13,14 +13,16 @@ module FinePrint
       blk = options[:must_sign_proc] || FinePrint.must_sign_proc
 
       # Use action_interceptor to save the current url
-      with_interceptor { instance_exec user, contract_ids, &blk }
+      store_url key: :fine_print_return_to
+
+      instance_exec user, contract_ids, &blk
     end
 
     # Accepts no arguments
     # Redirects the user back to the url they were at before
     # one of FinePrint's procs redirected them
     def fine_print_return
-      redirect_back
+      redirect_back key: :fine_print_return_to
     end
 
     protected

data/lib/fine_print/version.rb

@@ -1,3 +1,3 @@
 module FinePrint
-  VERSION = '2.2.1'
+  VERSION = '2.3.0'
 end

data/spec/controllers/contracts_controller_spec.rb

@@ -11,32 +11,32 @@ module FinePrint
     let!(:contract) { FactoryGirl.create(:fine_print_contract) }
 
     it "won't get index unless authorized" do
-      get :index, :use_route => :fine_print
+      get :index
       expect(response.status).to eq 403
       
       sign_in @user
-      get :index, :use_route => :fine_print
+      get :index
       expect(response.status).to eq 403
     end
     
     it 'must get index if authorized' do
       sign_in @admin
-      get :index, :use_route => :fine_print
+      get :index
       expect(response.status).to eq 200
     end
     
     it "won't get new unless authorized" do
-      get :new, :use_route => :fine_print
+      get :new
       expect(response.status).to eq 403
       
       sign_in @user
-      get :new, :use_route => :fine_print
+      get :new
       expect(response.status).to eq 403
     end
     
     it 'must get new if authorized' do
       sign_in @admin
-      get :new, :use_route => :fine_print
+      get :new
       expect(response.status).to eq 200
     end
     
@@ -46,12 +46,12 @@ module FinePrint
       attributes[:title] = 'Some title'
       attributes[:content] = 'Some content'
 
-      post :create, :contract => :attributes, :use_route => :fine_print
+      post :create, :contract => :attributes
       expect(response.status).to eq 403
       expect(assigns(:contract)).to be_nil
       
       sign_in @user
-      post :create, :contract => :attributes, :use_route => :fine_print
+      post :create, :contract => :attributes
       expect(response.status).to eq 403
       expect(assigns(:contract)).to be_nil
     end
@@ -63,7 +63,7 @@ module FinePrint
       attributes[:title] = 'Some title'
       attributes[:content] = 'Some content'
       
-      post :create, :contract => attributes, :use_route => :fine_print
+      post :create, :contract => attributes
       expect(response).to redirect_to assigns(:contract)
       expect(assigns(:contract).errors).to be_empty
       expect(assigns(:contract).name).to eq 'some_name'
@@ -72,17 +72,17 @@ module FinePrint
     end
     
     it "won't edit unless authorized" do
-      get :edit, :id => contract.id, :use_route => :fine_print
+      get :edit, :id => contract.id
       expect(response.status).to eq 403
       
       sign_in @user
-      get :edit, :id => contract.id, :use_route => :fine_print
+      get :edit, :id => contract.id
       expect(response.status).to eq 403
     end
     
     it 'must edit if authorized' do
       sign_in @admin
-      get :edit, :id => contract.id, :use_route => :fine_print
+      get :edit, :id => contract.id
       expect(response.status).to eq 200
     end
     
@@ -95,7 +95,7 @@ module FinePrint
       title = contract.title
       content = contract.content
       
-      put :update, :id => contract.id, :contract => attributes, :use_route => :fine_print
+      put :update, :id => contract.id, :contract => attributes
       expect(response.status).to eq 403
       contract.reload
       expect(contract.name).to eq name
@@ -103,7 +103,7 @@ module FinePrint
       expect(contract.content).to eq content
       
       sign_in @user
-      put :update, :id => contract.id, :contract => attributes, :use_route => :fine_print
+      put :update, :id => contract.id, :contract => attributes
       expect(response.status).to eq 403
       contract.reload
       expect(contract.name).to eq name
@@ -118,7 +118,7 @@ module FinePrint
       attributes[:content] = 'Another content'
 
       sign_in @admin
-      put :update, :id => contract.id, :contract => attributes, :use_route => :fine_print
+      put :update, :id => contract.id, :contract => attributes
       expect(response).to redirect_to contract
       contract.reload
       expect(contract.errors).to be_empty
@@ -128,32 +128,32 @@ module FinePrint
     end
 
     it "won't destroy unless authorized" do
-      delete :destroy, :id => contract.id, :use_route => :fine_print
+      delete :destroy, :id => contract.id
       expect(response.status).to eq 403
       expect(Contract.find(contract.id)).to eq contract
       
       sign_in @user
-      delete :destroy, :id => contract.id, :use_route => :fine_print
+      delete :destroy, :id => contract.id
       expect(response.status).to eq 403
       expect(Contract.find(contract.id)).to eq contract
     end
     
     it 'must destroy if authorized' do
       sign_in @admin
-      delete :destroy, :id => contract.id, :use_route => :fine_print
+      delete :destroy, :id => contract.id
       expect(response).to redirect_to contracts_path
       expect(Contract.find_by_id(contract.id)).to be_nil
     end
 
     it "won't publish unless authorized" do
       expect(contract.is_published?).to eq false
-      put :publish, :id => contract.id, :use_route => :fine_print
+      put :publish, :id => contract.id
       expect(response.status).to eq 403
       contract.reload
       expect(contract.is_published?).to eq false
       
       sign_in @user
-      put :publish, :id => contract.id, :use_route => :fine_print
+      put :publish, :id => contract.id
       expect(response.status).to eq 403
       contract.reload
       expect(contract.is_published?).to eq false
@@ -163,7 +163,7 @@ module FinePrint
       expect(contract.is_published?).to eq false
       sign_in @admin
 
-      put :publish, :id => contract.id, :use_route => :fine_print
+      put :publish, :id => contract.id
       expect(response).to redirect_to contracts_path
       contract.reload
       expect(contract.is_published?).to eq true
@@ -172,13 +172,13 @@ module FinePrint
     it "won't unpublish unless authorized" do
       contract.publish
       expect(contract.is_published?).to eq true
-      put :unpublish, :id => contract.id, :use_route => :fine_print
+      put :unpublish, :id => contract.id
       expect(response.status).to eq 403
       contract.reload
       expect(contract.is_published?).to eq true
       
       sign_in @user
-      put :unpublish, :id => contract.id, :use_route => :fine_print
+      put :unpublish, :id => contract.id
       expect(response.status).to eq 403
       contract.reload
       expect(contract.is_published?).to eq true
@@ -189,7 +189,7 @@ module FinePrint
       expect(contract.is_published?).to eq true
 
       sign_in @admin
-      put :unpublish, :id => contract.id, :use_route => :fine_print
+      put :unpublish, :id => contract.id
       expect(response).to redirect_to contracts_path
       contract.reload
       expect(contract.is_published?).to eq false
@@ -199,12 +199,12 @@ module FinePrint
       contract.publish
       expect(contract.is_published?).to eq true
       
-      post :new_version, :id => contract.id, :use_route => :fine_print
+      post :new_version, :id => contract.id
       expect(response.status).to eq 403
       expect(assigns(:contract)).to be_nil
       
       sign_in @user
-      post :new_version, :id => contract.id, :use_route => :fine_print
+      post :new_version, :id => contract.id
       expect(response.status).to eq 403
       expect(assigns(:contract)).to be_nil
     end
@@ -214,7 +214,7 @@ module FinePrint
       expect(contract.is_published?).to eq true
 
       sign_in @admin
-      post :new_version, :id => contract.id, :use_route => :fine_print
+      post :new_version, :id => contract.id
       expect(response.status).to eq 200
       expect(assigns(:contract)).not_to be_nil
     end

data/spec/controllers/home_controller_spec.rb

@@ -9,18 +9,18 @@ module FinePrint
     end
 
     it "won't get index unless authorized" do
-      get :index, :use_route => :fine_print
+      get :index
       expect(response.status).to eq 403
       
       sign_in @user
-      get :index, :use_route => :fine_print
+      get :index
       expect(response.status).to eq 403
     end
     
     it 'must get index if authorized' do
       sign_in @user
       @user.is_admin = true
-      get :index, :use_route => :fine_print
+      get :index
       expect(response).to redirect_to contracts_path
     end
   end

data/spec/controllers/signatures_controller_spec.rb

@@ -11,61 +11,56 @@ module FinePrint
     let!(:signature) { FactoryGirl.create(:fine_print_signature) }
 
     it "won't get index unless authorized" do
-      get :index, :contract_id => signature.contract.id, :use_route => :fine_print
+      get :index, :contract_id => signature.contract.id
       expect(response.status).to eq 403
       
       sign_in @user
-      get :index, :contract_id => signature.contract.id, :use_route => :fine_print
+      get :index, :contract_id => signature.contract.id
       expect(response.status).to eq 403
     end
     
     it 'must get index if authorized' do
       sign_in @admin
-      get :index, :contract_id => signature.contract.id,
-                  :use_route => :fine_print
+      get :index, :contract_id => signature.contract.id
       expect(response.status).to eq 200
     end
 
     it "won't get new unless signed in" do
-      get :new, :contract_id => signature.contract.id,
-                :use_route => :fine_print
+      get :new, :contract_id => signature.contract.id
       expect(response.status).to eq 401
     end
     
     it 'must get new if signed in' do
       sign_in @user
-      get :new, :contract_id => signature.contract.id,
-                :use_route => :fine_print
+      get :new, :contract_id => signature.contract.id
       expect(response.status).to eq 200
     end
 
     it "won't create unless signed in" do
-      post :create, :contract_id => signature.contract.id,
-                    :use_route => :fine_print
+      post :create, :contract_id => signature.contract.id
       expect(response.status).to eq 401
     end
     
     it 'must create if signed in' do
       sign_in @user
-      get :new, :contract_id => signature.contract.id,
-                :use_route => :fine_print
+      get :new, :contract_id => signature.contract.id
       expect(response.status).to eq 200
     end
 
     it "won't destroy unless authorized" do
-      delete :destroy, :id => signature.id, :use_route => :fine_print
+      delete :destroy, :id => signature.id
       expect(response.status).to eq 403
       expect(Signature.find(signature.id)).to eq signature
       
       sign_in @user
-      delete :destroy, :id => signature.id, :use_route => :fine_print
+      delete :destroy, :id => signature.id
       expect(response.status).to eq 403
       expect(Signature.find(signature.id)).to eq signature
     end
     
     it 'must destroy if authorized' do
       sign_in @admin
-      delete :destroy, :id => signature.id, :use_route => :fine_print
+      delete :destroy, :id => signature.id
       expect(response).to redirect_to contract_signatures_path(signature.contract)
       expect(Signature.find_by_id(signature.id)).to be_nil
     end

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

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

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

@@ -13,7 +13,7 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.