lucie-lib 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22fd96396292ce33f05a97f2f226a6c89ca3425a
-  data.tar.gz: 92bdeb9d7ec61ed9b381f2b67602427cac7945dc
+  metadata.gz: 6f509d04638ba165b1e444061f66d60870e6936c
+  data.tar.gz: 261d15e0851a26c5449972fd075ee754b7fd28e8
 SHA512:
-  metadata.gz: e126cfc3b93fcd8ac4ac875b5ad936475aaec2900d69dd93f14206988f705ac8de7f139cf3b9db9e87aaa30ad523d5511300480aa24fda552ad98a234852a11a
-  data.tar.gz: 4788f1a3742bae56bf44450606a3d0274aa285f81c856480d9b90cc34a021b994b4e4aa48fb894000dfffcc1e87b57b05e3aafb1d3377923f203d35b097c36a6
+  metadata.gz: fc15a34df4977c1f297f8f1b823253593286c65d1ea267f4a314236d4641b59afebd5ececc829f0fe7f57f1cd27ebcb858506241329a338c1632b6725ec01728
+  data.tar.gz: 0c5087237ad1a707e766c435d98985082fff2019de84dabc2bf21509cf5dfbf44e59e3cdb787a193ff7b4213eb2f3fb8fbe36ce9c1974fd2a64f588bdca5ced8

data/lib/lucie/app.rb

@@ -58,6 +58,7 @@ module Lucie
 private
 
     def call_method_invoking_process
+      autoload_controllers
       apply_validators
       pair_parameters
       call_action_on_controller
@@ -87,25 +88,38 @@ private
     end
 
     def controller_class
-      if task
-        @controller_class ||= [task.split("_").map{|i| i.capitalize}.join, "Controller"].join
-        Object.const_get(@controller_class.to_sym)
-      else
-        include_controller_for "application"
-        @controller_class = "ApplicationController"
-        @action = :help
-        Object.const_get(@controller_class.to_sym)
+      controller_class = begin
+        if task
+          [task.split("_").map{|i| i.capitalize}.join, "Controller"].join
+        else
+          @action = :help
+          "ApplicationController"
+        end
+      end
+
+      begin
+        Object.const_get(controller_class.to_sym)
+      rescue NameError
+        self.exit_value = 255
+        raise ControllerNotFound.new task
       end
-    rescue NameError
-      include_controller_for(task)
-      Object.const_get(@controller_class.to_sym)
     end
 
-    def include_controller_for(task)
-      require File.join([root, "app/controllers", "#{task}_controller"])
-    rescue LoadError
-      self.exit_value = 255
-      raise ControllerNotFound, task
+    def autoload_controllers
+      base_path = File.join([root, "app/controllers"])
+      $LOAD_PATH << base_path
+      Dir.glob(File.join([base_path, "*_controller.rb"])).each do |path|
+        filename = File.basename(path)
+        controller_name = filename.split(".rb").first
+        if controller_name.to_s.length > 0
+          const_name = controller_name.split("_").map!{|x| x.capitalize!}.join
+
+          # place the constant to the root namespace
+          Object.class_eval do
+            autoload const_name.to_sym, controller_name
+          end
+        end
+      end
     end
 
     def call_action_on_controller

data/lib/lucie/controller/base.rb

@@ -72,14 +72,8 @@ module Lucie
 
       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
+          return self.send(action)
         else
           raise ActionNotFound.new(action, nil)
         end

data/lib/lucie/version.rb

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

data/test/functional/app_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 require "stringio"
-require "helpers/test_app"
+require "fixtures/test_app"
 require "fixtures/command_parser_fixtures"
 
 describe App do
@@ -111,4 +111,14 @@ describe App do
   should "store the ENV" do
     assert_equal ENV["PWD"], TestApp.init([], "").env["PWD"]
   end
+
+  should "find other controllers as well in controllers directory without require statement" do
+    if defined?(FakeController)
+      Object.send(:remove_const, :FakeController)
+    end
+
+    assert_output "ok", "" do
+      TestApp.run "inheritance index", File.expand_path("../../test_app/", __FILE__)
+    end
+  end
 end

data/test/test_app/app/controllers/fake_controller.rb

@@ -0,0 +1,2 @@
+class FakeController < Controller::Base
+end

data/test/test_app/app/controllers/inheritance_controller.rb

@@ -0,0 +1,5 @@
+class InheritanceController < FakeController
+  def index
+    print "ok"
+  end
+end

data/test/test_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucie-lib
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Nucc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,13 +88,15 @@ files:
 - lib/lucie/validators/optional.rb
 - lib/lucie/version.rb
 - lucie-lib.gemspec
+- test/fixtures/before_filter_controller.rb
 - test/fixtures/command_parser_fixtures.rb
 - test/fixtures/template_snippet_fixtures.rb
+- test/fixtures/test_app.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_app/app/controllers/fake_controller.rb
+- test/test_app/app/controllers/inheritance_controller.rb
 - test/test_helper.rb
 - test/unit/command_line_parser_test.rb
 - test/unit/command_line_slicer_test.rb
@@ -124,13 +126,15 @@ specification_version: 4
 summary: Library part of Lucie framework. Use only this gem, if you don't need project
   generator.
 test_files:
+- test/fixtures/before_filter_controller.rb
 - test/fixtures/command_parser_fixtures.rb
 - test/fixtures/template_snippet_fixtures.rb
+- test/fixtures/test_app.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_app/app/controllers/fake_controller.rb
+- test/test_app/app/controllers/inheritance_controller.rb
 - test/test_helper.rb
 - test/unit/command_line_parser_test.rb
 - test/unit/command_line_slicer_test.rb