appsignal 0.6.7 → 0.7.0.alpha.1

data/spec/lib/tmp/config/appsignal.yml

@@ -0,0 +1,2 @@
+production:
+  api_key: 111

data/spec/spec_helper.rb

@@ -1,34 +1,43 @@
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 require 'rspec'
-require 'rails'
-require 'action_controller/railtie'
+require 'pry'
+require 'active_support/notifications'
 
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
-
-module Rails
-  class Application
-  end
+begin
+  require 'rails'
+  Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support/rails','*.rb'))].each {|f| require f}
+  puts 'Rails present, running Rails specific specs'
+  RAILS_PRESENT = true
+rescue LoadError
+  puts 'Rails not present, skipping Rails specific specs'
+  RAILS_PRESENT = false
 end
 
-module MyApp
-  class Application < Rails::Application
-    config.active_support.deprecation = proc { |message, stack| }
-    config.eager_load = false
-  end
+def rails_present?
+  RAILS_PRESENT
 end
 
-def log_file
-  File.join(File.dirname(__FILE__), '../log/appsignal.log')
+require 'appsignal'
+
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support/helpers','*.rb'))].each {|f| require f}
+
+def tmp_dir
+  @tmp_dir ||= File.expand_path(File.join(File.dirname(__FILE__), 'tmp'))
 end
 
-require 'appsignal'
-require 'appsignal/cli'
+def fixtures_dir
+  @fixtures_dir ||= File.expand_path(File.join(File.dirname(__FILE__), 'support/fixtures'))
+end
 
 RSpec.configure do |config|
-  config.include TransactionHelpers
+  config.include ConfigHelpers
   config.include NotificationHelpers
+  config.include TransactionHelpers
 
-  config.before :all do
-    FileUtils.rm(log_file) if File.exists?(log_file)
+  config.before do
+    ENV['PWD'] = File.expand_path(File.join(File.dirname(__FILE__), '../'))
+    ENV['RAILS_ENV'] = 'test'
+    ENV.delete('APPSIGNAL_PUSH_API_KEY')
+    ENV.delete('APPSIGNAL_API_KEY')
   end
 end

data/spec/support/delegate_matcher.rb

@@ -35,5 +35,4 @@ RSpec::Matchers.define :delegate do |method|
 
   chain(:to) { |receiver| @to = receiver }
   chain(:with_prefix) { @prefix = true }
-
 end

data/spec/support/fixtures/generated_config.yml

@@ -0,0 +1,20 @@
+default: &defaults
+  # Your push api key, it is possible to set this dynamically using ERB:
+  # push_api_key: "<%= ENV['APPSIGNAL_PUSH_API_KEY'] %>"
+  push_api_key: "my_app_key"
+
+  # Your app's name
+  name: "MyApp"
+
+  # The cuttoff point in ms above which a request is considered slow, default is 200
+  # slow_request_threshold: 200
+
+# Configuration per environment, leave out an environment or set active
+# to false to not push metrics for that environment.
+development:
+  <<: *defaults
+  active: true
+
+production:
+  <<: *defaults
+  active: true

data/spec/support/helpers/config_helpers.rb

@@ -0,0 +1,24 @@
+module ConfigHelpers
+  def project_fixture_path
+    File.expand_path(
+      File.join(File.dirname(__FILE__),'../project_fixture')
+    )
+  end
+
+  def project_fixture_log_file
+    File.join(project_fixture_path, 'log/appsignal.log')
+  end
+
+  def project_fixture_config(env='production', logger=Logger.new(project_fixture_log_file))
+    Appsignal::Config.new(
+      project_fixture_path,
+      env,
+      logger
+    )
+  end
+
+  def start_agent(env='production')
+    Appsignal.config = project_fixture_config(env)
+    Appsignal.start
+  end
+end

data/spec/support/helpers/notification_helpers.rb

@@ -1,5 +1,4 @@
 module NotificationHelpers
-
   def notification_event(args={})
     args = {
       :name => 'process_action.action_controller',
@@ -25,5 +24,4 @@ module NotificationHelpers
       :db_runtime => 500
     }.merge(args)
   end
-
 end

data/spec/support/helpers/transaction_helpers.rb

@@ -3,6 +3,14 @@ module TransactionHelpers
     @fixed_time ||= Time.at(978364860.0)
   end
 
+  def uploaded_file
+    if rails_present?
+      ActionDispatch::Http::UploadedFile.new(:tempfile => '/tmp')
+    else
+      ::Rack::Multipart::UploadedFile.new(File.join(fixtures_dir, '/uploaded_file.txt'))
+    end
+  end
+
   def transaction_with_exception
     appsignal_transaction.tap do |o|
       o.set_tags('user_id' => 123)
@@ -10,7 +18,7 @@ module TransactionHelpers
         raise ArgumentError, 'oh no'
       rescue ArgumentError => exception
         exception.stub(:backtrace => [
-          Rails.root.join('app/controllers/somethings_controller.rb:10').to_s,
+          File.join(project_fixture_path, 'app/controllers/somethings_controller.rb:10').to_s,
           '/user/local/ruby/path.rb:8'
         ])
         o.add_exception(exception)
@@ -22,6 +30,13 @@ module TransactionHelpers
     appsignal_transaction(:process_action_event => notification_event)
   end
 
+  def regular_transaction_with_x_request_start
+    appsignal_transaction(
+      :process_action_event => notification_event,
+      'HTTP_X_REQUEST_START' => "t=#{((fixed_time.to_f - 40.0) * 1_000_000).to_i}"
+    )
+  end
+
   def slow_transaction(args={})
     appsignal_transaction(
       {
@@ -44,7 +59,7 @@ module TransactionHelpers
     )
   end
 
-  def appsignal_transaction(args = {})
+  def appsignal_transaction(args={})
     process_action_event = args.delete(:process_action_event)
     events = args.delete(:events) || [
       notification_event(:name => 'query.mongoid')

data/spec/support/project_fixture/config/appsignal.yml

@@ -0,0 +1,18 @@
+default: &defaults
+  push_api_key: "abc"
+  name: "TestApp"
+  slow_request_threshold: 200
+
+production:
+  <<: *defaults
+  active: true
+
+test:
+  <<: *defaults
+  endpoint: "http://localhost:3000/1"
+  debug: true
+  active: true
+
+old_api_key:
+  api_key: "def"
+  active: true

data/spec/support/rails/my_app.rb

@@ -0,0 +1,6 @@
+module MyApp
+  class Application < Rails::Application
+    config.active_support.deprecation = proc { |message, stack| }
+    config.eager_load = false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0.alpha.1
 platform: ruby
 authors:
 - Robert Beekman
@@ -12,10 +12,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -29,7 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -57,7 +57,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -71,33 +71,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: generator_spec
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '0'
 description: The official appsignal.com gem
 email:
-- contact@appsignal.com
+- support@appsignal.com
 executables:
 - appsignal
 extensions: []
@@ -130,68 +130,77 @@ files:
 - Rakefile
 - appsignal.gemspec
 - bin/appsignal
-- config/appsignal.yml
-- gemfiles/3.0.gemfile
-- gemfiles/3.1.gemfile
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
+- gemfiles/no_dependencies.gemfile
+- gemfiles/rails-3.0.gemfile
+- gemfiles/rails-3.1.gemfile
+- gemfiles/rails-3.2.gemfile
+- gemfiles/rails-4.0.gemfile
+- gemfiles/sinatra.gemfile
 - lib/appsignal.rb
 - lib/appsignal/agent.rb
 - lib/appsignal/aggregator.rb
+- lib/appsignal/aggregator/middleware.rb
+- lib/appsignal/aggregator/middleware/action_view_sanitizer.rb
+- lib/appsignal/aggregator/middleware/active_record_sanitizer.rb
+- lib/appsignal/aggregator/middleware/chain.rb
+- lib/appsignal/aggregator/middleware/delete_blanks.rb
 - lib/appsignal/aggregator/post_processor.rb
 - lib/appsignal/auth_check.rb
 - lib/appsignal/capistrano.rb
-- lib/appsignal/careful_logger.rb
 - lib/appsignal/cli.rb
 - lib/appsignal/config.rb
+- lib/appsignal/integrations/capistrano.rb
+- lib/appsignal/integrations/capistrano/careful_logger.rb
 - lib/appsignal/integrations/passenger.rb
-- lib/appsignal/listener.rb
+- lib/appsignal/integrations/rails.rb
+- lib/appsignal/integrations/sinatra.rb
 - lib/appsignal/marker.rb
-- lib/appsignal/middleware.rb
-- lib/appsignal/middleware/action_view_sanitizer.rb
-- lib/appsignal/middleware/active_record_sanitizer.rb
-- lib/appsignal/middleware/chain.rb
-- lib/appsignal/middleware/delete_blanks.rb
-- lib/appsignal/railtie.rb
-- lib/appsignal/to_appsignal_hash.rb
+- lib/appsignal/rack/instrumentation.rb
+- lib/appsignal/rack/listener.rb
 - lib/appsignal/transaction.rb
+- lib/appsignal/transaction/formatter.rb
 - lib/appsignal/transaction/params_sanitizer.rb
-- lib/appsignal/transaction/transaction_formatter.rb
 - lib/appsignal/transmitter.rb
 - lib/appsignal/version.rb
 - lib/generators/appsignal/USAGE
 - lib/generators/appsignal/appsignal_generator.rb
 - lib/generators/appsignal/templates/appsignal.yml
-- log/.gitkeep
 - resources/cacert.pem
-- spec/appsignal/agent_spec.rb
-- spec/appsignal/aggregator/post_processor_spec.rb
-- spec/appsignal/aggregator_spec.rb
-- spec/appsignal/auth_check_spec.rb
-- spec/appsignal/capistrano_spec.rb
-- spec/appsignal/cli_spec.rb
-- spec/appsignal/config_spec.rb
-- spec/appsignal/inactive_railtie_spec.rb
-- spec/appsignal/integrations/passenger_spec.rb
-- spec/appsignal/listener_spec.rb
-- spec/appsignal/marker_spec.rb
-- spec/appsignal/middleware/action_view_sanitizer_spec.rb
-- spec/appsignal/middleware/active_record_sanitizer_spec.rb
-- spec/appsignal/middleware/chain_spec.rb
-- spec/appsignal/middleware/delete_blanks_spec.rb
-- spec/appsignal/railtie_spec.rb
-- spec/appsignal/to_appsignal_hash_spec.rb
-- spec/appsignal/transaction/params_sanitizer_spec.rb
-- spec/appsignal/transaction/transaction_formatter_spec.rb
-- spec/appsignal/transaction_spec.rb
-- spec/appsignal/transmitter_spec.rb
-- spec/appsignal_spec.rb
-- spec/generators/appsignal/appsignal_generator_spec.rb
+- spec/lib/appsignal/agent_spec.rb
+- spec/lib/appsignal/aggregator/middleware/action_view_sanitizer_spec.rb
+- spec/lib/appsignal/aggregator/middleware/active_record_sanitizer_spec.rb
+- spec/lib/appsignal/aggregator/middleware/chain_spec.rb
+- spec/lib/appsignal/aggregator/middleware/delete_blanks_spec.rb
+- spec/lib/appsignal/aggregator/post_processor_spec.rb
+- spec/lib/appsignal/aggregator_spec.rb
+- spec/lib/appsignal/auth_check_spec.rb
+- spec/lib/appsignal/cli_spec.rb
+- spec/lib/appsignal/config_spec.rb
+- spec/lib/appsignal/integrations/capistrano_spec.rb
+- spec/lib/appsignal/integrations/passenger_spec.rb
+- spec/lib/appsignal/integrations/rails_spec.rb
+- spec/lib/appsignal/integrations/sinatra_spec.rb
+- spec/lib/appsignal/marker_spec.rb
+- spec/lib/appsignal/rack/instrumentation_spec.rb
+- spec/lib/appsignal/rack/listener_spec.rb
+- spec/lib/appsignal/transaction/formatter_spec.rb
+- spec/lib/appsignal/transaction/params_sanitizer_spec.rb
+- spec/lib/appsignal/transaction_spec.rb
+- spec/lib/appsignal/transmitter_spec.rb
+- spec/lib/appsignal_spec.rb
+- spec/lib/generators/appsignal/appsignal_generator_spec.rb
+- spec/lib/tmp/config/appsignal.yml
 - spec/spec_helper.rb
 - spec/support/delegate_matcher.rb
+- spec/support/fixtures/generated_config.yml
+- spec/support/fixtures/uploaded_file.txt
+- spec/support/helpers/config_helpers.rb
 - spec/support/helpers/notification_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
-homepage: http://github.com/appsignal/appsignal
+- spec/support/project_fixture/config/appsignal.yml
+- spec/support/project_fixture/log/.gitkeep
+- spec/support/rails/my_app.rb
+homepage: https://github.com/appsignal/appsignal
 licenses:
 - MIT
 metadata: {}
@@ -203,12 +212,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -216,30 +225,37 @@ signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app toappsignal.com
 test_files:
-- spec/appsignal/agent_spec.rb
-- spec/appsignal/aggregator/post_processor_spec.rb
-- spec/appsignal/aggregator_spec.rb
-- spec/appsignal/auth_check_spec.rb
-- spec/appsignal/capistrano_spec.rb
-- spec/appsignal/cli_spec.rb
-- spec/appsignal/config_spec.rb
-- spec/appsignal/inactive_railtie_spec.rb
-- spec/appsignal/integrations/passenger_spec.rb
-- spec/appsignal/listener_spec.rb
-- spec/appsignal/marker_spec.rb
-- spec/appsignal/middleware/action_view_sanitizer_spec.rb
-- spec/appsignal/middleware/active_record_sanitizer_spec.rb
-- spec/appsignal/middleware/chain_spec.rb
-- spec/appsignal/middleware/delete_blanks_spec.rb
-- spec/appsignal/railtie_spec.rb
-- spec/appsignal/to_appsignal_hash_spec.rb
-- spec/appsignal/transaction/params_sanitizer_spec.rb
-- spec/appsignal/transaction/transaction_formatter_spec.rb
-- spec/appsignal/transaction_spec.rb
-- spec/appsignal/transmitter_spec.rb
-- spec/appsignal_spec.rb
-- spec/generators/appsignal/appsignal_generator_spec.rb
+- spec/lib/appsignal/agent_spec.rb
+- spec/lib/appsignal/aggregator/middleware/action_view_sanitizer_spec.rb
+- spec/lib/appsignal/aggregator/middleware/active_record_sanitizer_spec.rb
+- spec/lib/appsignal/aggregator/middleware/chain_spec.rb
+- spec/lib/appsignal/aggregator/middleware/delete_blanks_spec.rb
+- spec/lib/appsignal/aggregator/post_processor_spec.rb
+- spec/lib/appsignal/aggregator_spec.rb
+- spec/lib/appsignal/auth_check_spec.rb
+- spec/lib/appsignal/cli_spec.rb
+- spec/lib/appsignal/config_spec.rb
+- spec/lib/appsignal/integrations/capistrano_spec.rb
+- spec/lib/appsignal/integrations/passenger_spec.rb
+- spec/lib/appsignal/integrations/rails_spec.rb
+- spec/lib/appsignal/integrations/sinatra_spec.rb
+- spec/lib/appsignal/marker_spec.rb
+- spec/lib/appsignal/rack/instrumentation_spec.rb
+- spec/lib/appsignal/rack/listener_spec.rb
+- spec/lib/appsignal/transaction/formatter_spec.rb
+- spec/lib/appsignal/transaction/params_sanitizer_spec.rb
+- spec/lib/appsignal/transaction_spec.rb
+- spec/lib/appsignal/transmitter_spec.rb
+- spec/lib/appsignal_spec.rb
+- spec/lib/generators/appsignal/appsignal_generator_spec.rb
+- spec/lib/tmp/config/appsignal.yml
 - spec/spec_helper.rb
 - spec/support/delegate_matcher.rb
+- spec/support/fixtures/generated_config.yml
+- spec/support/fixtures/uploaded_file.txt
+- spec/support/helpers/config_helpers.rb
 - spec/support/helpers/notification_helpers.rb
 - spec/support/helpers/transaction_helpers.rb
+- spec/support/project_fixture/config/appsignal.yml
+- spec/support/project_fixture/log/.gitkeep
+- spec/support/rails/my_app.rb