lucie-lib 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a736c31b498e6c4051e20b80f7c66a9081f5c327
-  data.tar.gz: 49e0ee62ac880ca1373821663285f7de6890106c
+  metadata.gz: 22fd96396292ce33f05a97f2f226a6c89ca3425a
+  data.tar.gz: 92bdeb9d7ec61ed9b381f2b67602427cac7945dc
 SHA512:
-  metadata.gz: c4d686941affd4a5e8af762a5880f72197c9f948a5c7ba63ffb329c3aaa94a81fa14666325dba17bbf467ae6556dca60a9ea51854404e636d230c1d987184530
-  data.tar.gz: 5b55550a159a5a5db88b8b58893ea09ef0cfd9075210fd2ec27f43703d812f164609201ee1b0a5aa0544c5b11a6e9bfe256e7e27c618f5972fb91afc0a28d24b
+  metadata.gz: e126cfc3b93fcd8ac4ac875b5ad936475aaec2900d69dd93f14206988f705ac8de7f139cf3b9db9e87aaa30ad523d5511300480aa24fda552ad98a234852a11a
+  data.tar.gz: 4788f1a3742bae56bf44450606a3d0274aa285f81c856480d9b90cc34a021b994b4e4aa48fb894000dfffcc1e87b57b05e3aafb1d3377923f203d35b097c36a6

data/lib/lucie/app.rb

@@ -109,26 +109,16 @@ private
     end
 
     def call_action_on_controller
-      method = action
-      if controller_has_action? action
-        # pop the args[0] element because this is the method
-        @command.shift
-      elsif controller_has_action? :no_method
-        method = :no_method
-      else
-        self.exit_value = 255
-        raise ActionNotFound.new(action, task)
-      end
-      self.exit_value = controller.send(method)
-    rescue Controller::ExitRequest => exit_request
-      self.exit_value = exit_request.code
-    end
+      begin
+        self.exit_value = controller.send(:apply_action, action)
 
-    def controller_has_action?(action)
-      @public_actions ||= begin
-        controller_class.public_instance_methods - Controller::Base.public_instance_methods + [:help]
+        # pop the args[0] element because this is the method
+        command.shift
+      rescue ActionNotFound
+        self.exit_value = controller.send(:apply_action, :no_method)
       end
-      @public_actions.include?(action.to_sym)
+    rescue ActionNotFound
+      raise ActionNotFound.new(action, task)
     end
 
     def apply_validators

data/lib/lucie/controller/base.rb

@@ -10,6 +10,13 @@ module Lucie
       class << self
         @validators = []
         @params = CommandLineParser.new("")
+      protected
+        @before_filter_args = []
+        attr_accessor :before_filter_args
+      end
+
+      def help
+        "Help"
       end
 
       def initialize(command_line_parser, app)
@@ -17,14 +24,17 @@ module Lucie
         @app = app
       end
 
-      def self.params=(params)
-        @params = params
-      end
+    protected
 
       def params
         self.class.params
       end
 
+      def self.params=(params)
+        @params = params
+      end
+
+
       def self.params
         @params
       end
@@ -49,14 +59,51 @@ module Lucie
         validators.each {|validator| validator.apply(params) } if validators
       end
 
+      def self.before_filter(*args)
+        self.before_filter_args ||= []
+        args.each do |value|
+          self.before_filter_args << value
+        end
+      end
+
       def exit(value)
         raise ExitRequest, value
       end
 
-      def help
-        "Help"
+      def apply_action(action)
+        if has_action? action
+
+          self.apply_before_filters
+
+          begin
+            return self.send(action)
+          rescue NameError
+            raise ActionNotFound.new(action, nil)
+          end
+        else
+          raise ActionNotFound.new(action, nil)
+        end
+      rescue Controller::ExitRequest => exit_request
+        return exit_request.code
       end
 
+      def apply_before_filters
+        klass = self.class
+        while klass.respond_to?(:before_filter)
+          args = Array(klass.send(:before_filter_args))
+          args.each do |method|
+            self.send(method.to_sym)
+          end
+          klass = klass.superclass
+        end
+      end
+
+      def has_action?(action)
+        @public_actions ||= begin
+          self.class.public_instance_methods - Object.public_instance_methods
+        end
+        @public_actions.include?(action.to_sym)
+      end
     end
   end
 end

data/lib/lucie/version.rb

@@ -1,3 +1,3 @@
 module Lucie
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/test/helpers/before_filter_controller.rb

@@ -0,0 +1,35 @@
+class BeforeFilterController < Controller::Base
+  before_filter :set_touched
+  attr_reader :touched
+
+  def set_touched
+    @touched = true
+  end
+
+  def method1
+  end
+end
+
+class BeforeFilterRecursionController < BeforeFilterController
+  def method2
+  end
+end
+
+class MultipleBeforeFilters < Controller::Base
+  before_filter :set_one, :set_two
+
+  def method3
+  end
+
+  attr_reader :one, :two
+
+protected
+
+  def set_one
+    @one = true
+  end
+
+  def set_two
+    @two = true
+  end
+end

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require "pathname"
 #require 'debugger'
 
 require File.expand_path('../../lib/lucie.rb', __FILE__)
-
+$LOAD_PATH << File.expand_path('../helpers', __FILE__)
 
 LUCIE_ROOT = File.expand_path File.dirname(__FILE__)
 

data/test/unit/controller/base_test.rb

@@ -10,4 +10,29 @@ class ControllerBaseTest < MiniTest::Unit::TestCase
     assert_equal app, controller.app
   end
 
+  def test_before_filter
+    require "before_filter_controller"
+
+    controller = BeforeFilterController.new(nil, Object.new)
+    controller.send(:apply_action, :method1)
+    assert_equal true, controller.touched
+  end
+
+  def test_before_filter_recursion
+    require "before_filter_controller"
+
+    controller = BeforeFilterRecursionController.new(nil, Object.new)
+    controller.send(:apply_action, :method2)
+    assert_equal true, controller.touched
+  end
+
+  def test_multiple_before_filters
+    require "before_filter_controller"
+
+    controller = MultipleBeforeFilters.new(nil, Object.new)
+    controller.send(:apply_action, :method3)
+    assert_equal true, controller.one
+    assert_equal true, controller.two
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucie-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Nucc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,7 @@ files:
 - test/fixtures/template_snippet_fixtures.rb
 - test/functional/app_test.rb
 - test/functional/template_snippet_test.rb
+- test/helpers/before_filter_controller.rb
 - test/helpers/test_app.rb
 - test/test_app/app/controllers/application_controller.rb
 - test/test_helper.rb
@@ -127,6 +128,7 @@ test_files:
 - test/fixtures/template_snippet_fixtures.rb
 - test/functional/app_test.rb
 - test/functional/template_snippet_test.rb
+- test/helpers/before_filter_controller.rb
 - test/helpers/test_app.rb
 - test/test_app/app/controllers/application_controller.rb
 - test/test_helper.rb