gors 0.0.1 → 0.0.2

data/bin/gors

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+require 'optitron'
+require 'fileutils'
+require 'gors'
+require 'json'
+
+class GorsCLI < Optitron::CLI
+	desc "Create Gors project"
+	def new projectname
+		puts "Creating project directory and structure"
+		Dir.mkdir("#{projectname}")
+		Dir.mkdir("#{projectname}/controllers")
+		Dir.mkdir("#{projectname}/models")
+		Dir.mkdir("#{projectname}/views")
+		FileUtils.touch("#{projectname}/views/layout.html.erb")
+		File.write("#{projectname}/main.rb","# Example of basic configuration\ngors = Gors::Server.new\ngors.routes do\n\nend\n\ngors.autoimport\ngors.start")
+		File.write("#{projectname}/controllers/default_controller.rb","class DefaultController < Gors::Controller
+\n	def index\n		\"<h1>Welcome to GORS</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}/routes.json","{\n \"get\": [{\n    \"/\": \"DefaultController#index\"\n}]\n}")
+		puts "Done"
+		puts "Test GORS by running \"gors s\""
+	end
+
+	desc "Start gors server with default configuration"
+	def s  
+		gors = Gors::Server.new
+
+		routes = JSON.parse(File.read("routes.json"))
+		gors.routes do 
+			routes["get"].each do |route|
+				get route
+			end
+		end
+		gors.autoimport
+		gors.start
+	end
+end
+
+GorsCLI.dispatch

data/lib/gors.rb

@@ -2,6 +2,7 @@ require 'rack'
 require 'erb'
 require 'tilt'
 require 'json'
+require 'filemagic'
 
 module Gors
   class Server
@@ -10,29 +11,55 @@ module Gors
       @logger = Logger.new(@settings)
       @routesklass = Routes.new(@logger)
     end
+    
+    def run
+    
+    end
+
     def call env
-      @logger.log env["REQUEST_METHOD"]+" "+env["REQUEST_PATH"]
-      controller = @routesklass.routes[env["PATH_INFO"]]
+      if(@settings.errorhandler != nil)
+        @errorhandler = Object.const_get(@settings.errorhandler).new
+      else
+        @errorhandler = Gors::DefaultErrorHandler.new
+      end
+
+      routesinfo = @routesklass.routes(env["REQUEST_PATH"])
+      controller = routesinfo[0]
+      @logger.log controller.inspect
+      matcheddata = routesinfo[1]
+
       if(controller == nil)
+        if(File.exist?("public"+env["REQUEST_PATH"]))
+          fm = FileMagic.new(FileMagic::MAGIC_MIME)
+          mime = fm.file("public/"+env["REQUEST_PATH"])
+          return ["200",{"Content-type" => mime},[File.read("public"+env["REQUEST_PATH"])]]    
+        end
         if(@settings.server != "thin")
           response = ["<h1>404 Not Found</h1>"]
         else
           response = "<h1>404 Not Found</h1>"
         end
-        return ["404",{},response]
+        return @errorhandler.call "404"
       end
 
+      #
       if(controller.include? "Gors::")
         ctrl = controller.split("#")
         params = ctrl[1].split(":")
 
-        data = Model.new.call(params[1])
+        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) 
@@ -45,6 +72,12 @@ module Gors
     end
 
     def start
+      if(@settings.errorhandler != nil)
+        @errorhandler = Object.const_get(@settings.errorhandler).new
+      else
+        @errorhandler = Gors::DefaultErrorHandler.new
+      end
+
       if(@settings.daemon)
         puts "Sending Gors to background"
         system("kill `cat running.pid`")
@@ -75,6 +108,8 @@ module Gors
 
   end
   class Routes
+    NAME_PATTERN = /:(\S+)/
+
     attr_accessor :routes
     attr_accessor :models
     attr_accessor :posts
@@ -87,10 +122,14 @@ module Gors
     end
 
     def get hash
-      @routes[hash.keys.first.to_s] = hash[hash.keys.first.to_s]
+      @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
@@ -105,6 +144,39 @@ module Gors
       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
@@ -118,9 +190,13 @@ module Gors
 
     def erb template
       renderer = Tilt::ERBTemplate.new("views/layout.erb")
-      output = renderer.render(self){ Tilt::ERBTemplate.new("views/"+template+".erb").render(self) }
+      output = renderer.render(self){ Tilt::ERBTemplate.new("views/"+template.to_s+".erb").render(self) }
       return output
     end
+
+    def params
+      @info.request.params
+    end
   end
 
   class Request
@@ -138,15 +214,31 @@ module Gors
   end
 
   class Model
+    def initialize req
+      @req = req
+    end
+
     def call modelname
-      if(Object.const_get(modelname.capitalize).respond_to? "append")
-        puts "Running appending function"
-        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
+      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
@@ -154,12 +246,14 @@ module Gors
     attr_accessor :server
     attr_accessor :verbose
     attr_accessor :daemon
+    attr_accessor :errorhandler
 
     def initialize
       @port = 8080
       @server = "thin"
       @verbose = true
       @daemon = false
+      @errorhandler = nil
     end
   end
   class Logger
@@ -178,12 +272,29 @@ module Gors
     end
 
   end
-
-  class DataManager
-    def self.model modelname
-      Object.const_get(modelname)
+  
+  class ErrorHelper
+    def call(errortype)
+      if(self.respond_to? "error_"+errortype)
+        [errortype, {},[self.send("error_"+errortype)]]
+      else
+        Gors::DefaultErrorHandler.new.send("error_"+errortype)
+      end
     end
   end
+
+  class DefaultErrorHandler < Gors::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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gors
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -62,11 +62,13 @@ dependencies:
 description: A web framework built on top of Rack, it has the simplicity of sinatra
   and the structure of rails
 email: bram.vandenbogaerde@gmail.com
-executables: []
+executables:
+- gors
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/gors.rb
+- bin/gors
 homepage: http://rubygems.org/gems/gors
 licenses:
 - MIT