action_interceptor 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTU1MDgzOGZiM2E5N2U1YzA5ZDQzNGUwYzA4NmY2ODYxY2Y4MDQ2Mw==
-  data.tar.gz: !binary |-
-    Mjc2YjgzZTBiYzk0YjRiY2E2ZTY1Zjg1YmQwNGU4NjllYWY3MjlmNQ==
+SHA1:
+  metadata.gz: 04669ca4f3feb14833aa912c88dff4787e3c4c1e
+  data.tar.gz: 63cb94be3b6dc259fb9ea5c9db942aa59549c436
 SHA512:
-  metadata.gz: !binary |-
-    NWUzNmZiMmRkZmI2NTM5YTdkNmEyZDU2NzM1ZGI0NmE5NGNlZjc1MzE4ZDY4
-    NTdmMzI5MGRhMDZlYTM3OWI2ZTMwNTZlMDEyMDAyYTdjNDVkNmFmMTY0ODYz
-    ZTY4NDAwYWZjMTY3MTEzNGE5ZjczMDFiNjQ2YzA4ZjI5NGZmNDM=
-  data.tar.gz: !binary |-
-    M2IzOWJkZTMzMjgxMzZmYzY0YzRkNTM3ZjNhODNiYWI3YjNhODYyYjk4YzZh
-    MTNlODg2MDFiNTk2YmY4YzQyZjg5Mzc4YmIzYmEzODEwY2NlOTdiYzc1YTNl
-    ODc4NjVhMWRkOWZjMDgyOTMzY2NmYzAyNWFmYzVmOGY4ZjM2YzE=
+  metadata.gz: 175943387c1c16fa25aa2c5a827dd130a56eadb4706bdb72d3228cd48127e49e5c59ed3c10dc9ce1f87dd947c9cebefa7ebb034d3ceb3927bd8e95a905ab48b0
+  data.tar.gz: f56f418f2136734120cd716df80d6a3d41a830a59723b3273d6e64839bd808fac43c21f648195ca2f10ce76750d6db5dadc922efe7f739a563b7c46fb88112df

data/lib/action_interceptor/controller.rb

@@ -5,21 +5,30 @@ module ActionInterceptor
   module Controller
 
     def self.included(base)
-      base.class_attribute :is_interceptor, :interceptor_filters
+      base.class_attribute :is_interceptor, :use_interceptor,
+                           :interceptor_filters
       base.is_interceptor = false
+      base.use_interceptor = false
       base.interceptor_filters = {}
+
+      base.before_filter :delete_intercepted_url
+
+      base.helper_method :current_page?, :current_url, :current_url_hash
+
       base.extend(ClassMethods)
     end
 
-    def current_url
-      "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
-    end
+    protected
 
     def current_page?(url)
       # Blank is the current page
       url.blank? || URI(url).path == request.path
     end
 
+    def current_url
+      "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
+    end
+
     def current_url_hash
       return @current_url_hash if @current_url_hash
 
@@ -31,15 +40,48 @@ module ActionInterceptor
       @current_url_hash = {key => url}
     end
 
-    # Executes the given block as if it was an interceptor
+    def url_for(options = {})
+      url = super
+      return url unless self.use_interceptor
+
+      @intercepted_url_hash ||= self.is_interceptor ? intercepted_url_hash : \
+                                                      current_url_hash
+
+      uri = URI(url)
+      new_query = URI.decode_www_form(uri.query || '') + \
+                    @intercepted_url_hash.to_a
+      uri.query = URI.encode_www_form(new_query)
+      uri.to_s
+    end
+
+    # Executes the given block as if it was inside an interceptor
     def with_interceptor(&block)
-      @previous_default_url_options ||= default_url_options
+      previous_use_interceptor = self.use_interceptor
+
+      begin
+        # Send the referer with intercepted requests
+        # So we don't rely on the user's browser to do it for us
+        self.use_interceptor = true
+
+        # Execute the block as if it was defined in this controller
+        instance_exec &block
+      rescue LocalJumpError => e
+        # Silently ignore `return` errors in the block
+        # and return the given value
+        e.exit_value
+      ensure
+        self.use_interceptor = previous_use_interceptor
+      end
+    end
+
+    # Executes the given block as if it was not inside an interceptor
+    def without_interceptor(&block)
+      previous_use_interceptor = self.use_interceptor
 
       begin
         # Send the referer with intercepted requests
         # So we don't rely on the user's browser to do it for us
-        self.default_url_options = @previous_default_url_options
-                                     .merge(current_url_hash)
+        self.use_interceptor = false
 
         # Execute the block as if it was defined in this controller
         instance_exec &block
@@ -48,10 +90,14 @@ module ActionInterceptor
         # and return the given value
         e.exit_value
       ensure
-        self.default_url_options = @previous_default_url_options
+        self.use_interceptor = previous_use_interceptor
       end
     end
 
+    def delete_intercepted_url
+      session.delete(ActionInterceptor.intercepted_url_key)
+    end
+
     module ClassMethods
 
       def interceptor(*interceptor_names, &block)
@@ -85,18 +131,20 @@ module ActionInterceptor
       end
 
       def acts_as_interceptor(options = {})
-        return if is_interceptor
         self.is_interceptor = true
+        self.use_interceptor = options[:override_url_options].nil? ? \
+                                 ActionInterceptor.override_url_options : \
+                                 options[:override_url_options]
 
-        @override_url_options = options[:override_url_options].nil? ? \
-                                  ActionInterceptor.override_url_options : \
-                                  options[:override_url_options]
-
-        class_eval do
+        class_exec do
 
           attr_writer :intercepted_url
 
-          helper_method :intercepted_url
+          skip_before_filter :delete_intercepted_url
+
+          helper_method :intercepted_url, :intercepted_url_hash
+
+          protected
 
           def intercepted_url
             return @intercepted_url if @intercepted_url
@@ -127,30 +175,6 @@ module ActionInterceptor
             @intercepted_url_hash = {key => url}
           end
 
-          alias_method :url_options_without_interceptor, :url_options
-
-          def url_options_with_interceptor
-            return @url_options_with_interceptor \
-              if @url_options_with_interceptor
-
-            @url_options_with_interceptor = intercepted_url_hash.merge(
-                                              url_options_without_interceptor)
-          end
-
-          alias_method :url_options, :url_options_with_interceptor \
-            if @override_url_options.nil? || @override_url_options
-
-          def without_interceptor(&block)
-            previous_url_options = url_options_with_interceptor
-
-            begin
-              @url_options_with_interceptor = url_options_without_interceptor
-              instance_exec &block
-            ensure
-              @url_options_with_interceptor = previous_url_options
-            end
-          end
-
           def redirect_back(options = {})
             url = intercepted_url
 

data/lib/action_interceptor/engine.rb

@@ -1,4 +1,5 @@
 require 'action_interceptor/controller'
+require 'action_interceptor/view'
 
 module ActionInterceptor
   class Engine < ::Rails::Engine

data/lib/action_interceptor/version.rb

@@ -1,4 +1,4 @@
 module ActionInterceptor
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end
 

data/lib/action_interceptor/view.rb

@@ -0,0 +1,63 @@
+module ActionInterceptor
+  module View
+
+    # Can't reuse url_for from controller
+    # because the view's super method is different
+    def url_for(options = {})
+      url = super
+      return url unless controller.use_interceptor
+
+      @intercepted_url_hash ||= controller.is_interceptor ? \
+                                intercepted_url_hash : current_url_hash
+
+      uri = URI(url)
+      new_query = URI.decode_www_form(uri.query || '') + \
+                    @intercepted_url_hash.to_a
+      uri.query = URI.encode_www_form(new_query)
+      uri.to_s
+    end
+
+    # Executes the given block as if it was inside an interceptor
+    def with_interceptor(&block)
+      previous_use_interceptor = controller.use_interceptor
+
+      begin
+        # Send the referer with intercepted requests
+        # So we don't rely on the user's browser to do it for us
+        controller.use_interceptor = true
+
+        # Execute the block as if it was defined in this controller
+        instance_exec &block
+      rescue LocalJumpError => e
+        # Silently ignore `return` errors in the block
+        # and return the given value
+        e.exit_value
+      ensure
+        controller.use_interceptor = previous_use_interceptor
+      end
+    end
+
+    # Executes the given block as if it was not inside an interceptor
+    def without_interceptor(&block)
+      previous_use_interceptor = controller.use_interceptor
+
+      begin
+        # Send the referer with intercepted requests
+        # So we don't rely on the user's browser to do it for us
+        controller.use_interceptor = false
+
+        # Execute the block as if it was defined in this controller
+        instance_exec &block
+      rescue LocalJumpError => e
+        # Silently ignore `return` errors in the block
+        # and return the given value
+        e.exit_value
+      ensure
+        controller.use_interceptor = previous_use_interceptor
+      end
+    end
+
+  end
+end
+
+ActionView::Base.send :include, ActionInterceptor::View

data/spec/lib/action_interceptor/controller_spec.rb

@@ -5,6 +5,7 @@ module ActionInterceptor
 
     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 be_false
       expect(ActionController::Base.interceptor_filters).to be_a(Hash)
@@ -13,24 +14,29 @@ module ActionInterceptor
       expect(ActionController::Base).to respond_to(:skip_interceptor)
       expect(ActionController::Base).to respond_to(:acts_as_interceptor)
 
-      expect(ActionController::Base.new).to respond_to(:current_page?)
-      expect(ActionController::Base.new).to respond_to(:current_url)
-      expect(ActionController::Base.new).to respond_to(:current_url_hash)
-      expect(ActionController::Base.new).to respond_to(:with_interceptor)
+      expect(ActionController::Base.new.respond_to?(
+        :current_page?, true)).to be_true
+      expect(ActionController::Base.new.respond_to?(
+        :current_url, true)).to be_true
+      expect(ActionController::Base.new.respond_to?(
+        :current_url_hash, true)).to be_true
+      expect(ActionController::Base.new.respond_to?(
+        :with_interceptor, true)).to be_true
+      expect(ActionController::Base.new.respond_to?(
+        :without_interceptor, true)).to be_true
     end
 
     it 'modifies classes that act_as_interceptor' do
       expect(RegistrationsController.is_interceptor).to be_true
 
-      expect(RegistrationsController.new).to respond_to(:intercepted_url)
-      expect(RegistrationsController.new).to respond_to(:intercepted_url=)
-      expect(RegistrationsController.new).to respond_to(:intercepted_url_hash)
-      expect(RegistrationsController.new).to(
-        respond_to(:url_options_without_interceptor))
-      expect(RegistrationsController.new).to(
-        respond_to(:url_options_with_interceptor))
-      expect(RegistrationsController.new).to respond_to(:without_interceptor)
-      expect(RegistrationsController.new).to respond_to(:redirect_back)
+      expect(RegistrationsController.new.respond_to?(
+        :intercepted_url, true)).to be_true
+      expect(RegistrationsController.new.respond_to?(
+        :intercepted_url=, true)).to be_true
+      expect(RegistrationsController.new.respond_to?(
+        :intercepted_url_hash, true)).to be_true
+      expect(RegistrationsController.new.respond_to?(
+        :redirect_back, true)).to be_true
     end
 
     it 'registers and skips before_filters' do

data/spec/lib/action_interceptor/view_spec.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: action_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dante Soares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-03 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
@@ -71,6 +71,7 @@ files:
 - lib/action_interceptor/engine.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
@@ -110,6 +111,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/lib/action_interceptor/controller_spec.rb
 - spec/lib/action_interceptor/encryptor_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
@@ -122,12 +124,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: []
@@ -175,5 +177,6 @@ test_files:
 - spec/dummy/README.md
 - spec/lib/action_interceptor/controller_spec.rb
 - spec/lib/action_interceptor/encryptor_spec.rb
+- spec/lib/action_interceptor/view_spec.rb
 - spec/lib/action_interceptor_spec.rb
 - spec/spec_helper.rb