sails 0.1.4 → 0.1.5

data/lib/sails/cli.rb

@@ -4,7 +4,7 @@ require 'sails/version'
 module Sails
   class CLI < Thor
     include Thor::Actions
-    
+
     map '-v' => :version
     map 's' => :start
     map 'c' => :console
@@ -12,12 +12,12 @@ module Sails
     def self.source_root
       __dir__
     end
-    
-    no_commands {
+
+    no_commands do
       def app_name
         @app_name
       end
-    }
+    end
 
     # sails start
     #
@@ -25,9 +25,9 @@ module Sails
     option :daemon, type: :boolean, default: false
     option :mode, default: 'nonblocking'
     desc "start", "Start Thrift server"
-    def start()
-      Sails::Daemon.init(mode: options[:mode])
-      Sails::Daemon.start_process(daemon: options[:daemon])
+    def start
+      Sails::Daemon.init(mode: options[:mode], daemon: options[:daemon])
+      Sails::Daemon.start_process
     end
 
     # sails stop
@@ -35,29 +35,28 @@ module Sails
     # Stop thrift app server
     option :mode, default: 'nonblocking'
     desc "stop", "Stop Thrift server"
-    def stop()
+    def stop
       Sails::Daemon.init(mode: options[:mode])
       Sails::Daemon.stop_process
     end
-    
+
     # sails restart
     #
     # Restart thrift app server
     option :mode, default: 'nonblocking'
     desc "restart", "Restart Thrift server"
-    def restart()
+    def restart
       Sails::Daemon.init(mode: options[:mode])
       Sails::Daemon.restart_process
     end
 
     desc "new APP_NAME", "Create a project"
-    def new name
+    def new(name)
       require 'fileutils'
 
       app_dir = File.expand_path File.join(Dir.pwd, name)
       @rel_dir = name
       @app_name = File.basename app_dir
-      templte_dir = File.join(File.dirname(__FILE__), "templates")
 
       directory 'templates', name
       %W(log tmp/pids tmp/cache lib/tasks app/models/concerns config/initializers log).each do |dir_name|
@@ -68,12 +67,12 @@ module Sails
       @app_name = nil
       @rel_dir = nil
     end
-    
+
     desc "console", "Enter Sails console"
     def console
       Sails::Console.start(Sails.root.join("config/application.rb"))
     end
-    
+
     desc "version", "Show Sails version"
     def version
       puts "Sails #{Sails.version}"

data/lib/sails/config.rb

@@ -1,20 +1,20 @@
 module Sails
   class Config
     include ActiveSupport::Configurable
-    
+
     def initialize
       init_defaults!
     end
-    
+
     def init_defaults!
       config.app_name = "Sails"
       config.cache_store = [:memory_store]
-      config.autoload_paths = %W(app/models app/models/concerns app/workers app/services app/services/concerns lib)
+      config.autoload_paths = %w(app/models app/models/concerns app/workers app/services app/services/concerns lib)
       config.i18n = I18n
       config.i18n.load_path += Dir[Sails.root.join('config', 'locales', '*.{rb,yml}').to_s]
       config.i18n.default_locale = :en
       config.cache_classes = false
-      
+
       config.port = 4000
       config.thread_port = 4001
       config.processor = nil
@@ -22,4 +22,4 @@ module Sails
       config.protocol = :binary
     end
   end
-end
+end

data/lib/sails/console.rb

@@ -4,32 +4,32 @@ require "irb/ext/loader"
 module Sails
   module ConsoleMethods
     extend ActiveSupport::Concern
-    
+
     included do
     end
-    
+
     def service
       Sails.service
     end
-    
+
     def reload!
       puts "Reloading..."
       Sails.reload!(force: true)
-      return true
+      true
     end
   end
-  
+
   class Console
     class << self
       def start(app_path)
         new(app_path).start
       end
     end
-    
+
     def initialize(app_path)
       @app_path = app_path
     end
-    
+
     def start
       puts "Loading #{Sails.env} environment (Sails #{Sails.version})"
       IRB.conf[:IRB_NAME] = "Sails console"
@@ -38,7 +38,7 @@ module Sails
       if defined?(IRB::ExtendCommandBundle)
         IRB::ExtendCommandBundle.send :include, Sails::ConsoleMethods
       end
-      IRB.start()
+      IRB.start
     end
   end
-end
+end

data/lib/sails/daemon.rb

@@ -1,14 +1,15 @@
 module Sails
   class Daemon
     class << self
-      attr_accessor :options, :mode, :app_name, :pid_file
+      attr_accessor :options, :daemon, :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
+        self.daemon = opts[:daemon]
+        self.options = opts
       end
 
       def read_pid
@@ -22,13 +23,13 @@ module Sails
         rescue
           pid = nil
         end
-        return pid
+        pid
       end
 
-      def start_process(options = {})
+      def start_process
         old_pid = read_pid
-        if old_pid != nil
-          Sails.logger.info "Current have #{app_name} process in running on pid #{old_pid}"
+        if !old_pid.nil?
+          puts colorize("Current have #{app_name} process in running on pid #{old_pid}", :red)
           return
         end
 
@@ -38,11 +39,10 @@ module Sails
           f.puts @master_pid
         end
 
-        Sails.logger.info "Started #{app_name} on pid: #{@master_pid}"
+        puts "Started #{app_name} on pid: #{@master_pid}"
+        # puts "in init: #{Sails.service.object_id}"
 
-        if options[:daemon] == false
-          log_file = Sails.root.join("log/#{Sails.env}.log")
-          system "tail -f #{log_file}"
+        if not self.daemon
           Process.waitpid(@master_pid)
         else
           exit
@@ -52,32 +52,35 @@ module Sails
       def restart_process(options = {})
         old_pid = read_pid
         if old_pid == nil
-          Sails.logger.info "#{app_name} process not found on pid #{old_pid}"
+          puts colorize("#{app_name} process not found on pid #{old_pid}", :red)
           return
         end
 
+        print "Restarting #{app_name}..."
         Process.kill("USR2", old_pid)
+        puts colorize(" [OK]", :green)
       end
 
       def fork_master_process!
         fork do
+          # WARN: DO NOT CALL Sails IN THIS BLOCK!
           $PROGRAM_NAME = self.app_name + " [sails master]"
           @child_pid = fork_child_process!
 
-          Signal.trap("QUIT") {
+          Signal.trap("QUIT") do
             Process.kill("QUIT", @child_pid)
             exit
-          }
+          end
 
-          Signal.trap("USR2") {
+          Signal.trap("USR2") do
             Process.kill("USR2", @child_pid)
-          }
+          end
 
           loop do
             sleep 1
             begin
               Process.getpgid(@child_pid)
-            rescue Errno::ESRCH => e
+            rescue Errno::ESRCH
               @child_pid = fork_child_process!
             end
           end
@@ -87,35 +90,77 @@ module Sails
       def fork_child_process!
         pid = fork do
           $PROGRAM_NAME = self.app_name + " [sails child]"
-          Signal.trap("QUIT") {
+          Signal.trap("QUIT") do
             exit
-          }
-          
-          Signal.trap("USR2") {
+          end
+
+          Signal.trap("USR2") do
             # TODO: reload Sails in current process
             exit
-          }
-          Sails.start!(self.mode)          
+          end
+
+          if self.daemon == true
+            redirect_stdout
+          else
+            log_to_stdout
+          end
+          # puts "in child: #{Sails.service.object_id}"
+          Sails.start!(self.mode)
         end
         # http://ruby-doc.org/core-1.9.3/Process.html#detach-method
         Process.detach(pid)
-        return pid
+        pid
       end
 
       def stop_process
         pid = read_pid
-        if pid == nil
-          Sails.logger.info "#{app_name} process not found, pid #{pid}"
+        if pid.nil?
+          puts colorize("#{app_name} process not found, pid #{pid}", :red)
           return
         end
 
-        Sails.logger.info "Stopping #{app_name} with pid: #{pid}..."
+        print "Stoping #{app_name}..."
         begin
           Process.kill("QUIT", pid)
         ensure
           File.delete(pid_file)
         end
-        Sails.logger.info " [Done]"
+        puts colorize(" [OK]", :green)
+      end
+
+      private
+      # Sync Sails.logger output in file to STDOUT
+      def log_to_stdout
+        console = ActiveSupport::Logger.new($stdout)
+        console.formatter = Sails.logger.formatter
+        console.level = Sails.logger.level
+
+        Sails.logger.extend(ActiveSupport::Logger.broadcast(console))
+      end
+
+      # Redirect stdout, stderr to log file,
+      # If we not do this, stdout will block sails daemon, for example `puts`.
+      def redirect_stdout
+        redirect_io($stdout, Sails.logger_path)
+        redirect_io($stderr, Sails.logger_path)
+      end
+
+      def redirect_io(io, path)
+        File.open(path, 'ab') { |fp| io.reopen(fp) } if path
+        io.sync = true
+      end
+
+      def colorize(text, c)
+        case c
+        when :red
+          return ["\033[31m",text,"\033[0m"].join("")
+        when :green
+          return ["\033[32m",text,"\033[0m"].join("")
+        when :blue
+          return ["\033[34m",text,"\033[0m"].join("")
+        else
+          return text
+        end
       end
     end
   end

data/lib/sails/log_subscriber.rb

@@ -0,0 +1,40 @@
+module Sails
+  class LogSubscriber < ActiveSupport::LogSubscriber
+    INTERNAL_PARAMS = %w(controller action format _method only_path)
+
+    def start_processing(event)
+      return unless logger.info?
+
+      payload = event.payload
+      params = payload[:params]
+
+      info ""
+      info "Processing by #{payload[:controller]}##{payload[:action]} at #{Time.now}"
+      info "  Parameters: #{params.inspect}" unless params.empty?
+
+      ActiveRecord::LogSubscriber.reset_runtime if defined?(ActiveRecord::LogSubscriber)
+    end
+
+    def process_action(event)
+      info do
+        payload   = event.payload
+        additions = []
+
+        additions << ("DB: %.1fms" % payload[:db_runtime].to_f) if payload[:db_runtime]
+        additions << ("Views: %.1fms" % payload[:view_runtime].to_f) if payload[:view_runtime]
+        status = payload[:status]
+        payload[:runtime] = event.duration
+
+        message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{event.duration.round(2)}ms"
+        message << " (#{additions.join(" | ")})"
+        message
+      end
+    end
+
+    def logger
+      Sails.logger
+    end
+  end
+end
+
+Sails::LogSubscriber.attach_to :sails

data/lib/sails/rails.rb

@@ -11,5 +11,9 @@ if not defined?(Rails)
     def self.cache
       Sails.cache
     end
+
+    def self.root
+      Sails.root
+    end
   end
-end
+end

data/lib/sails/service/base.rb

@@ -3,13 +3,13 @@ module Sails
     # Like ActionController::Base
     class Base
       include Callbacks
-      
+
       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
@@ -17,18 +17,18 @@ module Sails
               # 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 }
+              public_instance_methods(false)).uniq.map(&:to_s)
 
             # Clear out AS callback method pollution
             Set.new(methods.reject { |method| method =~ /_one_time_conditions/ })
           end
         end
       end
-      
+
       # action params to Hash
       #
       # example:
-      # 
+      #
       #    class FooService < Sails::Service::Base
       #       def foo(name, age)
       #         # you can use params in any instance methods
@@ -40,13 +40,13 @@ module Sails
       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)
         raise Exception.new(code: code, message: msg)
       end
-      
+
       def action_methods
         self.class.action_methods
       end
@@ -58,4 +58,4 @@ module Sails
       end
     end
   end
-end
+end

data/lib/sails/service/callbacks.rb

@@ -2,9 +2,9 @@ module Sails
   module Service
     module Callbacks
       extend ActiveSupport::Concern
-      
+
       include ActiveSupport::Callbacks
-      
+
       included do
         define_callbacks :action
 
@@ -12,7 +12,6 @@ module Sails
         end
 
         set_callback :action, :after do |object|
-          ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
         end
       end
 

data/lib/sails/service/interface.rb

@@ -2,7 +2,7 @@ module Sails
   module Service
     class Interface
       attr_accessor :services
-      
+
       def initialize
         @services = []
         Dir["#{Sails.root.join("app/services")}/*_service.rb"].each do |f|
@@ -26,9 +26,10 @@ module Sails
           end
         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] }
+        instance.params[:method_name] = method_name
         method_args.each_with_index do |arg, idx|
           instance.params[arg] = args[idx]
         end
@@ -37,36 +38,42 @@ module Sails
       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
+          raw_payload = {
+            controller: instance.class.to_s,
+            action: method_name,
+            params: instance.params,
+          }
+
+          ActiveSupport::Notifications.instrument("start_processing.sails", raw_payload.dup)
+          ActiveSupport::Notifications.instrument("process_action.sails", raw_payload) do |payload|
+            begin
+              res = instance.send(method_name, *args, &block)
+              payload[:status] = 200
+              return res
+            rescue Thrift::Exception => e
+              payload[:status] = e.try(:code)
+              raise e
+            rescue => e
+              if e.class.to_s == "ActiveRecord::RecordNotFound"
+                payload[:status] = 404
+              else
+                payload[:status] = 500
 
-          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?
+                Sails.logger.info "  ERROR #{e.inspect} backtrace: \n  #{e.backtrace.join("\n  ")}"
+              end
 
-          begin
-            res = instance.send(method_name, *args, &block)
-            status = "Completed"
-            return res
-          rescue Thrift::Exception => e
-            status = "Failed #{e.try(:code)}"
-            raise e
-          rescue => e
-            if defined?(ActiveRecord) && e.is_a?(ActiveRecord::RecordNotFound)
-              status = "Not Found"
-              code = 404
-            else
-              status = "Error 500"
-              code = 500
+              instance.raise_error(payload[:status])
+            ensure
+              ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
+              if defined?(ActiveRecord::RuntimeRegistry)
+                payload[:db_runtime] = ActiveRecord::RuntimeRegistry.sql_runtime || 0
+              else
+                payload[:db_runtime] = nil
+              end
             end
-            
-            Sails.logger.info "\"#{method_name}\" error : #{e.inspect}\n\n"
-            Sails.logger.info %Q(backtrace: #{e.backtrace.join("\n")}\n)
-            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?
           end
         end
       end
     end
   end
-end
+end

data/lib/sails/service.rb

@@ -1,11 +1,11 @@
 module Sails
   module Service
     extend ActiveSupport::Autoload
-    
+
     autoload :Base
     autoload :Config
     autoload :Exception
     autoload :Interface
     autoload :Callbacks
   end
-end
+end

data/lib/sails/tasks.rb

@@ -0,0 +1,61 @@
+if defined?(ActiveRecord::Base)
+  load 'active_record/railties/databases.rake'
+
+  class << ActiveRecord::Tasks::DatabaseTasks
+    def env
+      @env ||= Sails.env
+    end
+
+    def migrations_paths
+      [Sails.root.join("db/migrate")]
+    end
+
+    def database_configuration
+      YAML.load open(Sails.root.join('config/database.yml')).read
+    end
+
+    def db_dir
+      Sails.root.join("db")
+    end
+  end
+end
+
+namespace :db do
+  namespace :migrate do
+    desc "Create new migration file. use `rake db:migrate:create NAME=create_users`"
+    task :create do
+      name = ENV['NAME']
+      abort("no NAME specified. use `rake db:migrate:create NAME=create_users`") if !name
+
+      migrations_dir = File.join("db", "migrate")
+      version = ENV["VERSION"] || Time.now.utc.strftime("%Y%m%d%H%M%S")
+      filename = "#{version}_#{name}.rb"
+      migration_name = name.gsub(/_(.)/) { $1.upcase }.gsub(/^(.)/) { $1.upcase }
+
+      FileUtils.mkdir_p(migrations_dir)
+
+      open(File.join(migrations_dir, filename), 'w') do |f|
+        f << (<<-EOS).gsub("        ", "")
+        class #{migration_name} < ActiveRecord::Migration
+          def self.change
+          end
+        end
+        EOS
+      end
+      puts filename
+    end
+  end
+end
+
+desc "Generate code from thrift IDL file"
+task :generate do
+  puts "Generating Thrift code..."
+  out = Sails.root.join("app/services/gen-rb")
+
+  cmd = "thrift --gen rb -out #{out} -strict #{Sails.config.app_name}.thrift"
+  puts "> #{cmd}"
+  system cmd
+  puts "[Done]"
+end
+
+task :gen => :generate

data/lib/sails/templates/Gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
 gem 'sails'
-gem 'activerecord', '~> 4.2.0.rc2'
-gem 'thin'
-# gem 'dalli'
+gem 'activerecord'
+gem 'sqlite3'
+gem 'eventmachine'
+gem 'thrift'
 
 group :development, :test do
   # gem 'rspec'
   # gem 'factory_girl'
-  # gem 'database_cleaner'
   # gem 'capistrano'
 end