sails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f45fd6f786f64cce9eba7b122b22e29aa7e337a
-  data.tar.gz: 78eac1b7c08a56f29af0e56c97aa2bcf9ad23dfb
+  metadata.gz: 9752501c98161e8b95d109743e4f9ce2091d0127
+  data.tar.gz: 24a4dcca7f3748da76c715f4d97cb46857308d0c
 SHA512:
-  metadata.gz: 47fb7a78f01a40bffe5bcbc4abaac978d9230a240fc1e22f66f8336293075d1961605682709e3cfc1b8771f8050e0c1ab048d5df90fb5ee2bdea127e9a74dc95
-  data.tar.gz: 68ef692559d3be35f00d714872d3453842f6cf635f99be1b4cd537a23a3fd0e949fa9c5b45e9d3b7e773bc9eaf7b216fbcebc6f436f3bdab951c7c403a6b44cc
+  metadata.gz: 703defe29c4488dfce4147d86416cea85c1d5834cc6b10c535cfc24f2ad0c62bd6f6463d3618b394919302e35bffdefd9daabdcfe3023d1fd78ded56a0ecfa1a
+  data.tar.gz: 90f1944aed8c06b9c98c49f2fc0602bc189a7b02ab326d5b2fa623b40f3381967d65a966d9a252b02aa3d5cc59439a9015f7f97e4bb4e0771e6e430b95210c92

data/.gitignore

@@ -9,28 +9,14 @@
 /test/version_tmp/
 /tmp/
 log/*
-
-## Specific to RubyMotion:
 .dat*
-.repl_history
 build/
-
-## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
 /doc/
 /rdoc/
-
-## Environment normalisation:
 /.bundle/
 /lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
-spec/dummy/log/
+spec/dummy/log/*.log
+spec/dummy/log/*.log

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.1.5
+
+- Fix stdout error in daemon mode.
+- Clear ActiveRecord connections after method call in ensure.
+- Do not output exception info when raise 404.
+- Add more default code with new project template.
+- Add `rake client` task for thrift client connect test, and you can edit client test code in lib/tasks/client.rake.
+- Move ActiveRecord migration rake tasks into Sails.
+- Add `rake db:migrate:create` command to generate a new migration file.
+- Add default ActiveRecord initialize code.
+- Default use SQLite.
+- Use ActiveSupport::Notifications to output service action logs.
+
 ## 0.1.4 / 2014-12-24
 
 - Sails.root use Linux pwd command, to support symlink dir, for example like Capistrano's project/current path.

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    sails (0.1.3)
-      activesupport (>= 3.2.0)
+    sails (0.1.4)
+      activesupport (> 3.2.0, < 5.0)
       thor
       thrift (>= 0.9.0)
 

data/README.md

@@ -41,27 +41,50 @@ $ sails start
 You can edit Thrift IDL in `app_name.thrift`, and then generate it to ruby source code.
 
 ```
-$ rake gen
+$ rake generate
 ```
 
-## Client Connect
+## Rake tasks
 
-```ruby
-require "app/services/gen-rb/you_app_name"
-@transport ||= Thrift::FramedTransport.new(::Thrift::Socket.new('127.0.0.1', 4000, 10))
-@protocol  ||= Thrift::BinaryProtocol.new(@transport)
-@client    ||= Thrift::YouAppName::Client.new(@protocol)
-@transport.open()
-puts @client.ping()
-=> Ping pong
+```bash
+rake client:ping            # client ping test
+rake db:create              # Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config)
+rake db:drop                # Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config)
+rake db:fixtures:load       # Load fixtures into the current environment's database
+rake db:migrate             # Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)
+rake db:migrate:create      # Create new migration file
+rake db:migrate:status      # Display status of migrations
+rake db:rollback            # Rolls the schema back to the previous version (specify steps w/ STEP=n)
+rake db:schema:cache:clear  # Clear a db/schema_cache.dump file
+rake db:schema:cache:dump   # Create a db/schema_cache.dump file
+rake db:schema:dump         # Create a db/schema.rb file that is portable against any DB supported by AR
+rake db:schema:load         # Load a schema.rb file into the database
+rake db:seed                # Load the seed data from db/seeds.rb
+rake db:setup               # Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the database first)
+rake db:structure:dump      # Dump the database structure to db/structure.sql
+rake db:structure:load      # Recreate the databases from the structure.sql file
+rake db:version             # Retrieves the current schema version number
+rake generate               # Generate code from thrift IDL file
+```
+
+## Client connect to test
+
+You can write test code in `lib/tasks/client.rake` to test your thrift methods.
+
+And then start sails server, and run rake task to test, for example:
+
+```bash
+sails s --daemon
+rake client:ping
 ```
 
+
 ## Deploy
 
 ```
 $ sails s --daemon
 $ ps aux
-jason            2408   0.1  0.2  2648176  13532 s003  S    12:14下午   0:00.02 you_sails_app    
+jason            2408   0.1  0.2  2648176  13532 s003  S    12:14下午   0:00.02 you_sails_app
 jason            2407   0.0  0.0  2604916   1016 s003  S    12:14下午   0:00.00 you_sails_app [master]
 $ sails restart
 $ sails stop
@@ -77,3 +100,6 @@ http://www.rubydoc.info/github/huacnlee/sails
 - [ ] Reload without restart;
 - [ ] Scaffold generator;
 - [X] Multi processes;
+- [ ] Default test case templates;
+- [ ] Client rake task to test services;
+- [ ] Write more framework test cases.

data/lib/sails/base.rb

@@ -1,244 +1,261 @@
-Bundler.require()
+Bundler.require
 
 module Sails
   extend ActiveSupport::Autoload
 
   autoload :Config
 
-  # Sails.config
-  #
-  # Configs with Sails
-  # For example:
-  #
-  #   Sails.config.app_name
-  #   # => returns "You App Name"
-  #
-  #   Sails.config.autoload_paths
-  #   # => returns ['app/models','app/models/concerns', 'app/workers', 'app/services'...]
-  #
-  #   Sails.config.cache_store = [:dalli_store, '127.0.0.1', { pool_size: 100 }]
-  #   Sails.config.i18n.default_locale = 'zh-CN'
-  #
-  def self.config
-    return @config if defined?(@config)
-    @config = Config.new.config
-  end
+  class << self
+    # Sails.config
+    #
+    # Configs with Sails
+    # For example:
+    #
+    #   Sails.config.app_name
+    #   # => returns "You App Name"
+    #
+    #   Sails.config.autoload_paths
+    #   # => returns ['app/models','app/models/concerns', 'app/workers', 'app/services'...]
+    #
+    #   Sails.config.cache_store = [:dalli_store, '127.0.0.1', { pool_size: 100 }]
+    #   Sails.config.i18n.default_locale = 'zh-CN'
+    #
+    def config
+      return @config if defined?(@config)
+      @config = Config.new.config
+    end
 
-  # Sails.cache
-  #
-  # An abstract cache store class. There are multiple cache store
-  # implementations, each having its own additional features. See the classes
-  # under the ActiveSupport::Cache module, e.g.
-  # ActiveSupport::Cache::MemCacheStore. MemCacheStore is currently the most
-  # popular cache store for large production websites.
-  #
-  # Some implementations may not support all methods beyond the basic cache
-  # methods of +fetch+, +write+, +read+, +exist?+, and +delete+.
-  #
-  # ActiveSupport::Cache::Store can store any serializable Ruby object.
-  #
-  #   Sails.cache.read('city')   # => nil
-  #   Sails.cache.write('city', "Duckburgh")
-  #   Sails.cache.read('city')   # => "Duckburgh"
-  #
-  # Keys are always translated into Strings and are case sensitive. When an
-  # object is specified as a key and has a +cache_key+ method defined, this
-  # method will be called to define the key.  Otherwise, the +to_param+
-  # method will be called. Hashes and Arrays can also be used as keys. The
-  # elements will be delimited by slashes, and the elements within a Hash
-  # will be sorted by key so they are consistent.
-  #
-  #   Sails.cache.read('city') == Sails.cache.read(:city)   # => true
-  #
-  # Nil values can be cached.
-  def self.cache
-    return @cache if defined?(@cache)
-    @cache = ActiveSupport::Cache.lookup_store(self.config.cache_store)
-  end
+    # Sails.cache
+    #
+    # An abstract cache store class. There are multiple cache store
+    # implementations, each having its own additional features. See the classes
+    # under the ActiveSupport::Cache module, e.g.
+    # ActiveSupport::Cache::MemCacheStore. MemCacheStore is currently the most
+    # popular cache store for large production websites.
+    #
+    # Some implementations may not support all methods beyond the basic cache
+    # methods of +fetch+, +write+, +read+, +exist?+, and +delete+.
+    #
+    # ActiveSupport::Cache::Store can store any serializable Ruby object.
+    #
+    #   Sails.cache.read('city')   # => nil
+    #   Sails.cache.write('city', "Duckburgh")
+    #   Sails.cache.read('city')   # => "Duckburgh"
+    #
+    # Keys are always translated into Strings and are case sensitive. When an
+    # object is specified as a key and has a +cache_key+ method defined, this
+    # method will be called to define the key.  Otherwise, the +to_param+
+    # method will be called. Hashes and Arrays can also be used as keys. The
+    # elements will be delimited by slashes, and the elements within a Hash
+    # will be sorted by key so they are consistent.
+    #
+    #   Sails.cache.read('city') == Sails.cache.read(:city)   # => true
+    #
+    # Nil values can be cached.
+    def cache
+      return @cache if defined?(@cache)
+      @cache = ActiveSupport::Cache.lookup_store(self.config.cache_store)
+    end
 
-  # Sails.root
-  #
-  # This method returns a Pathname object which handles paths starting with a / as absolute (starting from the root of the filesystem). Compare:
-  #
-  # For example:
-  #   >> Sails.root
-  #   => #<Pathname:/some/path/to/project>
-  #   >> Sails.root + "file"
-  #   => #<Pathname:/some/path/to/project/file>
-  #
-  def self.root
-    return @root if defined?(@root)
-    path = `pwd -L`.sub(/\n/,'') rescue Dir.pwd
-    @root ||= Pathname.new(path)
-  end
+    # Sails.root
+    #
+    # This method returns a Pathname object which handles paths starting with a / as absolute (starting from the root of the filesystem). Compare:
+    #
+    # For example:
+    #   >> Sails.root
+    #   => #<Pathname:/some/path/to/project>
+    #   >> Sails.root + "file"
+    #   => #<Pathname:/some/path/to/project/file>
+    #
+    def root
+      return @root if defined?(@root)
+      path = `pwd -L`.sub(/\n/,'') rescue Dir.pwd
+      @root ||= Pathname.new(path)
+    end
 
-  def self.root=(root)
-    @root = Pathname.new(root)
-  end
+    def root=(root)
+      @root = Pathname.new(root)
+    end
 
-  # Sails.env
-  #
-  # returns a string representing the current Sails environment.
-  # This will read from ENV['RAILS_ENV'] like Rails
-  #
-  # For example:
-  #
-  #     Sails.env # in development mode
-  #     => "development"
-  #     Sails.env.development?
-  #     => true
-  #
-  def self.env
-    @env ||= ActiveSupport::StringInquirer.new(ENV['RAILS_ENV'].presence || 'development')
-  end
+    # Sails.env
+    #
+    # returns a string representing the current Sails environment.
+    # This will read from ENV['RAILS_ENV'] like Rails
+    #
+    # For example:
+    #
+    #     Sails.env # in development mode
+    #     => "development"
+    #     Sails.env.development?
+    #     => true
+    #
+    def env
+      @env ||= ActiveSupport::StringInquirer.new(ENV['RAILS_ENV'].presence || 'development')
+    end
 
-  # Sails.logger
-  #
-  # returns a Logger class
-  # For example:
-  #
-  #     Sails.logger.info "Hello world"
-  #     Sails.logger.error "Hello world"
-  #
-  def self.logger
-    return @logger if defined?(@logger)
-    log_file = File.join(Sails.root, "log/#{self.env}.log")
-    @logger = Logger.new(log_file)
-    @logger.formatter = proc { |severity, datetime, progname, msg|
-      "#{msg}\n"
-    }
-    @logger
-  end
+    # Sails.logger
+    #
+    # returns a Logger class
+    # For example:
+    #
+    #     Sails.logger.info "Hello world"
+    #     Sails.logger.error "Hello world"
+    #
+    def logger
+      return @logger if defined?(@logger)
+      @logger = Logger.new(logger_path)
+      @logger.formatter = proc { |severity, datetime, progname, msg|
+        "#{msg}\n"
+      }
+      @logger
+    end
 
-  def self.init
-    # init root
-    return false if @inited == true
-    $:.unshift self.root.join("lib")
+    def logger_path
+      @logger_path ||= Sails.root.join("log/#{self.env}.log")
+    end
 
-    self.root
+    def init
+      # init root
+      return false if @inited == true
+      $:.unshift self.root.join("lib")
 
-    ActiveSupport::Dependencies.autoload_paths += Sails.config.autoload_paths
+      self.root
+      self.check_create_dirs
 
-    env_file = self.root.join('config/environments/',Sails.env + ".rb")
-    if File.exist?(env_file)
-      require env_file
-    end
+      ActiveSupport::Dependencies.autoload_paths += Sails.config.autoload_paths
 
-    require "sails/service"
+      env_file = self.root.join('config/environments/',Sails.env + ".rb")
+      if File.exist?(env_file)
+        require env_file
+      end
 
-    load_initialize
-    @inited = true
-  end
+      require "sails/service"
 
-  # Sails.service
-  #
-  # return a instance of Sails Service layer
-  #
-  # for example:
-  #
-  #     class UsersService < Sails::Service::Base
-  #       def check_name_exist?(name)
-  #         User.check_name_exist?(name)
-  #       end
-  #     end
-  #
-  #     class UsersServiceTest
-  #       def test_check_name_exist?
-  #         assert_equal(Sails.service.check_name_exist?(name), true)
-  #       end
-  #     end
-  #
-  def self.service
-    @service ||= Sails::Service::Interface.new
-  end
+      self.load_initialize
+      @inited = true
+    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
-      ActiveSupport::Dependencies.clear
-      # reload_server!
+    # Sails.service
+    #
+    # return a instance of Sails Service layer
+    #
+    # for example:
+    #
+    #     class UsersService < Sails::Service::Base
+    #       def check_name_exist?(name)
+    #         User.check_name_exist?(name)
+    #       end
+    #     end
+    #
+    #     class UsersServiceTest
+    #       def test_check_name_exist?
+    #         assert_equal(Sails.service.check_name_exist?(name), true)
+    #       end
+    #     end
+    #
+    def service
+      @service ||= Sails::Service::Interface.new
     end
-    return true
-  end
 
-  def self.reload_server!
-    if @server
-      new_processor = config.processor.new(self.service)
-      @server.instance_variable_set(:@processor, new_processor)
+    # Force reload Sails cache classes in config.autoload_paths
+    def reload!(opts = {})
+      force = opts[:force] || false
+      if force || config.cache_classes == false
+        # @service = nil
+        ActiveSupport::Dependencies.clear
+        # reload_server!
+      end
+      true
+    end
+
+    def reload_server!
+      if @server
+        new_processor = config.processor.new(self.service)
+        @server.instance_variable_set(:@processor, new_processor)
+      end
     end
-  end
 
-  def self.start!(type)
-    logger.info "ENV: #{Sails.env}"
+    def start!(type)
+      logger.info "ENV: #{Sails.env}"
 
-    @server_type = type
-    if @server_type == "thread"
-      start_thread_pool_server!
-    else
-      start_non_blocking_server!
+      @server_type = type
+      if @server_type == "thread"
+        start_thread_pool_server!
+      else
+        start_non_blocking_server!
+      end
     end
-  end
 
-  def self.thrift_protocol_class
-    case config.protocol
-    when :compact
-      return ::Thrift::CompactProtocolFactory
-    when :json
-      return ::Thrift::JsonProtocolFactory
-    else
-      return ::Thrift::BinaryProtocolFactory
+    def thrift_protocol_class
+      case config.protocol
+      when :compact
+        return ::Thrift::CompactProtocolFactory
+      when :json
+        return ::Thrift::JsonProtocolFactory
+      else
+        return ::Thrift::BinaryProtocolFactory
+      end
     end
-  end
 
-  # Start Thrift Server with Threaded mode
-  #
-  def self.start_thread_pool_server!
-    transport = ::Thrift::ServerSocket.new(nil, config.thread_port)
-    transport_factory = ::Thrift::BufferedTransportFactory.new
-    protocol_factory = thrift_protocol_class.new
-    processor = config.processor.new(self.service)
-    @server = ::Thrift::ThreadPoolServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
-
-    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
+    # Start Thrift Server with Threaded mode
+    #
+    def start_thread_pool_server!
+      transport = ::Thrift::ServerSocket.new(nil, config.thread_port)
+      transport_factory = ::Thrift::BufferedTransportFactory.new
+      protocol_factory = thrift_protocol_class.new
+      processor = config.processor.new(self.service)
+      @server = ::Thrift::ThreadPoolServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
+
+      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
+      end
     end
-  end
 
-  # Start Thrift Server with Event drive mode
-  def self.start_non_blocking_server!
-    transport = ::Thrift::ServerSocket.new(nil, config.port)
-    transport_factory = ::Thrift::FramedTransportFactory.new
-    protocol_factory = thrift_protocol_class.new
-    processor = config.processor.new(self.service)
-    @server = ::Thrift::NonblockingServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
-
-    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
+    # Start Thrift Server with Event drive mode
+    def start_non_blocking_server!
+      transport = ::Thrift::ServerSocket.new(nil, config.port)
+      transport_factory = ::Thrift::FramedTransportFactory.new
+      protocol_factory = thrift_protocol_class.new
+      processor = config.processor.new(self.service)
+      @server = ::Thrift::NonblockingServer.new(processor, transport, transport_factory, protocol_factory, config.thread_size)
+
+      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
+      end
+    end
+
+    def load_initialize
+      Dir["#{Sails.root}/config/initializers/*.rb"].each do |f|
+        require f
+      end
     end
-  end
 
-  def self.load_initialize
-    Dir["#{Sails.root}/config/initializers/*.rb"].each do |f|
-      require f
+    def check_create_dirs
+      %w(log tmp tmp/cache tmp/pids).each do |name|
+        if not Dir.exist? Sails.root.join(name)
+          require "fileutils"
+          dir_path = Sails.root.join(name)
+          FileUtils.mkdir_p dir_path
+          FileUtils.touch [dir_path,".keep"].join("/")
+        end
+      end
     end
   end
 end
 
-Sails.init()
+Sails.init