ki 0.4.11 → 0.4.12

data/spec/lib/ki/channel_manager_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::ChannelManager do

data/spec/lib/ki/helpers_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Helpers do
   include Ki::Helpers
 
   it 'should render_haml' do
-    haml('%div.foo').should == "<div class='foo'></div>\n"
+    expect(haml('%div.foo')).to eq "<div class='foo'></div>\n"
   end
 
   it 'renders css tag' do
@@ -22,7 +24,7 @@ describe Ki::Helpers do
   end
 
   it 'renders haml' do
-    File.stub(:join).and_return('lib/ki/views/404.haml')
+    expect(File).to receive(:join).and_return('lib/ki/views/404.haml')
     expect(partial('404')).to include('h1')
   end
 end

data/spec/lib/ki/indifferent_hash_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe IndifferentHash do

data/spec/lib/ki/ki_app_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::KiApp do

data/spec/lib/ki/ki_config_spec.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::KiConfig do
   let(:config) { Ki::KiConfig.instance }
 
   it 'should know db name in test env' do
-    config.environment.should == 'test'
+    expect(config.environment).to eq 'test'
   end
 
   it 'is overwritten for testing. see spec_helper' do
     path = config.config_file_path
-    path.start_with?('spec/config.yml').should be true
+    expect(path).to be_start_with('spec/config.yml')
   end
 
   it 'defaults cors to true' do
@@ -48,7 +50,7 @@ describe Ki::KiConfig do
   end
 
   it 'does not add duplicate middleware' do
-    config.config['add_middleware'] = %w(Realtime Realtime)
+    config.config['add_middleware'] = %w[Realtime Realtime]
     expect(config.middleware.to_s.scan(/Realtime/).count).to eq 1
   end
 end

data/spec/lib/ki/ki_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Ki do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Middleware::AdminInterfaceGenerator do

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

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Middleware::HamlCompiler do
   let(:compiler) { Ki::Middleware::HamlCompiler }
 
   it 'works' do
-    compiler.any_instance.stub(:view_exists?).and_return(true)
-    File.stub(:read).and_return('%p hello')
+    # TODO: find out why twice
+    expect_any_instance_of(compiler).to receive(:view_exists?).twice.and_return(true)
+    expect(File).to receive(:read).twice.and_return('%p hello')
     get '/existing_haml'
     expect(last_response.body).to eq "<p>hello</p>\n"
   end
 
   it 'passes to next middleware' do
-    compiler.any_instance.stub(:view_exists?).and_return(false)
+    expect_any_instance_of(compiler).to receive(:view_exists?).and_return(false)
     get '/inexisting_haml'
     expect(last_response.body).to eq '<h1>404</h1>'
   end

data/spec/lib/ki/middleware/helpers/format_of_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Middleware::Helpers::FormatOf do
@@ -8,11 +10,11 @@ describe Ki::Middleware::Helpers::FormatOf do
 
   it 'should parse url format' do
     [nil, {}, '', '.json'].each do |s|
-      obj.format_of(s).should == ''
+      expect(obj.format_of(s)).to eq ''
     end
 
     ['asd.json', 'asd.json?asd=1'].each do |s|
-      obj.format_of(s).should == 'json'
+      expect(obj.format_of(s)).to eq 'json'
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Middleware::InitMiddleware do
@@ -14,7 +16,7 @@ describe Ki::Middleware::InitMiddleware do
   it 'renders index.html if it exists' do
     env = Rack::MockRequest.env_for('/', { 'REQUEST_METHOD' => 'GET' })
 
-    Ki::Middleware::InitMiddleware.any_instance.stub(:public_file_exists?).and_return(true)
+    expect_any_instance_of(Ki::Middleware::InitMiddleware).to receive(:public_file_exists?).and_return(true)
     resp = init.call env
     expect(resp[0]).to eq 404 # not found because index.html doesn't exist
   end

data/spec/lib/ki/middleware/{doc_generator_spec.rb → insta_doc_spec.rb}

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-describe Ki::Middleware::DocGenerator do
+describe Ki::Middleware::InstaDoc do
   it 'works' do
     get '/instadoc'
     expect(last_response.body).to include('Ki InstaDoc')

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # TODO: find a way to test
@@ -18,8 +20,10 @@ describe Ki::Middleware::Realtime do
   it 'handle_websocket' do
     env = Rack::MockRequest.env_for('/realtime', { 'REQUEST_METHOD' => 'GET' })
 
-    Ki::Middleware::Realtime.any_instance.stub(:handle_websocket).and_return('handle_websocket')
-    Faye::WebSocket.stub(:websocket?).and_return(true)
+    # Ki::Middleware::Realtime.any_instance.stub(:handle_websocket).and_return('handle_websocket')
+    # Faye::WebSocket.stub(:websocket?).and_return(true)
+    expect_any_instance_of(Ki::Middleware::Realtime).to receive(:handle_websocket).and_return('handle_websocket')
+    expect(Faye::WebSocket).to receive(:websocket?).and_return(true)
 
     resp = realtime.call env
     expect(resp).to eq 'handle_websocket'
@@ -27,15 +31,17 @@ describe Ki::Middleware::Realtime do
 
   it 'continues call' do
     env = Rack::MockRequest.env_for('/bazinga', { 'REQUEST_METHOD' => 'GET' })
-    Hash.any_instance.stub(:call).and_return('continue')
+    expect_any_instance_of(Hash).to receive(:call).and_return('continue')
+    # Hash.any_instance.stub(:call).and_return('continue')
     resp = realtime.call env
     expect(resp).to eq 'continue'
   end
 
   it 'has ws_send' do
     ws = {}
-    ws.stub(:send).and_return true
-    expect(realtime.ws_send(ws, {})).to be_true
+    expect(ws).to receive(:send).and_return(true)
+    # ws.stub(:send).and_return true
+    expect(realtime.ws_send(ws, {})).to be true
   end
 
   describe 'on_message' do
@@ -43,7 +49,7 @@ describe Ki::Middleware::Realtime do
     let(:db) { Ki::Orm::Db.instance }
 
     before :each do
-      realtime.stub(:ws_send) do |_arg1, arg2|
+      allow(realtime).to receive(:ws_send) do |_arg1, arg2|
         arg2
       end
     end

data/spec/lib/ki/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Middleware do
@@ -5,7 +7,7 @@ describe Ki::Middleware do
     it 'should only handle urls maped from objects that extend Ki::Model' do
       get '/asd.json'
       json
-      last_response.status.should == 404
+      expect(last_response.status).to eq 404
     end
   end
 end

data/spec/lib/ki/model_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Model do
@@ -6,20 +8,20 @@ describe Ki::Model do
     class Bar < Ki::Model; end
   end
 
-  it 'should know about all descendants' do
+  it 'knows about descendants' do
     desc = Ki::Model.descendants
-    desc.include?(Foo).should be_true
-    desc.include?(Bar).should be_true
+    expect(desc).to include(Foo)
+    expect(desc).to include(Bar)
   end
 
   context Ki::Model::QueryInterface do
     it 'should have the query interface' do
-      Foo.class_name.should eq 'Foo'
+      expect(Foo.class_name).to eq 'Foo'
       expect do
         id = Foo.create({ hello: 'world' })['id']
-        Foo.find(id).first['hello'].should eq 'world'
+        expect(Foo.find(id).first['hello']).to eq 'world'
         Foo.update('id' => id, 'hello' => 'universe')
-        Foo.find(id).first['hello'].should eq 'universe'
+        expect(Foo.find(id).first['hello']).to eq 'universe'
         Foo.delete(id)
       end.to change { Foo.count }.by 0
     end
@@ -34,9 +36,9 @@ describe Ki::Model do
   end
 
   it 'should have restrictions configured' do
-    Bar.unique_attributes.should eq []
-    Bar.required_attributes.should eq []
-    Bar.forbidden_actions.should eq []
+    expect(Bar.unique_attributes).to eq []
+    expect(Bar.required_attributes).to eq []
+    expect(Bar.forbidden_actions).to eq []
 
     class Bar < Ki::Model
       unique :foo
@@ -44,9 +46,9 @@ describe Ki::Model do
       forbid :delete
     end
 
-    Bar.unique_attributes.should eq [:foo]
-    Bar.required_attributes.should eq [:foo]
-    Bar.forbidden_actions.should eq [:delete]
+    expect(Bar.unique_attributes).to eq [:foo]
+    expect(Bar.required_attributes).to eq [:foo]
+    expect(Bar.forbidden_actions).to eq [:delete]
   end
 
   context 'default properties' do
@@ -55,8 +57,10 @@ describe Ki::Model do
 
     it 'should create object' do
       mock_req = {}
-      mock_req.stub(:to_action).and_return(:create)
-      mock_req.stub(:params).and_return({})
+      expect(mock_req).to receive(:to_action).and_return(:create)
+      # mock_req.stub(:to_action).and_return(:create)
+      # mock_req.stub(:params).and_return({})
+      expect(mock_req).to receive(:params).and_return({})
 
       expect {
         DefaultProperties.new(mock_req)
@@ -78,8 +82,8 @@ describe Ki::Model do
       SpecialProperties.delete({ 'foo' => t })
 
       mock_req = {}
-      mock_req.stub(:to_action).and_return(:create)
-      mock_req.stub(:params).and_return('name' => 'zim', 'foo' => t)
+      expect(mock_req).to receive(:to_action).and_return(:create)
+      expect(mock_req).to receive(:params).and_return('name' => 'zim', 'foo' => t)
 
       expect {
         SpecialProperties.new(mock_req)
@@ -88,8 +92,8 @@ describe Ki::Model do
 
     it 'should check for required attributes' do
       mock_req = {}
-      mock_req.stub(:to_action).and_return(:create)
-      mock_req.stub(:params).and_return({})
+      expect(mock_req).to receive(:to_action).and_return(:create)
+      expect(mock_req).to receive(:params).and_return({})
 
       expect {
         SpecialProperties.new(mock_req)
@@ -99,8 +103,8 @@ describe Ki::Model do
     it 'should check for unique attributes' do
       t = Time.now.to_i
       mock_req = {}
-      mock_req.stub(:to_action).and_return(:create)
-      mock_req.stub(:params).and_return({ 'name' => 'zim', 'foo' => t })
+      expect(mock_req).to receive(:to_action).and_return(:create)
+      expect(mock_req).to receive(:params).and_return({ 'name' => 'zim', 'foo' => t })
 
       expect {
         SpecialProperties.new(mock_req)
@@ -110,8 +114,8 @@ describe Ki::Model do
 
     it 'should not allow forbidden actions' do
       mock_req = {}
-      mock_req.stub(:to_action).and_return(:delete)
-      mock_req.stub(:params).and_return({})
+      expect(mock_req).to receive(:to_action).and_return(:delete)
+      expect(mock_req).to receive(:params).and_return({})
 
       expect {
         SpecialProperties.new(mock_req)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Model::ModelHelper do
@@ -28,8 +30,8 @@ describe Ki::Model::ModelHelper do
     end
 
     @req = TmpClassModelHelper.new
-    expect(post?).to be_true
-    expect(put?).to be_true
-    expect(delete?).to be_true
+    expect(post?).to be true
+    expect(put?).to be true
+    expect(delete?).to be true
   end
 end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ki::Model::Restrictions do
+  before :all do
+    class DoubleRestricted < Ki::Model
+      requires :foo, :cez
+      requires :bar
+    end
+  end
+
+  it 'merges multiple generic_restrictions' do
+    expect(DoubleRestricted.required_attributes).to eq %i[foo bar cez].sort
+  end
+end

data/spec/lib/ki/orm_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Ki::Orm do
@@ -6,7 +8,7 @@ describe Ki::Orm do
   end
 
   it 'should know db name in test env' do
-    @db.config['name'].should == 'np_test'
+    expect(@db.config['name']).to eq 'np_test'
   end
 
   it 'has a connection string' do
@@ -16,7 +18,7 @@ describe Ki::Orm do
   it 'should create a db object' do
     expect {
       oid = @db.insert 'foo', { hello: 'world' }
-      oid.class.should == Hash
+      expect(oid).to be_a(Hash)
     }.to change { @db.count('foo') }.by(1)
   end
 
@@ -39,28 +41,29 @@ describe Ki::Orm do
     it 'should find all' do
       @db.insert 'foo', { hello: 'world' }
       @db.insert 'foo', { hello: 'world' }
-      @db.find('foo').to_a.size.should >= 2
+      expect(@db.find('foo').to_a.size).to be >= 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 eq obj_id
+      expect(@db.find('foo', obj_id).first['id']).to 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 eq obj_id
+      obj_id = @db.insert('foo', { 'hello' => 'world' })['id']
+      find_query = @db.find('foo', { 'id' => obj_id })
+      expect(find_query.first['id']).to 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 eq obj_id
+      expect(@db.find('foo', { '_id' => obj_id }).first['id']).to 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 eq obj_id
-      @db.find('foo', { '_id' => BSON::ObjectId(obj_id) }).first['id'].should eq obj_id
+      expect(@db.find('foo', { 'id' => BSON::ObjectId(obj_id) }).first['id']).to eq obj_id
+      expect(@db.find('foo', { '_id' => BSON::ObjectId(obj_id) }).first['id']).to eq obj_id
     end
 
     it 'should return empty array when nothing found' do
@@ -75,12 +78,12 @@ describe Ki::Orm do
       @db.insert('sort_tests', { 'value' => 1 })
       @db.insert('sort_tests', { 'value' => 2 })
 
-      r = @db.find('sort_tests', { '__sort' => { 'value' => 'desc' } })
+      r = @db.find('sort_tests', { '__sort' => { 'value' => -1 } })
       expect(r.size).to eq 2
       expect(r[0]['value']).to eq 2
       expect(r[1]['value']).to eq 1
 
-      r = @db.find('sort_tests', { '__sort' => { 'value' => 'asc' } })
+      r = @db.find('sort_tests', { '__sort' => { 'value' => 1 } })
       expect(r.size).to eq 2
       expect(r[0]['value']).to eq 1
       expect(r[1]['value']).to eq 2
@@ -98,16 +101,16 @@ describe Ki::Orm do
 
   it 'should update' do
     obj_id = @db.insert('foo', { 'hello' => 'world' })['id']
-    @db.find('foo', obj_id).first['hello'].should eq 'world'
+    expect(@db.find('foo', obj_id).first['hello']).to eq 'world'
     up = @db.update('foo', { 'id' => obj_id, 'hello' => 'universe' })['id']
-    up.should eq obj_id
-    @db.find('foo', obj_id).first['hello'].should eq 'universe'
+    expect(up).to eq obj_id
+    expect(@db.find('foo', obj_id).first['hello']).to eq 'universe'
   end
 
   it 'should delete by id' do
     obj_id = @db.insert 'foo', { 'hello' => 'world' }
     expect {
-      @db.delete('foo', obj_id).should == { deleted_item_count: 1 }
+      expect(@db.delete('foo', obj_id)).to eq({ deleted_item_count: 1 })
     }.to change { @db.count 'foo' }.by(-1)
   end
 end