peastash 0.1.0 → 0.1.1

data/spec/dummy-3.2/test/test_helper.rb

@@ -0,0 +1,13 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/spec/peastash/middleware_spec.rb

@@ -60,6 +60,19 @@ describe Peastash::Middleware do
       end
     end
 
+    context 'with the X-Request-Time header' do
+      it 'adds the time_in_queue field' do
+        expect(LogStash::Event).to receive(:new).with({
+          '@source' => Peastash::STORE_NAME,
+          '@fields' => { duration: 0, status: 200, ip: nil, time_in_queue: 0.0 },
+          '@tags' => [],
+          '@pid' => an_instance_of(Fixnum),
+        })
+        middleware = Peastash::Middleware.new(app)
+        Timecop.freeze { middleware.call env_for('/', { 'HTTP_X_REQUEST_START' => Time.now.to_f }) }
+      end
+    end
+
     context 'storing data in the rack app' do
       before :each do
         app = ->(env) do

data/spec/peastash/rails_ext/railtie_spec.rb

@@ -34,7 +34,7 @@ describe Peastash::Railtie do
     context 'with regular conf' do
       before :all do
         ENV['RAILS_ENV'] = 'test'
-        require 'dummy/config/environment'
+        require testing_rails_32? ? 'dummy-3.2/config/environment' : 'dummy/config/environment'
       end
 
       before(:each) { Peastash.with_instance.store.clear }
@@ -49,7 +49,6 @@ describe Peastash::Railtie do
           Rails.application.middleware.each_with_index { |middleware, index| show_exceptions_index = index if middleware == ActionDispatch::ShowExceptions }
           expect(Rails.application.middleware[show_exceptions_index - 1]).to eq(Peastash::Middleware)
         end
-
       end
 
       it "adds a subscriber on 'process_action.action_controller' to gather metrics about the request" do
@@ -60,33 +59,48 @@ describe Peastash::Railtie do
       context "params logging" do
         it "doesn't log the parameters if log_parameters isn't true" do
           Peastash.with_instance.configuration[:log_parameters] = false
-          Rails.application.call env_for('/')
+          perform_request('/')
           expect(Peastash.with_instance.store.keys).to_not include(:params)
         end
 
         it "logs the parameters if log_parameters is true" do
           Peastash.with_instance.configuration[:log_parameters] = true
-          Rails.application.call env_for('/')
+          perform_request('/')
           expect(Peastash.with_instance.store.keys).to include(:params)
         end
 
         it "doesn't log filtered parameters in clear text" do
           Peastash.with_instance.configuration[:log_parameters] = true
-          Rails.application.call env_for('/?password=foo')
+          perform_request('/?password=foo')
           expect(Peastash.with_instance.store[:params]["password"]).to eq("[FILTERED]")
         end
-      end
+      end unless Rails.version.start_with?('3.') # The actual railtie work, just not in the specs for now
     end
   end
 end
 
+def perform_request(path)
+  (Rails.application.call env_for(path)).tap do |res|
+    # Rack-Lock doesn't release the mutex if body is not closed
+    res[2].close unless testing_rails_32?
+  end
+end
+
 def run_with_env(env = 'test')
   # Can't run those tests on jruby... yet
   return if RUBY_PLATFORM == 'java'
   fork do
     SimpleCov.running = false
     ENV['RAILS_ENV'] = env
-    require 'dummy/config/environment'
+    if testing_rails_32?
+      require 'dummy-3.2/config/environment'
+    else
+      require 'dummy/config/environment'
+    end
     yield
   end
 end
+
+def testing_rails_32?
+  Rails.version.start_with?('3.')
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peastash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vincent Boisard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -162,6 +162,11 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- gemfiles/Gemfile.rails-3.2.x
+- gemfiles/Gemfile.rails-4.0.x
+- gemfiles/Gemfile.rails-4.1.x
+- gemfiles/Gemfile.rails-4.2.x
+- gemfiles/Gemfile.rails-head
 - lib/peastash.rb
 - lib/peastash/middleware.rb
 - lib/peastash/outputs/io.rb
@@ -170,6 +175,56 @@ files:
 - lib/peastash/rails_ext/watch.rb
 - lib/peastash/version.rb
 - peastash.gemspec
+- spec/dummy-3.2/.gitignore
+- spec/dummy-3.2/Gemfile
+- spec/dummy-3.2/README.rdoc
+- spec/dummy-3.2/Rakefile
+- spec/dummy-3.2/app/assets/images/rails.png
+- spec/dummy-3.2/app/assets/javascripts/application.js
+- spec/dummy-3.2/app/assets/stylesheets/application.css
+- spec/dummy-3.2/app/controllers/application_controller.rb
+- spec/dummy-3.2/app/helpers/application_helper.rb
+- spec/dummy-3.2/app/mailers/.gitkeep
+- spec/dummy-3.2/app/models/.gitkeep
+- spec/dummy-3.2/app/views/layouts/application.html.erb
+- spec/dummy-3.2/config.ru
+- spec/dummy-3.2/config/application.rb
+- spec/dummy-3.2/config/boot.rb
+- spec/dummy-3.2/config/database.yml
+- spec/dummy-3.2/config/environment.rb
+- spec/dummy-3.2/config/environments/development.rb
+- spec/dummy-3.2/config/environments/production.rb
+- spec/dummy-3.2/config/environments/test.rb
+- spec/dummy-3.2/config/environments/test_with_specific_position.rb
+- spec/dummy-3.2/config/initializers/backtrace_silencers.rb
+- spec/dummy-3.2/config/initializers/inflections.rb
+- spec/dummy-3.2/config/initializers/mime_types.rb
+- spec/dummy-3.2/config/initializers/secret_token.rb
+- spec/dummy-3.2/config/initializers/session_store.rb
+- spec/dummy-3.2/config/initializers/wrap_parameters.rb
+- spec/dummy-3.2/config/locales/en.yml
+- spec/dummy-3.2/config/routes.rb
+- spec/dummy-3.2/db/seeds.rb
+- spec/dummy-3.2/doc/README_FOR_APP
+- spec/dummy-3.2/lib/assets/.gitkeep
+- spec/dummy-3.2/lib/tasks/.gitkeep
+- spec/dummy-3.2/log/.gitkeep
+- spec/dummy-3.2/public/404.html
+- spec/dummy-3.2/public/422.html
+- spec/dummy-3.2/public/500.html
+- spec/dummy-3.2/public/favicon.ico
+- spec/dummy-3.2/public/index.html
+- spec/dummy-3.2/public/robots.txt
+- spec/dummy-3.2/script/rails
+- spec/dummy-3.2/test/fixtures/.gitkeep
+- spec/dummy-3.2/test/functional/.gitkeep
+- spec/dummy-3.2/test/integration/.gitkeep
+- spec/dummy-3.2/test/performance/browsing_test.rb
+- spec/dummy-3.2/test/test_helper.rb
+- spec/dummy-3.2/test/unit/.gitkeep
+- spec/dummy-3.2/vendor/assets/javascripts/.gitkeep
+- spec/dummy-3.2/vendor/assets/stylesheets/.gitkeep
+- spec/dummy-3.2/vendor/plugins/.gitkeep
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
@@ -194,7 +249,6 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/test_with_specific_position.rb
-- spec/dummy/config/environments/test_without_buchestache.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -217,7 +271,8 @@ files:
 - spec/peastash_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/elhu/peastash
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -235,11 +290,61 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Peastash allows you to instrument your code with the ELK stack easily.
 test_files:
+- spec/dummy-3.2/.gitignore
+- spec/dummy-3.2/Gemfile
+- spec/dummy-3.2/README.rdoc
+- spec/dummy-3.2/Rakefile
+- spec/dummy-3.2/app/assets/images/rails.png
+- spec/dummy-3.2/app/assets/javascripts/application.js
+- spec/dummy-3.2/app/assets/stylesheets/application.css
+- spec/dummy-3.2/app/controllers/application_controller.rb
+- spec/dummy-3.2/app/helpers/application_helper.rb
+- spec/dummy-3.2/app/mailers/.gitkeep
+- spec/dummy-3.2/app/models/.gitkeep
+- spec/dummy-3.2/app/views/layouts/application.html.erb
+- spec/dummy-3.2/config.ru
+- spec/dummy-3.2/config/application.rb
+- spec/dummy-3.2/config/boot.rb
+- spec/dummy-3.2/config/database.yml
+- spec/dummy-3.2/config/environment.rb
+- spec/dummy-3.2/config/environments/development.rb
+- spec/dummy-3.2/config/environments/production.rb
+- spec/dummy-3.2/config/environments/test.rb
+- spec/dummy-3.2/config/environments/test_with_specific_position.rb
+- spec/dummy-3.2/config/initializers/backtrace_silencers.rb
+- spec/dummy-3.2/config/initializers/inflections.rb
+- spec/dummy-3.2/config/initializers/mime_types.rb
+- spec/dummy-3.2/config/initializers/secret_token.rb
+- spec/dummy-3.2/config/initializers/session_store.rb
+- spec/dummy-3.2/config/initializers/wrap_parameters.rb
+- spec/dummy-3.2/config/locales/en.yml
+- spec/dummy-3.2/config/routes.rb
+- spec/dummy-3.2/db/seeds.rb
+- spec/dummy-3.2/doc/README_FOR_APP
+- spec/dummy-3.2/lib/assets/.gitkeep
+- spec/dummy-3.2/lib/tasks/.gitkeep
+- spec/dummy-3.2/log/.gitkeep
+- spec/dummy-3.2/public/404.html
+- spec/dummy-3.2/public/422.html
+- spec/dummy-3.2/public/500.html
+- spec/dummy-3.2/public/favicon.ico
+- spec/dummy-3.2/public/index.html
+- spec/dummy-3.2/public/robots.txt
+- spec/dummy-3.2/script/rails
+- spec/dummy-3.2/test/fixtures/.gitkeep
+- spec/dummy-3.2/test/functional/.gitkeep
+- spec/dummy-3.2/test/integration/.gitkeep
+- spec/dummy-3.2/test/performance/browsing_test.rb
+- spec/dummy-3.2/test/test_helper.rb
+- spec/dummy-3.2/test/unit/.gitkeep
+- spec/dummy-3.2/vendor/assets/javascripts/.gitkeep
+- spec/dummy-3.2/vendor/assets/stylesheets/.gitkeep
+- spec/dummy-3.2/vendor/plugins/.gitkeep
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
@@ -264,7 +369,6 @@ test_files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/test_with_specific_position.rb
-- spec/dummy/config/environments/test_without_buchestache.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
@@ -286,4 +390,3 @@ test_files:
 - spec/peastash/rails_ext/watch_spec.rb
 - spec/peastash_spec.rb
 - spec/spec_helper.rb
-has_rdoc: