objectsframework 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66c4aab9f98eb5bab5e492fdd128af96701b5fd1
-  data.tar.gz: 8703ff842c0f3029f241b54dc6bfabbbc905f6f8
+  metadata.gz: 8473759ee5a1dcf0869209554775c3bbf357c19b
+  data.tar.gz: 5f1bf46f201910b77a8d1533eaf9b8923cc3e2ba
 SHA512:
-  metadata.gz: 9ecfb074f8755e8804f987e00dabc3df1bff641ac92622156a6d9c04a80dcd47381390579762a673469584a1ce158eb04aff8ee1869d08d64d5ac7d1ff0c4cf1
-  data.tar.gz: 84a2a4ce630ee03a788e317936a7cdaaeff87eccf5a8f28f45c8cd198783fc2bac312acc82f8e161a68788fde60cb93baa5b7a109599a91d9db15ba0ab4e51d0
+  metadata.gz: 31331c5f6f94730c621663814a2293f6ac16b7eae739563a2993e600657e12282fda9c3f0e8b8606a88c5bdfe620d820b3a666fced5302a58f79612a8f8a9632
+  data.tar.gz: 082b5bbe45575af69f5395c95b7ce785b98fc39715c8b807b345f6ddfd77e5002793f46618c31c483260b726bba21dc1dac8c6dcad24199193638245091a466c

data/lib/objectsframework/hook_helper.rb

@@ -0,0 +1,9 @@
+module ObjectsFramework
+	module HookHelper
+		@@hooks = []
+
+		def self.add_hook(hook)
+			@@hooks << hook
+		end
+	end
+end

data/lib/objectsframework/hooks.rb

@@ -3,8 +3,19 @@ module ObjectsFramework
 		def self.fire(filter, klass)
 			hooks_to_execute = klass.class.get_hooks.select { |hook| hook[:filter] == filter }
 			hooks_to_execute.each do |hook|
-				klass.send(hook[:method].to_sym)
+				result = klass.send(hook[:method].to_sym)
+				return result unless result == 0
 			end
+			return 0
 		end
+
+		def self.hook_exists?(filter,klass)
+			!(klass.class.get_hooks.select{|hook| hook[:filter] == filter}).empty?
+		end
+
+		def self.continue
+      return 0
+    end
+
 	end
 end

data/lib/objectsframework/object.rb

@@ -1,7 +1,7 @@
 module ObjectsFramework
   class Object
-      def set_instance_variables(request,response)
-        @request,@response = request,response
+      def set_instance_variables(request,response,env)
+        @request,@response,@env = request,response,env
         return self;
       end
 
@@ -13,6 +13,10 @@ module ObjectsFramework
         @response
       end
 
+      def continue
+        return 0
+      end
+
       # Object hooks:
       # Usage: add_hook :filter => "afilter", :method => "yourmethod"
       # Available hooks/filters (some are not implement yet, but planned):
@@ -20,6 +24,9 @@ module ObjectsFramework
       # * request.finished: fired when the request is finished and the response is about to get served [planned]
       # * server.ready: fired when the server is ready accepting connections [planned]
       # * server.error: fired when an internal error happens (for example method not found) [planned]
+      # * request.capture: capture the request before anything happens, like a real pirate! (fired after your object is created)
+      #                    if the result of your hook returns true, the request must be finished by your hook
+      #                    this can block the request
       # All hooks are blocking, so they could eventually block the request [Future testing required]
       @@hooks = []
 

data/lib/objectsframework/object_handler.rb

@@ -11,15 +11,26 @@ module ObjectsFramework
       parts = path.split("/")
       if(path == "/" && !context.config[:root].nil?)
         klass = Object.const_get(context.config[:root]).new
+        klass.set_instance_variables(request,response,context.env)
+
+        captured_result = captured?(klass)
+        if(captured_result != 0)
+          return captured_result
+        end
 
         Hooks.fire("object.before_execute", klass)
 
-        klass.set_instance_variables(request,response).send(request.request_method.downcase!+"_"+context.config[:index_method])
-        return
+        klass.send(request.request_method.downcase!+"_"+context.config[:index_method])
+        return true
       end
 
       begin
-        klass = Object.const_get(parts[1].capitalize).new.set_instance_variables(request,response)
+        klass = Object.const_get(parts[1].capitalize).new.set_instance_variables(request,response,context.env)
+
+        captured_result = captured?(klass)
+        if(captured_result != 0)
+          return captured_result
+        end
 
         Hooks.fire("object.before_execute", klass)
 
@@ -34,21 +45,38 @@ module ObjectsFramework
         end
       rescue Exception => e
         begin
-          obj = Object.const_get(context.config[:root]).new.set_instance_variables(request,response)
+          obj = Object.const_get(context.config[:root]).new.set_instance_variables(request,response,context.env)
+
+          captured_result = captured?(obj)
+          if(captured_result != 0)
+            return captured_result
+          end
+
           Hooks.fire("object.before_execute", obj)
           obj.send(request.request_method.downcase!+"_"+parts[1])
-          return
+          return true
         rescue
 
         end
         response.status =  404
         notfound_response(response,e)
       end
-
+      return true
     end
 
     def self.notfound_response(response,e)
       response.write "<h1>404 Not Found</h1><hr/><i>Ruby Rack Server powered by ObjectsFramework <br/><pre>#{e.to_s}</pre></i>"
     end
+
+    def self.captured?(klass)
+      if(Hooks.hook_exists?("request.capture",klass))
+          result = Hooks.fire("request.capture",klass)
+          if(result != 0)
+            return result
+          end
+          return 0
+      end
+      return 0
+    end
   end
 end

data/lib/objectsframework/server.rb

@@ -1,12 +1,13 @@
 module ObjectsFramework
   class Server
-    attr_accessor :config
+    attr_accessor :config, :env
 
     def initialize(config = {})
       @config = {:index_method => "index"}.merge(config)
     end
 
     def call(env)
+      @env = env
       request = Rack::Request.new(env)
       response = Rack::Response.new(env)
       # Solves some weird bug where ENV is added to the response body
@@ -14,8 +15,12 @@ module ObjectsFramework
       response.length = 0
       # Set text/html as Content-type by default
       response.header["Content-type"] = "text/html"
-      ObjectsFramework::ObjectHandler.run_methods(request,response,self);
-      response.finish
+      handler = ObjectsFramework::ObjectHandler.run_methods(request,response,self)
+      if(handler === true)
+        response.finish
+      else
+        return handler
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: objectsframework
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Bram Vandenbogaerde
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/objectsframework.rb
+- lib/objectsframework/hook_helper.rb
 - lib/objectsframework/hooks.rb
 - lib/objectsframework/object.rb
 - lib/objectsframework/object_handler.rb