incline 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b57eeb71154ecd78ca518cff42f4611b83039d
-  data.tar.gz: deaf5ce2ff1810f725b928d00aec489e80e63a76
+  metadata.gz: 5d480afc97f1235565c6a453fc357d1a3055b3b0
+  data.tar.gz: 439acc31750a1a618f1255f3fcf6d4efaea31492
 SHA512:
-  metadata.gz: 0b1350992064923d07dbdd0de0257ebbe98f9bf308a62b5b35d3dbe36dfd9c90f905fb1b18d16009ba82b4ee7438eb090820c4c80424a3698bd240cb58a96917
-  data.tar.gz: 25bc635ab9533868136a17239a0141ab7922d74f814eb11a99de455055334b04cbcbf052cfab22b7906c9b88be7c08bcbf06f68498fec9cfae78acf6b40d7d0c
+  metadata.gz: 3dd29096c66f7cf8678dee49f828fc9f0dfa79aa014837068fc1194ba031dc48ab915bf211344934e20cc495954a9267c9cea8837c609733d7b4d2b6ca16eddf
+  data.tar.gz: 2e9f293bdd559bf718ea385031de52c15683f3978613df97370712dd518c76e8bc1899347edd3cfc0cc33ae5d1b99d3f1968124d16a1b99ca38d3a2e5c183e96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.2.17)
+    incline (0.2.18)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass

data/app/models/incline/action_security.rb

@@ -31,41 +31,7 @@ module Incline
       self.allow_anon = self.require_anon = self.require_admin = self.unknown_controller = self.non_standard = false
 
       self.unknown_controller = true
-      klass =
-          begin
-            (controller_name + '_controller').classify.constantize
-          rescue NameError
-             nil
-          end
-
-      unless klass
-        options =
-            if controller_name.include?('/')
-              ns = controller_name.rpartition('/')[0]
-              ctrl = controller_name.rpartition('/')[2]
-              options = [
-                  "#{ns}/app/controllers/#{ns}/#{ctrl}_controller",
-                  "app/controllers/#{ns}/#{ctrl}_controller",
-                  "#{ns}/app/controllers/#{ctrl}_controller",
-                  "#{ns}/#{ctrl}_controller"
-              ]
-            else
-              options = [
-                  "app/controllers/#{controller_name}_controller",
-                  "#{controller_name}_controller"
-              ]
-            end
-
-        while (file = options.shift)
-          begin
-            require file
-            klass = (controller_name + '_controller').classify.constantize
-            break
-          rescue LoadError, NameError
-            # just preventing the error from bubbling up.
-          end
-        end
-      end
+      klass = ::Incline.get_controller_class(controller_name)
 
       if klass
         self.unknown_controller = false

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.2.17"
+  VERSION = "0.2.18"
 end

data/lib/incline.rb

@@ -146,6 +146,66 @@ module Incline
   def self.migrate!
     ActiveRecord::Migrator.migrate File.expand_path('../../db/migrate', __FILE__), nil
   end
+  
+  ##
+  # Locates and loads a controller's class definition.
+  #
+  # If found, returns the controller class, otherwise nil.
+  def self.get_controller_class(controller_name)
+    controller_name += '_controller' unless controller_name =~ /_controller$/
+    class_name = controller_name.classify
+    
+    klass =
+        begin
+          class_name.constantize
+        rescue NameError
+          nil
+        end
+    
+    if klass
+      unless klass <= ::ActionController::Base
+        ::Incline::Log::warn "The '#{class_name}' class does not inherit from 'ActionController::Base'."
+        return nil
+      end
+    end
+    
+    unless klass
+      file_options =
+          if controller_name.include?('/')
+            ns,_,ctrl = controller_name.rpartition('/')
+            [
+                "#{ns}/app/controllers/#{ns}/#{ctrl}_controller",
+                "app/controllers/#{ns}/#{ctrl}_controller",
+                "#{ns}/app/controllers/#{ctrl}_controller",
+                "#{ns}/#{ctrl}_controller"
+            ]
+          else
+            [
+                "app/controllers/#{controller_name}_controller",
+                "#{controller_name}_controller"
+            ]
+          end
+      
+      while (file = file_options.shift)
+        begin
+          require file
+          klass = class_name.constantize
+          if klass <= ::ActionController::Base
+            ::Incline::Log::debug "Found '#{class_name}' in '#{file}'."
+          else
+            ::Incline::Log::warn "Found '#{class_name}' in '#{file}', but it does not inherit from 'ActionController::Base'."
+            klass = nil
+          end
+          break
+        rescue LoadError, NameError
+          # don't bubble up these errors.
+          klass = nil
+        end
+      end
+    end
+    
+    klass
+  end
 
   private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Beau Barker