ki 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/examples/northpole/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    ki (0.0.1)
+    ki (0.1.1)
       bson_ext
       haml
       mongo

data/examples/northpole/app.rb

@@ -1,5 +1,8 @@
 require 'ki'
 
+class Test < Ki::Model
+end
+
 class Email < Ki::Model
   include Ki::Mail
 

data/ki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ki"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristian Mircea Messel"]
-  s.date = "2013-02-09"
+  s.date = "2013-02-10"
   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

@@ -26,9 +26,15 @@ module Ki
 
     def find
       raise 'params missing' unless @req.params
-      raise 'param _id missing' unless @req.params['_id']
 
-      @hash = @db.find(class_name, @req.params['_id'])
+      if @req.params['_id']
+        unless @req.params.length == 1
+          raise 'no other params allowed when querying _id'
+        end
+        @hash = @db.find(class_name, @req.params['_id'])
+      else
+        @hash = @db.find_by(class_name, @req.params)
+      end
       raise "#{class_name} not found" if @hash.nil?
     end
 

data/spec/model_spec.rb

@@ -27,16 +27,31 @@ describe Ki::Model do
     Zoidberg.new(get).hash['name'].should == 'homer'
   end
 
-  it "should raise error if no params are given when getting model" do
-    expect {
-      Zoidberg.new(ReqFactory.new(:get))
-    }.to raise_error
+  it "should find objects depending on params" do
+    @db.create 'zoidberg', { :name => 'homer', :valid => true }
+    @db.create 'zoidberg', { :name => 'bart', :valid => true }
+    @db.create 'zoidberg', { :name => 'batman', :valid => false, :cool => true }
+    @db.create 'zoidberg', { :name => 'joker', :valid => false, :cool => true }
+    @db.create 'zoidberg', { :name => 'joker', :valid => false, :cool => false }
+
+    r = Zoidberg.new(ReqFactory.new(:get, { :name => 'homer' })).hash
+    r[0]['name'].should == 'homer'
+
+    r = Zoidberg.new(ReqFactory.new(:get, { :valid => true })).hash
+    r.length.should == 2
+
+    r.collect { |z|
+      z['valid'].should be_true
+    }
+
+    r = Zoidberg.new(ReqFactory.new(:get, { :valid => false, :cool => true })).hash
+    r.length.should == 2
   end
 
-  it "should raise error if no id is given when getting model" do
+  it "should raise error when _id and other params are given. it should be _id only" do
     expect {
-      Zoidberg.new(ReqFactory.new(:get_with_params, { :name => 'homer' }))
-    }.to raise_error
+      Zoidberg.new(ReqFactory.new(:get, { '_id' => 'hi', 'foo' => 'bar'}))
+    }.to raise_error 'no other params allowed when querying _id'
   end
 
   it "should only accept valid object ids" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -293,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2984834792591649896
+      hash: -3381699098757723557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: