actionframework 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWFhZWM0YWE5ZGNiNGZmOTliMjFhNWY2NjUzNWJmMGE2NzRjNzRmNA==
-  data.tar.gz: !binary |-
-    NDFjZDIwYTFlMWQxNGFiYjAyOWI2MzlhMjJlZDZjZGFkMzU2YWYxMQ==
+SHA1:
+  metadata.gz: e567264bb4c4bea8b0995d3732ab73749566b048
+  data.tar.gz: 4f4403e202ad4a53f497813a9a69a67a5474e834
 SHA512:
-  metadata.gz: !binary |-
-    NjkyNTlkODJkZDI3MmIyN2IyMTAxNTg5MTlmMTk4ZmQwMDIwZmJmYzA0NjNk
-    MWMzYTZhNDc3NzlmMjE1MjljNzkwZWU1ZDQxNDQyNTJhYmE4OGM4Nzk5MjYy
-    ZDFhNjc5NDdkMGIwMzNlYzE4MzkzMjJkY2E1MDMyYWYzNTIxODg=
-  data.tar.gz: !binary |-
-    YTM3NmFlODM2ZTA0MmU3MGFhMzVmNWVjMTFjNmNhYzA0ZDQ2MTNkNWM0YjY5
-    MGUxMjMwNWFhYjg3ZmRhMDg4OTUzY2M2NDhmZWZjOGJkZmU0NThkMzlmOTY1
-    NDdiMjJlNDcyNDY2NTE0ODg0ZmM4ZmIxYzUwNWRiZTY2M2JlMzk=
+  metadata.gz: 749bb05d5c73a860a8c7f033206a9b26d0892d2178d9df1ee125e325fd76ff410d0af6b5b18c518ff9af46ea62ddccb4081eda910dbf0d5f1be25bce786d85f7
+  data.tar.gz: 53d628a78ff2bb2895712ec6973499f97245583c692ed52d8a007bae519a8894e860f461a18ee0f78d76cd6e4964a6744c8542d38263b9102364ce13b720d4d6

data/bin/action

@@ -4,7 +4,6 @@ require 'fileutils'
 require 'actionframework'
 require 'json'
 require 'httparty'
-require 'minigit'
 
 class String
 def black;          "\033[30m#{self}\033[0m" end

data/lib/actionframework.rb

@@ -17,13 +17,18 @@ require 'actionframework/realtime'
 require 'actionframework/base'
 require 'actionframework/authentication'
 require 'actionframework/mailer'
+require 'actionframework/project'
+require 'actionframework/nextcontroller'
 require 'event_emitter'
 
 
+
 $runningserver = nil
 
 module ActionFramework
 	class Server
+		attr_accessor :routesklass
+
 		def initialize
 			require 'bundler'
 			Bundler.require(:default)
@@ -35,7 +40,7 @@ module ActionFramework
 		def self.current
 	       if($runningserver.nil?)
 	       	 $runningserver = ActionFramework::Server.new
-	       	 $runningserver.autoimport
+					 ActionFramework::Project.autoimport
 	         $runningserver
 	       else
 	         $runningserver
@@ -46,27 +51,10 @@ module ActionFramework
 	      $runningserver = runningserver
 	    end
 
+			# DEPRECATED This method will soon be removed in favor of ActionFramework::Project.autoimport
 	    def autoimport
-	      Dir.glob("controllers/*.rb").each do |file|
-	        require './'+file
-	      end
-
-	      Dir.glob("controller/mailers/*.rb") do |file|
-	      	require './'+file
-	      end
 
-	      Dir.glob("models/*.rb").each do |file|
-	        require './'+file
-	      end
-
-	      require './config/routes'
-	      require './config/settings'
-	      require './config/plugables'
-	      require './config/mailer'
-
-	      Dir.glob("initializers/*.rb").each do |file|
-	        require './'+file
-	      end
+	     ActionFramework::Project.autoimport
 
 	    end
 
@@ -99,8 +87,12 @@ module ActionFramework
 			matcheddata = controllerinfo[1]
 
 			result = ActionFramework::ControllerSupervisor.new.run(controller,env,req,res,matcheddata)
-			res.write result
-			res.finish
+			if(result.class.to_s == "ActionFramework::ThisObject")
+				result.response.finish
+			else
+				res.write result
+				res.finish
+			end
 		end
 		def routes &block
 			@routesklass.instance_eval &block

data/lib/actionframework/base.rb

@@ -21,7 +21,7 @@ module ActionFramework
 				end
 
 				use Rack::Session::Cookie, :secret => ActionFramework::Server.current.get_settings.cookie_secret
-				
+
 				use Warden::Manager do |manager|
 					config = File.read('./config/auth.rb')
 					manager.failure_app = ActionFramework::Server.current
@@ -38,4 +38,4 @@ module ActionFramework
 			@app.call(env)
 		end
 	end
-end
+end

data/lib/actionframework/controller.rb

@@ -83,11 +83,26 @@ module ActionFramework
 					output = returns
 					break
 				end
-				
+
 			end
 
 			return output
 		end
 
+		def _static filename
+			File.read("./views/_/#{filename}.html")
+		end
+
+		def _erb templatename,context=self
+			renderer = Tilt::ERBTemplate.new("./views/#{templatename}")
+			renderer.render(context)
+		end
+
+
+		# Legacy support for partials
+		def _render filename
+			File.read("./views/_/#{filename}.html")
+		end
+		
 	end
 end

data/lib/actionframework/controller_supervisor.rb

@@ -1,12 +1,25 @@
 module ActionFramework
   class ControllerSupervisor
     def run(execute_cmd,env,req,res,url)
+      if(execute_cmd.class == Array)
+        classname,methodname = execute_cmd[0].split("#")[0], execute_cmd[0].split("#")[1]
+        controller = Object.const_get(classname).new
+        controller.setup(req,res,url,execute_cmd);
+        controller.setNext(1);
+        controller.send(methodname)
+
+        return controller.this
+      else
+
       classname, methodname = execute_cmd.split("#")[0], execute_cmd.split("#")[1]
 
-      controller = Object.const_get(classname).new(env,req,res,url)
+      controllerobject = Object.const_get(classname)
+
+      controller = controllerobject.new(env,req,res,url)
       object_from_run_before = controller.execute_run_before
       return object_from_run_before unless object_from_run_before.nil?
       return controller.send(methodname);
+      end
     end
   end
 end

data/lib/actionframework/nextcontroller.rb

@@ -0,0 +1,71 @@
+require 'rack'
+require 'actionframework/controller'
+require 'actionframework/template_manager'
+
+module ActionFramework
+  class ThisObject
+    def method_missing(meth,*args,&block)
+      if(meth.to_s.include?("="))
+        instance_variable_set("@"+meth.to_s.gsub("=",""),args[0])
+
+        create_method(meth.to_s.gsub("=","")) do
+          instance_variable_get("@"+meth.to_s.gsub("=",""))
+        end
+      else
+        super
+      end
+    end
+
+    def create_method( name, &block )
+          self.class.send( :define_method, name, &block )
+    end
+  end
+
+  class NextControllerError < StandardError
+
+  end
+
+  module NextController
+      attr_accessor :klass
+      attr_accessor :method
+      attr_accessor :nexts
+      attr_accessor :nextElementPlace
+      attr_accessor :neep
+      attr_writer :this
+
+
+      def setup(req,res,url,nexts)
+        this.request = req
+        this.response = res
+        this.url = url
+        @nexts = nexts
+      end
+
+      def goNext(ctx)
+        raise  ActionFramework::NextControllerError,"No \"next\" found, check your routes.rb" if(ctx.nexts.length < ctx.neep+1)
+
+        klass,method = ctx.nexts[ctx.neep].split("#")[0],ctx.nexts[ctx.neep].split("#")[1]
+        klass_inst = Object.const_get(klass).new
+        klass_inst.this = ctx.this
+        klass_inst.nexts = ctx.nexts
+        klass_inst.setNext(ctx.neep+1)
+        klass_inst.send(method)
+
+      end
+
+      def setNext(nextElementPlace)
+        @neep = nextElementPlace
+      end
+
+      def this
+        if(@this.nil?)
+          @this = ActionFramework::ThisObject.new
+        end
+        @this
+      end
+
+      def erb(templatename)
+        ActionFramework::TemplateManager::Erb.render(templatename,self)
+      end
+  end
+end

data/lib/actionframework/project.rb

@@ -0,0 +1,28 @@
+module ActionFramework
+  class Project
+      def self.autoimport
+          Dir.glob("controllers/*.rb").each do |file|
+            require './'+file
+          end
+
+          Dir.glob("controller/mailers/*.rb") do |file|
+            require './'+file
+          end
+
+          Dir.glob("models/*.rb").each do |file|
+            require './'+file
+          end
+
+          require './config/routes'
+          require './config/settings'
+          require './config/plugables'
+          require './config/mailer'
+
+          require './config/realtime' unless !File.exist?("./config/realtime.rb")
+
+          Dir.glob("initializers/*.rb").each do |file|
+            require './'+file
+          end
+      end
+  end
+end

data/lib/actionframework/realtime.rb

@@ -2,41 +2,67 @@
 # Licenced under MIT ##
 ### © BramVDB.com #####
 #######################
+
 require 'rack/websocket'
 require 'socket'
 require 'json'
+require 'redis'
+require 'tubesock'
 
+$redis = Redis.new
 module ActionFramework
-	class Realtime < Rack::WebSocket::Application
-
-		def initialize
-			super
-			@nosocket = true
-		
-			begin 
-				socket = UNIXSocket.new("./realtime.socket")
-				@nosocket = false
-				@message = ActionFramework::RealtimeMessage.new(socket)
-			rescue
+	class Realtime
+
+		def call(env)
+				tubesock = Tubesock.hijack(env)
+				tubesock.listen
 				
-			end
+				@sock = tubesock
+
+				tubesock.onmessage do |message|
+					on_message(env,message);
+				end
+
+				tubesock.onopen do
+					on_open(env)
+				end
+
+				tubesock.onclose do
+					on_close(env)
+				end
+		    [ -1, {}, [] ]
 		end
 
-		def on_open env
-			return exit_me unless @nosocket
-			@message.post("client_connected",{:env => env,:msg => msg})
+		def on_open(env)
+			request = Rack::Request.new(env)
+			perform_action(env,request,request.path,"on_open",nil)
 		end
 
-		def on_close env
-			
+		def on_message(env,message)
+			request = Rack::Request.new(env)
+			perform_action(env,request,request.path,"on_message",message)
 		end
 
-		def on_message env,msg
-			@message.post("client_message",{:env => env,:msg => msg})
+		def on_close(env)
+			request = Rack::Request.new(env)
+			perform_action(env,request,request.path,"on_close",nil)
 		end
 
-		def exit_me
-			puts "INFO: No Unix Socket found, your application doesn't implement the realtime API"
+		def self.configure
+			$realtime_config = RealtimeConfigure.new
+			yield($realtime_config)
 		end
+
+
+		def perform_action(env,req,path,method,payload)
+			matchedroute = ActionFramework::Server.current.routesklass.route(path,"realtime")
+			controller,url = matchedroute[0],matchedroute[1]
+
+			Object.const_get(controller).new(url,req,env,payload,@sock).send(method,payload)
+		end
+	end
+
+	class RealtimeConfigure
+		attr_accessor :enabled
 	end
-end
+end

data/lib/actionframework/realtime_controller.rb

@@ -0,0 +1,36 @@
+module ActionFramework
+  class RealtimeController
+      attr_accessor :url
+      attr_accessor :req
+      attr_accessor :env
+      attr_accessor :payload
+
+      def initialize(url,req,env,payload,socket)
+        @url = url
+        @req = req
+        @env = env
+        @payload = payload
+        @socket = socket
+      end
+
+      def request
+        @req
+      end
+
+      def socket
+        @socket
+      end
+
+      def on_open
+
+      end
+
+      def on_close
+
+      end
+
+      def on_message
+
+      end
+  end
+end

data/lib/actionframework/realtime_socket.rb

@@ -4,17 +4,7 @@ require 'securerandom'
 module ActionFramework
 	class RealtimeSocket
 		def initialize
-			@sock = UNIXServer.new("realtime.sock")
-		end
-
-		def listen
-			$pid = Procces.fork do
-				while(client = @sock.accept)
-					while(line = client.gets)
-						yield
-					end
-				end
-			end
+			puts "RealtimeSocket will soon be removed because of the choice of Redis for transport"
 		end
 	end
-end
+end

data/lib/actionframework/routes.rb

@@ -11,14 +11,14 @@ module ActionFramework
 		attr_accessor :redirects
 
 		def initialize
-			@routes = {:get => {}, :post => {}, :update => {}, :delete => {}, :patch => {}}
+			@routes = {:get => {}, :post => {}, :update => {}, :delete => {}, :patch => {},:realtime => {}}
 			@models = []
 			@redirects = []
 		end
 
 		def build_regex string
 			string = string.gsub("{{","(?<")
-			string = string.gsub("}}",">(.*))") 
+			string = string.gsub("}}",">(.*))")
 			string.insert(0,"^")
 			string = string+"$"
 			regex = Regexp.new (string)
@@ -26,34 +26,37 @@ module ActionFramework
 		end
 
 		def get hash
-			@routes[:get][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s] 
+			@routes[:get][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
 		end
 
 		def post hash
-			@routes[:post][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s] 
+			@routes[:post][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
 		end
 
 		def update hash
-			@routes[:update][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s] 
+			@routes[:update][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
 		end
 
 		def delete hash
-			@routes[:delete][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s] 
+			@routes[:delete][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
 		end
 
 		def patch hash
-			@routes[:patch][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s] 
+			@routes[:patch][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
 		end
 
 		def model name
 			# @models[name of the class of the model] = name of class of the access policy of the model
-			@models << name 
+			@models << name
+		end
+
+		def realtime hash
+			@routes[:realtime][build_regex(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
 		end
 
 		def route(path,method)
 			@routes[method.downcase.to_sym].each do |regex,controller|
-				puts regex.inspect
-				
+
 				if(matched = path.match(regex))
 					return [controller,matched]
 				end
@@ -77,9 +80,12 @@ module ActionFramework
 					end
 					return OpenStruct.new(redirect)
 				end
-			end	
+			end
 			nil
 		end
 
+	 def add_next(method,path,index,action)
+		@routes[method][build_regex(path)].insert(index,action);
+	 end
 	end
-end
+end

data/lib/actionframework/template_manager.rb

@@ -0,0 +1,12 @@
+module ActionFramework
+  module TemplateManager
+
+    class Erb
+      def self.render(template,ctx)
+        renderer = Tilt::ERBTemplate.new("views/layout.html.erb");
+        output = renderer.render(ctx){ Tilt::ERBTemplate.new("views/"+template.to_s+".html.erb").render(ctx) }
+      end
+    end
+
+  end
+end

data/resources/config/realtime.rb

@@ -0,0 +1,6 @@
+# Configure realtime interface
+# Please don't use the realtime interface yet because it is not functioning yet
+
+ActionFramework::Realtime.configure do |c|
+  c.enabled :false
+end

data/resources/templates/index.html.erb

@@ -4,9 +4,9 @@
 <pre style="text-align: left;margin: auto;width: 60%;">
 	<code>
 # In config/routes.rb
-ActionFramework::Server.current.routes do 
+ActionFramework::Server.current.routes do
 	get "/" => "DefaultController#index" # This route
 	get "/mynewroute" = "MyNewController#index" # Your new route!
-end	
+end
 	</code>
-</pre>
+</pre>

metadata

@@ -1,181 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: actionframework
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Bram Vandenbogaerde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: optitron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jewel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minigit
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: event_emitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: warden
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: event_emitter
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: warden
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionmailer
+  name: tubesock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A web framework built on top of Rack, it has the simplicity of sinatra
@@ -198,17 +226,22 @@ files:
 - lib/actionframework/mailer.rb
 - lib/actionframework/model.rb
 - lib/actionframework/modelhelper.rb
+- lib/actionframework/nextcontroller.rb
 - lib/actionframework/plugables.rb
 - lib/actionframework/plugmod.rb
+- lib/actionframework/project.rb
 - lib/actionframework/rackup.rb
 - lib/actionframework/realtime.rb
+- lib/actionframework/realtime_controller.rb
 - lib/actionframework/realtime_message.rb
 - lib/actionframework/realtime_socket.rb
 - lib/actionframework/routes.rb
 - lib/actionframework/settings.rb
 - lib/actionframework/string.rb
+- lib/actionframework/template_manager.rb
 - lib/actionframework/untitled
 - resources/config/auth.rb
+- resources/config/realtime.rb
 - resources/project_template/Gemfile
 - resources/project_template/authentication/README.md
 - resources/project_template/config.ru
@@ -239,19 +272,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: A web framework built on top of Rack
 test_files: []
-has_rdoc: