scms 3.0.4 → 3.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWVmZDQ5MGVhNjU5ZGE0MGY1MjNlYTVkZDFlOGE2NjRlZjIzN2Y4Nw==
+    MGY4MWMyMjE3ZjdlOTBiOGU1Y2Y5ZmFlY2ViY2VlNDRkMmE2ZTBlNA==
   data.tar.gz: !binary |-
-    MjMxN2Q1Y2UzZDdhNDdmYzIyZDRkYjBiZDc2ZDhiY2IwODhlZjQ5Zg==
+    N2U4NjVkMDM3Mjc0OWZiZmFkYTNmOTliNjkzMDBkYzgzMGJkZmM4OQ==
 SHA512:
   metadata.gz: !binary |-
-    YzMxMDJmZWU1MTdiMGU5ZmYyOTUxZTM4Y2E2NmVhODY3OGJiMDIyZWMzYTAy
-    MjU2OGM4YmJlMzNmZDk1NjljN2ZlZGE2NWU4ZjZkZmVkODc5MDIzYjNiZTFi
-    NjdiOTRmYTc3ZTAzZTI4Y2UxOTU2YzcxOTc2YWQ1MDQyOGNkMTA=
+    MmE1MWJhOGU0N2Q3NjA0MThjMmEyOWNmYmI2NDdhYTY3NWM1ZmFiNWExMDZi
+    NGFkMzMzYWQ2MDRiM2Y0YzdlMDg3MGU4ZWVkYmFhMjAzNzdjMWVlNWU1Nzg5
+    OGQxNzUzOWY5ZWVjMGM1MGJjNTQ4MDhmYTRhZTYwZmMzNThiYmM=
   data.tar.gz: !binary |-
-    YWQ3ODFiOGI4ZTZkNmRlMDkyODBhZWYwZTEzOWVmMTI5ZjIzZDdmZTBjYjRh
-    ODg5ZGZjYmJmMzQ3YTk4YmMyNThkZDUyODcwNDMzNGNmZmYxMGQyNWVlYzMw
-    NGNhNDkwMzcyYmM1ZmJmMDQwZmY2OTVkNThlZmI1MGNmMTlhYmQ=
+    ZTJhNDVjNmQ2NzcxNTE4ZjhjZGVjNDk5MTVhZmE1MTdhZjA4ZjkwZTZkYTEy
+    YjBkZTAwMWI1YzYzOWIzMGMwNDkyZGEwMDFiZTA5Njc0NDUyODVmYTRkYzI1
+    Yzk4MDhhZTU1NTllMDA1ZGE3OGI1NmJlZWI1MzFhZjhiMWJlNWE=

data/lib/scms.rb

@@ -111,13 +111,18 @@ module Scms
                         if pageconfig["handler"] != nil
                             handlerpath = File.join(@website, pageconfig["handler"])
                             if File.exists?(handlerpath)
-                                #ScmsUtils.log( "Handler found: #{pageconfig["handler"]}" )
-                                require handlerpath
-                                funDefined = defined? Handler.render
-                                if funDefined != nil
-                                    hasHandler = true
-                                else
-                                    ScmsUtils.errLog( "Handler doesnt have a render method" )
+                                ScmsUtils.log( "Handler found: #{pageconfig["handler"]}" )
+                                hasHandler = true
+                                begin
+                                     require handlerpath
+                                #     #hasHandler = ScmsHandler.instance_methods(false).include? :render
+                                #     hasHandler = ScmsHandler.method_defined?(:render)
+                                #     puts "has render method: #{hasHandler}"
+                                #     if !hasHandler
+                                #         ScmsUtils.errLog( "Handler doesnt have a render method" )
+                                #     end
+                                rescue Exception => e 
+                                    ScmsUtils.errLog( "Problem running: ScmsHandler: #{e.message}" )
                                 end
                             else
                                 ScmsUtils.errLog("Handler not found: #{pageconfig["handler"]}")
@@ -171,7 +176,7 @@ module Scms
                                     if hasHandler
                                         ScmsUtils.log("Rendering with handler")
                                         begin
-                                            viewSnippet = Handler.render(viewpath)
+                                            viewSnippet = ScmsHandler.render(viewpath)
                                         rescue Exception=>e
                                             ScmsUtils.errLog(e.message)
                                             ScmsUtils.log(e.backtrace.inspect)

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync