sails 0.1.4 → 0.1.5

data/lib/sails/templates/Rakefile.tt

@@ -1,49 +1,9 @@
 require "rake"
 require "rubygems"
-
 require File.expand_path('../config/application.rb', __FILE__)
-
+require "sails/tasks"
 Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
-task :default => :test
-
-task :gen do
-  puts "Generating thrift code..."
-  system 'thrift \
-  --gen rb \
-  -out app/services/gen-rb \
-  -strict \
-  -debug \
-  -verbose \
-  <%= app_name %>.thrift'
-
-  puts "[Done]"
-end
-
-task :test do
-  system 'rspec spec'
-end
-
-load 'active_record/railties/databases.rake'
-
-class << ActiveRecord::Tasks::DatabaseTasks
-  def env
-    @env ||= Sails.env
-  end
-
-  def migrations_paths
-    [File.expand_path('../db/migrate', __FILE__)]
-  end
-
-  def database_configuration
-    YAML.load open(File.expand_path('../config/database.yml', __FILE__)).read
-  end
-
-  def db_dir
-    File.expand_path('../db', __FILE__)
-  end
-end
-
 task :environment do
   require File.expand_path('../config/application.rb', __FILE__)
 end

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

@@ -1,8 +1,12 @@
 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
+
+  def ping
+    return "Pong #{Time.now}"
+  end
+end

data/lib/sails/templates/app/services/gen-rb/%app_name%.rb.tt

@@ -1,11 +1,86 @@
+#
+# Autogenerated by Thrift Compiler (0.9.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require '<%= @app_name %>_types'
+
 module Thrift
-  module <%= app_name.capitalize %>
+  module <%= @app_name.capitalize %>
     class Client
       include ::Thrift::Client
+
+      def ping()
+        send_ping()
+        return recv_ping()
+      end
+
+      def send_ping()
+        send_message('ping', Ping_args)
+      end
+
+      def recv_ping()
+        result = receive_message(Ping_result)
+        return result.success unless result.success.nil?
+        raise result.failure unless result.failure.nil?
+        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'ping failed: unknown result')
+      end
+
     end
-    
+
     class Processor
       include ::Thrift::Processor
+
+      def process_ping(seqid, iprot, oprot)
+        args = read_args(iprot, Ping_args)
+        result = Ping_result.new()
+        begin
+          result.success = @handler.ping()
+        rescue ::Thrift::OperationFailed => failure
+          result.failure = failure
+        end
+        write_result(result, oprot, 'ping', seqid)
+      end
+
     end
+
+    # HELPER FUNCTIONS AND STRUCTURES
+
+    class Ping_args
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+
+      FIELDS = {
+
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
+    class Ping_result
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+      SUCCESS = 0
+      FAILURE = 1
+
+      FIELDS = {
+        SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'},
+        FAILURE => {:type => ::Thrift::Types::STRUCT, :name => 'failure', :class => ::Thrift::OperationFailed}
+      }
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+    end
+
   end
-end
+
+end

data/lib/sails/templates/app/services/gen-rb/%app_name%_constants.rb.tt

@@ -0,0 +1,11 @@
+#
+# Autogenerated by Thrift Compiler (0.9.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require '<%= app_name %>_types'
+
+module Thrift
+end

data/lib/sails/templates/app/services/gen-rb/%app_name%_types.rb.tt

@@ -0,0 +1,46 @@
+#
+# Autogenerated by Thrift Compiler (0.9.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Thrift
+  class Session
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    USER_ID = 1
+    ACCESS_TOKEN = 2
+
+    FIELDS = {
+      USER_ID => {:type => ::Thrift::Types::I64, :name => 'user_id'},
+      ACCESS_TOKEN => {:type => ::Thrift::Types::STRING, :name => 'access_token'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class OperationFailed < ::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

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

@@ -9,21 +9,21 @@ module Sails
   config.app_name = '<%= app_name %>'
   # Thrift Configs
   config.port = 4000
-  
+
   # Thrift protocol allows: :binary, :compact, default: :binary
-  # config.protocol = :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)
-  
+
   config.i18n.default_locale = 'zh-CN'
-  
+
   # cache store
   # config.cache_store = [:dalli_store, '127.0.0.1']
 end
 
-Sails.init()
+Sails.init()

data/lib/sails/templates/config/{database.yml → database.yml.tt}

@@ -1,9 +1,6 @@
 default: &default
-  adapter: mysql2
-  pool: 100
-  username: root
-  password:
-  socket: /tmp/mysql.sock
+  adapter: sqlite3
+  database: db/<%= app_name %>.sqlite
 
 development:
   <<: *default

data/lib/sails/templates/config/initializers/active_record.rb

@@ -0,0 +1,6 @@
+require "active_record"
+ActiveRecord::Base.raise_in_transactional_callbacks = true
+
+config_file = Sails.root.join("config/database.yml")
+database_config = YAML.load_file(config_file)[Sails.env]
+ActiveRecord::Base.establish_connection(database_config)

data/lib/sails/templates/config/locales/rails.zh-CN.yml

@@ -116,17 +116,17 @@ zh-CN:
       not_an_integer: 必须是整数
       odd: 必须为单数
       record_invalid: ! '验证失败: %{errors}'
-      restrict_dependent_destroy: 
+      restrict_dependent_destroy:
         one: 由于 %{record} 需要此记录，所以无法移除记录
         many: 由于 %{record} 需要此记录，所以无法移除记录
       taken: 已经被使用
-      too_long: 
+      too_long:
         one: 过长（最长为一个字符）
         other: 过长（最长为 %{count} 个字符）
-      too_short: 
+      too_short:
         one: 过短（最短为一个字符）
         other: 过短（最短为 %{count} 个字符）
-      wrong_length: 
+      wrong_length:
         one: 长度非法（必须为一个字符）
         other: 长度非法（必须为 %{count} 个字符）
       other_than: 长度非法（不可为 %{count} 个字符
@@ -200,4 +200,4 @@ zh-CN:
       default: ! '%Y年%b%d日 %A %H:%M:%S %Z'
       long: ! '%Y年%b%d日 %H:%M'
       short: ! '%b%d日 %H:%M'
-    pm: 下午
+    pm: 下午

data/lib/sails/templates/config/locales/zh-CN.yml

@@ -1,4 +1,3 @@
 zh-CN:
   hello: "你好"
-        
-  
+

data/lib/sails/templates/lib/tasks/client.rake.tt

@@ -0,0 +1,25 @@
+$:.unshift Sails.root.join("app/services")
+require "handler"
+
+class TestClient
+  def self.instance
+    @transport ||= Thrift::FramedTransport.new(::Thrift::Socket.new('127.0.0.1', 4000, 10))
+    @protocol  ||=  Thrift::BinaryProtocol.new(@transport)
+    @client    ||= Thrift::<%= @app_name.capitalize %>::Client.new(@protocol)
+    @transport.open() if !@transport.open?
+    @client
+  end
+
+  def self.method_missing(name, *args)
+    puts "> #{name}"
+    puts self.instance.send(name, *args).inspect
+    puts ""
+  end
+end
+
+namespace :client do
+  desc "client ping test"
+  task :ping do
+    TestClient.ping()
+  end
+end

data/lib/sails/version.rb

@@ -1,5 +1,5 @@
 module Sails
   def self.version
-    "0.1.4"
+    "0.1.5"
   end
-end
+end

data/lib/sails.rb

@@ -7,7 +7,7 @@ require 'yaml'
 require "sails/rails"
 require "sails/base"
 
-# Sails 
+# Sails
 #
 # You can custom Sails configs in config/application.rb
 #
@@ -19,22 +19,28 @@ require "sails/base"
 #      # 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
+
+  eager_autoload do
+    autoload :LogSubscriber
+  end
+end
+
+Sails.eager_load!

data/sails.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = 'MIT'
 
-  s.add_dependency "activesupport", [">= 3.2.0"]
+  s.add_dependency "activesupport", ["> 3.2.0","< 5.0"]
   s.add_dependency "thrift", [">= 0.9.0"]
   s.add_dependency "thor"
 end

data/spec/cli_spec.rb

@@ -10,7 +10,7 @@ describe 'Sails::CLI' do
       cli.start
     }
   end
-  
+
   describe '.stop' do
     it { expect(cli).to respond_to(:stop) }
     it {
@@ -19,7 +19,7 @@ describe 'Sails::CLI' do
       cli.stop
     }
   end
-  
+
   describe '.restart' do
     it { expect(cli).to respond_to(:restart) }
     it {
@@ -28,16 +28,16 @@ describe 'Sails::CLI' do
       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
+end

data/spec/rails_spec.rb

@@ -2,4 +2,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 }
+  it { expect(Rails.root).to eq Sails.root }
 end

data/spec/sails_spec.rb

@@ -2,33 +2,47 @@ 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 '#init' do
+    it 'should work' do
+      Sails.instance_variable_set(:@inited, false)
+      expect(Sails).to receive(:check_create_dirs).once
+      expect(Sails).to receive(:load_initialize).once
+      Sails.init
+      expect(Sails.instance_variable_get(:@inited)).to eq true
+    end
+  end
+
   describe '#logger' do
     it 'should be a Logger class' do
       expect(Sails.logger).to be_a(Logger)
     end
+
+    it 'should have logger_path' do
+      expect(Sails.logger_path).to eq Sails.root.join("log/#{Sails.env}.log")
+    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' }
@@ -39,12 +53,12 @@ describe 'Sails' do
       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)
@@ -57,7 +71,7 @@ describe 'Sails' do
       expect(Sails.thrift_protocol_class).to eq ::Thrift::BinaryProtocolFactory
     end
   end
-  
+
   describe '#reload!' do
     it 'should work' do
       s1 = Sails.service
@@ -66,5 +80,19 @@ describe 'Sails' do
       # TODO: test reload autoload_paths
     end
   end
-  
-end
+
+  describe '#check_create_dirs' do
+    it 'should work' do
+      require "fileutils"
+      log_path = Sails.root.join("log")
+      FileUtils.rm_r(log_path) if Dir.exist?(log_path)
+      expect(Dir.exist?(log_path)).to eq false
+
+      Sails.check_create_dirs
+      %W(log tmp tmp/cache tmp/pids).each do |name|
+        expect(Dir.exist?(Sails.root.join(name))).to eq true
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ 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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jason Lee
@@ -12,22 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
@@ -82,32 +88,42 @@ files:
 - lib/sails/config.rb
 - lib/sails/console.rb
 - lib/sails/daemon.rb
+- lib/sails/log_subscriber.rb
 - 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/tasks.rb
 - lib/sails/templates/%app_name%.thrift.tt
 - lib/sails/templates/Gemfile
-- lib/sails/templates/Gemfile.lock
 - lib/sails/templates/Rakefile.tt
 - lib/sails/templates/app/services/application_service.rb.tt
 - lib/sails/templates/app/services/gen-rb/%app_name%.rb.tt
+- lib/sails/templates/app/services/gen-rb/%app_name%_constants.rb.tt
+- lib/sails/templates/app/services/gen-rb/%app_name%_types.rb.tt
 - lib/sails/templates/app/services/handler.rb.tt
 - lib/sails/templates/config/application.rb.tt
 - lib/sails/templates/config/boot.rb
-- lib/sails/templates/config/database.yml
+- lib/sails/templates/config/database.yml.tt
 - lib/sails/templates/config/environments/development.rb
 - lib/sails/templates/config/environments/production.rb
 - lib/sails/templates/config/environments/test.rb
+- lib/sails/templates/config/initializers/active_record.rb
 - lib/sails/templates/config/locales/en.yml
 - lib/sails/templates/config/locales/rails.zh-CN.yml
 - lib/sails/templates/config/locales/zh-CN.yml
 - lib/sails/templates/db/seeds.rb
+- lib/sails/templates/lib/tasks/client.rake.tt
 - lib/sails/version.rb
 - sails.gemspec
 - spec/cli_spec.rb
+- spec/dummy/.keep
+- spec/dummy/log/.keep
+- spec/dummy/tmp/.keep
+- spec/dummy/tmp/cache/.keep
+- spec/dummy/tmp/pids/.keep
 - spec/rails_spec.rb
 - spec/sails_spec.rb
 - spec/service/base_spec.rb
@@ -134,16 +150,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sails, Help you to create Rails style Thrift Server
 test_files:
 - spec/cli_spec.rb
+- spec/dummy/.keep
+- spec/dummy/log/.keep
+- spec/dummy/tmp/.keep
+- spec/dummy/tmp/cache/.keep
+- spec/dummy/tmp/pids/.keep
 - spec/rails_spec.rb
 - spec/sails_spec.rb
 - spec/service/base_spec.rb
 - spec/service/callbacks_spec.rb
 - spec/spec_helper.rb
 - spec/support/service_support.rb
-has_rdoc: