ki 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/ki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ki"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristian Mircea Messel"]
-  s.date = "2013-02-18"
+  s.date = "2013-02-19"
   s.description = "Fuck setting up a database for your prototypes. Some call it an ORM with a RESTful interface. Some say its for prototyping."
   s.email = "mess110@gmail.com"
   s.executables = ["ki"]

data/lib/db.rb

@@ -48,8 +48,12 @@ module Ki
     
     def config_db
       config_path = File.join(Dir.pwd, 'config.yml')
-      yaml = YAML.load_file(config_path)
-      config yaml['database_host'], yaml['database_port'], yaml['database_name']
+      if File.exists? config_path
+        yaml = YAML.load_file(config_path)
+        config yaml['database_host'], yaml['database_port'], yaml['database_name']
+      else
+        config '127.0.0.1', 27017, 'ki_default_db'
+      end
     end
 
     def config host, port, db_name

data/lib/req.rb

@@ -17,10 +17,29 @@ module Ki
 
     def route
       @klass = Util.base(path).to_class
-      @format = Util.format(path)
+      @format = content_type == 'application/json' ? :json : Util.format(path)
       @code = klass || path == '/' ? 200 : 404
     end
 
+    def json?
+      @format == :json
+    end
+
+    def html?
+      @format == :html
+    end
+
+    def index?
+      path == '/'
+    end
+
+    def content_type_for_result
+      {
+        :json => 'application/json',
+        :html => 'text/html'
+      }[@format]
+    end
+
     private
 
     def static_path_requested?

data/lib/resp.rb

@@ -9,22 +9,24 @@ module Ki
     def initialize req
       @req = req
       headers = {
-        'Content-Type' => respond_to(@req.format)
+        'Content-Type' => @req.content_type_for_result
       }
 
+      # TODO think of a way to clean this up
       klass = @req.klass
       if klass.responds_to_formats.include? @req.format
         if @req.code == 404
-          body = @req.format == :html ? partial('404') : { :error => 404 }
+          body = @req.html? ? partial('404') : { :error => 404 }
         else
-          if @req.path == '/'
-            body = @req.format == :html ? partial('index') : { :index => 200 }
+          if @req.index?
+            body = @req.html? ? partial('index') : { :index => 200 }
           else
             klass_view = Util.root_view_path(klass.to_s.downcase)
-            if @req.format == :html
+            if @req.html?
               body = File.exists?(klass_view) ? partial(klass.to_s.downcase) : partial('index')
             else
               begin
+                interpret_json_params
                 body = klass.new(@req).to_json
               rescue Exception => e
                 @req.code = 400
@@ -35,7 +37,7 @@ module Ki
         end
       else
         @req.code = 406
-        body = @req.format == :html ? partial('406') : { :error => 'format not allowed' }.to_json
+        body = @req.html? ? partial('406') : { :error => 'format not allowed' }.to_json
       end
 
       super [body], @req.code, headers
@@ -47,8 +49,16 @@ module Ki
       Util.render_partial s, { 'env' => @req.env }
     end
 
-    def respond_to resp
-      resp == :html ? 'text/html' : 'application/json'
+    def interpret_json_params
+      if @req.json? && @req.body.length > 0
+        begin
+          @req.body.rewind
+          @req.env.update('rack.request.form_hash' => JSON.parse(@req.body.string),
+                          'rack.request.form_input' => @req.env['rack.input'])
+        rescue JSON::ParserError
+          raise "json body invalid: #{@req.body.string}"
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -343,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2930016913991517107
+      hash: 3465853450355248841
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: