librato-rails 0.9.0 → 0.10.0.pre1

data/test/unit/configuration_test.rb

@@ -1,85 +1,75 @@
 require 'test_helper'
 
-class LibratoRailsConfigTest < MiniTest::Unit::TestCase
+module Librato
+  module Rails
+    class ConfigTest < MiniTest::Unit::TestCase
 
-  def setup
-    Librato::Rails.explicit_source = nil
-  end
+      def teardown
+        ENV.delete('LIBRATO_USER')
+        ENV.delete('LIBRATO_TOKEN')
+        ENV.delete('LIBRATO_SOURCE')
+        # legacy
+        ENV.delete('LIBRATO_METRICS_USER')
+        ENV.delete('LIBRATO_METRICS_TOKEN')
+        ENV.delete('LIBRATO_METRICS_SOURCE')
+      end
 
-  def teardown
-    ENV.delete('LIBRATO_USER')
-    ENV.delete('LIBRATO_TOKEN')
-    ENV.delete('LIBRATO_SOURCE')
-    # legacy
-    ENV.delete('LIBRATO_METRICS_USER')
-    ENV.delete('LIBRATO_METRICS_TOKEN')
-    ENV.delete('LIBRATO_METRICS_SOURCE')
-    Librato::Rails.check_config
-    Librato::Rails.prefix = nil
-    Librato::Rails.explicit_source = nil
-  end
+      def test_environmental_variable_config
+        ENV['LIBRATO_USER'] = 'foo@bar.com'
+        ENV['LIBRATO_TOKEN'] = 'api_key'
+        ENV['LIBRATO_SOURCE'] = 'source'
+        config = Configuration.new
+        assert_equal 'foo@bar.com', config.user
+        assert_equal 'api_key', config.token
+        assert_equal 'source', config.source
+        assert config.explicit_source?, 'source is explicit'
+      end
 
-  def test_environmental_variable_config
-    ENV['LIBRATO_USER'] = 'foo@bar.com'
-    ENV['LIBRATO_TOKEN'] = 'api_key'
-    ENV['LIBRATO_SOURCE'] = 'source'
-    Librato::Rails.check_config
-    assert_equal 'foo@bar.com', Librato::Rails.user
-    assert_equal 'api_key', Librato::Rails.token
-    assert_equal 'source', Librato::Rails.source
-    assert Librato::Rails.explicit_source, 'source is explicit'
-  end
+      def test_legacy_env_variable_config
+        ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
+        ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
+        ENV['LIBRATO_METRICS_SOURCE'] = 'source'
+        config = Configuration.new
+        assert_equal 'foo@bar.com', config.user
+        assert_equal 'api_key', config.token
+        assert_equal 'source', config.source
+        assert config.explicit_source?, 'source is explicit'
+      end
 
-  def test_legacy_env_variable_config
-    ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
-    ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
-    ENV['LIBRATO_METRICS_SOURCE'] = 'source'
-    Librato::Rails.check_config
-    assert_equal 'foo@bar.com', Librato::Rails.user
-    assert_equal 'api_key', Librato::Rails.token
-    assert_equal 'source', Librato::Rails.source
-    assert Librato::Rails.explicit_source, 'source is explicit'
-  end
+      def test_config_file_config
+        config = fixture_config
+        assert_equal 'test@bar.com', config.user
+        assert_equal 'test api key', config.token
+        assert_equal 'rails-test', config.prefix
+        assert_equal 30, config.flush_interval
+        assert_equal 'custom-1', config.source
+        assert_equal false, config.source_pids
+        assert config.explicit_source?, 'source is explicit'
+      end
 
-  def test_config_file_config
-    with_fixture_config do
-      assert_equal 'test@bar.com', Librato::Rails.user
-      assert_equal 'test api key', Librato::Rails.token
-      assert_equal 'rails-test', Librato::Rails.prefix
-      assert_equal 30, Librato::Rails.flush_interval
-      assert_equal 'custom-1', Librato::Rails.source
-      assert_equal false, Librato::Rails.source_pids
-      assert Librato::Rails.explicit_source, 'source is explicit'
-    end
-  end
+      def test_implicit_source
+        config = fixture_config('simple')
+        assert_equal 'test@bar.com', config.user
+        assert_equal 'test api key', config.token
+        assert !config.explicit_source?, 'source is not explicit'
+      end
 
-  def test_implicit_source
-    with_fixture_config('simple') do
-      assert_equal 'test@bar.com', Librato::Rails.user
-      assert_equal 'test api key', Librato::Rails.token
-      assert !Librato::Rails.explicit_source, 'source is not explicit'
-    end
-  end
+      def test_environmental_and_config_file_config
+        ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
+        ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
+        ENV['LIBRATO_METRICS_SOURCE'] = 'source'
+        config = fixture_config
+        assert_equal 'test@bar.com', config.user # from config file
+        assert_equal 'test api key', config.token # from config file
+        assert_equal 'rails-test', config.prefix # from config file
+        assert_equal 30, config.flush_interval # from config file
+      end
 
-  def test_environmental_and_config_file_config
-    ENV['LIBRATO_METRICS_USER'] = 'foo@bar.com'
-    ENV['LIBRATO_METRICS_TOKEN'] = 'api_key'
-    ENV['LIBRATO_METRICS_SOURCE'] = 'source'
-    with_fixture_config do
-      assert_equal 'test@bar.com', Librato::Rails.user # from config file
-      assert_equal 'test api key', Librato::Rails.token # from config file
-      assert_equal 'rails-test', Librato::Rails.prefix # from config file
-      assert_equal 30, Librato::Rails.flush_interval # from config file
-    end
-  end
+      def fixture_config(file='librato')
+        fixture_config = File.join(File.dirname(__FILE__), "../fixtures/config/#{file}.yml")
+        Configuration.new(:config_file => fixture_config)
+      end
 
-  def with_fixture_config(file='librato')
-    fixture_config = File.join(File.dirname(__FILE__), "../fixtures/config/#{file}.yml")
-    previous, Librato::Rails.config_file = Librato::Rails.config_file, fixture_config
-    Librato::Rails.check_config
-    yield
-  ensure
-    Librato::Rails.config_file = previous
+    end
   end
-
 end

data/test/unit/tracker_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+module Librato
+  module Rails
+    class TrackerTest < MiniTest::Unit::TestCase
+
+      def test_user_agent
+        config = Configuration.new
+        tracker = Tracker.new(config)
+        assert_match /librato\-rails/, tracker.send(:user_agent)
+      end
+
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.0
-  prerelease: 
+  version: 0.10.0.pre1
+  prerelease: 7
 platform: ruby
 authors:
 - Matt Sanders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: librato-metrics
+  name: librato-rack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -75,22 +75,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
 description: Report key app statistics to the Librato Metrics service and easily track
   your own custom metrics.
 email:
@@ -99,26 +83,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/librato/rack/middleware.rb
-- lib/librato/rack.rb
-- lib/librato/rails/aggregator.rb
-- lib/librato/rails/collector.rb
 - lib/librato/rails/configuration.rb
-- lib/librato/rails/counter_cache.rb
-- lib/librato/rails/group.rb
-- lib/librato/rails/logging.rb
 - lib/librato/rails/railtie.rb
+- lib/librato/rails/subscribers/cache.rb
+- lib/librato/rails/subscribers/controller.rb
+- lib/librato/rails/subscribers/mail.rb
+- lib/librato/rails/subscribers/render.rb
+- lib/librato/rails/subscribers/sql.rb
 - lib/librato/rails/subscribers.rb
-- lib/librato/rails/validating_queue.rb
+- lib/librato/rails/tracker.rb
 - lib/librato/rails/version.rb
-- lib/librato/rails/worker.rb
 - lib/librato/rails.rb
 - lib/librato-rails.rb
-- lib/tasks/metrics-rails_tasks.rake
 - LICENSE
 - Rakefile
 - README.md
 - CHANGELOG.md
+- FAQ.md
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/home.js
 - test/dummy/app/assets/javascripts/status.js
@@ -126,7 +107,9 @@ files:
 - test/dummy/app/assets/stylesheets/home.css
 - test/dummy/app/assets/stylesheets/status.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/cache_controller.rb
 - test/dummy/app/controllers/home_controller.rb
+- test/dummy/app/controllers/render_controller.rb
 - test/dummy/app/controllers/status_controller.rb
 - test/dummy/app/controllers/user_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -136,6 +119,10 @@ files:
 - test/dummy/app/models/user.rb
 - test/dummy/app/views/home/index.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/render/_first.html.erb
+- test/dummy/app/views/render/_second.html.erb
+- test/dummy/app/views/render/partial.html.erb
+- test/dummy/app/views/render/template.html.erb
 - test/dummy/app/views/status/code.html.erb
 - test/dummy/app/views/user_mailer/welcome_email.text.erb
 - test/dummy/config/application.rb
@@ -167,22 +154,19 @@ files:
 - test/dummy/script/rails
 - test/fixtures/config/librato.yml
 - test/fixtures/config/simple.yml
+- test/integration/cache_test.rb
 - test/integration/custom_test.rb
 - test/integration/mail_test.rb
+- test/integration/render_test.rb
 - test/integration/request_test.rb
 - test/integration/sql_test.rb
-- test/librato-rails_test.rb
-- test/remote/rails_remote_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
-- test/unit/aggregator_test.rb
 - test/unit/configuration_test.rb
-- test/unit/counter_cache_test.rb
-- test/unit/group_test.rb
-- test/unit/middleware_test.rb
-- test/unit/worker_test.rb
+- test/unit/tracker_test.rb
 homepage: https://github.com/librato/librato-rails
-licenses: []
+licenses:
+- BSD 3-clause
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -195,16 +179,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 928415932724141645
+      hash: -1394071796353976924
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 928415932724141645
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -219,7 +200,9 @@ test_files:
 - test/dummy/app/assets/stylesheets/home.css
 - test/dummy/app/assets/stylesheets/status.css
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/cache_controller.rb
 - test/dummy/app/controllers/home_controller.rb
+- test/dummy/app/controllers/render_controller.rb
 - test/dummy/app/controllers/status_controller.rb
 - test/dummy/app/controllers/user_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -229,6 +212,10 @@ test_files:
 - test/dummy/app/models/user.rb
 - test/dummy/app/views/home/index.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/render/_first.html.erb
+- test/dummy/app/views/render/_second.html.erb
+- test/dummy/app/views/render/partial.html.erb
+- test/dummy/app/views/render/template.html.erb
 - test/dummy/app/views/status/code.html.erb
 - test/dummy/app/views/user_mailer/welcome_email.text.erb
 - test/dummy/config/application.rb
@@ -260,17 +247,13 @@ test_files:
 - test/dummy/script/rails
 - test/fixtures/config/librato.yml
 - test/fixtures/config/simple.yml
+- test/integration/cache_test.rb
 - test/integration/custom_test.rb
 - test/integration/mail_test.rb
+- test/integration/render_test.rb
 - test/integration/request_test.rb
 - test/integration/sql_test.rb
-- test/librato-rails_test.rb
-- test/remote/rails_remote_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
-- test/unit/aggregator_test.rb
 - test/unit/configuration_test.rb
-- test/unit/counter_cache_test.rb
-- test/unit/group_test.rb
-- test/unit/middleware_test.rb
-- test/unit/worker_test.rb
+- test/unit/tracker_test.rb

data/lib/librato/rack/middleware.rb

@@ -1,47 +0,0 @@
-class Librato::Rack::Middleware
-  def initialize(app, metrics = Librato::Rails)
-    @app, @metrics = app, metrics
-  end
-
-  def call(env)
-    @metrics.check_worker
-
-    header_metrics env
-
-    time     = Time.now
-    response = @app.call(env)
-    duration = (Time.now - time) * 1000.0
-
-    request_metrics response.first, duration
-
-    response
-  end
-
-  private
-
-  def header_metrics(env)
-    return unless env.keys.include?('HTTP_X_HEROKU_QUEUE_DEPTH')
-
-    @metrics.group 'rack.heroku' do |group|
-      group.measure 'queue.depth',     env['HTTP_X_HEROKU_QUEUE_DEPTH'].to_f
-      group.timing  'queue.wait_time', env['HTTP_X_HEROKU_QUEUE_WAIT_TIME'].to_f
-      group.measure 'queue.dynos',     env['HTTP_X_HEROKU_DYNOS_IN_USE'].to_f
-    end
-  end
-
-  def request_metrics(status, duration)
-    @metrics.group 'rack.request' do |group|
-      group.increment 'total'
-      group.timing    'time', duration
-      group.increment 'slow' if duration > 200.0
-
-      group.group 'status' do |s|
-        s.increment status
-        s.increment "#{status.to_s[0]}xx"
-
-        s.timing "#{status}.time", duration
-        s.timing "#{status.to_s[0]}xx.time", duration
-      end
-    end
-  end
-end

data/lib/librato/rack.rb

@@ -1,4 +0,0 @@
-module Librato::Rack
-end
-
-require 'librato/rack/middleware'

data/lib/librato/rails/aggregator.rb

@@ -1,95 +0,0 @@
-module Librato
-  module Rails
-    class Aggregator
-      extend Forwardable
-
-      def_delegators :@cache, :empty?, :prefix, :prefix=
-
-      def initialize(options={})
-        @cache = Librato::Metrics::Aggregator.new(:prefix => options[:prefix])
-        @lock = Mutex.new
-      end
-
-      def [](key)
-        fetch(key)
-      end
-
-      def fetch(key, options={})
-        return nil if @cache.empty?
-        gauges = nil
-        source = options[:source]
-        @lock.synchronize { gauges = @cache.queued[:gauges] }
-        gauges.each do |metric|
-          if metric[:name] == key.to_s
-            return metric if !source && !metric[:source]
-            return metric if source.to_s == metric[:source]
-          end
-        end
-        nil
-      end
-
-      def delete_all
-        @lock.synchronize { @cache.clear }
-      end
-
-      # transfer all measurements to queue and reset internal status
-      def flush_to(queue, options={})
-        queued = nil
-        @lock.synchronize do
-          return if @cache.empty?
-          queued = @cache.queued
-          @cache.clear
-        end
-        queue.merge!(queued) if queued
-      end
-
-      # @example Simple measurement
-      #   measure 'sources_returned', sources.length
-      #
-      # @example Simple timing in milliseconds
-      #   timing 'twitter.lookup', 2.31
-      #
-      # @example Block-based timing
-      #   timing 'db.query' do
-      #     do_my_query
-      #   end
-      #
-      # @example Custom source
-      #    measure 'user.all_orders', user.order_count, :source => user.id
-      #
-      def measure(*args, &block)
-        options = {}
-        event = args[0].to_s
-        returned = nil
-
-        # handle block or specified argument
-        if block_given?
-          start = Time.now
-          returned = yield
-          value = ((Time.now - start) * 1000.0).to_i
-        elsif args[1]
-          value = args[1]
-        else
-          raise "no value provided"
-        end
-
-        # detect options hash if present
-        if args.length > 1 and args[-1].respond_to?(:each)
-          options = args[-1]
-        end
-        source = options[:source]
-
-        @lock.synchronize do
-          if source
-            @cache.add event => {:source => source, :value => value}
-          else
-            @cache.add event => value
-          end
-        end
-        returned
-      end
-      alias :timing :measure
-
-    end
-  end
-end

data/lib/librato/rails/collector.rb

@@ -1,45 +0,0 @@
-
-# an abstract collector object which can be given measurement values
-# and can periodically report those values back to the Metrics service
-
-module Librato
-  module Rails
-    class Collector
-      extend Forwardable
-
-      def_delegators :counters, :increment
-      def_delegators :aggregate, :measure, :timing
-
-      # access to internal aggregator object
-      def aggregate
-        @aggregator_cache ||= Aggregator.new(:prefix => @prefix)
-      end
-
-      # access to internal counters object
-      def counters
-        @counter_cache ||= CounterCache.new
-      end
-
-      # remove any accumulated but unsent metrics
-      def delete_all
-        aggregate.delete_all
-        counters.delete_all
-      end
-
-      def group(prefix)
-        group = Group.new(prefix)
-        yield group
-      end
-
-      # update prefix
-      def prefix=(new_prefix)
-        @prefix = new_prefix
-        aggregate.prefix = @prefix
-      end
-
-      def prefix
-        @prefix
-      end
-    end
-  end
-end

data/lib/librato/rails/counter_cache.rb

@@ -1,122 +0,0 @@
-module Librato
-  module Rails
-
-    class CounterCache
-      DEFAULT_SOURCE = '%%'
-
-      extend Forwardable
-
-      def_delegators :@cache, :empty?
-
-      def initialize
-        @cache = {}
-        @lock = Mutex.new
-        @sporadics = {}
-      end
-
-      # Retrieve the current value for a given metric. This is a short
-      # form for convenience which only retrieves metrics with no custom
-      # source specified. For more options see #fetch.
-      #
-      # @param [String|Symbol] key metric name
-      # @return [Integer|Float] current value
-      def [](key)
-        @lock.synchronize do
-          @cache[key.to_s][DEFAULT_SOURCE]
-        end
-      end
-
-      # removes all tracked metrics. note this removes all measurement
-      # data AND metric names any continuously tracked metrics will not
-      # report until they get another measurement
-      def delete_all
-        @lock.synchronize { @cache.clear }
-      end
-
-
-      def fetch(key, options={})
-        source = DEFAULT_SOURCE
-        if options[:source]
-          source = options[:source].to_s
-        end
-        @lock.synchronize do
-          return nil unless @cache[key.to_s]
-          @cache[key.to_s][source]
-        end
-      end
-
-      # transfer all measurements to queue and reset internal status
-      def flush_to(queue)
-        counts = nil
-        @lock.synchronize do
-          # work off of a duplicate data set so we block for
-          # as little time as possible
-          counts = Marshal.load(Marshal.dump(@cache))
-          reset_cache
-        end
-        counts.each do |key, data|
-          data.each do |source, value|
-            if source == DEFAULT_SOURCE
-              queue.add key => value
-            else
-              queue.add key => {:value => value, :source => source}
-            end
-          end
-        end
-      end
-
-      # Increment a given metric
-      #
-      # @example Increment metric 'foo' by 1
-      #   increment :foo
-      #
-      # @example Increment metric 'bar' by 2
-      #   increment :bar, :by => 2
-      #
-      # @example Increment metric 'foo' by 1 with a custom source
-      #   increment :foo, :source => user.id
-      #
-      def increment(counter, options={})
-        counter = counter.to_s
-        if options.is_a?(Fixnum)
-          # suppport legacy style
-          options = {:by => options}
-        end
-        by = options[:by] || 1
-        source = DEFAULT_SOURCE
-        if options[:source]
-          source = options[:source].to_s
-        end
-        if options[:sporadic]
-          make_sporadic(counter, source)
-        end
-        @lock.synchronize do
-          @cache[counter] ||= {}
-          @cache[counter][source] ||= 0
-          @cache[counter][source] += by
-        end
-      end
-
-      private
-
-      def make_sporadic(metric, source)
-        @sporadics[metric] ||= Set.new
-        @sporadics[metric] << source
-      end
-
-      def reset_cache
-        # remove any source/metric pairs that aren't continuous
-        @sporadics.each do |key, sources|
-          sources.each { |source| @cache[key].delete(source) }
-        end
-        @sporadics.clear
-        # reset all continuous source/metric pairs to 0
-        @cache.each_key do |key|
-          @cache[key].each_key { |source| @cache[key][source] = 0 }
-        end
-      end
-
-    end
-
-  end
-end