culpa 0.1.0.5 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTNkZjU4NjI3NDcyZjJjNDc0ZDhkZGIyMTBiYjZkMmY0Njc3MGNiMg==
+    ODRhZjgzN2MwYjZlMWVjNjZhMzk4NWYxYjFhOTE3YzQ5YzE3NjhlYQ==
   data.tar.gz: !binary |-
-    NGVjOWFhODFhYmQ4YjNjODljMmE4MjljODg4MGMyYWM5MjY1NGRhMw==
+    ZjJlMWU0ZTViOWE1NTFmM2E3ZmQ0YzY0NzMxM2RjYWM1ODBkMGM5Nw==
 SHA512:
   metadata.gz: !binary |-
-    ZDc2ZWY1MDM2ZTVhOTljYjdlZjJhZGRjOTczNzgxY2M2ZmYzZGYyYTJkNzMz
-    Zjc1ZGYyYTAyYTk4NjNkYWY5MTExMjViYjI2OTBkZDgyMDAwMDI5MTMxYWUx
-    YWI4YmQzMGUzYzZjYzU4Y2ZmZGI0ZjY2NTgxYzk5NmM4ZGM2NGM=
+    ODk0NTAzM2FjZjQ5MmM5NDA3Yjc0MTZlOGEzNzFmODVkMzM3Y2NhNzM4ZTc4
+    OTA1N2JhNDFhODEwZDdjMTA4NTI3ZGUxOWRmZTM5ZTM3NzIxZjk0NzhiNDM4
+    ZjQyMDBhM2Q5ODc4NTAwZGVmZjdhNTBhYzk3YjM1NDg3NmE0YTE=
   data.tar.gz: !binary |-
-    MDExZTkzOWJlMWM5OGM2ZDVlMzA3YzgwZWQ2MTExNmVlY2IwYzBiNmFkNWRk
-    NDVmNTg1YTRjMjk1MTJhZjU1YTQ3YzJiOWJkZmY1NzBlYTg4Y2IyYWE2M2I1
-    NTk5MGIzMzRhZDFjZmFhMzZjYzFiZGVmNGIwMTE2MGEyNDRjY2I=
+    M2VkOWY1NzFjOGZmYzMzNDNmYWM0MDlhNzZhNWU0Y2ZhMTJiZDI0YzYxMmQz
+    ZjE0OTc2NWMxMDBlOThlMDRhZDllN2UxZTRiZmNkM2EwNGU2ZjVmMDgyNjQ3
+    ZTg0Njk2ODM2NGYyOTY5NmJjOTMwOTZlYjY1NGRlMmI3MmU0MjU=

data/bin/culpa

@@ -2,18 +2,6 @@
 
 require 'fileutils'
 
-module Actions
-  Dir['./actions/*.rb'].each do |file|
-    eval(File.open(file).read)
-  end
-end
-
-module Models
-  Dir['./models/*.rb'].each do |file|
-    eval(File.open(file).read)
-  end
-end
-
 def create_project(project_path)
   puts "Initializing Culpa project in #{project_path}"
 

data/lib/action.rb

@@ -1,19 +1,15 @@
-module Actions
+class Action
 
-  class Action
+  attr_accessor :to_render
 
-    attr_accessor :to_render
-
-    def initialize(envelope, request)
-      @e = envelope
-      @r = request
-      @to_render = nil
-    end
-
-    def render(response_object, options={})
-      @to_render = {object: response_object, options: options}
-    end
+  def initialize(envelope, request)
+    @e = envelope
+    @r = request
+    @to_render = nil
+  end
 
+  def render(response_object, options={})
+    @to_render = {object: response_object, options: options}
   end
 
 end

data/lib/culpa.rb

@@ -1,39 +1,33 @@
 require 'bundler'
-require 'envelope'
-require 'action'
 require 'json'
+require 'yaml'
+
+require 'envelope'
+require 'path_parser'
+
+ACTIONS_PATH ||= './actions/*.rb'
+MODELS_PATH ||= './models/*.rb'
+
+module Actions
+  require 'action'
+  Dir[ACTIONS_PATH].each do |file|
+    require file
+  end
+end
+
+module Models
+  Dir[MODELS_PATH].each do |file|
+    require file
+  end
+end
 
 module Culpa
 
-  ROUTE_PATTERNS = {
-      '/:res_name' => {
-          regex: Regexp.new('^/(\w+)$'),
-          id_to_sym: {
-              1 => :res_name
-          }
-      },
-      '/:res_name/:id' => {
-          regex: Regexp.new('^/(\w+)/(\w+)$'),
-          id_to_sym: {
-              1 => :res_name,
-              2 => :id
-          }
-      },
-      '/:res_name/:id/:sub_call' => {
-          regex: Regexp.new('^/(\w+)/(\w+)/(\w+)$'),
-          id_to_sym: {
-              1 => :res_name,
-              2 => :id,
-              3 => :sub_call
-          }
-      }
-  }
+  class UnpredictableSubCallError < StandardError; end
+  class NoRenderCalled < StandardError; end
 
   class Application
 
-    class UnpredictableSubCallError < StandardError; end
-    class NoRenderCalled < StandardError; end
-
     def initialize(router = {})
        @router = router
     end
@@ -72,25 +66,28 @@ module Culpa
       raise NoRenderCalled.new
     end
 
+    # Render a view
     def do_render(to_render)
       code = to_render[:options][:status] || 200
       content_type = to_render[:options][:content_type] || 'application/json'
       [code.to_s, {'Content-Type' => content_type}, [to_render[:object].to_json]]
     end
 
+    # Called by rack
     def call(env)
       call_options = {
           verb: env['REQUEST_METHOD'].downcase.to_sym
       }
-      if env['rack.input'].is_a? Hash
-        if env['rack.input'].has_key? :sub_call
-          call_options[:sub_call] =  env['rack.input'][:sub_call]
+      if env['CONTENT_TYPE'] == 'application/json'
+        body = JSON.parse(env['rack.input'].read)
+        if body.has_key? 'sub_call'
+          call_options[:sub_call] = body['sub_call']
         end
-        call_options[:input] = env['rack.input'][:data]
+        call_options[:input] = body['data']
       else
         call_options[:input] = env['rack.input']
       end
-      if !(route_params = parse_path('/:res_name', env['PATH_INFO'])).nil?
+      if !(route_params = PathParser.parse('/:res_name', env['PATH_INFO'])).nil?
         call_options[:res_name] = route_params[:res_name]
         case call_options[:verb]
           when :get
@@ -100,7 +97,7 @@ module Culpa
           else
             raise UnpredictableSubCallError.new
         end unless call_options.has_key? :sub_call
-      elsif !(route_params = parse_path('/:res_name/:id', env['PATH_INFO'])).nil?
+      elsif !(route_params = PathParser.parse('/:res_name/:id', env['PATH_INFO'])).nil?
         call_options[:res_name] = route_params[:res_name]
         call_options[:id] = route_params[:id]
         case call_options[:verb]
@@ -113,7 +110,7 @@ module Culpa
           else
             raise UnpredictableSubCallError.new
         end unless call_options.has_key? :sub_call
-      elsif !(route_params = parse_path('/:res_name/:id/:sub_call', env['PATH_INFO'])).nil?
+      elsif !(route_params = PathParser.parse('/:res_name/:id/:sub_call', env['PATH_INFO'])).nil?
         call_options[:res_name] = route_params[:res_name]
         call_options[:id] = route_params[:id]
         call_options[:sub_call] = route_params[:sub_call]
@@ -123,21 +120,12 @@ module Culpa
       call_action call_options
     end
 
-    def parse_path(pattern, path)
-      current_pattern = ROUTE_PATTERNS[pattern]
-      result = path.match(current_pattern[:regex])
-      return unless result
-      returned = {}
-      current_pattern[:id_to_sym].each do |id, sym|
-        returned[sym] = result[id]
-      end
-      returned
-    end
-
+    # 400 : Bad request
     def bad_request
       ['400', {'Content-Type' => 'application/json'}, ['{ "error": "bad_request" }']]
     end
 
+    # 404 : Not found
     def not_found
       ['404', {'Content-Type' => 'application/json'}, ['{ "error": "not_found" }']]
     end

data/lib/path_parser.rb

@@ -0,0 +1,44 @@
+module Culpa
+
+  class PathParser
+
+    ROUTE_PATTERNS = {
+        '/:res_name' => {
+            regex: Regexp.new('^/(\w+)$'),
+            id_to_sym: {
+                1 => :res_name
+            }
+        },
+        '/:res_name/:id' => {
+            regex: Regexp.new('^/(\w+)/(\w+)$'),
+            id_to_sym: {
+                1 => :res_name,
+                2 => :id
+            }
+        },
+        '/:res_name/:id/:sub_call' => {
+            regex: Regexp.new('^/(\w+)/(\w+)/(\w+)$'),
+            id_to_sym: {
+                1 => :res_name,
+                2 => :id,
+                3 => :sub_call
+            }
+        }
+    }
+
+    # Parsing a path
+    def self.parse(pattern, path)
+      current_pattern = ROUTE_PATTERNS[pattern]
+      result = path.match(current_pattern[:regex])
+      return unless result
+      returned = {}
+      current_pattern[:id_to_sym].each do |id, sym|
+        returned[sym] = result[id]
+      end
+      returned
+    end
+
+
+  end
+
+end

data/templates/config.ru

@@ -3,16 +3,4 @@ require 'bundler/setup'
 require 'yaml'
 require 'culpa'
 
-module Actions
-  Dir['./actions/*.rb'].each do |file|
-    eval(File.open(file).read)
-  end
-end
-
-module Models
-  Dir['./models/*.rb'].each do |file|
-    eval(File.open(file).read)
-  end
-end
-
 run Culpa::Application.new(YAML.load_file('./config/router.yml'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.1.0.5
+  version: 0.1.1
 platform: ruby
 authors:
 - Jérémy SEBAN
@@ -49,6 +49,7 @@ files:
 - lib/action.rb
 - lib/culpa.rb
 - lib/envelope.rb
+- lib/path_parser.rb
 - templates/Gemfile
 - templates/config.ru
 homepage: https://github.com/HipsterWhale/culpa