sails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9910e5d27ef628ca22aec968edd2ed2a94604295
-  data.tar.gz: 6e72d2491ad1950a6a2e6946205a6ac84e266914
+  metadata.gz: fdca82274162d55762d2eddeb183930b7e0b77a5
+  data.tar.gz: 6008de27f43aed4eec5c4d2935abb318a5e64f46
 SHA512:
-  metadata.gz: 91c9dc674800da1fcb081bafa44438b5a673f68300df5ddbfdbc207b1c216de6354972a9dcb9866db5af245bf18dbb2d51b983b85c9c89c53e52768116561840
-  data.tar.gz: df6d3b9110cf3d8c3c71e31ae5c0f0c9e0744b2cd6826dd98517356b0e8b2835637f5565904e186e292aa118d33d8df7d59a7326280ec5ad1e7ee44688cd9c7e
+  metadata.gz: 0a8a8dedb82895595fa18613dd058ed6c4f91f8db83cd10d8e3a02a51d85c3490c5a364d38cfa1c8f1ed55c7dd2535763b593223c61bd62d54d092a6758cba53
+  data.tar.gz: e7ee9fd640638548ed95a81a65bf1443c84fb09531d74c8cf70397f233e022979d4b4c16780400491a2885e900c14eec7f7944b6fc23d27607798f561f8d93c8

data/.gitignore

@@ -8,6 +8,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+log/*
 
 ## Specific to RubyMotion:
 .dat*

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 0.1.1
+## 0.1.2 / 2014-12-17
+
+- `sails restart` use kill -USR2 signal, not kill master process.
+- Use tail log file to instead of direct stdout.
+- Add `before_action` support for Service layout;
+- Add `params` like same name in ActionController for Service layout;
+
+## 0.1.1 / 2014-12-10
 
 - Add `sails s`, `sails c` commands.
 - Refactor service layer, use class to instead module.

data/README.md

@@ -1,7 +1,7 @@
 Sails
 =====
 
-Sails, create [Thrift](thrift.apache.org) app server like Rails.
+Sails, create [Thrift](http://thrift.apache.org) app server like Rails.
 
 [![Build Status](https://travis-ci.org/huacnlee/sails.svg)](https://travis-ci.org/huacnlee/sails) [![Gem Version](https://badge.fury.io/rb/sails.svg)](http://badge.fury.io/rb/sails)
 

data/lib/sails/base.rb

@@ -2,7 +2,7 @@ Bundler.require()
 
 module Sails
   extend ActiveSupport::Autoload
-  
+
   autoload :Config
 
   # Sails.config
@@ -69,7 +69,7 @@ module Sails
   def self.root
     @root ||= Pathname.new(Dir.pwd)
   end
-  
+
   def self.root=(root)
     @root = Pathname.new(root)
   end
@@ -100,18 +100,18 @@ module Sails
   #
   def self.logger
     return @logger if defined?(@logger)
-    @logger = Logger.new(File.join(Sails.root, "log/#{self.env}.log"))
+    log_file = File.join(Sails.root, "log/#{self.env}.log")
+    @logger = Logger.new(log_file)
     @logger.formatter = proc { |severity, datetime, progname, msg|
-      self.stdout_logger.info msg if !Sails.env.test?
       "#{msg}\n"
     }
     @logger
   end
 
   def self.init
-    $:.unshift self.root.join("lib")
     # init root
     return false if @inited == true
+    $:.unshift self.root.join("lib")
 
     self.root
 
@@ -124,8 +124,6 @@ module Sails
 
     require "sails/service"
 
-    puts "ENV: #{Sails.env}"
-
     load_initialize
     @inited = true
   end
@@ -144,22 +142,23 @@ module Sails
   #
   #     class UsersServiceTest
   #       def test_check_name_exist?
-  #         assert_equal(Sails.service.check_name_exist?(name), true) 
+  #         assert_equal(Sails.service.check_name_exist?(name), true)
   #       end
   #     end
   #
   def self.service
     @service ||= Sails::Service::Interface.new
   end
-  
+
   # Force reload Sails cache classes in config.autoload_paths
   def self.reload!(opts = {})
     force = opts[:force] || false
     if force || config.cache_classes == false
-      @service = nil
+      # @service = nil
       ActiveSupport::Dependencies.clear
-      reload_server!
+      # reload_server!
     end
+    return true
   end
 
   def self.reload_server!
@@ -168,8 +167,10 @@ module Sails
       @server.instance_variable_set(:@processor, new_processor)
     end
   end
-  
+
   def self.start!(type)
+    logger.info "ENV: #{Sails.env}"
+
     @server_type = type
     if @server_type == "thread"
       start_thread_pool_server!
@@ -177,14 +178,14 @@ module Sails
       start_non_blocking_server!
     end
   end
-  
+
   def self.thrift_protocol_class
     case config.protocol
     when :compact
       return ::Thrift::CompactProtocolFactory
     when :json
       return ::Thrift::JsonProtocolFactory
-    else 
+    else
       return ::Thrift::BinaryProtocolFactory
     end
   end
@@ -198,20 +199,15 @@ module Sails
     processor = config.processor.new(self.service)
     @server = ::Thrift::ThreadPoolServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
 
-    puts "Boot on: #{Sails.root}"
-    puts "[#{Time.now}] Starting the Sails with ThreadPool size: #{Setting.pool_size}..."
-    puts "serve: 127.0.0.1:#{config.thread_port}"
+    logger.info "Boot on: #{Sails.root}"
+    logger.info "[#{Time.now}] Starting the Sails with ThreadPool size: #{Setting.pool_size}..."
+    logger.info "serve: 127.0.0.1:#{config.thread_port}"
 
     begin
       @server.serve
     rescue => e
       puts "Start thrift server exception! \n  #{e.inspect}"
       puts e.backtrace
-
-      if self.env != "development"
-        sleep 2
-        retry
-      end
     end
   end
 
@@ -223,33 +219,18 @@ module Sails
     processor = config.processor.new(self.service)
     @server = ::Thrift::NonblockingServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
 
-    puts "Boot on: #{Sails.root}"
-    puts "[#{Time.now}] Starting the Sails with NonBlocking..."
-    puts "Protocol: #{thrift_protocol_class.name}"
-    puts "serve: 127.0.0.1:#{config.port}"
+    logger.info "Boot on: #{Sails.root}"
+    logger.info "[#{Time.now}] Starting the Sails with NonBlocking..."
+    logger.info "Protocol: #{thrift_protocol_class.name}"
+    logger.info "serve: 127.0.0.1:#{config.port}"
 
     begin
       @server.serve
     rescue => e
       puts "Start thrift server exception! \n  #{e.inspect}"
       puts e.backtrace
-
-      if self.env != "development"
-        sleep 2
-        retry
-      end
     end
   end
-  
-  private
-  def self.stdout_logger
-    return @stdout_logger if defined?(@stdout_logger)
-    @stdout_logger = Logger.new(STDOUT)
-    @stdout_logger.formatter = proc { |severity, datetime, progname, msg|
-      "#{msg}\n"
-    }
-    @stdout_logger
-  end
 
   def self.load_initialize
     Dir["#{Sails.root}/config/initializers/*.rb"].each do |f|
@@ -258,4 +239,4 @@ module Sails
   end
 end
 
-Sails.init()
+Sails.init()

data/lib/sails/cli.rb

@@ -47,8 +47,7 @@ module Sails
     desc "restart", "Restart Thrift server"
     def restart()
       Sails::Daemon.init(mode: options[:mode])
-      Sails::Daemon.stop_process
-      Sails::Daemon.start_process(daemon: true)
+      Sails::Daemon.restart_process
     end
 
     desc "new APP_NAME", "Create a project"

data/lib/sails/daemon.rb

@@ -28,7 +28,7 @@ module Sails
       def start_process(options = {})
         old_pid = read_pid
         if old_pid != nil
-          puts "Current have #{app_name} process in running on pid #{old_pid}"
+          Sails.logger.info "Current have #{app_name} process in running on pid #{old_pid}"
           return
         end
 
@@ -37,28 +37,41 @@ module Sails
         File.open(pid_file, "w+") do |f|
           f.puts @master_pid
         end
-        
-        puts "Started #{app_name} on pid: #{@master_pid}"
+
+        Sails.logger.info "Started #{app_name} on pid: #{@master_pid}"
 
         if options[:daemon] == false
+          log_file = Sails.root.join("log/#{Sails.env}.log")
+          system "tail -f #{log_file}"
           Process.waitpid(@master_pid)
         end
       end
-      
+
+      def restart_process(options = {})
+        old_pid = read_pid
+        if old_pid == nil
+          Sails.logger.info "#{app_name} process not found on pid #{old_pid}"
+          return
+        end
+
+        Process.kill("USR2", old_pid)
+      end
+
       def fork_master_process!
         fork do
           $PROGRAM_NAME = self.app_name + " [master]"
           @child_pid = fork_child_process!
-  
-          Signal.trap("QUIT") { 
+
+          Signal.trap("QUIT") {
             Process.kill("QUIT", @child_pid)
             exit
           }
-          
+
           Signal.trap("USR2") {
-            Process.kill("USR2", @child_pid)
+            puts @child_pid.inspect
+            Process.kill("QUIT", @child_pid)
           }
-  
+
           loop do
             sleep 1
             begin
@@ -70,34 +83,34 @@ module Sails
           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}"
+          Sails.logger.info "#{app_name} process not found, pid #{pid}"
           return
         end
 
-        print "Stopping #{app_name} with pid: #{pid}..."
+        Sails.logger.info "Stopping #{app_name} with pid: #{pid}..."
         begin
           Process.kill("QUIT", pid)
         ensure
           File.delete(pid_file)
         end
-        puts " [Done]"
+        Sails.logger.info " [Done]"
       end
     end
   end
-end
+end

data/lib/sails/service/base.rb

@@ -2,18 +2,7 @@ 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
+      include Callbacks
       
       class << self
         def internal_methods
@@ -36,6 +25,22 @@ module Sails
         end
       end
       
+      # action params to Hash
+      #
+      # example:
+      # 
+      #    class FooService < Sails::Service::Base
+      #       def foo(name, age)
+      #         # you can use params in any instance methods
+      #         puts params[:name]
+      #         puts params[:age]
+      #       end
+      #    end
+      #
+      def params
+        @params ||= {}
+      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)

data/lib/sails/service/callbacks.rb

@@ -0,0 +1,28 @@
+module Sails
+  module Service
+    module Callbacks
+      extend ActiveSupport::Concern
+      
+      include ActiveSupport::Callbacks
+      
+      included do
+        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
+      end
+
+      module ClassMethods
+        def before_action(*names, &blk)
+          names.each do |name|
+            set_callback(:action, :before, name, &blk)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sails/service/interface.rb

@@ -27,7 +27,15 @@ module Sails
         end
       end
       
+      def set_params_with_method_args(instance, method_name, args)
+        method_args = instance.method(method_name.to_sym).parameters.map { |arg| arg[1] }
+        method_args.each_with_index do |arg, idx|
+          instance.params[arg] = args[idx]
+        end
+      end
+
       def run_action(instance, method_name, *args, &block)
+        set_params_with_method_args(instance, method_name, args)
         instance.run_callbacks :action do
           time = Time.now.to_f
 
@@ -38,17 +46,22 @@ module Sails
             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"
+            puts "------- #{e.inspect}"
+            if defined?(ActiveRecord) && e.is_a?(ActiveRecord::RecordNotFound)
+              status = "Not Found"
+              code = 404
+            else
+              status = "Error 500"
+              code = 500
+            end
+            
             Sails.logger.info "\"#{method_name}\" error : #{e.inspect}\n\n"
             Sails.logger.info %Q(backtrace: #{e.backtrace.join("\n")}\n)
-            instance.raise_error(500)
+            instance.raise_error(code)
           ensure
             elapsed = format('%.3f', (Time.now.to_f - time) * 1000)
             Sails.logger.info "#{status} in (#{elapsed}ms).\n\n" unless Sails.env.test?

data/lib/sails/service.rb

@@ -6,5 +6,6 @@ module Sails
     autoload :Config
     autoload :Exception
     autoload :Interface
+    autoload :Callbacks
   end
 end

data/lib/sails/version.rb

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

data/spec/cli_spec.rb

@@ -24,8 +24,7 @@ describe 'Sails::CLI' 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)
+      expect(Sails::Daemon).to receive(:restart_process)
       cli.restart
     }
   end