ki 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/ki.gemspec

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

@@ -17,16 +17,24 @@ module Ki
     end
 
     def find_all name
-      @db[name].find.collect{ |row| row }
+      @db[name].find.collect{ |row| row }.stringify_ids
     end
 
     def find name, id
-      @db[name].find( { '_id' => BSON::ObjectId(id) }).first
+      @db[name].find( { '_id' => BSON::ObjectId(id) }).to_a.stringify_ids.first
     end
 
     def find_by name, hash
-      hash['_id'] = BSON::ObjectId(hash['_id']) if hash['_id']
-      @db[name].find(hash).to_a
+      if hash['_id']
+        hash['_id'] = BSON::ObjectId(hash['_id'])
+      end
+
+      if hash['id']
+        hash['_id'] = BSON::ObjectId(hash['id'])
+        hash.delete('id')
+      end
+
+      @db[name].find(hash).to_a.stringify_ids
     end
 
     def create name, hash
@@ -36,8 +44,8 @@ module Ki
     # document doesn't update if :_id is in the hash
     # all prev object data is deleted
     def update name, hash
-      id = hash['_id']
-      hash.delete('_id')
+      id = hash['id']
+      hash.delete('id')
       @db[name].update({:_id => BSON::ObjectId(id)}, hash)
       id
     end

data/lib/model.rb

@@ -37,20 +37,20 @@ module Ki
     def create
       check_for_required_attributes
       check_for_unique_attributes
-      @hash['_id'] = @db.create(class_name, @req.params)
+      @hash['id'] = @db.create(class_name, @req.params)
     end
 
     def update
       raise 'params missing' unless @req.params
-      raise 'param _id missing' unless @req.params['_id']
+      raise 'param id missing' unless @req.params['id']
       check_for_required_attributes
-      @hash['_id'] = @db.update(class_name, @req.params)
+      @hash['id'] = @db.update(class_name, @req.params)
     end
 
     def delete
       raise 'params missing' unless @req.params
-      raise 'param _id missing' unless @req.params['_id']
-      @hash = @db.delete(class_name, @req.params['_id'])
+      raise 'param id missing' unless @req.params['id']
+      @hash = @db.delete(class_name, @req.params['id'])
     end
 
     def to_json
@@ -105,7 +105,7 @@ module Ki
       send "after_#{m.to_s}".to_sym
       after_all
     rescue BSON::InvalidObjectId
-      raise "invalid _id format: #{params['_id']}"
+      raise "invalid id format: #{params['id']}"
     end
   end
 

data/lib/util.rb

@@ -1,3 +1,13 @@
+class Array
+  def stringify_ids
+    self.collect do |e|
+      e['id'] = e['_id'].to_s
+      e.delete('_id')
+      e
+    end
+  end
+end
+
 class NilClass
   def responds_to_formats
     [:json, :html]

data/spec/db_spec.rb

@@ -35,9 +35,14 @@ describe Ki::Db do
     @db.find('zoidberg', post_id)['foo'].should == [1,2]
   end
 
+  it "should find by _id, id, and objid" do
+    post_id = @db.create 'zoidberg', { :foo => [1,2] }
+    @db.find_by('zoidberg', {'id' => post_id})[0]['id'].should == post_id
+  end
+
   it "should update a document" do
     post_id = @db.create 'zoidberg', { :foo => [1,2], :bar => 'highj' }
-    @db.update 'zoidberg', { '_id' => post_id, :foo => 3.1415 }
+    @db.update 'zoidberg', { 'id' => post_id, :foo => 3.1415 }
     doc = @db.find('zoidberg', post_id)
     doc['foo'].should == 3.1415
     doc['bar'].should == nil
@@ -72,7 +77,7 @@ describe Ki::Db do
   it "should transform _id in BSON::ObjectId when using find_by" do
     hash = { :foo => [1,2], :bar => 'highj' }
     id = @db.create 'zoidberg', hash
-    hash['_id'] = id
+    hash['id'] = id
     r = @db.find_by 'zoidberg', hash
     r.length.should == 1
   end

data/spec/integration/integration_spec.rb

@@ -46,16 +46,16 @@ describe 'Integration Tests' do
     end
 
     expect {
-      User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com'})).hash['_id']
+      User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com'})).hash['id']
     }.to raise_error 'password missing'
 
     expect {
-      id = User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com', 'password' => '123'})).hash['_id']
-      User.new(ReqFactory.new(:get, { '_id' => id })).hash[0]['password'].should == '123!'
+      id = User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com', 'password' => '123'})).hash['id']
+      User.new(ReqFactory.new(:get, { 'id' => id })).hash[0]['password'].should == '123!'
     }.to change(User, :count).by(1)
 
     expect {
-      id = User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com', 'password' => '123'})).hash['_id']
+      id = User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com', 'password' => '123'})).hash['id']
     }.to raise_error 'mail not unique'
 
     expect {
@@ -68,7 +68,7 @@ describe 'Integration Tests' do
 
     # create storage
     storage = Storage.new(ReqFactory.new(:post, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1,2,3]}))
-    id = storage.hash['_id']
+    id = storage.hash['id']
     r = Storage.new(ReqFactory.new(:get, { 'mail' => 'cool@beans.com', 'password' => '123'}))
     r.hash[0]['all_my_data'].should == [1,2,3]
     r.hash[0]['password'].should == nil
@@ -78,36 +78,36 @@ describe 'Integration Tests' do
     }.to raise_error 'not authorized'
 
     expect {
-      Storage.new(ReqFactory.new(:delete, {'_id' => id}))
+      Storage.new(ReqFactory.new(:delete, {'id' => id}))
     }.to raise_error 'not authorized'
 
     expect {
       Storage.new(ReqFactory.new(:delete, {'mail' => 'cool@beans.com', 'password' => '123'}))
-    }.to raise_error 'param _id missing'
+    }.to raise_error 'param id missing'
 
     # delete from storage
     expect {
-      Storage.new(ReqFactory.new(:delete, {'_id' => id, 'mail' => 'cool@beans.com', 'password' => '123'}))
+      Storage.new(ReqFactory.new(:delete, {'id' => id, 'mail' => 'cool@beans.com', 'password' => '123'}))
     }.to change(Storage, :count).by(-1)
 
     # not allowed to delete user
     expect {
-      id = User.new(ReqFactory.new(:post, { 'mail' => 'other@beans.com', 'password' => '123'})).hash['_id']
-      p User.new(ReqFactory.new(:delete, { '_id' => id }))
+      id = User.new(ReqFactory.new(:post, { 'mail' => 'other@beans.com', 'password' => '123'})).hash['id']
+      p User.new(ReqFactory.new(:delete, { 'id' => id }))
     }.to raise_error 'action forbidden'
 
     storage = Storage.new(ReqFactory.new(:post, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [4,4,5]}))
-    id = storage.hash['_id']
+    id = storage.hash['id']
     expect {
       Storage.new(ReqFactory.new(:put, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1]}))
-    }.to raise_error 'param _id missing'
+    }.to raise_error 'param id missing'
 
     expect {
       Storage.new(ReqFactory.new(:put, {'mail' => 'cool@beans.com', 'password' => '1234', 'all_my_data' => [1]}))
     }.to raise_error 'not authorized'
 
-    storage = Storage.new(ReqFactory.new(:put, {'_id' => id, 'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1]}))
-    storage.hash['_id'].should == id
+    storage = Storage.new(ReqFactory.new(:put, {'id' => id, 'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1]}))
+    storage.hash['id'].should == id
     storage = Storage.find(id)
     storage['all_my_data'].should == [1]
   end

data/spec/model_spec.rb

@@ -17,13 +17,13 @@ describe Ki::Model do
     @db.db['zoidberg'].count.should == 0
     hash = Zoidberg.new(post).hash
     @db.db['zoidberg'].count.should == 1
-    @db.find('zoidberg', hash['_id'])['user'].should == 'homer'
+    @db.find('zoidberg', hash['id'])['user'].should == 'homer'
   end
 
   it "should get a model depending on id" do
     id = @db.create 'zoidberg', { :name => 'homer' }
 
-    get = ReqFactory.new(:get, {'_id' => id})
+    get = ReqFactory.new(:get, {'id' => id})
     Zoidberg.new(get).hash[0]['name'].should == 'homer'
   end
 
@@ -50,7 +50,7 @@ describe Ki::Model do
 
   it "should only accept valid object ids" do
     expect {
-      Zoidberg.new(ReqFactory.new(:get_with_params, { :_id => 'homer' }))
+      Zoidberg.new(ReqFactory.new(:get_with_params, { :id => 'homer' }))
     }.to raise_error
   end
 
@@ -58,7 +58,7 @@ describe Ki::Model do
     id = @db.create 'zoidberg', { :name => 'homer' }
     @db.find('zoidberg', id)['name'].should == 'homer'
 
-    Zoidberg.new(ReqFactory.new(:put, {'_id' => id, :name => 'bart'}))
+    Zoidberg.new(ReqFactory.new(:put, {'id' => id, :name => 'bart'}))
     @db.find('zoidberg', id)['name'].should == 'bart'
   end
 
@@ -70,7 +70,7 @@ describe Ki::Model do
 
   it "should raise error if id is invalid" do
     expect {
-      Zoidberg.new(ReqFactory.new(:put, {'_id' => 'f*ck', :name => 'bart'}))
+      Zoidberg.new(ReqFactory.new(:put, {'id' => 'f*ck', :name => 'bart'}))
     }.to raise_error
   end
 
@@ -80,12 +80,12 @@ describe Ki::Model do
     }.to raise_error
 
     expect {
-      Zoidberg.new(ReqFactory.new(:delete, {'_id' => 'f*ck', :name => 'bart'}))
+      Zoidberg.new(ReqFactory.new(:delete, {'id' => 'f*ck', :name => 'bart'}))
     }.to raise_error
 
     id = @db.create 'zoidberg', { :name => 'homer' }
     expect {
-      Zoidberg.new(ReqFactory.new(:delete, {'_id' => id}))
+      Zoidberg.new(ReqFactory.new(:delete, {'id' => id}))
     }.to change(@db.db['zoidberg'], :count).by(-1)
   end
 end

data/spec/modules/callbacks_spec.rb

@@ -8,8 +8,8 @@ describe Ki::Callbacks do
       end
     end
 
-    id = Foo.new(ReqFactory.new(:post, {:foo => 'bar'})).hash['_id']
-    Foo.new(ReqFactory.new(:get, { '_id' => id })).hash[0]['meaning_of_life'].should == 42
+    id = Foo.new(ReqFactory.new(:post, {:foo => 'bar'})).hash['id']
+    Foo.new(ReqFactory.new(:get, { 'id' => id })).hash[0]['meaning_of_life'].should == 42
   end
 
   it "should handle before and after all" do
@@ -19,7 +19,7 @@ describe Ki::Callbacks do
       end
     end
 
-    id = Foo.new(ReqFactory.new(:post, {:foo => 'bar'})).hash['_id']
-    Foo.new(ReqFactory.new(:get, { '_id' => id })).hash[0]['cool'].should be_true
+    id = Foo.new(ReqFactory.new(:post, {:foo => 'bar'})).hash['id']
+    Foo.new(ReqFactory.new(:get, { 'id' => id })).hash[0]['cool'].should be_true
   end
 end

data/spec/modules/query_interface_spec.rb

@@ -71,7 +71,7 @@ describe Ki::QueryInterface do
 
     id = Software.create({ :version => 1.1 })
     expect {
-      Software.update({'_id' => id, :version => 1.2})
+      Software.update({'id' => id, :version => 1.2})
       Software.find(id)['version'].should == 1.2
     }.to change(Software, :count).by(0)
   end

data/spec/modules/restrictions_spec.rb

@@ -21,14 +21,23 @@ describe Ki::Restrictions do
     Foo.new(ReqFactory.new(:post_homer))
   end
 
+  it "should restrict search when find is forbidden" do
+    class Foo < Ki::Model
+      forbid :find
+    end
+    expect {
+      Foo.new(ReqFactory.new(:search, {'foo' => 'bar'} ))
+    }.to raise_exception
+  end
+
   it "should only restrict :delete" do
     class Foo < Ki::Model
       forbid :delete
     end
     Foo.forbidden_actions.include?(:delete).should be_true
-    id = Foo.new(ReqFactory.new(:post_homer)).hash['_id']
+    id = Foo.new(ReqFactory.new(:post_homer)).hash['id']
     expect {
-      Foo.new(ReqFactory.new(:delete, { '_id' => id } ))
+      Foo.new(ReqFactory.new(:delete, { 'id' => id } ))
     }.to raise_exception
   end
 

data/spec/req_spec.rb

@@ -16,4 +16,14 @@ describe Ki::Req do
     hash = Book.new(search).hash
     hash[0]['title'].should == 'Foundation'
   end
+
+  it "should format the id properly" do
+    post = ReqFactory.new(:post, { :title => 'Foundation' })
+    id = Book.new(post).hash['id']
+
+    get = ReqFactory.new(:get, { :title => 'Foundation' })
+    Book.new(get).hash[0]['id'].should == id
+
+    update = ReqFactory.new(:put, { 'id' => id, :title => 'Foundation' })
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-31 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: -4473479922562030383
+      hash: -1443684808405340499
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: