sails 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9752501c98161e8b95d109743e4f9ce2091d0127
-  data.tar.gz: 24a4dcca7f3748da76c715f4d97cb46857308d0c
+  metadata.gz: c2aaddc8f77dfe3c1738daa0b1823b47fd8aa545
+  data.tar.gz: 5f0831ff50a200b4e8d1eb315e11b3190ffdff7e
 SHA512:
-  metadata.gz: 703defe29c4488dfce4147d86416cea85c1d5834cc6b10c535cfc24f2ad0c62bd6f6463d3618b394919302e35bffdefd9daabdcfe3023d1fd78ded56a0ecfa1a
-  data.tar.gz: 90f1944aed8c06b9c98c49f2fc0602bc189a7b02ab326d5b2fa623b40f3381967d65a966d9a252b02aa3d5cc59439a9015f7f97e4bb4e0771e6e430b95210c92
+  metadata.gz: 9a81c552abca5745fdbe5a3fedfc42dd62d12f235a9c8cfb10867589956596177880e04b8cb690a4aa83c3db14a3781bc30c5405e887aab1dfb74bd73e658f01
+  data.tar.gz: f58f1c56ecbecde6989832b1ae4858e3a4379191d29a77c6341b76485ad2e6358a8f904eb910953198adbae1554df986bef5c36f8fdaea88101894b97a9e0938

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0
+
+- Remove define `Rails`;
+
 ## 0.1.5
 
 - Fix stdout error in daemon mode.

data/Gemfile.lock

@@ -1,25 +1,24 @@
 PATH
   remote: .
   specs:
-    sails (0.1.4)
-      activesupport (> 3.2.0, < 5.0)
+    sails (0.2.0)
+      activesupport (> 3.2.0, <= 5.0)
       thor
       thrift (>= 0.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    concurrent-ruby (1.0.2)
     dalli (2.7.1)
     diff-lcs (1.2.5)
     i18n (0.7.0)
-    json (1.8.1)
-    minitest (5.5.0)
+    minitest (5.9.1)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -33,8 +32,8 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    thrift (0.9.2.0)
+    thread_safe (0.3.5)
+    thrift (0.9.3.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -45,3 +44,6 @@ DEPENDENCIES
   dalli
   rspec
   sails!
+
+BUNDLED WITH
+   1.13.6

data/Rakefile

@@ -0,0 +1,5 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/sails.rb

@@ -4,7 +4,6 @@ require 'active_support/all'
 require 'i18n'
 require 'thrift'
 require 'yaml'
-require "sails/rails"
 require "sails/base"
 
 # Sails

data/lib/sails/log_subscriber.rb

@@ -10,7 +10,7 @@ module Sails
 
       info ""
       info "Processing by #{payload[:controller]}##{payload[:action]} at #{Time.now}"
-      info "  Parameters: #{params.inspect}" unless params.empty?
+      info "  Parameters: #{params.except(:method_name).inspect}" unless params.empty?
 
       ActiveRecord::LogSubscriber.reset_runtime if defined?(ActiveRecord::LogSubscriber)
     end
@@ -20,12 +20,19 @@ module Sails
         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]
+        payload.each_key do |key|
+          key_s = key.to_s
+          if key_s.include?("_runtime")
+            next if payload[key].blank?
+            runtime_name = key_s.sub("_runtime","").capitalize
+            additions << ("#{runtime_name}: %.1fms" % payload[key].to_f)
+          end
+        end
+
         status = payload[:status]
         payload[:runtime] = event.duration
 
-        message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{event.duration.round(2)}ms"
+        message = "Completed #{status} in #{event.duration.round(2)}ms"
         message << " (#{additions.join(" | ")})"
         message
       end

data/lib/sails/version.rb

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

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","< 5.0"]
+  s.add_dependency "activesupport", ["> 3.2.0","<= 5.0"]
   s.add_dependency "thrift", [">= 0.9.0"]
   s.add_dependency "thor"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Lee
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -21,7 +21,7 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
@@ -31,7 +31,7 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.2.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -81,6 +81,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- Rakefile
 - bin/sails
 - lib/sails.rb
 - lib/sails/base.rb
@@ -89,7 +90,6 @@ files:
 - 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
@@ -124,7 +124,6 @@ files:
 - 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
@@ -150,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Sails, Help you to create Rails style Thrift Server
@@ -161,7 +160,6 @@ test_files:
 - 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

data/lib/sails/rails.rb

@@ -1,19 +0,0 @@
-if not defined?(Rails)
-  module Rails
-    def self.logger
-      Sails.logger
-    end
-
-    def self.env
-      Sails.env
-    end
-
-    def self.cache
-      Sails.cache
-    end
-
-    def self.root
-      Sails.root
-    end
-  end
-end

data/spec/rails_spec.rb

@@ -1,6 +0,0 @@
-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