ruby_wolf 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d60914f1d8dd41e9242834687e19f41409036932
-  data.tar.gz: 8a51798908bce2046da3d23bd7845af237df05d9
+  metadata.gz: 1791ad834e8ba7733e34262dce2bc95d254fc653
+  data.tar.gz: 415e919027a607f3fe876d1e43bbd65d713aa638
 SHA512:
-  metadata.gz: 5fc70290442f8fef6ff599bd3d21f2421851e8dd384a5cdb37333c765958d95d92a6f7bf040c24019d16984fe0cba16fc37a0b4fd4ed191b5f2eb28e08bac0de
-  data.tar.gz: 9ebfa97ef988cbe019d2a11e707d21f8245d0f8339e3ac580fdb7bea5065d493598d5fc7b525894e658c435e18785c7fd9c5574abdb753cddff49b8b749e7aec
+  metadata.gz: 8d96997f1596a88713002211c8f19847fd944577d1d66e80d8df48d14642d78a96b4dd882ac059d88747598e999139a5bca168f9bc00c0d7f38bb4a01d049305
+  data.tar.gz: 2d00b55807d1a798e1f4e8c944c8e449ea9fbf9b7b93f9b0e2a39b810b1acafc6ab482b74c785752cdebc52f34f6f02b86615f206c19a2d0b93f8db0e40ad274

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+tags

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in ruby_wolf.gemspec
+gem 'rack', '< 3.0'
 gemspec

data/lib/ruby_wolf/cli.rb

@@ -12,6 +12,8 @@ module RubyWolf
 
     def run
       parse_options
+      set_environment
+
       raise 'Rack file not found' unless File.exist?(rack_file)
 
       @server = RubyWolf::Server.new(rack_file, configs)
@@ -38,6 +40,10 @@ module RubyWolf
           @configs[:worker] = arg.to_i
         end
 
+        opts.on('-e ENVIRONMENT', '--environment=ENVIRONMENT', 'Current environment') do |arg|
+          @configs[:environment] = arg
+        end
+
         opts.on('-h', '--help', 'Show the usages') do
           puts opts
           exit
@@ -52,5 +58,10 @@ module RubyWolf
     def rack_file
       "#{@app_root}/config.ru"
     end
+
+    def set_environment
+      ENV['RAILS_ENV'] = configs[:environment]
+      ENV['RACK_ENV'] = configs[:environment]
+    end
   end
 end

data/lib/ruby_wolf/configuration.rb

@@ -4,13 +4,15 @@ module RubyWolf
     DEFAULT_HOST = '0.0.0.0'.freeze
     DEFAULT_PORT = 3000
     DEFAULT_WORKER = 4
+    DEFAULT_ENVIRONMENT = 'development'.freeze
 
     def initialize
       @configs = {
         daemon: DEFAULT_DAEMON,
         worker: DEFAULT_WORKER,
         host: DEFAULT_HOST,
-        port: DEFAULT_PORT
+        port: DEFAULT_PORT,
+        environment: DEFAULT_ENVIRONMENT
       }
     end
 

data/lib/ruby_wolf/handler.rb

@@ -3,7 +3,7 @@ require 'http/parser'
 module RubyWolf
   class Handler
 
-    attr_reader :app, :env, :connection, :response, :callback
+    attr_reader :app, :env, :connection, :response, :callback, :body, :headers, :status
 
     def initialize(app, connection, &callback)
       @app = app
@@ -47,25 +47,16 @@ module RubyWolf
 
         'rack.input' => StringIO.new(connection.read_chunk)
       )
-
-      RubyWolf.log(
-        [
-          'HTTP/1.1',
-          connection.method,
-          "#{connection.path}?#{connection.query}"
-        ].join(' ')
-      )
+      log_request
     end
 
     def generate_response
-      status, headers, body = app.call(env)
-      RubyWolf.log(
-        "Response HTTP/1.1 #{status}"
-      )
-      compose_response(status, headers, body)
+      @status, @headers, @body = app.call(env)
+      compose_response
+      log_response
     end
 
-    def compose_response(status, headers, body)
+    def compose_response
       @response += "HTTP/1.1 #{status} #{RubyWolf::CRLF}"
       headers.each do |key, value|
         @response += "#{key}: #{value}#{RubyWolf::CRLF}"
@@ -78,5 +69,31 @@ module RubyWolf
     ensure
       body.close if body.respond_to? :close
     end
+
+    private
+
+    def log_request
+      RubyWolf.logger.info(
+        [
+          'HTTP/1.1',
+          connection.method,
+          request_path
+        ].join(' ')
+      )
+    end
+
+    def log_response
+      RubyWolf.logger.info(
+        "Response HTTP/1.1 #{status}"
+      )
+    end
+
+    def request_path
+      if connection.query
+        "#{connection.path}?#{connection.query}"
+      else
+        connection.path
+      end
+    end
   end
 end

data/lib/ruby_wolf/logger.rb

@@ -0,0 +1,44 @@
+require 'logger'
+
+module RubyWolf
+  class Logger < ::Logger
+    def info(contents = "")
+      pre_process(contents) do |content|
+        super(content)
+      end
+    end
+
+    def warn(contents = "")
+      pre_process(contents) do |content|
+        super(content)
+      end
+    end
+
+    def debug(contents = "")
+      pre_process(contents) do |content|
+        super(content)
+      end
+    end
+
+    def error(contents = "")
+      pre_process(contents) do |content|
+        super(content)
+      end
+    end
+
+    def fatal(contents = "")
+      pre_process(contents) do |content|
+        super(content)
+      end
+    end
+
+    private
+
+    def pre_process(contents)
+      object = Process.pid == MAIN_PID ? '[Main]' : "[Worker #{Process.pid}]"
+      contents.to_s.split("\n").each do |line|
+        yield("#{object} #{line}")
+      end
+    end
+  end
+end

data/lib/ruby_wolf/server.rb

@@ -1,5 +1,3 @@
-require 'logger'
-
 module RubyWolf
   class Server
     attr_reader :app, :configs, :socket, :workers
@@ -25,16 +23,18 @@ module RubyWolf
     private
 
     def setup_rack
-      RubyWolf.log('~~~ Ruby Wolf ~~~')
-      RubyWolf.log('Loading Rack application')
+      RubyWolf.logger.info('~~~ Ruby Wolf ~~~')
+      RubyWolf.logger.info('Loading Rack application')
       @app, _rack_options = ::Rack::Builder.parse_file(@rack_file)
+      Rails.logger = RubyWolf.logger if defined?(Rails)
+      ActiveRecord::Base.logger = RubyWolf.logger if defined?(ActiveRecord)
     end
 
     def setup_socket
       @socket = TCPServer.new(configs[:host], configs[:port])
-      RubyWolf.log("Server is running on #{configs[:host]}:#{configs[:port]}")
-      RubyWolf.log("Process pid is #{Process.pid}")
-      RubyWolf.log("Number of worker: #{configs[:worker]}")
+      RubyWolf.logger.info("Server is running on #{configs[:host]}:#{configs[:port]}")
+      RubyWolf.logger.info("Process pid is #{Process.pid}")
+      RubyWolf.logger.info("Number of worker: #{configs[:worker]}")
     end
 
     def handle_loop
@@ -42,7 +42,7 @@ module RubyWolf
         stopped_worker = workers.find { |w| w.pid == stopped_pid }
         next unless stopped_worker
 
-        RubyWolf.log("Worker with pid #{stopped_pid} suddenly stopped", :error)
+        RubyWolf.logger.info("Worker with pid #{stopped_pid} suddenly stopped", :error)
 
         sleep(1)
         worker = RubyWolf::Worker.new(self)

data/lib/ruby_wolf/version.rb

@@ -1,3 +1,3 @@
 module RubyWolf
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/ruby_wolf/worker.rb

@@ -11,7 +11,7 @@ module RubyWolf
 
     def start
       @pid = fork do
-        RubyWolf.log('Worker is ready')
+        RubyWolf.logger.info('Worker is ready')
         handle_loop
       end
     end

data/lib/ruby_wolf.rb

@@ -2,6 +2,7 @@ require 'byebug'
 require 'rack'
 
 require 'ruby_wolf/version'
+require 'ruby_wolf/logger'
 require 'ruby_wolf/configuration'
 require 'ruby_wolf/connection'
 require 'ruby_wolf/handler'
@@ -16,14 +17,6 @@ module RubyWolf
   READ_SIZE = 16 * 1024
 
   def self.logger
-    @logger ||= Logger.new(STDOUT)
-  end
-
-  def self.log(content, mode = :info)
-    contents = content.to_s.split("\n")
-    object = Process.pid == MAIN_PID ? '[Main]' : "[Worker #{Process.pid}]"
-    contents.each do |line|
-      logger.send(mode, "#{object} #{line}")
-    end
+    @logger ||= RubyWolf::Logger.new(STDOUT)
   end
 end

data/spec/ruby_wolf/cli_spec.rb

@@ -111,5 +111,22 @@ describe RubyWolf::CLI do
         it { expect(cli.configs[:port]).to eql(20) }
       end
     end
+
+    describe 'environment option' do
+      context 'default environment' do
+        let(:args) { [] }
+        it { expect(cli.configs[:environment]).to eql('development') }
+      end
+
+      context 'short form' do
+        let(:args) { ['-w production'] }
+        it { expect(cli.configs[:environment]).to eql('production') }
+      end
+
+      context 'full form' do
+        let(:args) { ['--environment=20'] }
+        it { expect(cli.configs[:environment]).to eql('production') }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wolf
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nguyễn Quang Minh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -93,6 +93,7 @@ files:
 - lib/ruby_wolf/configuration.rb
 - lib/ruby_wolf/connection.rb
 - lib/ruby_wolf/handler.rb
+- lib/ruby_wolf/logger.rb
 - lib/ruby_wolf/server.rb
 - lib/ruby_wolf/version.rb
 - lib/ruby_wolf/worker.rb