action_interceptor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODI1YzZmYmQ1MjU4YjUwY2IwMmJkZTUyNjdiNzVmMDIxMTg4OWYzMg==
-  data.tar.gz: !binary |-
-    M2E5NTczN2RkZWNiZGQxNjgzMzhiNGZmODYyNWM0ZjAxZjBhYWI3Nw==
+SHA1:
+  metadata.gz: 91fc5da27aa7c29f7251f8e2eab3118ff37a276a
+  data.tar.gz: 2981fdd570f8d5ef6aacecfcb61152943f791d02
 SHA512:
-  metadata.gz: !binary |-
-    MzNkODA1MWQ4NTQ2YWIwOWRiZGM0NzFjZDRlMWI4YTRlYjNhZDM4Y2Y3YmJi
-    MTk0NDE0NWViZjIyN2ViYjlkYzE5NzNhZmUxNzI0NTVkN2UxOGQ4ZjM3YzBl
-    YWViMWIxZjBlZWNhMzJlZDlkMzQzOTM1ZmEzOGE3Y2FjYzg4OGE=
-  data.tar.gz: !binary |-
-    MTVhN2IyYjFkYTA2YzgwNWZkYTg4OTg5YjU2NjRhYTY1NzUwMjVkMDkyYzQ4
-    YzczMGFjNDhmNjdmYWU0MTE2NTQ3NTFjOGVlM2ZkYmFjODlhZTcxZmI3OWY1
-    MTMyOGZhMDc1ZWQ0ZDg5OGVhNDg4ZWNjYjZjODBlMDVhYzgwZWU=
+  metadata.gz: 10a8bc701038b757e287fef7c14970f5dacbdb4b836d6599dce8327e1a9a50dbb00cf241c05e92ab94000a1660753dddd7ca92a8c95af4090c30a92e437151db
+  data.tar.gz: 21f27ea5f58e8ac0d25d1de9278510b286a62bb6a60441bd82a3ea890d88eb9e3687412e8e02dd24100268865a0ae2580d422af743160c42848c3a3e581c3eed

data/lib/action_interceptor.rb

@@ -2,8 +2,8 @@ require 'action_interceptor/engine'
 
 module ActionInterceptor
   def self.intercepted_url_key(key = nil)
-    @intercepted_url_key = key unless key.blank?
-    @intercepted_url_key || :r
+    @intercepted_url_key = key.to_s unless key.blank?
+    @intercepted_url_key || 'r'
   end
 
   def self.override_url_options(bool = nil)

data/lib/action_interceptor/{controller.rb → action_controller.rb}

@@ -3,9 +3,7 @@ require 'action_interceptor/encryptor'
 require 'action_interceptor/undefined_interceptor'
 
 module ActionInterceptor
-  module Controller
-
-    include Common
+  module ActionController
 
     def self.included(base)
       base.class_attribute :is_interceptor, :use_interceptor,
@@ -49,6 +47,12 @@ module ActionInterceptor
       session.delete(ActionInterceptor.intercepted_url_key)
     end
 
+    private
+
+    def _compute_redirect_to_location(options)
+      url_for(super)
+    end
+
     module ClassMethods
 
       def interceptor(*interceptor_names, &block)
@@ -159,4 +163,4 @@ module ActionInterceptor
   end
 end
 
-ActionController::Base.send :include, ActionInterceptor::Controller
+ActionController::Base.send :include, ActionInterceptor::ActionController

data/lib/action_interceptor/{mailer.rb → action_mailer.rb}

@@ -1,5 +1,5 @@
 module ActionInterceptor
-  module Mailer
+  module ActionMailer
 
     def self.included(base)
       base.helper_method :use_interceptor, :use_interceptor=
@@ -18,4 +18,4 @@ module ActionInterceptor
   end
 end
 
-ActionMailer::Base.send :include, ActionInterceptor::Mailer
+ActionMailer::Base.send :include, ActionInterceptor::ActionMailer

data/lib/action_interceptor/common.rb

@@ -1,16 +1,23 @@
+require 'action_interceptor/action_controller'
+
 module ActionInterceptor
   module Common
 
-    def url_for(options = {})
-      url = super
+    def self.included(base)
+      base.alias_method_chain :url_for, :interceptor
+    end
+
+    def url_for_with_interceptor(options = {})
+      url = url_for_without_interceptor(options)
       return url unless use_interceptor
 
       @interceptor_url_for_hash ||= is_interceptor ? \
-                                    intercepted_url_hash : current_url_hash
+                                    intercepted_url_hash : \
+                                    current_url_hash
 
       uri = URI(url)
-      new_query = URI.decode_www_form(uri.query || '') + \
-                    @interceptor_url_for_hash.to_a
+      new_query = Hash[URI.decode_www_form(uri.query || '')]
+                    .merge(@interceptor_url_for_hash)
       uri.query = URI.encode_www_form(new_query)
       uri.to_s
     end
@@ -59,3 +66,8 @@ module ActionInterceptor
 
   end
 end
+
+ActionController::Base.send :include, ActionInterceptor::Common
+ActionView::Base.send :include, ActionInterceptor::Common
+ActionView::RoutingUrlFor.send :include, ActionInterceptor::Common \
+  if defined?(ActionView::RoutingUrlFor)

data/lib/action_interceptor/engine.rb

@@ -1,6 +1,6 @@
-require 'action_interceptor/controller'
-require 'action_interceptor/mailer'
-require 'action_interceptor/view'
+require 'action_interceptor/common'
+require 'action_interceptor/action_controller'
+require 'action_interceptor/action_mailer'
 
 module ActionInterceptor
   class Engine < ::Rails::Engine

data/lib/action_interceptor/version.rb

@@ -1,4 +1,3 @@
 module ActionInterceptor
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end
-

data/spec/lib/action_interceptor/{controller_spec.rb → action_controller_spec.rb}

@@ -1,31 +1,25 @@
 require 'spec_helper'
 
 module ActionInterceptor
-  describe Controller do
+  describe ActionController do
 
     it 'modifies ActionController::Base' do
-      expect(ActionController::Base).to respond_to(:is_interceptor)
-      expect(ActionController::Base).to respond_to(:use_interceptor)
-      expect(ActionController::Base).to respond_to(:interceptor_filters)
-      expect(ActionController::Base.is_interceptor).to eq(false)
-      expect(ActionController::Base.interceptor_filters).to be_a(Hash)
+      expect(::ActionController::Base).to respond_to(:is_interceptor)
+      expect(::ActionController::Base).to respond_to(:use_interceptor)
+      expect(::ActionController::Base).to respond_to(:interceptor_filters)
+      expect(::ActionController::Base.is_interceptor).to eq(false)
+      expect(::ActionController::Base.interceptor_filters).to be_a(Hash)
 
-      expect(ActionController::Base).to respond_to(:interceptor)
-      expect(ActionController::Base).to respond_to(:skip_interceptor)
-      expect(ActionController::Base).to respond_to(:acts_as_interceptor)
+      expect(::ActionController::Base).to respond_to(:interceptor)
+      expect(::ActionController::Base).to respond_to(:skip_interceptor)
+      expect(::ActionController::Base).to respond_to(:acts_as_interceptor)
 
-      expect(ActionController::Base.new.respond_to?(
+      expect(::ActionController::Base.new.respond_to?(
         :current_page?, true)).to eq(true)
-      expect(ActionController::Base.new.respond_to?(
+      expect(::ActionController::Base.new.respond_to?(
         :current_url, true)).to eq(true)
-      expect(ActionController::Base.new.respond_to?(
+      expect(::ActionController::Base.new.respond_to?(
         :current_url_hash, true)).to eq(true)
-      expect(ActionController::Base.new.respond_to?(
-        :url_for, true)).to eq(true)
-      expect(ActionController::Base.new.respond_to?(
-        :with_interceptor, true)).to eq(true)
-      expect(ActionController::Base.new.respond_to?(
-        :without_interceptor, true)).to eq(true)
     end
 
     it 'modifies classes that act_as_interceptor' do

data/spec/lib/action_interceptor/{mailer_spec.rb → action_mailer_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 module ActionInterceptor
-  describe Mailer do
+  describe ActionMailer do
 
     it 'modifies ActionMailer::Base' do
-      mailer = ActionMailer::Base.send(:new)
+      mailer = ::ActionMailer::Base.send(:new)
       expect(mailer.respond_to?(:use_interceptor, true)).to eq(true)
       expect(mailer.respond_to?(:use_interceptor=, true)).to eq(true)
 

data/spec/lib/action_interceptor/common_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module ActionInterceptor
+  describe Common do
+
+    it 'modifies ActionController::Base' do
+      expect(::ActionController::Base.new.respond_to?(
+        :url_for, true)).to eq(true)
+      expect(::ActionController::Base.new.respond_to?(
+        :with_interceptor, true)).to eq(true)
+      expect(::ActionController::Base.new.respond_to?(
+        :without_interceptor, true)).to eq(true)
+    end
+
+    it 'modifies ActionView::Base' do
+      expect(::ActionView::Base.new.respond_to?(
+        :url_for, true)).to eq(true)
+      expect(::ActionView::Base.new.respond_to?(
+        :with_interceptor, true)).to eq(true)
+      expect(::ActionView::Base.new.respond_to?(
+        :without_interceptor, true)).to eq(true)
+    end
+
+  end
+end

data/spec/lib/action_interceptor_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ActionInterceptor do
   it 'must be configurable' do
-    expect(ActionInterceptor.intercepted_url_key).to eq(:dummy_key)
+    expect(ActionInterceptor.intercepted_url_key).to eq('dummy_key')
     expect(ActionInterceptor.override_url_options).to eq(true)
     expect(ActionInterceptor.interceptors.keys).to include(:registration)
 
@@ -14,7 +14,7 @@ describe ActionInterceptor do
       interceptor :my_name, &my_block
     end
 
-    expect(ActionInterceptor.intercepted_url_key).to eq(:my_key)
+    expect(ActionInterceptor.intercepted_url_key).to eq('my_key')
     expect(ActionInterceptor.override_url_options).to eq(false)
     expect(ActionInterceptor.interceptors).to include({:my_name => my_block})
   end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: action_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Action Interceptor provides controllers that require users to perform
@@ -66,14 +66,13 @@ files:
 - Rakefile
 - config/initializers/action_interceptor.rb
 - lib/action_interceptor.rb
+- lib/action_interceptor/action_controller.rb
+- lib/action_interceptor/action_mailer.rb
 - lib/action_interceptor/common.rb
-- lib/action_interceptor/controller.rb
 - lib/action_interceptor/encryptor.rb
 - lib/action_interceptor/engine.rb
-- lib/action_interceptor/mailer.rb
 - lib/action_interceptor/undefined_interceptor.rb
 - lib/action_interceptor/version.rb
-- lib/action_interceptor/view.rb
 - lib/tasks/action_interceptor_tasks.rake
 - spec/dummy/README.md
 - spec/dummy/Rakefile
@@ -111,10 +110,10 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/lib/action_interceptor/controller_spec.rb
+- spec/lib/action_interceptor/action_controller_spec.rb
+- spec/lib/action_interceptor/action_mailer_spec.rb
+- spec/lib/action_interceptor/common_spec.rb
 - spec/lib/action_interceptor/encryptor_spec.rb
-- spec/lib/action_interceptor/mailer_spec.rb
-- spec/lib/action_interceptor/view_spec.rb
 - spec/lib/action_interceptor_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/openstax/action_interceptor
@@ -127,12 +126,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -178,9 +177,9 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.md
-- spec/lib/action_interceptor/controller_spec.rb
+- spec/lib/action_interceptor/action_controller_spec.rb
+- spec/lib/action_interceptor/action_mailer_spec.rb
+- spec/lib/action_interceptor/common_spec.rb
 - spec/lib/action_interceptor/encryptor_spec.rb
-- spec/lib/action_interceptor/mailer_spec.rb
-- spec/lib/action_interceptor/view_spec.rb
 - spec/lib/action_interceptor_spec.rb
 - spec/spec_helper.rb

data/lib/action_interceptor/view.rb

@@ -1,11 +0,0 @@
-require 'action_interceptor/common'
-
-module ActionInterceptor
-  module View
-
-    include Common
-
-  end
-end
-
-ActionView::Base.send :include, ActionInterceptor::View

data/spec/lib/action_interceptor/view_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-module ActionInterceptor
-  describe View do
-
-    it 'modifies ActionView::Base' do
-      expect(ActionView::Base.new.respond_to?(
-        :url_for, true)).to eq(true)
-      expect(ActionView::Base.new.respond_to?(
-        :with_interceptor, true)).to eq(true)
-      expect(ActionView::Base.new.respond_to?(
-        :without_interceptor, true)).to eq(true)
-    end
-
-  end
-end