ki 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/ki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ki"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristian Mircea Messel"]
-  s.date = "2013-03-31"
+  s.date = "2013-06-27"
   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"]
@@ -39,11 +39,13 @@ Gem::Specification.new do |s|
     "gfx/logo.png",
     "ki.gemspec",
     "ki_wrap.rb",
+    "lib/conf.rb",
     "lib/db.rb",
     "lib/extensions/mail.rb",
     "lib/helpers.rb",
     "lib/ki.rb",
     "lib/ki_cli.rb",
+    "lib/mockreq.rb",
     "lib/model.rb",
     "lib/modules/callbacks.rb",
     "lib/modules/model_helpers.rb",
@@ -57,6 +59,7 @@ Gem::Specification.new do |s|
     "lib/views/406.haml",
     "lib/views/index.haml",
     "lib/views/layout.haml",
+    "spec/conf_spec.rb",
     "spec/db_spec.rb",
     "spec/extensions/mail_spec.rb",
     "spec/integration/integration_spec.rb",

data/lib/conf.rb

@@ -0,0 +1,28 @@
+require 'singleton'
+
+module Ki
+  # named conf because ruby has Config class :(
+  # in version 2 Config class will be deprecated and
+  # replace with RbConfig
+  # When you update to ruby2, think about changing the name
+  class Conf
+    include Singleton
+
+    attr_accessor :yaml
+
+    def initialize
+      super
+
+      config_path = File.join(Dir.pwd, 'config.yml')
+      if File.exists? config_path
+        @yaml = YAML.load_file(config_path)
+      else
+        @yaml = YAML.load({
+          'database_host' => '127.0.0.1',
+          'database_port' => 27017,
+          'database_name' => 'ki_default_db'
+        }.to_yaml)
+      end
+    end
+  end
+end

data/lib/db.rb

@@ -8,6 +8,12 @@ module Ki
 
     attr_reader :db
 
+    def initialize
+      super
+
+      config
+    end
+
     def collection_names
       @db.collection_names.delete_if{|name| name =~ /^system/}
     end
@@ -25,10 +31,6 @@ module Ki
     end
 
     def find_by name, hash
-      if hash['_id']
-        hash['_id'] = BSON::ObjectId(hash['_id'])
-      end
-
       if hash['id']
         hash['_id'] = BSON::ObjectId(hash['id'])
         hash.delete('id')
@@ -54,24 +56,18 @@ module Ki
       @db[name].remove(:_id => BSON::ObjectId(id))
     end
     
-    def config_db
-      config_path = File.join(Dir.pwd, 'config.yml')
-      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
+    def db_name db_name
+      Conf.instance.yaml['database_name'] = db_name
+      @db = @con.db(db_name)
     end
 
-    def config host, port, db_name
-      # puts "Using #{db_name} at #{host}:#{port}"
-      @con = Mongo::Connection.new(host, port)
-      @db = @con.db(db_name)
+    def config
+      yaml = Conf.instance.yaml
+      @con = Mongo::Connection.new(yaml['database_host'], yaml['database_port'])
+      @db = @con.db(yaml['database_name'])
     rescue Mongo::ConnectionFailure
       puts "Could not connect to MongoDB"
       exit 1
     end
   end
 end
-

data/lib/ki.rb

@@ -4,7 +4,7 @@ require 'haml'
 require 'sass'
 require 'coffee-script'
 
-
+require 'conf'
 require 'db'
 require 'model'
 require 'helpers'
@@ -12,8 +12,12 @@ require 'util'
 require 'req'
 require 'resp'
 require 'static_file'
+require 'mockreq'
 
-Ki::Db.instance.config_db
+Dir['public/**/**'].each do |s|
+  Ki::StaticFile.compile_css(s)
+  Ki::StaticFile.compile_js(s)
+end
 
 module Ki
   class Ki
@@ -22,8 +26,3 @@ module Ki
     end
   end
 end
-
-Dir['public/**/**'].each do |s|
-  Ki::StaticFile.compile_css(s)
-  Ki::StaticFile.compile_js(s)
-end

data/lib/mockreq.rb

@@ -0,0 +1,45 @@
+module Ki
+  class MockReq
+    attr_accessor :request_method
+    attr_accessor :params
+  
+    def get?
+      request_method == 'GET'
+    end
+  
+    def post?
+      request_method == 'POST'
+    end
+  
+    def put?
+      request_method == 'PUT'
+    end
+  
+    def delete?
+      request_method == 'DELETE'
+    end
+  
+    def search?
+      request_method == 'SEARCH'
+    end
+  end
+  
+  class ReqFactory
+    def self.new sym, params={}
+      case sym
+      when :get, :post, :put, :delete, :head, :search
+        mr = MockReq.new
+        mr.request_method = sym.to_s.upcase
+        mr.params = params
+        return mr
+      when :post_homer
+        mr = MockReq.new
+        mr.request_method = 'POST'
+        mr.params = { 'user' => 'homer' }
+        return mr
+      else
+        raise "not a valid factory"
+      end
+    end
+  end
+end

data/lib/static_file.rb

@@ -46,7 +46,6 @@ module Ki
 
     def self.sass_to_css sass_path, css_path
       if File.exists? sass_path
-        p "Compiling #{sass_path}"
         eng = Sass::Engine.new(File.read(sass_path), :syntax => :sass)
         File.open(css_path, 'w') do |f|
           f.puts eng.render
@@ -56,7 +55,6 @@ module Ki
 
     def self.coffee_to_js coffee_path, js_path
       if File.exists? coffee_path
-        p "Compiling #{coffee_path}"
         cont = CoffeeScript.compile(File.read(coffee_path))
         File.open(js_path, 'w') do |f|
           f.puts cont

data/spec/conf_spec.rb

@@ -0,0 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Ki::Conf do
+  it "should work" do
+  end
+end

data/spec/db_spec.rb

@@ -81,4 +81,13 @@ describe Ki::Db do
     r = @db.find_by 'zoidberg', hash
     r.length.should == 1
   end
+
+  it "should be able to change db name" do
+    new_db_name = 'test_ki_change_name'
+    @db.db.name.should == DB_NAME
+
+    @db.db_name new_db_name
+
+    @db.db.name.should == new_db_name
+  end
 end

data/spec/integration/integration_spec.rb

@@ -46,67 +46,67 @@ describe 'Integration Tests' do
     end
 
     expect {
-      User.new(ReqFactory.new(:post, { 'mail' => 'cool@beans.com'})).hash['id']
+      User.new(Ki::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(Ki::ReqFactory.new(:post, { 'mail' => 'cool@beans.com', 'password' => '123'})).hash['id']
+      User.new(Ki::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(Ki::ReqFactory.new(:post, { 'mail' => 'cool@beans.com', 'password' => '123'})).hash['id']
     }.to raise_error 'mail not unique'
 
     expect {
-      Storage.new(ReqFactory.new(:post, {}))
+      Storage.new(Ki::ReqFactory.new(:post, {}))
     }.to raise_error 'not authorized'
 
     expect {
-      Storage.new(ReqFactory.new(:post, {'mail' => 'cool@beans.com'}))
+      Storage.new(Ki::ReqFactory.new(:post, {'mail' => 'cool@beans.com'}))
     }.to raise_error 'not authorized'
 
     # create storage
-    storage = Storage.new(ReqFactory.new(:post, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1,2,3]}))
+    storage = Storage.new(Ki::ReqFactory.new(:post, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1,2,3]}))
     id = storage.hash['id']
-    r = Storage.new(ReqFactory.new(:get, { 'mail' => 'cool@beans.com', 'password' => '123'}))
+    r = Storage.new(Ki::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
 
     expect {
-      Storage.new(ReqFactory.new(:delete, {}))
+      Storage.new(Ki::ReqFactory.new(:delete, {}))
     }.to raise_error 'not authorized'
 
     expect {
-      Storage.new(ReqFactory.new(:delete, {'id' => id}))
+      Storage.new(Ki::ReqFactory.new(:delete, {'id' => id}))
     }.to raise_error 'not authorized'
 
     expect {
-      Storage.new(ReqFactory.new(:delete, {'mail' => 'cool@beans.com', 'password' => '123'}))
+      Storage.new(Ki::ReqFactory.new(:delete, {'mail' => 'cool@beans.com', 'password' => '123'}))
     }.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(Ki::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(Ki::ReqFactory.new(:post, { 'mail' => 'other@beans.com', 'password' => '123'})).hash['id']
+      p User.new(Ki::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]}))
+    storage = Storage.new(Ki::ReqFactory.new(:post, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [4,4,5]}))
     id = storage.hash['id']
     expect {
-      Storage.new(ReqFactory.new(:put, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1]}))
+      Storage.new(Ki::ReqFactory.new(:put, {'mail' => 'cool@beans.com', 'password' => '123', 'all_my_data' => [1]}))
     }.to raise_error 'param id missing'
 
     expect {
-      Storage.new(ReqFactory.new(:put, {'mail' => 'cool@beans.com', 'password' => '1234', 'all_my_data' => [1]}))
+      Storage.new(Ki::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 = Storage.new(Ki::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]

data/spec/model_spec.rb

@@ -13,7 +13,7 @@ describe Ki::Model do
   end
 
   it "should create a new item in the databse" do
-    post = ReqFactory.new(:post_homer)
+    post = Ki::ReqFactory.new(:post_homer)
     @db.db['zoidberg'].count.should == 0
     hash = Zoidberg.new(post).hash
     @db.db['zoidberg'].count.should == 1
@@ -23,7 +23,7 @@ describe Ki::Model do
   it "should get a model depending on id" do
     id = @db.create 'zoidberg', { :name => 'homer' }
 
-    get = ReqFactory.new(:get, {'id' => id})
+    get = Ki::ReqFactory.new(:get, {'id' => id})
     Zoidberg.new(get).hash[0]['name'].should == 'homer'
   end
 
@@ -34,23 +34,23 @@ describe Ki::Model do
     @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 = Zoidberg.new(Ki::ReqFactory.new(:get, { :name => 'homer' })).hash
     r[0]['name'].should == 'homer'
 
-    r = Zoidberg.new(ReqFactory.new(:get, { :valid => true })).hash
+    r = Zoidberg.new(Ki::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 = Zoidberg.new(Ki::ReqFactory.new(:get, { :valid => false, :cool => true })).hash
     r.length.should == 2
   end
 
   it "should only accept valid object ids" do
     expect {
-      Zoidberg.new(ReqFactory.new(:get_with_params, { :id => 'homer' }))
+      Zoidberg.new(Ki::ReqFactory.new(:get_with_params, { :id => 'homer' }))
     }.to raise_error
   end
 
@@ -58,34 +58,34 @@ 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(Ki::ReqFactory.new(:put, {'id' => id, :name => 'bart'}))
     @db.find('zoidberg', id)['name'].should == 'bart'
   end
 
   it "should raise error if id is missing when updating" do
     expect {
-      Zoidberg.new(ReqFactory.new(:put, {:name => 'bart'}))
+      Zoidberg.new(Ki::ReqFactory.new(:put, {:name => 'bart'}))
     }.to raise_error
   end
 
   it "should raise error if id is invalid" do
     expect {
-      Zoidberg.new(ReqFactory.new(:put, {'id' => 'f*ck', :name => 'bart'}))
+      Zoidberg.new(Ki::ReqFactory.new(:put, {'id' => 'f*ck', :name => 'bart'}))
     }.to raise_error
   end
 
   it "should delete a document" do
     expect {
-      Zoidberg.new(ReqFactory.new(:delete))
+      Zoidberg.new(Ki::ReqFactory.new(:delete))
     }.to raise_error
 
     expect {
-      Zoidberg.new(ReqFactory.new(:delete, {'id' => 'f*ck', :name => 'bart'}))
+      Zoidberg.new(Ki::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(Ki::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(Ki::ReqFactory.new(:post, {:foo => 'bar'})).hash['id']
+    Foo.new(Ki::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(Ki::ReqFactory.new(:post, {:foo => 'bar'})).hash['id']
+    Foo.new(Ki::ReqFactory.new(:get, { 'id' => id })).hash[0]['cool'].should be_true
   end
 end

data/spec/modules/restrictions_spec.rb

@@ -10,7 +10,7 @@ describe Ki::Restrictions do
     class Foo < Ki::Model
     end
     expect {
-      Foo.new(ReqFactory.new(:head))
+      Foo.new(Ki::ReqFactory.new(:head))
     }.to raise_error
   end
 
@@ -18,7 +18,7 @@ describe Ki::Restrictions do
     class Foo < Ki::Model
     end
     Foo.forbidden_actions.empty?.should be_true
-    Foo.new(ReqFactory.new(:post_homer))
+    Foo.new(Ki::ReqFactory.new(:post_homer))
   end
 
   it "should restrict search when find is forbidden" do
@@ -26,7 +26,7 @@ describe Ki::Restrictions do
       forbid :find
     end
     expect {
-      Foo.new(ReqFactory.new(:search, {'foo' => 'bar'} ))
+      Foo.new(Ki::ReqFactory.new(:search, {'foo' => 'bar'} ))
     }.to raise_exception
   end
 
@@ -35,9 +35,9 @@ describe Ki::Restrictions do
       forbid :delete
     end
     Foo.forbidden_actions.include?(:delete).should be_true
-    id = Foo.new(ReqFactory.new(:post_homer)).hash['id']
+    id = Foo.new(Ki::ReqFactory.new(:post_homer)).hash['id']
     expect {
-      Foo.new(ReqFactory.new(:delete, { 'id' => id } ))
+      Foo.new(Ki::ReqFactory.new(:delete, { 'id' => id } ))
     }.to raise_exception
   end
 
@@ -68,11 +68,11 @@ describe Ki::Restrictions do
     Foo.required_attributes.include?(:name).should be_true
 
     expect {
-      Foo.new(ReqFactory.new(:post_homer))
+      Foo.new(Ki::ReqFactory.new(:post_homer))
     }.to raise_exception
 
     expect {
-      Foo.new(ReqFactory.new(:post, {'name' => 'bart' }))
+      Foo.new(Ki::ReqFactory.new(:post, {'name' => 'bart' }))
     }.to change(Ki::Db.instance.db['foo'], :count).by(1)
   end
 
@@ -87,11 +87,11 @@ describe Ki::Restrictions do
     Bar.unique_attributes.should == [:foo]
 
     expect {
-      Bar.new(ReqFactory.new(:post, { 'foo' => 'bar'}))
+      Bar.new(Ki::ReqFactory.new(:post, { 'foo' => 'bar'}))
     }.to change(Bar, :count).by(1)
 
     expect {
-      Bar.new(ReqFactory.new(:post, { 'foo' => 'bar'}))
+      Bar.new(Ki::ReqFactory.new(:post, { 'foo' => 'bar'}))
     }.to raise_error 'foo not unique'
   end
 

data/spec/req_spec.rb

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

data/spec/spec_helper.rb

@@ -3,59 +3,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'ki'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-DB_NAME = 'test_ki_db'
-DB_HOST = '127.0.0.1'
-DB_PORT = 27017
-
-Ki::Db.instance.config DB_HOST, DB_PORT, DB_NAME
-
-class MockReq
-  attr_accessor :request_method
-  attr_accessor :params
-
-  def get?
-    request_method == 'GET'
-  end
-
-  def post?
-    request_method == 'POST'
-  end
-
-  def put?
-    request_method == 'PUT'
-  end
-
-  def delete?
-    request_method == 'DELETE'
-  end
-
-  def search?
-    request_method == 'SEARCH'
-  end
-end
-
-class ReqFactory
-  def self.new sym, params={}
-    case sym
-    when :get, :post, :put, :delete, :head, :search
-      mr = MockReq.new
-      mr.request_method = sym.to_s.upcase
-      mr.params = params
-      return mr
-    when :post_homer
-      mr = MockReq.new
-      mr.request_method = 'POST'
-      mr.params = { 'user' => 'homer' }
-      return mr
-    else
-      raise "not a valid factory"
-    end
-  end
-end
+DB_NAME = 'ki_test_db'
+Ki::Conf.instance.yaml['database_name'] = DB_NAME
+Ki::Db.instance.config
 
 RSpec.configure do |config|
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -298,11 +298,13 @@ files:
 - gfx/logo.png
 - ki.gemspec
 - ki_wrap.rb
+- lib/conf.rb
 - lib/db.rb
 - lib/extensions/mail.rb
 - lib/helpers.rb
 - lib/ki.rb
 - lib/ki_cli.rb
+- lib/mockreq.rb
 - lib/model.rb
 - lib/modules/callbacks.rb
 - lib/modules/model_helpers.rb
@@ -316,6 +318,7 @@ files:
 - lib/views/406.haml
 - lib/views/index.haml
 - lib/views/layout.haml
+- spec/conf_spec.rb
 - spec/db_spec.rb
 - spec/extensions/mail_spec.rb
 - spec/integration/integration_spec.rb
@@ -343,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1443684808405340499
+      hash: -4593100471811426201
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: