ki 0.4.6 → 0.4.7

data/lib/ki/modules/query_interface.rb

@@ -5,33 +5,33 @@ module Ki
     # sort.
     # it writes directly to the database
     module QueryInterface
-      def count hash={}
+      def count(hash = {})
         Orm::Db.instance.count class_name, hash
       end
 
-      def find hash={}
+      def find(hash = {})
         Orm::Db.instance.find class_name, hash
       end
 
-      def create hash
+      def create(hash)
         Orm::Db.instance.insert class_name, hash
       end
 
-      def find_or_create hash
+      def find_or_create(hash)
         r = find hash
         r.empty? ? create(hash) : r
       end
 
-      def update hash
+      def update(hash)
         Orm::Db.instance.update class_name, hash
       end
 
-      def delete hash
+      def delete(hash)
         Orm::Db.instance.delete class_name, hash
       end
 
       def class_name
-        self.to_s
+        to_s
       end
     end
   end

data/lib/ki/modules/restrictions.rb

@@ -5,7 +5,7 @@ module Ki
         []
       end
 
-      def forbid *actions
+      def forbid(*actions)
         generic_restriction :forbidden_actions, actions
       end
 
@@ -13,7 +13,7 @@ module Ki
         []
       end
 
-      def requires *attributes
+      def requires(*attributes)
         generic_restriction :required_attributes, attributes
       end
 
@@ -21,13 +21,13 @@ module Ki
         []
       end
 
-      def unique *attributes
+      def unique(*attributes)
         generic_restriction :unique_attributes, attributes
       end
 
       private
 
-      def generic_restriction method_name, attributes
+      def generic_restriction(method_name, attributes)
         send :define_method, method_name do
           attributes
         end
@@ -37,7 +37,6 @@ module Ki
           attributes
         end
       end
-
     end
   end
 end

data/lib/ki/orm.rb

@@ -30,7 +30,7 @@ module Ki
       #
       def establish_connection
         @config = KiConfig.instance.database
-        if ENV["MONGODB_URI"]
+        if ENV['MONGODB_URI']
           @connection = Mongo::Connection.new
           @db = @connection.db
         else
@@ -42,8 +42,8 @@ module Ki
 
       def connection_string
         db = KiConfig.instance.database
-        if ENV["MONGODB_URI"]
-          ENV["MONGODB_URI"]
+        if ENV['MONGODB_URI']
+          ENV['MONGODB_URI']
         else
           "#{db['host']}:#{db['port']}/#{db['name']}"
         end
@@ -54,7 +54,7 @@ module Ki
       # An array of all the collection names in the database.
       #
       def collection_names
-        @db.collection_names.delete_if{|name| name =~ /^system/}
+        @db.collection_names.delete_if { |name| name =~ /^system/ }
       end
 
       # Insert a hash in the database.
@@ -75,7 +75,7 @@ module Ki
       #   db = Db.instance
       #   db.insert 'users', { name: 'Homer' }
       #
-      def insert name, hash
+      def insert(name, hash)
         @db[name].insert(hash)
         [hash].stringify_ids.first
       end
@@ -101,7 +101,7 @@ module Ki
       #   db.find 'users', { id: 'id' }
       #   db.find 'users', { name: 'Homer' }
       #
-      def find name, hash={}
+      def find(name, hash = {})
         hash = nourish_hash_id hash
         @db[name].find(hash).to_a.stringify_ids
       end
@@ -126,11 +126,11 @@ module Ki
       #  db = Db.instance
       #  db.update('users', { id: 'id', name: 'Sir Homer' })
       #
-      def update name, hash
+      def update(name, hash)
         hash = nourish_hash_id hash
         id = hash['_id'].to_s
         hash.delete('_id')
-        @db[name].update({'_id' => BSON::ObjectId(id)}, hash)
+        @db[name].update({ '_id' => BSON::ObjectId(id) }, hash)
         hash['id'] = id
         hash
       end
@@ -152,7 +152,7 @@ module Ki
       #   db.delete 'users', { id: 'id' }
       #   db.delete 'users', {}
       #
-      def delete name, hash
+      def delete(name, hash)
         hash = nourish_hash_id hash
         @db[name].remove hash
         {}
@@ -179,13 +179,13 @@ module Ki
       #   db.count 'users'
       #   db.count 'users', { name: 'Homer' }
       #
-      def count name, hash={}
+      def count(name, hash = {})
         @db[name].count hash
       end
 
       private
 
-      def nourish_hash_id hash
+      def nourish_hash_id(hash)
         hash = { '_id' => BSON::ObjectId(hash) } if hash.class == String
         if hash['id']
           hash['_id'] = hash['id']

data/lib/ki/utils/api_error.rb

@@ -2,7 +2,7 @@ module Ki
   class ApiError < StandardError #:nodoc:
     attr_reader :status
 
-    def initialize body, status=400
+    def initialize(body, status = 400)
       super body
       @status = status
     end
@@ -22,19 +22,19 @@ module Ki
   end
 
   class ForbiddenAction < ApiError #:nodoc:
-    def initialize s='forbidden', code=403
+    def initialize(s = 'forbidden', code = 403)
       super s, code
     end
   end
 
   class UnauthorizedError < ApiError #:nodoc:
-    def initialize s='unauthroized', code=401
+    def initialize(s = 'unauthroized', code = 401)
       super s, code
     end
   end
 
   class PartialNotFoundError < ApiError #:nodoc:
-    def initialize s
+    def initialize(s)
       super "partial #{s} not found", 404
     end
   end

data/lib/ki/utils/extra_ruby.rb

@@ -9,10 +9,10 @@ class String
   #   "user".to_class == User
   #
   def to_class
-    chain = self.split "::"
+    chain = split '::'
     klass = Kernel
     chain.each do |klass_string|
-      klass = klass.const_get klass_string.split('_').map{|w| w.capitalize}.join('')
+      klass = klass.const_get klass_string.split('_').map(&:capitalize).join('')
     end
     klass.is_a?(Class) ? klass : nil
   rescue NameError
@@ -22,7 +22,7 @@ end
 
 class Array
   def stringify_ids
-    self.collect do |e|
+    collect do |e|
       if e['_id']
         e['id'] = e['_id'].to_s
         e.delete('_id')

data/lib/ki/utils/indifferent_hash.rb

@@ -1,5 +1,5 @@
 class IndifferentHash < Hash
-  def []=(key,val)
+  def []=(key, val)
     key = key.to_sym
     super(key, val)
   end

data/lib/ki/version.rb

@@ -1,3 +1,3 @@
 module Ki
-  VERSION = "0.4.6"
+  VERSION = '0.4.7'
 end

data/lib/ki/views/404.haml

@@ -0,0 +1 @@
+%h1 404

data/lib/ki/views/instadmin.haml

@@ -1,5 +1,48 @@
-%h1 Ki InstAdmin
+= js "//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.15/angular.js"
 
-%p
-  Connected to
-  = Ki::Orm::Db.instance.connection_string
+%div{ 'ng-app' => 'instaAdminApp', 'ng-controller' => 'InstaAdmin' }
+  %h1 Ki InstAdmin
+
+  %p
+    Connected to
+    = Ki::Orm::Db.instance.connection_string
+
+  %input{ 'ng-model' => 'verb' }
+  %input{ 'ng-model' => 'resource' }
+  %button{ 'ng-click' => 'executeReq()' } Execute Request
+
+  %textarea{ 'ng-model' => 'input' }
+  %textarea{ 'ng-model' => 'output' }
+
+  :css
+    textarea {
+      width: 100%;
+      height: 300px;
+      padding: 15px;
+    }
+
+    button, input {
+      width: 33%;
+      padding: 15px;
+    }
+
+  :javascript
+    var adminApp = angular.module('instaAdminApp', []);
+
+    adminApp.controller('InstaAdmin', function ($scope, $http) {
+      $scope.verb = 'get';
+      $scope.resource = 'users';
+      $scope.input = '{}'
+
+      $scope.executeReq = function () {
+        $http[$scope.verb]("/" + $scope.resource + ".json", JSON.parse($scope.input)).
+          success(function(data, status, headers, config) {
+            console.log(data);
+            $scope.output = JSON.stringify(data, `undefined`, 2)
+          }).
+          error(function(data, status, headers, config) {
+            console.log(data);
+            $scope.output = JSON.stringify(data, `undefined`, 2)
+          });
+      }
+    });

data/spec/examples/base/app.rb

@@ -1 +1,6 @@
 require 'ki'
+
+# class Message < Ki::Model
+#   requires :title
+#   forbid :delete
+# end

data/spec/examples/json.northpole.ro/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
 gem 'ki', :path => '../../..'
-gem 'passenger'
+gem 'passenger', '4.0.40'
 gem 'capistrano'
 gem 'capistrano-rvm'

data/spec/lib/ki/base_request_spec.rb

@@ -4,8 +4,8 @@ describe Ki::BaseRequest do
   let(:req) { Ki::BaseRequest }
 
   it 'knows if current path is root' do
-    req.new({'PATH_INFO' => '/'}).root?.should be_true
-    req.new({'PATH_INFO' => '/foo'}).root?.should be_false
+    req.new({ 'PATH_INFO' => '/' }).root?.should be_true
+    req.new({ 'PATH_INFO' => '/foo' }).root?.should be_false
   end
 
   it 'coverts path to class' do
@@ -13,37 +13,37 @@ describe Ki::BaseRequest do
     class Bar < Ki::Model; end
     class FooBar < Ki::Model; end
 
-    req.new({'PATH_INFO' => ''}).to_ki_model_class.should == nil
-    req.new({'PATH_INFO' => '/'}).to_ki_model_class.should == nil
-    req.new({'PATH_INFO' => 'foo'}).to_ki_model_class.should == Foo
-    req.new({'PATH_INFO' => '/foo'}).to_ki_model_class.should == Foo
-    req.new({'PATH_INFO' => '/Foo.json'}).to_ki_model_class.should == Foo
-    req.new({'PATH_INFO' => '/bar.json'}).to_ki_model_class.should == Bar
-    req.new({'PATH_INFO' => '/Foo/bar.json'}).to_ki_model_class.should == nil
-    req.new({'PATH_INFO' => '/Foo/bar'}).to_ki_model_class.should == nil
-    req.new({'PATH_INFO' => '/Foo_bar'}).to_ki_model_class.should == FooBar
-    req.new({'PATH_INFO' => '/foo_bar'}).to_ki_model_class.should == FooBar
-    req.new({'PATH_INFO' => '/foo_bar.json'}).to_ki_model_class.should == FooBar
+    req.new({ 'PATH_INFO' => '' }).to_ki_model_class.should be nil
+    req.new({ 'PATH_INFO' => '/' }).to_ki_model_class.should be nil
+    req.new({ 'PATH_INFO' => 'foo' }).to_ki_model_class.should be Foo
+    req.new({ 'PATH_INFO' => '/foo' }).to_ki_model_class.should be Foo
+    req.new({ 'PATH_INFO' => '/Foo.json' }).to_ki_model_class.should be Foo
+    req.new({ 'PATH_INFO' => '/bar.json' }).to_ki_model_class.should be Bar
+    req.new({ 'PATH_INFO' => '/Foo/bar.json' }).to_ki_model_class.should be nil
+    req.new({ 'PATH_INFO' => '/Foo/bar' }).to_ki_model_class.should be nil
+    req.new({ 'PATH_INFO' => '/Foo_bar' }).to_ki_model_class.should be FooBar
+    req.new({ 'PATH_INFO' => '/foo_bar' }).to_ki_model_class.should be FooBar
+    req.new({ 'PATH_INFO' => '/foo_bar.json' }).to_ki_model_class.should be FooBar
   end
 
   it 'converts verb to action' do
-    req.new({'REQUEST_METHOD' => 'GET'}).to_action.should == :find
-    req.new({'REQUEST_METHOD' => 'POST'}).to_action.should == :create
-    req.new({'REQUEST_METHOD' => 'PUT'}).to_action.should == :update
-    req.new({'REQUEST_METHOD' => 'DELETE'}).to_action.should == :delete
-    req.new({'REQUEST_METHOD' => 'SEARCH'}).to_action.should == :find
+    req.new({ 'REQUEST_METHOD' => 'GET' }).to_action.should be :find
+    req.new({ 'REQUEST_METHOD' => 'POST' }).to_action.should be :create
+    req.new({ 'REQUEST_METHOD' => 'PUT' }).to_action.should be :update
+    req.new({ 'REQUEST_METHOD' => 'DELETE' }).to_action.should be :delete
+    req.new({ 'REQUEST_METHOD' => 'SEARCH' }).to_action.should be :find
   end
 
   context 'json' do
     it 'considers application/json content type as a json request' do
-      req.new({'CONTENT_TYPE' => 'application/xml'}).json?.should be_false
+      req.new({ 'CONTENT_TYPE' => 'application/xml' }).json?.should be_false
       req.new({}).json?.should be_false
-      req.new({'CONTENT_TYPE' => 'application/json'}).json?.should be_true
+      req.new({ 'CONTENT_TYPE' => 'application/json' }).json?.should be_true
     end
 
     it 'considers .json url format as a json request' do
-      req.new({'PATH_INFO' => '/foo'}).json?.should be_false
-      req.new({'PATH_INFO' => '/foo.json'}).json?.should be_true
+      req.new({ 'PATH_INFO' => '/foo' }).json?.should be_false
+      req.new({ 'PATH_INFO' => '/foo.json' }).json?.should be_true
     end
 
     # context 'params' do
@@ -54,7 +54,7 @@ describe Ki::BaseRequest do
     #       'REQUEST_METHOD' => 'GET',
     #       'rack.input' => ''
     #     })
-    #     asd.params.should == {}
+    #     asd.params.should be {}
     #   end
 
     #   it 'handles query params' do
@@ -64,7 +64,7 @@ describe Ki::BaseRequest do
     #       'REQUEST_METHOD' => 'GET',
     #       'rack.input' => ''
     #     })
-    #     asd.params.should == {'foo' => 'bar', 'cez' => ['dar', 'asd']}
+    #     asd.params.should be {'foo' => 'bar', 'cez' => ['dar', 'asd']}
     #   end
 
     #   it 'handles both query and body params' do

data/spec/lib/ki/helpers_spec.rb

@@ -4,7 +4,7 @@ describe Ki::Helpers do
   include Ki::Helpers
 
   it 'should render_haml' do
-    render_haml('%div.foo').should == "<div class='foo'></div>\n"
+    haml('%div.foo').should == "<div class='foo'></div>\n"
   end
 
   it 'renders css tag' do

data/spec/lib/ki/ki_app_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Ki::KiApp do
+  it 'html returns 404 if not found' do
+    get '/invalid_url'
+    expect(last_response.status).to eq 404
+  end
+
+  it 'json returns 404 if not found' do
+    get '/invalid_url.json'
+    expect(last_response.status).to eq 404
+  end
+end

data/spec/lib/ki/ki_config_spec.rb

@@ -1,12 +1,26 @@
 require 'spec_helper'
 
 describe Ki::KiConfig do
+  let(:config) { Ki::KiConfig.instance }
+
   it 'should know db name in test env' do
-    Ki::KiConfig.instance.environment.should == 'test'
+    config.environment.should == 'test'
   end
 
   it 'is overwritten for testing. see spec_helper' do
-    path = Ki::KiConfig.instance.config_file_path
+    path = config.config_file_path
     path.start_with?('spec/config.yml').should be true
   end
+
+  it 'defaults cors to true' do
+    expect(config).to be_cors
+  end
+
+  it 'has a database method' do
+    expect(config.database['name']).to eq 'np_test'
+  end
+
+  it 'has a middleware method' do
+    expect(config.middleware).to_not be_empty
+  end
 end

data/spec/lib/ki/ki_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Ki::Ki do
+  class CorsResource < Ki::Model
+  end
+
+  it 'has CORS enabled' do
+    get '/cors_resource.json'
+    expect(last_response.headers.key?('Vary')).to be true
+  end
+end