sails 0.1.1 → 0.1.2

data/spec/sails_spec.rb

@@ -62,7 +62,7 @@ describe 'Sails' do
     it 'should work' do
       s1 = Sails.service
       Sails.reload!
-      expect(Sails.service).not_to eq s1
+      # expect(Sails.service).not_to eq s1
       # TODO: test reload autoload_paths
     end
   end

data/spec/service/base_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Service' do
+  describe 'Base' do
+    class SimpleBaseTestService < Sails::Service::Base
+      def foo
+      end
+
+      def bar(a, b)
+      end
+
+      private
+      def dar
+      end
+    end
+
+    let(:simple) { SimpleBaseTestService.new }
+
+    describe '.raise_error' do
+      it { expect(simple).to respond_to(:raise_error) }
+      it {
+        expect { simple.raise_error(11,'foo') }.to raise_error do |error|
+          expect(error).to be_a(Sails::Service::Exception)
+          expect(error.code).to eq 11
+          expect(error.message).to eq 'foo'
+        end
+      }
+    end
+
+    describe '.action_methods' do
+      it { expect(simple.action_methods).to include("foo", "bar") }
+      it { expect(simple.action_methods.size).to eq 2 }
+      it { expect(simple.action_methods).not_to include("dar") }
+    end
+
+    describe '.logger' do
+      it { expect(simple.logger).to eq Sails.logger }
+    end
+
+    describe '.params' do
+      it { expect(simple.params).to eq({}) }
+      it "should set val" do
+        simple.params[:foo] = 111
+        expect(simple.params).to eq({ foo: 111 })
+      end
+    end
+  end
+end

data/spec/service/callbacks_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'Service' do
+  describe 'Callbacks' do
+    context 'callback with method_name' do
+      class CallbackTest1Service < Sails::Service::Base
+        before_action :bar, :dar
+        def bar; end
+        def dar; end
+        def foo; end
+      end
+
+      let(:simple) { CallbackTest1Service.new }
+
+      before do
+        insert_service(simple)
+      end
+
+      it 'should work' do
+        expect(simple).to receive(:bar).once
+        expect(simple).to receive(:dar).once
+        service.foo
+      end
+    end
+
+    describe 'params' do
+      class CallbackTest3Service < Sails::Service::Base
+        def foo(a, b)
+          return params
+        end
+      end
+
+      let(:simple) { CallbackTest3Service.new }
+
+      before do
+        insert_service(simple)
+      end
+
+      it "should work" do
+        params = service.foo(1,2)
+        expect(params).to include(:a, :b)
+        expect(params[:a]).to eq 1
+        expect(params[:b]).to eq 2
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -14,8 +14,11 @@ module Sails
   config.cache_store = [:dalli_store, '127.0.0.1']
 end
 
-RSpec.configure do |config|
+Dir["./spec/support/**/*.rb"].each { |f| require f }
 
+RSpec.configure do |config|
+  config.include ServiceSupport, file_path: /spec\/service/
+  
   config.before(:each) do
   end
 

data/spec/support/service_support.rb

@@ -0,0 +1,13 @@
+module ServiceSupport
+  extend ActiveSupport::Concern
+  
+  def service
+    Sails.service
+  end
+  
+  # Insert a instance into Sails.service
+  def insert_service(instance)
+    service.services << simple
+    service.send(:define_service_methods!)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jason Lee
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -85,6 +85,7 @@ files:
 - lib/sails/rails.rb
 - lib/sails/service.rb
 - lib/sails/service/base.rb
+- lib/sails/service/callbacks.rb
 - lib/sails/service/exception.rb
 - lib/sails/service/interface.rb
 - lib/sails/templates/%app_name%.thrift.tt
@@ -110,8 +111,10 @@ files:
 - spec/dummy/log/development.log
 - spec/rails_spec.rb
 - spec/sails_spec.rb
-- spec/service_spec.rb
+- spec/service/base_spec.rb
+- spec/service/callbacks_spec.rb
 - spec/spec_helper.rb
+- spec/support/service_support.rb
 homepage: https://github.com/huacnlee/sails
 licenses:
 - MIT
@@ -141,6 +144,8 @@ test_files:
 - spec/dummy/log/development.log
 - spec/rails_spec.rb
 - spec/sails_spec.rb
-- spec/service_spec.rb
+- spec/service/base_spec.rb
+- spec/service/callbacks_spec.rb
 - spec/spec_helper.rb
+- spec/support/service_support.rb
 has_rdoc: 

data/spec/service_spec.rb

@@ -1,38 +0,0 @@
-require "spec_helper"
-
-describe 'Service' do
-  class SimpleService < Sails::Service::Base
-    def foo
-    end
-    
-    def bar
-    end
-    
-    private
-    def dar
-    end
-  end
-  
-  let(:simple) { SimpleService.new }
-  
-  describe '.raise_error' do
-    it { expect(simple).to respond_to(:raise_error) }
-    it {
-      expect { simple.raise_error(11,'foo') }.to raise_error do |error|
-        expect(error).to be_a(Sails::Service::Exception)
-        expect(error.code).to eq 11
-        expect(error.message).to eq 'foo'
-      end
-    }
-  end
-  
-  describe '.action_methods' do
-    it { expect(simple.action_methods).to include("foo", "bar") }
-    it { expect(simple.action_methods.size).to eq 2 }
-    it { expect(simple.action_methods).not_to include("dar") }
-  end
-  
-  describe '.logger' do
-    it { expect(simple.logger).to eq Sails.logger }
-  end
-end