actionframework 0.0.7 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f2dfbfdbff057caaa49f475b6181cfe8a8c65a1c
+  data.tar.gz: a232de6f77636b5790bd31cb3f06887da70223a3
+SHA512:
+  metadata.gz: 60ca2cf0c2938de702fa57cebaa58bcd4fd4d6e5c5522454337a55bea0ec1f3db7ce60308f674bccc7def60214980d97fe03d6cfd5e21725c7d2c4ebf0de90d3
+  data.tar.gz: 4167766a9254097c0b2f8aca143708a9dae10c9b3f01a109b7b955e590ed84f9a112972efc724a72bbeac3ca059cfe62babc1b35caeb41ee77e226ce72bb2b47

data/bin/afw

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 require 'optitron'
 require 'fileutils'
-require 'gors'
+require 'actionframework'
 require 'json'
 
-class GorsCLI < Optitron::CLI
+class ActionFrameworkCLI < Optitron::CLI
 	desc "About ActionFramework"
 	def about
-		puts "ActionFramework (previously called GORS) is a web application framework that tries to be as flexible as sinatra and at the same time have the structure of rails.Enjoy!"
+		puts "ActionFramework (previously called ActionFramework) is a web application framework that tries to be as flexible as sinatra and at the same time have the structure of rails.Enjoy!"
 	end
 	desc "Create ActionFramework project"
 	def new projectname
@@ -20,30 +20,32 @@ class GorsCLI < Optitron::CLI
 		Dir.mkdir("#{projectname}/initializers")
 		FileUtils.touch("#{projectname}/views/layout.html.erb")
 		FileUtils.touch("#{projectname}/Gemfile")
-		File.write("#{projectname}/main.rb","# Example of basic configuration\ngors = Gors::Server.new\n\nngors.autoimport\ngors.start")
-		File.write("#{projectname}/controllers/default_controller.rb","class DefaultController < Gors::Controller
-\n	def index\n		\"<h1>Welcome to ActionFramework</h1><i>Great Opensource Ruby Server</i><p>Gors is loading routes from routes.json but you should write your own main.rb<br/>This is just to gettings started</p>\"\n    end\nend");
+		File.write("#{projectname}/main.rb","# Example of basic configuration\nActionFramework = ActionFramework::Server.new\n\nnActionFramework.autoimport\nActionFramework.start")
+		File.write("#{projectname}/controllers/default_controller.rb","class DefaultController < ActionFramework::Controller
+\n	def index\n		\"<h1>Welcome to ActionFramework</h1><i>Great Opensource Ruby Server</i><p>ActionFramework is loading routes from routes.json but you should write your own main.rb<br/>This is just to gettings started</p>\"\n    end\nend");
 		File.write("#{projectname}/routes.json","{\n \"get\": [{\n    \"/\": \"DefaultController#index\"\n}]\n}")
-		File.write("#{projectname}/config/routes.rb","Gors::Server.current.routes do\n\n	get \"/\" => \"DefaultController#index\"\n\nend")
-		File.write("#{projectname}/config/settings.rb","Gors::Server.current.settings do |s|\n\nend")
+		File.write("#{projectname}/config/routes.rb","ActionFramework::Server.current.routes do\n\n	get \"/\" => \"DefaultController#index\"\n\nend")
+		File.write("#{projectname}/config/settings.rb","ActionFramework::Server.current.settings do |s|\n\nend")
+		File.write("#{projectname}/Gemfile","source 'https://rubygems.org'\n\ngem 'actionframework'")
+		system("cd #{projectname} && bundle install")
 		puts "Done"
-		puts "Test ActionFramework by running \"gors s\""
+		puts "Run \"afw s\" to run your app"
 	end
 
-	desc "Start gors server"
+	desc "Start ActionFramework server"
 	def s  
-		Gors::Server.init
-		Gors::Server.current.start
+		$runningserver = ActionFramework::Server.new
+		ActionFramework::Server.current.start
 	end
 
-	desc "Start gors console"
+	desc "Start ActionFramework console"
 	def c
-		Gors::Server.init
-		puts "Starting Gors IRB"
+		$runningserver = ActionFramework::Server.new
+		puts "Starting ActionFramework IRB"
 		require 'irb'
 		ARGV.clear	
 		IRB.start
 	end
 end
 
-GorsCLI.dispatch
+ActionFrameworkCLI.dispatch

data/lib/actionframework/controller.rb

@@ -0,0 +1,36 @@
+#######################
+# Licenced under MIT ##
+### © BramVDB.com #####
+#######################
+
+module ActionFramework
+	class Controller
+		def initialize req,res,url
+			@req = req
+			@res = res
+			@url = url
+		end
+
+		def request
+			@req
+		end
+
+		def response
+			@res
+		end
+
+		def params
+			@req.params
+		end
+
+		def url
+			@url
+		end
+
+		def erb template
+      		renderer = Tilt::ERBTemplate.new("views/layout.html.erb")
+      		output = renderer.render(self){ Tilt::ERBTemplate.new("views/"+template.to_s+".html.erb").render(self) }
+      		return output
+		end
+	end
+end

data/lib/actionframework/rackup.rb

@@ -0,0 +1,2 @@
+$runningserver = ActionFramework::Server.new
+$runningserver.autoimport

data/lib/actionframework/routes.rb

@@ -0,0 +1,53 @@
+#######################
+# Licenced under MIT ##
+### © BramVDB.com #####
+#######################
+
+module ActionFramework
+	class Routes
+		attr_accessor :routes
+		def initialize
+			@routes = {:get => {}, :post => {}, :update => {}, :delete => {}, :patch => {}}
+		end
+
+		def build_regex string
+			string = string.gsub("{{","(?<")
+			string = string.gsub("}}",">(.*))") 
+			string.insert(0,"^")
+			string = string+"$"
+			regex = Regexp.new (string)
+			regex
+		end
+
+		def get hash
+			@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] 
+		end
+
+		def update hash
+			@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] 
+		end
+
+		def patch hash
+			@routes[:patch][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
+				p regex
+				if(matched = path.match(regex))
+					return [controller,matched]
+				end
+			end
+			return nil
+		end
+	end
+end

data/lib/actionframework/settings.rb

@@ -0,0 +1,12 @@
+module ActionFramework
+	class Settings
+		attr_accessor :server
+		attr_accessor :port
+		attr_accessor :errorhandler
+
+		def initialize
+			@port = 3000
+			@server = "thin"
+		end	
+	end
+end	

data/lib/actionframework.rb

@@ -1,329 +1,84 @@
 require 'rack'
-require 'erb'
 require 'tilt'
 require 'json'
-require 'ostruct'
+require 'erb'
+
+require 'actionframework/routes'
+require 'actionframework/controller'
+require 'actionframework/settings'
 
 $runningserver = nil
 
 module ActionFramework
-  class Server
-    def self.init
-      require 'bundler'
-      Bundler.require(:default)
-      ActionFramework::Server.current = ActionFramework::Server.new
-      ActionFramework::Server.current.autoimport
-    end
-    def initialize
-      @settings = Settings.new
-      @logger = Logger.new(@settings)
-      @routesklass = Routes.new(@logger)
-    end
-    
-    def self.current
-       if($runningserver.nil?)
-         ActionFramework::Server.init
-         $runningserver
-       else
-         $runningserver
-       end
-    end
-    
-    def self.current=(runningserver)
-      $runningserver = runningserver
-    end
-
-    def run
-    
-    end
-
-    def call env
-      if(@settings.errorhandler != nil)
-        @errorhandler = Object.const_get(@settings.errorhandler).new
-      else
-        @errorhandler = ActionFramework::DefaultErrorHandler.new
-      end
-
-      routesinfo = @routesklass.routes(env["REQUEST_PATH"])
-      controller = routesinfo[0]
-      @logger.log controller.inspect
-      matcheddata = routesinfo[1]
-
-      if(controller == nil)
-        if(@settings.server != "thin")
-          response = ["<h1>404 Not Found</h1>"]
-        else
-          response = "<h1>404 Not Found</h1>"
-        end
-        return @errorhandler.call "404"
-      end
-
-      #
-      if(controller.include? "ActionFramework::")
-        ctrl = controller.split("#")
-        params = ctrl[1].split(":")
-
-        req = Rack::Request.new(env)
-
-        data = Model.new(req).call(params[1])
-        return ["200",{"Content-type" => "application/json"},[data]]
-      end
-
-      # Call the Controller
-      request = Request.new
-      request.request.params = Rack::Utils.parse_query(env["QUERY_STRING"])
-      if(matcheddata != nil)
-        request.request.params.merge! (matcheddata)
-      end
-      request.request.params.default = ""
-
-      infoctrl = controller.split("#")
-      ctrl = Object.const_get(infoctrl[0]).new(request) 
-
-      response = ctrl.send(infoctrl[1])
-      if(@settings.server != "thin")
-        response = [response]
-      end
-      [ctrl.info.response.status_code,ctrl.info.response.headers,response]
-    end
-
-    def start
-      if(@settings.errorhandler != nil)
-        @errorhandler = Object.const_get(@settings.errorhandler).new
-      else
-        @errorhandler = ActionFramework::DefaultErrorHandler.new
-      end
-
-      if(@settings.daemon)
-        puts "Sending ActionFramework to background"
-        system("kill `cat running.pid`")
-        Process.daemon true
-        File.write("running.pid",Process.pid)
-      end
-      @logger.log @routesklass.inspect
-      Rack::Server.new({:app => self,:server => @settings.server, :Port => @settings.port}).start
-    end
-
-    def routes &block
-      @routesklass.instance_eval &block
-    end
-
-    def settings
-      yield(@settings)
-    end
-
-    def autoimport
-      Dir.glob("controllers/*").each do |file|
-        require './'+file
-      end
-
-      Dir.glob("models/*").each do |file|
-        require './'+file
-      end
-
-      require './config/routes'
-      require './config/settings'
-
-      Dir.glob("initializers/*").each do |file|
-        require './'+file
-      end
-
-    end
-
-  end
-  class Routes
-    NAME_PATTERN = /:(\S+)/
-
-    attr_accessor :routes
-    attr_accessor :models
-    attr_accessor :posts
-
-    def initialize logger
-      @routes = {}
-      @models = {}
-      @logger = logger
-      @routespost = {}
-    end
-
-    def get hash
-      @routes[pattern_for(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
-      @logger.log "Adding route GET "+hash.keys.first.to_s
-    end
-
-    def json
-      # TODO zorg evoor dat routes ook van routes.json gehaald kunnen worden (structuur zie generator in de CLI)
-    end
-
-    def post hash
-      @routespost[hash.keys.first.to_s] = hash[hash.keys.first.to_s]
-      @logger.log "Adding route POST "+hash.keys.first.to_s
-    end
-
-    def post
-
-    end
-
-    def model hash
-      @routes["/api/"+hash.keys.first.to_s] = "ActionFramework::Model#call:"+hash[hash.keys.first.to_s];
-      puts "Adding model with path "+hash.keys.first.to_s
-    end
-
-    def routes(path)
-      hash = {}
-      controller = nil
-      @routes.each do |route,controller|
-        if(matched = route.match path)
-          matched.names.each do |name|
-            hash[name] = matched[name]
-          end
-         
-          return [controller,hash]
-        end
-      end
-    end
-    # Logic from github.com/alisnic/nyny
-    def pattern_for signature
-        if(signature.class == Regexp)
-          return signature
-        end
-        build_regex(signature.start_with?('/') ? signature : "/#{signature}")
-    end
-
-    def build_regex signature
-        return %r(^#{signature}$) unless signature.include?(':')
-
-        groups = signature.split('/').map do |part|
-          next part if part.empty?
-          next part unless part.start_with? ':'
-          name = NAME_PATTERN.match(part)[1]
-          %Q{(?<#{name}>\\S+)}
-        end.select {|s| !s.empty? }.join('\/')
-
-        %r(^\/#{groups}$)
-    end
-  end
-  class Controller
-    attr_accessor :info
-
-    def initialize(context)
-      @info = context
-       if(self.respond_to? "before")
-        self.before
-       end
-    end
-
-    def erb template
-      renderer = Tilt::ERBTemplate.new("views/layout.html.erb")
-      output = renderer.render(self){ Tilt::ERBTemplate.new("views/"+template.to_s+".html.erb").render(self) }
-      return output
-    end
-
-    def params
-      @info.request.params
-    end
-  end
-
-  class Request
-    attr_accessor :response
-    attr_accessor :request
-
-    def initialize
-       @response = OpenStruct.new ({:headers => {}, :status_code => "200"})
-       @request =  OpenStruct.new ({:ip => "",:user_agent => "",:headers => {},:params => {}})
-    end
-
-    def info
-      return @info
-    end 
-  end
-
-  class Model
-    def initialize req
-      @req = req
-    end
-
-    def call modelname
-      case @req.request_method
-        when "GET"
-          if(Object.const_get(modelname.capitalize).respond_to? "append")
-            model = Object.const_get(modelname.capitalize).all.send(Object.const_get(modelname.capitalize).append)
-          else
-            model = Object.const_get(modelname.capitalize).all
-          end
-          model.to_json
-        when "POST"
-          if(Object.const_get(modelname.capitalize).respond_to? "append")
-            model = Object.const_get(modelname.capitalize).create(JSON.parse(@req.body.string))
-          else
-            model = Object.const_get(modelname.capitalize).create(JSON.parse(@req.body.string))
-          end
-          model.to_json
-        else
-         
-        end
-    end
-
-  end
-
-  class Settings
-    attr_accessor :port
-    attr_accessor :server
-    attr_accessor :verbose
-    attr_accessor :daemon
-    attr_accessor :errorhandler
-
-    def initialize
-      @port = 8080
-      @server = "puma"
-      @verbose = true
-      @daemon = false
-      @errorhandler = nil
-    end
-  end
-  class Logger
-
-    def initialize(settings)
-      @settings = settings
-    end
-
-    def log msg
-      if(@settings.daemon)
-        return
-      end
-      if(@settings.verbose)
-        puts msg
-      end
-    end
-
-  end
-  
-  class ErrorHelper
-    def call(errortype)
-      if(self.respond_to? "error_"+errortype)
-        [errortype, {},[self.send("error_"+errortype)]]
-      else
-        ActionFramework::DefaultErrorHandler.new.send("error_"+errortype)
-      end
-    end
-  end
-
-  class DefaultErrorHandler < ActionFramework::ErrorHelper
-      def error_404
-        "<h1>404 Not Found</h1>"
-      end
-      def error_500
-        "<h1>500 Internal server error</h1>"
-      end
-      def error_403
-        "<h1>403 Forbidden</h1>"
-      end
-  end
- 
+	class Server
+		def initialize
+			require 'bundler'
+			Bundler.require(:default)
+			
+			@routesklass = ActionFramework::Routes.new
+			@settings = ActionFramework::Settings.new
+		end
+
+		def self.current
+	       if($runningserver.nil?)
+	       	 $runningserver = ActionFramework::Server.new
+	       	 $runningserver.autoimport
+	         $runningserver
+	       else
+	         $runningserver
+	       end
+	    end
+	    
+	    def self.current=(runningserver)
+	      $runningserver = runningserver
+	    end
+
+	    def autoimport
+	      Dir.glob("controllers/*").each do |file|
+	        require './'+file
+	      end
+
+	      Dir.glob("models/*").each do |file|
+	        require './'+file
+	      end
+
+	      require './config/routes'
+	      require './config/settings'
+
+	      Dir.glob("initializers/*").each do |file|
+	        require './'+file
+	      end
+
+	    end
+
+		def call env
+			req = Rack::Request.new(env)
+			res = Rack::Response.new
+
+			controllerinfo = @routesklass.route(req.path,req.request_method)
+			if(controllerinfo == nil)
+				res.write "<h1>404 Not found</h1>"
+				return res.finish
+			end	
+
+			controller = controllerinfo[0]
+			matcheddata = controllerinfo[1]
+
+			control = controller.split("#")
+			result = Object.const_get(control[0]).new(req,res,matcheddata).send(control[1])			
+			res.body = [result]
+			res.finish
+		end
+		def routes &block
+			@routesklass.instance_eval &block
+		end
+
+		def settings
+			yield @settings
+		end
+
+		def start
+	      Rack::Server.new({:app => self,:server => @settings.server, :Port => @settings.port}).start
+	    end
+	end	
 end
-
-at_exit do
-  puts "Exiting..."
-  if(File.exists? "running.pid")
-    File.delete("running.pid")
-  end
-end

data/lib/actionframework_old.rb

@@ -0,0 +1,373 @@
+require 'rack.rb'
+require 'erb'
+require 'tilt'
+require 'json'
+require 'ostruct'
+
+$runningserver = nil
+
+module ActionFramework
+  class Server
+    def self.init
+      require 'bundler'
+      Bundler.require(:default)
+      ActionFramework::Server.current = ActionFramework::Server.new
+      ActionFramework::Server.current.autoimport
+    end
+    def initialize
+      @settings = Settings.new
+      @logger = Logger.new(@settings)
+      @routesklass = Routes.new(@logger)
+    end
+    
+    def self.current
+       if($runningserver.nil?)
+         ActionFramework::Server.init
+         $runningserver
+       else
+         $runningserver
+       end
+    end
+    
+    def self.current=(runningserver)
+      $runningserver = runningserver
+    end
+
+    def run
+    
+    end
+
+    def call env
+      if(@settings.errorhandler != nil)
+        @errorhandler = Object.const_get(@settings.errorhandler).new
+      else
+        @errorhandler = ActionFramework::DefaultErrorHandler.new
+      end
+
+      routesinfo = @routesklass.routes(env["REQUEST_PATH"],env["REQUEST_METHOD"].downcase)
+      controller = routesinfo[0]
+      @logger.log controller.inspect
+      matcheddata = routesinfo[1]
+
+      if(controller == nil)
+        if(@settings.server != "thin")
+          response = ["<h1>404 Not Found</h1>"]
+        else
+          response = "<h1>404 Not Found</h1>"
+        end
+        return @errorhandler.call "404"
+      end
+
+      # Logic for models: in development
+      if(controller.include? "ActionFramework::")
+        ctrl = controller.split("#")
+        params = ctrl[1].split(":")
+
+        req = Rack::Request.new(env)
+
+        data = Model.new(req).call(params[1])
+        return ["200",{"Content-type" => "application/json"},[data]]
+      end
+
+      # Call the Controller
+      request = Rack::Request.new(env)
+      request.request.params = Rack::Utils.parse_query(env["QUERY_STRING"])
+      Rack::Utils.parse_query(env["rack.input"].read).each do |key,value|
+        request.request.params[key] = value
+      end
+
+      if(matcheddata != nil)
+        request.request.params.merge! (matcheddata)
+      end
+      request.request.params.default = ""
+
+      infoctrl = controller.split("#")
+      ctrl = Object.const_get(infoctrl[0]).new(request) 
+
+      response = ctrl.send(infoctrl[1])
+      if(@settings.server != "thin")
+        response = [response]
+      end
+      [ctrl.info.response.status_code,ctrl.info.response.headers,response]
+    end
+
+    def start
+      if(@settings.errorhandler != nil)
+        @errorhandler = Object.const_get(@settings.errorhandler).new
+      else
+        @errorhandler = ActionFramework::DefaultErrorHandler.new
+      end
+
+      if(@settings.daemon)
+        puts "Sending ActionFramework to background"
+        system("kill `cat running.pid`")
+        Process.daemon true
+        File.write("running.pid",Process.pid)
+      end
+      @logger.log @routesklass.inspect
+      Rack::Server.new({:app => self,:server => @settings.server, :Port => @settings.port}).start
+    end
+
+    def routes &block
+      @routesklass.instance_eval &block
+    end
+
+    def settings
+      yield(@settings)
+    end
+
+    def autoimport
+      Dir.glob("controllers/*").each do |file|
+        require './'+file
+      end
+
+      Dir.glob("models/*").each do |file|
+        require './'+file
+      end
+
+      require './config/routes'
+      require './config/settings'
+
+      Dir.glob("initializers/*").each do |file|
+        require './'+file
+      end
+
+    end
+
+  end
+  class Routes
+    NAME_PATTERN = /:(\S+)/
+
+    attr_accessor :routes
+    attr_accessor :models
+    attr_accessor :posts
+
+    def initialize logger
+      @routes = {:get => {}, :post => {},:update => {}, :delete => {},:patch => {}}
+      @models = {}
+      @logger = logger
+      @routespost = {}
+    end
+
+    def get hash
+      @routes[:get][pattern_for(hash.keys.first.to_s)] = hash[hash.keys.first.to_s]
+      @logger.log "Adding route GET "+hash.keys.first.to_s
+    end
+
+    def post hash
+      @routes[:post][hash.keys.first.to_s] = hash[hash.keys.first.to_s]
+      @logger.log "Adding route POST "+hash.keys.first.to_s
+    end
+
+    def update hash
+      @routes[:update][hash.keys.first.to_s] = hash[hash.keys.first.to_s]
+      @logger.log "Adding route UPDATE "+hash.keys.first.to_s
+    end
+
+    def delete hash
+      @routes[:delete][hash.keys.first.to_s] = hash[hash.keys.first.to_s]
+      @logger.log "Adding route DELETE "+hash.keys.first.to_s
+    end
+
+    def patch hash
+      @routes[:patch][hash.keys.first.to_s] = hash[hash.keys.first.to_s]
+      @logger.log "Adding route PATCH "+hash.keys.first.to_s
+    end
+
+    def model hash
+      # In development
+      @routes["/api/"+hash.keys.first.to_s] = "ActionFramework::Model#call:"+hash[hash.keys.first.to_s];
+      puts "Adding model with path "+hash.keys.first.to_s
+    end
+
+    def routes(path,method)
+      hash = {}
+      controller = nil
+      @routes[method.to_sym].each do |route,controller|
+        if(matched = route.match path)
+          matched.names.each do |name|
+            hash[name] = matched[name]
+          end
+         
+          return [controller,hash]
+        end
+      end
+    end
+    # Logic from github.com/alisnic/nyny
+    def pattern_for signature
+        if(signature.class == Regexp)
+          return signature
+        end
+        build_regex(signature.start_with?('/') ? signature : "/#{signature}")
+    end
+
+    def build_regex signature
+        return %r(^#{signature}$) unless signature.include?(':')
+
+        groups = signature.split('/').map do |part|
+          next part if part.empty?
+          next part unless part.start_with? ':'
+          name = NAME_PATTERN.match(part)[1]
+          %Q{(?<#{name}>\\S+)}
+        end.select {|s| !s.empty? }.join('\/')
+
+        %r(^\/#{groups}$)
+    end
+  end
+  class Controller
+    attr_accessor :info
+
+    def initialize(context)
+      @info = context
+       if(self.respond_to? "before")
+        self.before
+       end
+    end
+
+    def erb template
+      renderer = Tilt::ERBTemplate.new("views/layout.html.erb")
+      output = renderer.render(self){ Tilt::ERBTemplate.new("views/"+template.to_s+".html.erb").render(self) }
+      return output
+    end
+
+    def params
+      @info.req.params
+    end
+
+    def request
+      @info.req
+    end
+
+  end
+
+  class Request
+    attr_accessor :response
+    attr_accessor :request
+    attr_accessor :req
+
+    def initialize(env)
+       @response = OpenStruct.new ({:headers => {}, :status_code => "200"})
+       @request =  OpenStruct.new ({:ip => "",:user_agent => "",:headers => {},:params => {}})
+       @req = Rack::Request.new(env)
+    end
+
+    def info
+      return @info
+    end
+  end
+
+  class Model
+    def initialize req
+      @req = req
+    end
+
+    def call modelname
+      case @req.request_method
+        when "GET"
+          if(Object.const_get(modelname.capitalize).respond_to? "append")
+            model = Object.const_get(modelname.capitalize).all.send(Object.const_get(modelname.capitalize).append)
+          else
+            model = Object.const_get(modelname.capitalize).all
+          end
+          model.to_json
+        when "POST"
+          if(Object.const_get(modelname.capitalize).respond_to? "append")
+            model = Object.const_get(modelname.capitalize).create(JSON.parse(@req.body.string))
+          else
+            model = Object.const_get(modelname.capitalize).create(JSON.parse(@req.body.string))
+          end
+          model.to_json
+        else
+         
+        end
+    end
+
+  end
+
+  class Settings
+    attr_accessor :port
+    attr_accessor :server
+    attr_accessor :verbose
+    attr_accessor :daemon
+    attr_accessor :errorhandler
+
+    def initialize
+      @port = 8080
+      @server = "puma"
+      @verbose = true
+      @daemon = false
+      @errorhandler = nil
+    end
+  end
+  class Logger
+
+    def initialize(settings)
+      @settings = settings
+    end
+
+    def log msg
+      if(@settings.daemon)
+        return
+      end
+      if(@settings.verbose)
+        puts msg
+      end
+    end
+
+  end
+  
+  class ErrorHelper
+    def call(errortype)
+      if(self.respond_to? "error_"+errortype)
+        puts "Yes!!!!!"
+        [errortype, {},[self.send("error_"+errortype)]]
+      else
+        [errortype, {}, [ActionFramework::DefaultErrorHandler.new.send("error_"+errortype)]]
+      end
+    end
+
+    def erb template
+      renderer = Tilt::ERBTemplate.new("views/layout.html.erb")
+      output = renderer.render(self){ Tilt::ERBTemplate.new("views/"+template.to_s+".html.erb").render(self) }
+      return output
+    end
+  
+  end
+
+  class DefaultErrorHandler < ActionFramework::ErrorHelper
+      def error_404
+        "<h1>404 Not Found</h1>"
+      end
+      def error_500
+        "<h1>500 Internal server error</h1>"
+      end
+      def error_403
+        "<h1>403 Forbidden</h1>"
+      end
+  end
+end
+
+at_exit do
+  puts "Exiting..."
+  if(File.exists? "running.pid")
+    File.delete("running.pid")
+  end
+end
+
+
+########## IMPORTANT LOGIC SOON TO BE INTEGRATED ###### 
+string = "/{{appname}}/{{userid}}"
+
+string = string.gsub("{{","(?<")
+string = string.gsub("}}",">(.*))") 
+string.insert(0,"^")
+string = string+"$"
+puts string
+regex = Regexp.new (string)
+
+puts regex
+
+if(matched = regex.match "/testapp/1")
+  puts "matched"
+  p matched
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionframework
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Bram Vandenbogaerde
@@ -14,49 +13,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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'
 description: A web framework built on top of Rack, it has the simplicity of sinatra
@@ -67,32 +74,35 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/actionframework/controller.rb
+- lib/actionframework/rackup.rb
+- lib/actionframework/routes.rb
+- lib/actionframework/settings.rb
 - lib/actionframework.rb
+- lib/actionframework_old.rb
 - bin/afw
 homepage: http://rubygems.org/gems/actionframework
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A web framework built on top of Rack
 test_files: []
-has_rdoc: