ki 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/ki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ki"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristian Mircea Messel"]
-  s.date = "2013-02-19"
+  s.date = "2013-02-23"
   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/model.rb

@@ -16,6 +16,8 @@ module Ki
     attr_accessor :hash
     attr_accessor :req
 
+    layout :layout
+
     def initialize req
       @hash = {}
       @db = Db.instance
@@ -100,6 +102,8 @@ module Ki
       send m.to_sym
       send "after_#{m.to_s}".to_sym
       after_all
+    rescue BSON::InvalidObjectId
+      raise "invalid _id format: #{params['_id']}"
     end
   end
 

data/lib/modules/model_helpers.rb

@@ -39,5 +39,9 @@ module Ki
     def unique_attributes
       []
     end
+
+    def selected_layout
+      :layout
+    end
   end
 end

data/lib/modules/restrictions.rb

@@ -59,5 +59,20 @@ module Ki
         attributes
       end
     end
+
+    def selected_layout
+      :layout
+    end
+
+    def layout l
+      send :define_method, :selected_layout do
+        l
+      end
+
+      eigen_class = class << self; self; end
+      eigen_class.send(:define_method, :selected_layout) do
+        l
+      end
+    end
   end
 end

data/lib/resp.rb

@@ -46,7 +46,7 @@ module Ki
     private
 
     def partial s
-      Util.render_partial s, { 'env' => @req.env }
+      Util.render_partial s, { 'env' => @req.env }, @req.klass.selected_layout
     end
 
     def interpret_json_params

data/lib/util.rb

@@ -2,6 +2,10 @@ class NilClass
   def responds_to_formats
     [:json, :html]
   end
+
+  def selected_layout
+    :layout
+  end
 end
 
 class String
@@ -71,9 +75,14 @@ module Ki
       File.basename(root)
     end
 
-    def self.render_partial s, hash={}
+    def self.render_partial s, hash={}, l=:layout
       contents = file_contents(s)
-      layout_contents = file_contents('layout')
+      case l
+      when :none
+        layout_contents = "= yield"
+      else
+        layout_contents = file_contents(l.to_s)
+      end
 
       haml(layout_contents).render do
         haml(contents).render(Object.new(), hash)

data/spec/modules/restrictions_spec.rb

@@ -85,4 +85,17 @@ describe Ki::Restrictions do
       Bar.new(ReqFactory.new(:post, { 'foo' => 'bar'}))
     }.to raise_error 'foo not unique'
   end
+
+  it "should default to :layout" do
+    class Foo < Ki::Model
+    end
+    Foo.selected_layout.should == :layout
+  end
+
+  it "should chage default layout" do
+    class Foo < Ki::Model
+      layout :none
+    end
+    Foo.selected_layout.should == :none
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-23 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: 3465853450355248841
+      hash: -2281689135110628816
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: