ki 0.4.6 → 0.4.7

data/spec/lib/ki/middleware/haml_compiler_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
 describe Ki::Middleware::HamlCompiler do
+  let(:compiler) { Ki::Middleware::HamlCompiler }
+
   it 'works' do
-    Ki::Middleware::HamlCompiler.any_instance.stub(:view_exists?).and_return(true)
-    File.stub(:read).and_return("%p hello")
+    compiler.any_instance.stub(:view_exists?).and_return(true)
+    File.stub(:read).and_return('%p hello')
     get '/existing_haml'
     expect(last_response.body).to eq "<p>hello</p>\n"
   end
 
   it 'passes to next middleware' do
-    Ki::Middleware::HamlCompiler.any_instance.stub(:view_exists?).and_return(false)
+    compiler.any_instance.stub(:view_exists?).and_return(false)
     get '/inexisting_haml'
-    expect(last_response.body).to eq "misplaced in space"
+    expect(last_response.body).to eq '<h1>404</h1>'
   end
 end

data/spec/lib/ki/{modules/format_of_spec.rb → middleware/helpers/format_of_helper_spec.rb}

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
 describe Ki::Middleware::Helpers::FormatOf do
-  let(:obj) { @obj = Object.new; @obj.extend(Ki::Middleware::Helpers::FormatOf) }
+  let(:obj) {
+    @obj = Object.new
+    @obj.extend(Ki::Middleware::Helpers::FormatOf)
+  }
 
   it 'should parse url format' do
     [nil, {}, '', '.json'].each do |s|

data/spec/lib/ki/model_spec.rb

@@ -6,7 +6,7 @@ describe Ki::Model do
     class Bar < Ki::Model; end
   end
 
-  it "should know about all descendants" do
+  it 'should know about all descendants' do
     desc = Ki::Model.descendants
     desc.include?(Foo).should be_true
     desc.include?(Bar).should be_true
@@ -14,14 +14,14 @@ describe Ki::Model do
 
   context Ki::Model::QueryInterface do
     it 'should have the query interface' do
-      Foo.class_name.should == 'Foo'
-      expect {
-        id = Foo.create({hello: 'world'})['id']
-        Foo.find(id).first['hello'].should == 'world'
+      Foo.class_name.should eq 'Foo'
+      expect do
+        id = Foo.create({ hello: 'world' })['id']
+        Foo.find(id).first['hello'].should eq 'world'
         Foo.update('id' => id, 'hello' => 'universe')
-        Foo.find(id).first['hello'].should == 'universe'
+        Foo.find(id).first['hello'].should eq 'universe'
         Foo.delete(id)
-      }.to change { Foo.count }.by 0
+      end.to change { Foo.count }.by 0
     end
 
     it 'should find or create' do
@@ -34,9 +34,9 @@ describe Ki::Model do
   end
 
   it 'should have restrictions configured' do
-    Bar.unique_attributes.should == []
-    Bar.required_attributes.should == []
-    Bar.forbidden_actions.should == []
+    Bar.unique_attributes.should eq []
+    Bar.required_attributes.should eq []
+    Bar.forbidden_actions.should eq []
 
     class Bar < Ki::Model
       unique :foo
@@ -44,9 +44,9 @@ describe Ki::Model do
       forbid :delete
     end
 
-    Bar.unique_attributes.should == [:foo]
-    Bar.required_attributes.should == [:foo]
-    Bar.forbidden_actions.should == [:delete]
+    Bar.unique_attributes.should eq [:foo]
+    Bar.required_attributes.should eq [:foo]
+    Bar.forbidden_actions.should eq [:delete]
   end
 
   context 'default properties' do
@@ -71,7 +71,7 @@ describe Ki::Model do
       t = Time.now.to_i
       # keep in mind that delete does not call unique/requires/forbid filters
       # make sure there are no duplicates
-      SpecialProperties.delete({'foo' => t})
+      SpecialProperties.delete({ 'foo' => t })
       expect {
         SpecialProperties.new(:create, { 'name' => 'zim', 'foo' => t })
       }.to change { SpecialProperties.count }.by 1

data/spec/lib/ki/modules/model_helper_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Ki::Model::ModelHelper do
+end

data/spec/lib/ki/orm_spec.rb

@@ -15,73 +15,73 @@ describe Ki::Orm do
 
   it 'should create a db object' do
     expect {
-      oid = @db.insert 'foo', {hello: 'world'}
+      oid = @db.insert 'foo', { hello: 'world' }
       oid.class.should == Hash
-    }.to change{@db.count('foo')}.by(1)
+    }.to change { @db.count('foo') }.by(1)
   end
 
   context 'count' do
     it 'should count' do
       expect {
-        @db.insert 'foo', {hello: 'world'}
-      }.to change{@db.count('foo')}.by(1)
+        @db.insert 'foo', { hello: 'world' }
+      }.to change { @db.count('foo') }.by(1)
     end
 
     it 'should count by hash' do
       t = Time.now.to_i.to_s
       expect {
-        @db.insert 'foo', {hello: t}
-      }.to change{@db.count('foo', {hello: t})}.by(1)
+        @db.insert 'foo', { hello: t }
+      }.to change { @db.count('foo', { hello: t }) }.by(1)
     end
   end
 
   context 'find' do
     it 'should find all' do
-      @db.insert 'foo', {hello: 'world'}
-      @db.insert 'foo', {hello: 'world'}
-      @db.find('foo').to_a.count.should >= 2
+      @db.insert 'foo', { hello: 'world' }
+      @db.insert 'foo', { hello: 'world' }
+      @db.find('foo').to_a.size.should >= 2
     end
 
     it 'should find by string id' do
-      obj_id = @db.insert('foo', {hello: 'world'})['id']
-      @db.find('foo', obj_id).first['id'].should == obj_id
+      obj_id = @db.insert('foo', { hello: 'world' })['id']
+      @db.find('foo', obj_id).first['id'].should eq obj_id
     end
 
     it 'should find by hash["id"]' do
-      obj_id = @db.insert 'foo', {'hello' => 'world'}
-      @db.find('foo', {'id' => obj_id['id']}).first.should == obj_id
+      obj_id = @db.insert 'foo', { 'hello' => 'world' }
+      @db.find('foo', { 'id' => obj_id['id'] }).first.should eq obj_id
     end
 
     it 'should find by hash["_id"]' do
-      obj_id = @db.insert('foo', {hello: 'world'})['id']
-      @db.find('foo', {'_id' => obj_id}).first['id'].should == obj_id
+      obj_id = @db.insert('foo', { hello: 'world' })['id']
+      @db.find('foo', { '_id' => obj_id }).first['id'].should eq obj_id
     end
 
     it 'should find by BSON::ObjectId(id)' do
-      obj_id = @db.insert('foo', {'hello' => 'world'})['id']
-      @db.find('foo', {'id' => BSON::ObjectId(obj_id)}).first['id'].should == obj_id
-      @db.find('foo', {'_id' => BSON::ObjectId(obj_id)}).first['id'].should == obj_id
+      obj_id = @db.insert('foo', { 'hello' => 'world' })['id']
+      @db.find('foo', { 'id' => BSON::ObjectId(obj_id) }).first['id'].should eq obj_id
+      @db.find('foo', { '_id' => BSON::ObjectId(obj_id) }).first['id'].should eq obj_id
     end
 
     it 'should return empty array when nothing found' do
-      r = @db.find('foo', {'it does not exist' => 'sure hope so' + Time.now.to_i.to_s })
-      r.class.should == Array
-      r.should be_empty
+      r = @db.find('foo', { 'it does not exist' => 'sure hope so' + Time.now.to_i.to_s })
+      expect(r.class).to eq Array
+      expect(r).to be_empty
     end
   end
 
   it 'should update' do
     obj_id = @db.insert('foo', { 'hello' => 'world' })['id']
-    @db.find('foo', obj_id).first['hello'].should == 'world'
+    @db.find('foo', obj_id).first['hello'].should eq 'world'
     up = @db.update('foo', { 'id' => obj_id, 'hello' => 'universe' })['id']
-    up.should == obj_id
-    @db.find('foo', obj_id).first['hello'].should == 'universe'
+    up.should eq obj_id
+    @db.find('foo', obj_id).first['hello'].should eq 'universe'
   end
 
   it 'should delete by id' do
     obj_id = @db.insert 'foo', { 'hello' => 'world' }
     expect {
       @db.delete('foo', obj_id).should == {}
-    }.to change { @db.count 'foo' }.by -1
+    }.to change { @db.count 'foo' }.by(-1)
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "codeclimate-test-reporter"
+require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -12,7 +12,9 @@ require 'ki'
 module Ki
   class KiConfig
     def config_file_path
-      config_yml_path = File.exists?('spec/config.yml') ? 'spec/config.yml' : 'spec/config.yml.example'
+      config_yml_path = 'spec/config.yml'
+      config_yml_path += '.example' unless File.exist?('spec/config.yml')
+
       if config_yml_path.end_with?('example')
         puts 'WARNING: spec/config.yml.example used'
       end
@@ -29,9 +31,9 @@ module Requests
   module JsonHelpers
     def json
       @json = JSON.parse(last_response.body)
-      # TODO find out if it is needed to convert to a hash with indifferent
+      # TODO: find out if it is needed to convert to a hash with indifferent
       # access
-      #@json = @json.with_indifferent_access if @json.class == Hash
+      # @json = @json.with_indifferent_access if @json.class == Hash
       @json
     end
   end

data/spec/util_spec.rb

@@ -8,8 +8,8 @@ describe Ki do
   it 'should convert string to class corectly' do
     class Cez; end
     class CezBar; end
-    'cez'.to_class.should == Cez
-    'cez_bar'.to_class.should == CezBar
+    expect('cez'.to_class).to eq Cez
+    expect('cez_bar'.to_class).to eq CezBar
   end
 
   describe Array do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Cristian Mircea Messel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +244,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -246,6 +261,7 @@ files:
 - lib/ki/base_request.rb
 - lib/ki/helpers.rb
 - lib/ki/ki.rb
+- lib/ki/ki_app.rb
 - lib/ki/ki_cli.rb
 - lib/ki/ki_config.rb
 - lib/ki/middleware/admin_interface_generator.rb
@@ -254,23 +270,25 @@ files:
 - lib/ki/middleware/coffee_compiler.rb
 - lib/ki/middleware/doc_generator.rb
 - lib/ki/middleware/haml_compiler.rb
+- lib/ki/middleware/helpers/format_of_helper.rb
+- lib/ki/middleware/helpers/haml_compiler_helper.rb
+- lib/ki/middleware/helpers/public_file_helper.rb
+- lib/ki/middleware/helpers/view_helper.rb
 - lib/ki/middleware/init_middleware.rb
 - lib/ki/middleware/public_file_server.rb
 - lib/ki/middleware/sass_compiler.rb
 - lib/ki/model.rb
 - lib/ki/modules/callbacks.rb
-- lib/ki/modules/format_of.rb
-- lib/ki/modules/model_helpers.rb
-- lib/ki/modules/public_file_helper.rb
+- lib/ki/modules/model_helper.rb
 - lib/ki/modules/query_interface.rb
 - lib/ki/modules/restrictions.rb
-- lib/ki/modules/view_helper.rb
 - lib/ki/orm.rb
 - lib/ki/utils/api_error.rb
 - lib/ki/utils/extra_irb.rb
 - lib/ki/utils/extra_ruby.rb
 - lib/ki/utils/indifferent_hash.rb
 - lib/ki/version.rb
+- lib/ki/views/404.haml
 - lib/ki/views/instadmin.haml
 - lib/ki/views/instadoc.haml
 - spec/config.yml.example
@@ -396,13 +414,15 @@ files:
 - spec/lib/ki/base_request_spec.rb
 - spec/lib/ki/helpers_spec.rb
 - spec/lib/ki/indifferent_hash_spec.rb
+- spec/lib/ki/ki_app_spec.rb
 - spec/lib/ki/ki_config_spec.rb
+- spec/lib/ki/ki_spec.rb
 - spec/lib/ki/middleware/doc_generator_spec.rb
 - spec/lib/ki/middleware/haml_compiler_spec.rb
+- spec/lib/ki/middleware/helpers/format_of_helper_spec.rb
 - spec/lib/ki/middleware_spec.rb
 - spec/lib/ki/model_spec.rb
-- spec/lib/ki/modules/format_of_spec.rb
-- spec/lib/ki/modules/model_helpers_spec.rb
+- spec/lib/ki/modules/model_helper_spec.rb
 - spec/lib/ki/orm_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
@@ -555,13 +575,15 @@ test_files:
 - spec/lib/ki/base_request_spec.rb
 - spec/lib/ki/helpers_spec.rb
 - spec/lib/ki/indifferent_hash_spec.rb
+- spec/lib/ki/ki_app_spec.rb
 - spec/lib/ki/ki_config_spec.rb
+- spec/lib/ki/ki_spec.rb
 - spec/lib/ki/middleware/doc_generator_spec.rb
 - spec/lib/ki/middleware/haml_compiler_spec.rb
+- spec/lib/ki/middleware/helpers/format_of_helper_spec.rb
 - spec/lib/ki/middleware_spec.rb
 - spec/lib/ki/model_spec.rb
-- spec/lib/ki/modules/format_of_spec.rb
-- spec/lib/ki/modules/model_helpers_spec.rb
+- spec/lib/ki/modules/model_helper_spec.rb
 - spec/lib/ki/orm_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb

data/spec/lib/ki/modules/model_helpers_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-
-describe Ki::Model::ModelHelpers do
-end