sails 0.1.0 → 0.1.1

data/lib/sails/daemon.rb

@@ -0,0 +1,103 @@
+module Sails
+  class Daemon
+    class << self
+      attr_accessor :options, :mode, :app_name, :pid_file
+
+      def init(opts = {})
+        self.app_name = Sails.config.app_name
+        self.mode = opts[:mode]
+        self.app_name = "#{Sails::Daemon.app_name}-thread" if self.mode == "thread"
+        self.pid_file = Sails.root.join("tmp/#{Sails::Daemon.app_name}.pid")
+        self.options = options
+      end
+
+      def read_pid
+        if !File.exist?(pid_file)
+          return nil
+        end
+
+        pid = File.open(pid_file).read.to_i
+        begin
+          Process.getpgid(pid)
+        rescue
+          pid = nil
+        end
+        return pid
+      end
+
+      def start_process(options = {})
+        old_pid = read_pid
+        if old_pid != nil
+          puts "Current have #{app_name} process in running on pid #{old_pid}"
+          return
+        end
+
+        # start master process
+        @master_pid = fork_master_process!
+        File.open(pid_file, "w+") do |f|
+          f.puts @master_pid
+        end
+        
+        puts "Started #{app_name} on pid: #{@master_pid}"
+
+        if options[:daemon] == false
+          Process.waitpid(@master_pid)
+        end
+      end
+      
+      def fork_master_process!
+        fork do
+          $PROGRAM_NAME = self.app_name + " [master]"
+          @child_pid = fork_child_process!
+  
+          Signal.trap("QUIT") { 
+            Process.kill("QUIT", @child_pid)
+            exit
+          }
+          
+          Signal.trap("USR2") {
+            Process.kill("USR2", @child_pid)
+          }
+  
+          loop do
+            sleep 1
+            begin
+              Process.getpgid(@child_pid)
+            rescue Errno::ESRCH => e
+              # puts "Child not found, will restart..."
+              @child_pid = fork_child_process!
+            end
+          end
+        end
+      end
+      
+      def fork_child_process!
+        fork do
+          $PROGRAM_NAME = self.app_name
+          Sails.start!(self.mode)
+          
+          Signal.trap("USR2") {
+            # TODO: reload Sails in current process
+            exit
+          }
+        end
+      end
+      
+      def stop_process
+        pid = read_pid
+        if pid == nil
+          puts "#{app_name} process not found, pid #{pid}"
+          return
+        end
+
+        print "Stopping #{app_name} with pid: #{pid}..."
+        begin
+          Process.kill("QUIT", pid)
+        ensure
+          File.delete(pid_file)
+        end
+        puts " [Done]"
+      end
+    end
+  end
+end

data/lib/sails/service/base.rb

@@ -0,0 +1,56 @@
+module Sails
+  module Service
+    # Like ActionController::Base
+    class Base
+      include ActiveSupport::Callbacks
+      
+      define_callbacks :action
+
+      set_callback :action, :before do |object|
+        # TODO: only reload on files changed
+        Sails.reload!
+      end
+
+      set_callback :action, :after do |object|
+        ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
+      end
+      
+      class << self
+        def internal_methods
+          controller = self.superclass
+          controller.public_instance_methods(true)
+        end
+        
+        def action_methods
+          @action_methods ||= begin
+            # All public instance methods of this class, including ancestors
+            methods = (public_instance_methods(true) -
+              # Except for public instance methods of Base and its ancestors
+              internal_methods +
+              # Be sure to include shadowed public instance methods of this class
+              public_instance_methods(false)).uniq.map { |x| x.to_s }
+
+            # Clear out AS callback method pollution
+            Set.new(methods.reject { |method| method =~ /_one_time_conditions/ })
+          end
+        end
+      end
+      
+      # Raise a Sails::Service::Exception (Thrift::Exception)
+      # if you want custom error you can override this method in you ApplicationService
+      def raise_error(code, msg = nil)
+        raise Exception.new(code: code, message: msg)
+      end
+      
+      def action_methods
+        self.class.action_methods
+      end
+
+      # Sails.logger
+      # You can use this method in app/services
+      def logger
+        Sails.logger
+      end
+    end
+  end
+end

data/lib/sails/service/exception.rb

@@ -0,0 +1,22 @@
+module Sails
+  module Service
+    # Thrift Exception
+    class Exception < ::Thrift::Exception
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      CODE = 1
+      MESSAGE = 2
+
+      FIELDS = {
+        CODE => {:type => ::Thrift::Types::I32, :name => 'code'},
+        MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+  end
+end

data/lib/sails/service/interface.rb

@@ -0,0 +1,60 @@
+module Sails
+  module Service
+    class Interface
+      attr_accessor :services
+      
+      def initialize
+        @services = []
+        Dir["#{Sails.root.join("app/services")}/*_service.rb"].each do |f|
+          if File.basename(f) =~ /^(.*)_service.rb$/
+            require f
+            mtd = $1.dup
+            klass_name = "#{mtd.camelize}Service"
+            @services << klass_name.constantize.new
+          end
+        end
+        define_service_methods!
+      end
+
+      private
+      def define_service_methods!
+        @services.each do |instance|
+          instance.action_methods.each do |method_name|
+            self.class.send(:define_method, method_name) do |*args, &block|
+              run_action(instance, method_name, *args, &block)
+            end
+          end
+        end
+      end
+      
+      def run_action(instance, method_name, *args, &block)
+        instance.run_callbacks :action do
+          time = Time.now.to_f
+
+          Sails.logger.info "\nProcessing by \"#{method_name}\" at #{Time.now.to_s}" unless Sails.env.test?
+          Sails.logger.info "  Parameters: { #{args.map(&:inspect).join(', ')} }" unless Sails.env.test?
+
+          begin
+            res = instance.send(method_name, *args, &block)
+            status = "Completed"
+            return res
+          rescue ActiveRecord::RecordNotFound => e
+            status = "Not Found"
+            instance.raise_error(404)
+          rescue Thrift::Exception => e
+            status = "Failed #{e.try(:code)}"
+            raise e
+          rescue => e
+            status = "Error 500"
+            Sails.logger.info "\"#{method_name}\" error : #{e.inspect}\n\n"
+            Sails.logger.info %Q(backtrace: #{e.backtrace.join("\n")}\n)
+            instance.raise_error(500)
+          ensure
+            elapsed = format('%.3f', (Time.now.to_f - time) * 1000)
+            Sails.logger.info "#{status} in (#{elapsed}ms).\n\n" unless Sails.env.test?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sails/service.rb

@@ -1,77 +1,10 @@
 module Sails
-  class Service
-    include ActiveSupport::Callbacks
-    define_callbacks :action
-
-    set_callback :action, :before do |object|
-    end
-
-    set_callback :action, :after do |object|
-      ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
-    end
-
-    def method_missing(method_name, *args, &block)
-      run_callbacks :action do
-        time = Time.now.to_f
-
-        Sails.logger.info "\nProcessing by \"#{method_name}\" at #{Time.now.to_s}" unless Sails.env.test?
-        Sails.logger.info "  Parameters: { #{args.map(&:inspect).join(', ')} }" unless Sails.env.test?
-
-        begin
-          res = interface.send(method_name, *args, &block)
-          status = "Completed"
-          return res
-        rescue ActiveRecord::RecordNotFound => e
-          status = "Not Found"
-          interface.raise_error(-1004)
-        rescue ThriftServer::OperationFailed => e
-          status = "Failed #{e.code}"
-          raise e
-        rescue => e
-          status = "Error 500"
-          Sails.logger.info "\"#{method_name}\" error : #{e.inspect}\n\n"
-          Sails.logger.info %Q(backtrace: #{e.backtrace.join("\n")}\n)
-          interface.raise_error(-1000)
-        ensure
-          elapsed = format('%.3f', (Time.now.to_f - time) * 1000)
-          Sails.logger.info "#{status} in (#{elapsed}ms).\n\n" unless Sails.env.test?
-        end
-      end
-    end
-
-    def args
-      @args ||= []
-    end
-
-    def initialize(*array)
-      args.concat array
-    end
-
-    class Interface
-      Dir["#{Sails.root.join("app/services")}/*_service.rb"].each do |f|
-        next if 'base_service.rb' == File.basename(f)
-        if File.basename(f) =~ /^(.*)_service.rb$/
-          require f
-          mtd = $1.dup
-          klass_name = "#{mtd.camelize}Service"
-          include klass_name.constantize
-        end
-      end
-
-      def raise_error code, msg = nil
-        raise ThriftServer::OperationFailed.new(
-        code: code,
-        message: msg
-        )
-      end
-
-      def logger
-        Sails.logger
-      end
-    end
-
-    def interface
-      @interface ||= Interface.new
-    end
+  module Service
+    extend ActiveSupport::Autoload
+    
+    autoload :Base
+    autoload :Config
+    autoload :Exception
+    autoload :Interface
   end
-end
+end

data/lib/sails/templates/Rakefile.tt

@@ -7,11 +7,6 @@ Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
 task :default => :test
 
-task :console do
-  puts "Starting thrift-server console..."
-  system "pry -I config/application.rb -r ./config/application.rb"
-end
-
 task :gen do
   puts "Generating thrift code..."
   system 'thrift \

data/lib/sails/templates/app/services/application_service.rb.tt

@@ -1,6 +1,8 @@
-module ApplicationService
-  extend ActiveSupport::Concern
-  
+class ApplicationService < Sails::Service::Base
   # def require_user!(user_id, access_token)
   # end
+  
+  # def raise_error(code, msg = nil)
+  #   raise YouCustomThriftException.new(code: code, message: msg)
+  # end
 end

data/lib/sails/templates/config/application.rb.tt

@@ -8,9 +8,15 @@ require "app/services/handler"
 module Sails
   config.app_name = '<%= app_name %>'
   # Thrift Configs
-  config.thrift_host = '127.0.0.1'
-  config.thrift_port = 4000
-  config.thrift_processor = Thrift::<%= app_name.capitalize %>::Processor
+  config.port = 4000
+  
+  # Thrift protocol allows: :binary, :compact, default: :binary
+  # config.protocol = :binary 
+  
+  # Number of threads, default: 20
+  # config.thread_size = 20
+  
+  config.processor = Thrift::<%= app_name.capitalize %>::Processor
   
   # config.autoload_paths += %W(app/workers)
   

data/lib/sails/templates/config/environments/development.rb

@@ -0,0 +1,3 @@
+module Sails
+  config.cache_classes = false
+end

data/lib/sails/templates/config/environments/production.rb

@@ -0,0 +1,3 @@
+module Sails
+  config.cache_classes = true
+end

data/lib/sails/templates/config/environments/test.rb

@@ -0,0 +1,3 @@
+module Sails
+  config.cache_classes = false
+end

data/lib/sails/version.rb

@@ -1,5 +1,5 @@
 module Sails
   def self.version
-    "0.1.0"
+    "0.1.1"
   end
 end

data/lib/sails.rb

@@ -1,7 +1,40 @@
-require "sails/version"
-require "sails/base"
+require 'rubygems'
+require 'bundler/setup'
+require 'active_support/all'
+require 'i18n'
+require 'thrift'
+require 'yaml'
 require "sails/rails"
-require "sails/cli"
-require "sails/service"
+require "sails/base"
 
-Sails.init()
+# Sails 
+#
+# You can custom Sails configs in config/application.rb
+#
+#    module Sails
+#      config.app_name = 'you_app_name'
+#      config.thrift.port = 7075
+#      config.thrift.processor = Thrift::YouAppName::Processor
+#
+#      # Thrift Protocols can be use [:binary, :compact, :json]
+#      # http://jnb.ociweb.com/jnb/jnbJun2009.html#protocols
+#      config.thrift.procotol = :binary
+#    
+#      config.autoload_paths += %W(app/workers)
+#    
+#      config.i18n.default_locale = 'zh-CN'
+#    
+#      # cache store
+#      config.cache_store = [:dalli_store, '127.0.0.1' }]
+#    end
+#
+module Sails
+  extend ActiveSupport::Autoload
+  
+  autoload :Config
+  autoload :Version
+  autoload :Service
+  autoload :CLI
+  autoload :Daemon
+  autoload :Console
+end

data/sails.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.name        = "sails"
   s.version     = Sails.version
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jason Lee"]
-  s.email       = ["huacnlee@gmail.com"]
+  s.authors     = ["Jason Lee", "P.S.V.R", "wxianfeng", "sapronlee","qhwa"]
+  s.email       = ["huacnlee@gmail.com", "pmq2001@gmail.com", "wang.fl1429@gmail.com", "sapronlee@gmail.com","qhwa@163.com"]
   s.homepage    = "https://github.com/huacnlee/sails"
-  s.summary     = %q{Sails, create Thrift Server use like Rails}
-  s.description = %q{Sails, create Thrift Server use like Rails}
+  s.summary     = %q{Sails, Help you to create Rails style Thrift Server}
+  s.description = %q{Sails, Help you to create Rails style Thrift Server}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = ["sails"]

data/spec/cli_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'Sails::CLI' do
+  let(:cli) { Sails::CLI.new }
+  describe '.start' do
+    it { expect(cli).to respond_to(:start) }
+    it {
+      expect(Sails::Daemon).to receive(:init)
+      expect(Sails::Daemon).to receive(:start_process)
+      cli.start
+    }
+  end
+  
+  describe '.stop' do
+    it { expect(cli).to respond_to(:stop) }
+    it {
+      expect(Sails::Daemon).to receive(:init)
+      expect(Sails::Daemon).to receive(:stop_process)
+      cli.stop
+    }
+  end
+  
+  describe '.restart' do
+    it { expect(cli).to respond_to(:restart) }
+    it {
+      # expect(Sails::Daemon).to receive(:init)
+      expect(Sails::Daemon).to receive(:stop_process)
+      expect(Sails::Daemon).to receive(:start_process)
+      cli.restart
+    }
+  end
+  
+  describe '.new' do
+    it { expect(cli).to respond_to(:new) }
+  end
+  
+  describe '.console' do
+    it { expect(cli).to respond_to(:console) }
+  end
+  
+  describe '.version' do
+    it { expect(cli).to respond_to(:version) }
+  end
+end

data/spec/dummy/log/development.log

@@ -1 +1,28 @@
 # Logfile created on 2014-12-08 13:02:26 +0800 by logger.rb/44203
+Cache clear: flushing all keys
+Dalli::Server#connect 127.0.0.1:11211
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys
+Cache clear: flushing all keys

data/spec/rails_spec.rb

@@ -0,0 +1,5 @@
+describe 'Rails' do
+  it { expect(Rails.logger).to eq Sails.logger }
+  it { expect(Rails.cache).to eq Sails.cache }
+  it { expect(Rails.env).to eq Sails.env }
+end

data/spec/sails_spec.rb

@@ -0,0 +1,70 @@
+require "spec_helper"
+
+describe 'Sails' do
+  it { expect(Sails.version).not_to be_nil }
+  
+  describe '#root' do
+    it 'should be a Pathname class' do
+      expect(Sails.root).to be_a(Pathname)
+    end
+    
+    it 'should support Sails.root.join' do
+      expect(Sails.root.join("aaa").to_s).to eq File.join(Dir.pwd, "spec/dummy/aaa")
+    end
+    
+    it 'should work' do
+      expect(Sails.root.to_s).to eq File.join(Dir.pwd, "spec/dummy")
+    end
+  end
+  
+  describe '#logger' do
+    it 'should be a Logger class' do
+      expect(Sails.logger).to be_a(Logger)
+    end
+  end
+  
+  describe '#config' do
+    it 'should work' do
+      expect(Sails.config).to be_a(Hash)
+      expect(Sails.config.autoload_paths).to be_a(Array)
+    end
+    
+    describe 'Real config' do
+      it { expect(Sails.config.app_name).to eq 'hello' }
+      it { expect(Sails.config.host).to eq '1.1.1.1' }
+      it { expect(Sails.config.port).to eq 1000 }
+      it { expect(Sails.config.protocol).to eq :binary }
+      it { expect(Sails.config.thread_size).to eq 20 }
+      it { expect(Sails.config.i18n.default_locale).to eq :'zh-TW' }
+      it { expect(Sails.config.autoload_paths).to include("app/bar") }
+    end
+  end
+  
+  describe '#cache' do
+    it { expect(Sails.cache).to be_a(ActiveSupport::Cache::DalliStore) }
+    it { expect(Sails.cache).to respond_to(:read, :write, :delete, :clear) }
+  end
+  
+  describe '#thrift_protocol_class' do
+    it 'should work' do
+      allow(Sails.config).to receive(:protocol).and_return(:binary)
+      expect(Sails.thrift_protocol_class).to eq ::Thrift::BinaryProtocolFactory
+      allow(Sails.config).to receive(:protocol).and_return(:compact)
+      expect(Sails.thrift_protocol_class).to eq ::Thrift::CompactProtocolFactory
+      allow(Sails.config).to receive(:protocol).and_return(:json)
+      expect(Sails.thrift_protocol_class).to eq ::Thrift::JsonProtocolFactory
+      allow(Sails.config).to receive(:protocol).and_return(:xxx)
+      expect(Sails.thrift_protocol_class).to eq ::Thrift::BinaryProtocolFactory
+    end
+  end
+  
+  describe '#reload!' do
+    it 'should work' do
+      s1 = Sails.service
+      Sails.reload!
+      expect(Sails.service).not_to eq s1
+      # TODO: test reload autoload_paths
+    end
+  end
+  
+end

data/spec/service_spec.rb

@@ -0,0 +1,38 @@
+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

data/spec/spec_helper.rb

@@ -1,4 +1,26 @@
 require_relative "../lib/sails"
 
 # Force set Sails root to spec/dummy
-Sails.root = File.expand_path("../dummy", __FILE__)
+Sails.root = File.expand_path("../dummy", __FILE__)
+$LOAD_PATH.unshift Sails.root
+
+# for test Sails config
+module Sails
+  config.app_name = 'hello'
+  config.host = '1.1.1.1'
+  config.port = 1000
+  config.i18n.default_locale = 'zh-TW'
+  config.autoload_paths += %W(app/bar)
+  config.cache_store = [:dalli_store, '127.0.0.1']
+end
+
+RSpec.configure do |config|
+
+  config.before(:each) do
+  end
+
+  config.after(:each) do
+  end
+
+  config.raise_errors_for_deprecations!
+end