tarquinn 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 127a3336f88c936432f99b747ce1fcc05a8ac383
-  data.tar.gz: 945174dc6e9dd2d0a53cd3c999577035df8683e9
+  metadata.gz: 9e8629e912a90812be4bfecbe735d47213dcc52a
+  data.tar.gz: e2f2c47d5be94b83b3640da3c2629feefca5b3b3
 SHA512:
-  metadata.gz: 159300d5d10e03e370861da7562adce6cb149f4b6d18923d2f0df8f19d8e69abbbdacb9a85dfec4e82bb9f21d7405d6e4e2f13500c5ec1e194cc6d57afff49f9
-  data.tar.gz: b1bcc793e2466dca7f3a1c4cb679912c22d930dff9b4409a17583d5e3cd10cfd6e35a7cfdb2d12c91e11c62579ab306959ca19a69fe12c0e834ada7380d63d6f
+  metadata.gz: 8a55c1cc2c11d6a2d4db1ef413616761ec8f795875355375b48908f3bf2a5be58865d0a6a65aa7b528bbf744028e409813a8cde170644d5ba7ead4312f5096c0
+  data.tar.gz: c8e2a0466104acb3392a568bc4c1d32fe91b36755537a299a4a926425720fd9e03e2f3f68961d948a9afd22dd5154bdc0f239a11be55a7e7ff5b2497f18d4226

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tarquinn (0.0.2)
+    tarquinn (0.1.0)
       activesupport
 
 GEM

data/README.md

@@ -30,7 +30,7 @@ Getting started
       end
 
       def loggin_needed?
-        user.present?
+        user.nil?
       end
     end
 
@@ -43,4 +43,4 @@ Getting started
         params[:action] == 'home'
       end
     end
-  ```
+  ```

data/lib/tarquinn/builder.rb

@@ -1,4 +1,8 @@
 class Tarquinn::Builder
+  def add_skip_action(redirection, *actions)
+    config_for(redirection).add_skip_action(*actions)
+  end
+
   def add_redirection_config(redirection, *methods, block)
     config_for(redirection).add_redirection_rules(*methods, &block)
   end
@@ -8,6 +12,7 @@ class Tarquinn::Builder
   end
 
   def build(controller)
+    controller = Tarquinn::Controller.new(controller)
     Tarquinn::Engine.new(configs, controller)
   end
 

data/lib/tarquinn/class_methods.rb

@@ -1,4 +1,8 @@
 module Tarquinn::ClassMethods
+  def skip_redirection(redirection, *actions)
+    redirector_builder.add_skip_action(redirection, *actions)
+  end
+
   def redirection_rule(redirection, *methods, &block)
     redirector_builder.add_redirection_config(redirection, *methods, block)
   end

data/lib/tarquinn/condition/action_checker.rb

@@ -0,0 +1,11 @@
+class Tarquinn::Condition::ActionChecker
+  attr_accessor :routes
+
+  def initialize(routes)
+    @routes = [ routes ].flatten.map(&:to_s)
+  end
+
+  def check?(controller)
+    routes.include? controller.params[:action]
+  end
+end

data/lib/tarquinn/condition/method_caller.rb

@@ -0,0 +1,13 @@
+class Tarquinn::Condition::MethodCaller
+  attr_accessor :methods
+
+  def initialize(methods)
+    @methods = [ methods ].flatten
+  end
+
+  def check?(controller)
+    methods.any? do |method|
+      controller.call(method)
+    end
+  end
+end

data/lib/tarquinn/condition/proc_runner.rb

@@ -0,0 +1,11 @@
+class Tarquinn::Condition::ProcRunner
+  attr_reader :block
+
+  def initialize(&block)
+    @block = block
+  end
+
+  def check?(controller)
+    block.yield(controller)
+  end
+end

data/lib/tarquinn/condition.rb

@@ -0,0 +1,5 @@
+module Tarquinn::Condition
+  require 'tarquinn/condition/action_checker'
+  require 'tarquinn/condition/method_caller'
+  require 'tarquinn/condition/proc_runner'
+end

data/lib/tarquinn/config.rb

@@ -5,29 +5,35 @@ class Tarquinn::Config
     @redirect = redirect
   end
 
+  def add_skip_action(*routes)
+    skip_blocks << block_routes(routes)
+  end
+
   def add_redirection_rules(*methods, &block)
-    self.methods.concat methods
-    blocks << block if block_given?
+    redirection_blocks << block_methods(methods)
+    redirection_blocks << Tarquinn::Condition::ProcRunner.new(&block) if block_given?
   end
 
   def add_skip_rules(*methods, &block)
-    skip_methods.concat methods
-    skip_blocks << block if block_given?
+    skip_blocks << block_methods(methods)
+    skip_blocks << Tarquinn::Condition::ProcRunner.new(&block) if block_given?
   end
 
-  def methods
-    @methods ||= []
+  def redirection_blocks
+    @blocks ||= []
   end
 
-  def skip_methods
-    @skip_methods ||= []
+  def skip_blocks
+    @skip_blocks ||= []
   end
 
-  def blocks
-    @blocks ||= []
+  private
+
+  def block_methods(methods)
+    Tarquinn::Condition::MethodCaller.new(methods)
   end
 
-  def skip_blocks
-    @skip_blocks ||= []
+  def block_routes(routes)
+    Tarquinn::Condition::ActionChecker.new(routes)
   end
 end

data/lib/tarquinn/controller.rb

@@ -0,0 +1,19 @@
+class Tarquinn::Controller
+  attr_reader :controller
+
+  def initialize(controller)
+    @controller = controller
+  end
+
+  def params
+    @params ||= controller.send(:params)
+  end
+
+  def call(method, *args)
+    controller.send(method, *args)
+  end
+
+  def has_method?(method)
+    controller.respond_to?(method, true)
+  end
+end

data/lib/tarquinn/engine.rb

@@ -6,17 +6,21 @@ class Tarquinn::Engine
     @controller = controller
   end
 
-  def perform_redirect?
-    handlers.any? { |h| h.perform_redirect? }
-  end
-
   def perform_redirect
     return unless perform_redirect?
-    handlers.find { |h| h.perform_redirect? }.redirect
+    handler_redirector.redirect
   end
 
   private
 
+  def perform_redirect?
+    handler_redirector.present?
+  end
+
+  def handler_redirector
+    @handler_redirector ||= handlers.find { |h| h.perform_redirect? }
+  end
+
   def handlers
     @handlers ||= build_handlers
   end

data/lib/tarquinn/handler.rb

@@ -1,7 +1,7 @@
 class Tarquinn::Handler
   attr_accessor :config, :controller
 
-  delegate :methods, :skip_methods, :blocks, :skip_blocks, to: :config
+  delegate :redirection_blocks, :skip_blocks, to: :config
 
   def initialize(config, controller)
     @config = config
@@ -9,12 +9,12 @@ class Tarquinn::Handler
   end
 
   def perform_redirect?
-    @perform_redirect = is_redirect? if @perform_redirect.nil?
-    @perform_redirect
+    return @perform_redirect unless @perform_redirect.nil?
+    @perform_redirect = is_redirect?
   end
 
   def redirect
-    controller.send(:redirect_to, redirect_path)
+    controller.call(:redirect_to, redirect_path)
   end
 
   private
@@ -24,35 +24,26 @@ class Tarquinn::Handler
   end
 
   def redirect_path
-    controller.send(redirect_method)
+    return redirect_method unless controller.has_method?(redirect_method)
+    controller.call redirect_method
   end
 
   def is_redirect?
-    return false if methods_skip_redirect? || blocks_skip_redirect?
-    methods_require_redirect? || blocks_require_redirect?
-  end
-
-  def methods_skip_redirect?
-    skip_methods.any? do |method|
-      controller.send(method)
-    end
+    return false if blocks_skip_redirect?
+    blocks_require_redirect?
   end
 
   def blocks_skip_redirect?
-    skip_blocks.any? do |block|
-      block.yield
-    end
+    check_blocks(skip_blocks)
   end
 
-  def methods_require_redirect?
-    methods.any? do |method|
-      controller.send(method)
-    end
+  def blocks_require_redirect?
+    check_blocks(redirection_blocks)
   end
 
-  def blocks_require_redirect?
+  def check_blocks(blocks)
     blocks.any? do |block|
-      block.yield
+      block.check?(controller)
     end
   end
 end

data/lib/tarquinn/version.rb

@@ -1,3 +1,3 @@
 module Tarquinn
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/tarquinn.rb

@@ -4,6 +4,8 @@ require 'active_support/core_ext'
 module Tarquinn
   require 'tarquinn/version'
   require 'tarquinn/handler'
+  require 'tarquinn/controller'
+  require 'tarquinn/condition'
   require 'tarquinn/config'
   require 'tarquinn/engine'
   require 'tarquinn/builder'

data/spec/lib/tarquinn/condition/action_checker_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Tarquinn::Condition::ActionChecker do
+  let(:dummy_controller) { Tarquinn::DummyController.new }
+  let(:controller) { Tarquinn::Controller.new(dummy_controller) }
+
+  context 'when initialized with a single route' do
+    let(:route) { :show }
+    let(:subject) { described_class.new(route) }
+
+    context 'when receiving a request for the given action' do
+      context 'but it was configured with a symbol' do
+        it do
+          expect(subject.check?(controller)).to be_truthy
+        end
+      end
+
+      context 'and it was configured with a string' do
+        let(:route) { 'show' }
+
+        it do
+          expect(subject.check?(controller)).to be_truthy
+        end
+      end
+    end
+
+    context 'when receiving a request for other action action' do
+      let(:route) { :view }
+
+      it do
+        expect(subject.check?(controller)).to be_falsey
+      end
+    end
+  end
+
+  context 'when initialized with more routes' do
+    let(:routes) { [ :show, :view ] }
+    let(:subject) { described_class.new(routes) }
+
+    context 'when receiving a request for one of the given action' do
+      it do
+        expect(subject.check?(controller)).to be_truthy
+      end
+    end
+
+    context 'when receiving a request for another action' do
+      let(:routes) { [ :update, :view ] }
+      it do
+        expect(subject.check?(controller)).to be_falsey
+      end
+    end
+  end
+end

data/spec/lib/tarquinn/condition/method_caller_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Tarquinn::Condition::MethodCaller do
+  let(:dummy_controller) { Tarquinn::DummyController.new }
+  let(:controller) { Tarquinn::Controller.new(dummy_controller) }
+
+  context 'when initialized with a single method' do
+    let(:method) { :true }
+    let(:subject) { described_class.new(method) }
+
+    context 'when method returns true' do
+      it do
+        expect(subject.check?(controller)).to be_truthy
+      end
+    end
+
+    context 'when method returns true' do
+      let(:method) { :false }
+
+      it do
+        expect(subject.check?(controller)).to be_falsey
+      end
+    end
+  end
+
+  context 'when initialized with more methods' do
+    let(:methods) { [ :true, :false ] }
+    let(:subject) { described_class.new(methods) }
+
+    context 'when one return true and the other false' do
+      it do
+        expect(subject.check?(controller)).to be_truthy
+      end
+    end
+
+    context 'when all return true' do
+      let(:methods) { [ :true, :true ] }
+      it do
+        expect(subject.check?(controller)).to be_truthy
+      end
+    end
+
+    context 'when all return false' do
+      let(:methods) { [ :false, :false ] }
+      it do
+        expect(subject.check?(controller)).to be_falsey
+      end
+    end
+  end
+end

data/spec/lib/tarquinn/condition/proc_runner_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Tarquinn::Condition::ProcRunner do
+  let(:controller) { double }
+  let(:value) { true }
+  let(:subject) { described_class.new { value } }
+
+  describe '#check?' do
+    context 'when block evaluates into true' do
+      it do
+        expect(subject.check?(controller)).to be_truthy
+      end
+    end
+
+    context 'when block evaluates into false' do
+      let(:value) { false }
+      it do
+        expect(subject.check?(controller)).to be_falsey
+      end
+    end
+  end
+end

data/spec/lib/tarquinn/config_spec.rb

@@ -5,31 +5,35 @@ describe Tarquinn::Config do
 
   describe '#add_redirection_rules' do
     context 'when not passing a block' do
-      it do
-        expect do
-          subject.add_redirection_rules(:methods)
-        end.to change { subject.methods }
+      it_behaves_like 'a method that adds a redirection rule', Tarquinn::Condition::MethodCaller do
+        let(:call_method) { subject.add_redirection_rules(:methods) }
       end
+    end
 
-      it do
-        expect do
-          subject.add_redirection_rules(:methods)
-        end.not_to change { subject.blocks }
+    context 'when passing only a block' do
+      it_behaves_like 'a method that adds a redirection rule', Tarquinn::Condition::ProcRunner do
+        let(:call_method) { subject.add_redirection_rules { true } }
       end
     end
+  end
 
-    context 'when not passing only a block' do
-      it do
-        expect do
-          subject.add_redirection_rules { true }
-        end.not_to change { subject.methods }
+  describe '#add_skip_rules' do
+    context 'when not passing a block' do
+      it_behaves_like 'a method that adds a skip rule', Tarquinn::Condition::MethodCaller do
+        let(:call_method) { subject.add_skip_rules(:methods) }
       end
+    end
 
-      it do
-        expect do
-          subject.add_redirection_rules { true }
-        end.to change { subject.blocks }
+    context 'when passing only a block' do
+      it_behaves_like 'a method that adds a skip rule', Tarquinn::Condition::ProcRunner do
+        let(:call_method) { subject.add_skip_rules { true } }
       end
     end
   end
+
+  describe '#add_skip_action' do
+    it_behaves_like 'a method that adds a skip rule', Tarquinn::Condition::ActionChecker do
+      let(:call_method) { subject.add_skip_action(:methods) }
+    end
+  end
 end

data/spec/lib/tarquinn/controller_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Tarquinn::Controller do
+  let(:controller) { Tarquinn::DummyController.new }
+  let(:subject) { described_class.new(controller) }
+
+  describe '#call' do
+    it 'redirects a method call to the controller' do
+      expect(controller).to receive(:redirect_to)
+      subject.call(:redirect_to)
+    end
+  end
+
+  describe '#params' do
+    it 'returns the instance params call' do
+      expect(subject.params).to eq(action: 'show')
+    end
+  end
+
+  describe '#has_method?' do
+    context 'when calling for a public method that exists' do
+      it do
+        expect(subject.has_method?(:parse_request)).to be_truthy
+      end
+    end
+
+    context 'when calling for a private method that exists' do
+      it do
+        expect(subject.has_method?(:redirection_path)).to be_truthy
+      end
+    end
+
+    context 'when calling for a non existing method' do
+      it do
+        expect(subject.has_method?(:non_existing)).to be_falsey
+      end
+    end
+  end
+end

data/spec/lib/tarquinn/engine_spec.rb

@@ -9,41 +9,8 @@ describe Tarquinn::Engine do
   let(:config) { Tarquinn::Config.new(:redirect_path) }
   let(:config2) { Tarquinn::Config.new(:redirect_path2) }
   let(:configs) { { redirect_path: config, redirect_path2: config2 } }
-  let(:subject) { described_class.new configs, controller }
-
-  describe '#perform_redirect?' do
-    context 'when no redirection should be performed' do
-      before do
-        config.add_skip_rules { true }
-        config2.add_skip_rules { true }
-      end
-
-      it do
-        expect(subject.perform_redirect?).to be_falsey
-      end
-    end
-
-    context 'when all redirection is required' do
-      before do
-        config.add_redirection_rules { true }
-        config2.add_redirection_rules { true }
-      end
-
-      it do
-        expect(subject.perform_redirect?).to be_truthy
-      end
-    end
-
-    context 'when only one allow for redirection' do
-      before do
-        config.add_redirection_rules { true }
-        config2.add_skip_rules { true }
-      end
-
-      it do
-        expect(subject.perform_redirect?).to be_truthy
-      end
-    end
+  let(:subject) do
+    described_class.new configs, Tarquinn::Controller.new(controller)
   end
 
   describe '#perform_redirect' do
@@ -54,19 +21,19 @@ describe Tarquinn::Engine do
       end
 
       it 'redirects to the first redirection' do
-        expect(controller).not_to receive(:redirect_to).with(redirection_path)
+        expect(controller).not_to receive(:redirect_to)
         subject.perform_redirect
       end
     end
 
-    context 'when all redirection is required' do
+    context 'when all redirection are required' do
       before do
         config.add_redirection_rules { true }
         config2.add_redirection_rules { true }
       end
 
       it do
-        expect(controller).to receive(:redirect_to)
+        expect(controller).to receive(:redirect_to).with(redirection_path)
         subject.perform_redirect
       end
     end

data/spec/lib/tarquinn/handler_spec.rb

@@ -2,9 +2,11 @@ require 'spec_helper'
 
 describe Tarquinn::Handler do
   let(:redirection_path) { '/path' }
-  let(:controller) { double('controller', true: true, false: false, redirect_path: redirection_path) }
-  let(:config) { Tarquinn::Config.new(:redirect_path) }
-  let(:subject) { described_class.new config, controller }
+  let(:controller) { Tarquinn::DummyController.new }
+  let(:config) { Tarquinn::Config.new(:redirection_path) }
+  let(:subject) do
+    described_class.new config, Tarquinn::Controller.new(controller)
+  end
 
   describe '#perform_redirect?' do
     context 'when rules allow for redirection' do
@@ -90,10 +92,19 @@ describe Tarquinn::Handler do
     end
 
     describe '#redirect' do
-      it do
+      it 'calls for redirection using controller method' do
         expect(controller).to receive(:redirect_to).with(redirection_path)
         subject.redirect
       end
+
+      context 'when configured with a method that does not exist in the controller' do
+        let(:config) { Tarquinn::Config.new('/new_path') }
+
+        it 'calls for redirection using static path' do
+          expect(controller).to receive(:redirect_to).with('/new_path')
+          subject.redirect
+        end
+      end
     end
   end
 end

data/spec/lib/tarquinn_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Tarquinn do
-  let(:controller) { Tarquinn::Controller.new }
+  let(:controller) { Tarquinn::DummyController.new }
 
   describe 'redirection' do
     context 'when configuration calls for a method that allows redirection' do

data/spec/support/models/tarquinn/{controller.rb → dummy_controller.rb}

@@ -1,9 +1,10 @@
-class Tarquinn::Controller
+class Tarquinn::DummyController
   def self.before_action(_)
   end
 
   include Tarquinn
 
+  skip_redirection :redirection_path, :route_method
   redirection_rule :redirection_path, :should_redirect?
   skip_redirection_rule :redirection_path, :should_skip_redirect?
 
@@ -13,6 +14,18 @@ class Tarquinn::Controller
 
   private
 
+  def params
+    { action: 'show' }
+  end
+
+  def true
+    true
+  end
+
+  def false
+    false
+  end
+
   def redirection_path
     '/path'
   end

data/spec/support/shared_examples/config.rb

@@ -0,0 +1,28 @@
+shared_examples 'a method that adds a redirection rule' do |expected_class|
+  it_behaves_like 'a method that adds a rule', :redirection, expected_class
+end
+
+shared_examples 'a method that adds a skip rule' do |expected_class|
+  it_behaves_like 'a method that adds a rule', :skip, expected_class
+end
+
+shared_examples 'a method that adds a rule' do |rule, expected_class|
+  let(:reverse_rule) { rule == :skip ? :redirection : :skip }
+  it do
+    expect do
+      call_method
+    end.to change { subject.public_send("#{rule}_blocks" ) }
+  end
+
+  it do
+    call_method
+    expect(subject.public_send("#{rule}_blocks" ).last).to be_a(expected_class)
+  end
+
+  it do
+    expect do
+      call_method
+    end.not_to change { subject.public_send("#{reverse_rule}_blocks" ) }
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarquinn
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - DarthJee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-30 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,17 +126,27 @@ files:
 - lib/tarquinn/builder.rb
 - lib/tarquinn/class_methods.rb
 - lib/tarquinn/concern.rb
+- lib/tarquinn/condition.rb
+- lib/tarquinn/condition/action_checker.rb
+- lib/tarquinn/condition/method_caller.rb
+- lib/tarquinn/condition/proc_runner.rb
 - lib/tarquinn/config.rb
+- lib/tarquinn/controller.rb
 - lib/tarquinn/engine.rb
 - lib/tarquinn/handler.rb
 - lib/tarquinn/version.rb
 - spec/lib/tarquinn/builder_spec.rb
+- spec/lib/tarquinn/condition/action_checker_spec.rb
+- spec/lib/tarquinn/condition/method_caller_spec.rb
+- spec/lib/tarquinn/condition/proc_runner_spec.rb
 - spec/lib/tarquinn/config_spec.rb
+- spec/lib/tarquinn/controller_spec.rb
 - spec/lib/tarquinn/engine_spec.rb
 - spec/lib/tarquinn/handler_spec.rb
 - spec/lib/tarquinn_spec.rb
 - spec/spec_helper.rb
-- spec/support/models/tarquinn/controller.rb
+- spec/support/models/tarquinn/dummy_controller.rb
+- spec/support/shared_examples/config.rb
 - tarquinn.gemspec
 homepage: https://github.com/darthje/tarquinn
 licenses: []