fluoride-collector 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79df9f5613527c47e3bfc8d757c779c992e0e34b
-  data.tar.gz: d00870129d5e02049f0d502dffcf5e2ba06f11e2
+  metadata.gz: e105ac67bef95d43c62790318839abbd6fe991eb
+  data.tar.gz: 888928f7e2a84edab100ca809c51788bf1ece05f
 SHA512:
-  metadata.gz: edcf5210f705bcf17fd40c5734a95537fe09877365761e6bfe68ccb159ceae23bbda5c949969fad19871418702695e648a3a38c22f2bd4e1ebcd36bb417923d0
-  data.tar.gz: 355afa02a28de428224911db463581798c9dec9d257e6ba91030056c3e8b7b07b55ec3ebfaebbb133acd3ba2d02a804f5c2e354b3ecb819ecd4c0533335b915a
+  metadata.gz: bc2e0053d0b0cdbe700dffa08514b38990a88640bd059d6c01ab9bc56d3f654b0cff179889eae9585133c0d7fe89b4e0feed935e38d4da8df7094627cce5d56e
+  data.tar.gz: e07ceb9cfde86ead95d37a32f5e621c2555f0f8a33fa6278ca224ad3f31ec3f1314f6cae95f9d18c86d822921f6a3e82d7585406b21bb9b14ba40b40eb9ec778

data/lib/fluoride-collector/middleware.rb

@@ -1,39 +1,46 @@
 module Fluoride
   module Collector
     class Middleware
-      def initialize(app, directory, tagging = nil)
+      def initialize(app, directory, storage_limit = 250_000_000, tagging = nil)
         @app = app
         @directory = directory
+        @storage_limit = storage_limit
         @tagging = tagging
       end
 
-      def call(env)
-        @app.call(env).tap do |response|
-          record_exchange(env, response)
-        end
-      rescue Object => ex
-        record_exception(env, ex)
-        raise
+      private
+
+      def thread_locals
+        Thread.current[:fluoride_collector] ||= {}
       end
 
-      private
+      def storage_path
+        thread_locals[collection_type] ||= File::join(@directory, "#{collection_type}-#{Process.pid}-#{Thread.current.object_id}.yml")
+      end
+
+      def storage_file
+        FileUtils.mkdir_p(File::dirname(storage_path))
+        return if storage_used > @storage_limit
+        File::open(storage_path, "a") do |file|
+          yield file
+        end
+      end
 
-      def record_exchange(env, response)
-        store(
-          "type" => "normal_exchange",
-          "tags" => @tagging,
-          "request" => request_hash(env),
-          "response" => response_hash(response)
-        )
+      def storage_used
+        dir = Dir.new(@directory)
+        dir.inject(0) do |sum, file|
+          if file =~ %r{\A\.}
+            sum
+          else
+            sum + File.size(File::join(@directory, file))
+          end
+        end
       end
 
-      def record_exception(env, ex)
-        store(
-          "type" => "exception_raised",
-          "tags" => @tagging,
-          "request" => request_hash(env),
-          "response" => exception_hash(ex)
-        )
+      def store(record)
+        storage_file do |file|
+          file.write(YAML::dump(record))
+        end
       end
 
       def request_hash(env)
@@ -56,41 +63,69 @@ module Fluoride
         }
       end
 
-      def response_hash(response)
-        status, headers, body = *response
+      class CollectExceptions < Middleware
+        def call(env)
+          @app.call(env)
+        rescue Object => ex
+          store(
+            "type" => "exception_raised",
+            "tags" => @tagging,
+            "request" => request_hash(env),
+            "response" => exception_hash(ex)
+          )
+          raise
+        end
 
-        {
-          "status" => status,
-          "headers" => headers,
-          "body" => body.to_a.join("") #every body? all of it?
-        }
-      end
+        private
 
-      def exception_hash(ex)
-        {
-          "type" => ex.class.name,
-          "message" => ex.message,
-          "backtrace" => ex.backtrace[0..10]
-        }
-      end
+        def collection_type
+          :exception
+        end
 
-      def thread_locals
-        Thread.current[:fluoride_collector] ||= {}
+        def exception_hash(ex)
+          {
+            "type" => ex.class.name,
+            "message" => ex.message,
+            "backtrace" => ex.backtrace[0..10]
+          }
+        end
       end
 
-      def storage_path
-        thread_locals[:storage_path] ||= File::join(@directory, "collection-#{Process.pid}-#{Thread.current.object_id}.yml")
-      end
+      class CollectExchanges < Middleware
+        def call(env)
+          @app.call(env).tap do |response|
+            store(
+              "type" => "normal_exchange",
+              "tags" => @tagging,
+              "request" => request_hash(env),
+              "response" => response_hash(response)
+            )
+          end
+        end
 
-      def storage_file
-        File::open(storage_path, "a") do |file|
-          yield file
+        private
+
+        def collection_type
+          :exchange
         end
-      end
 
-      def store(record)
-        storage_file do |file|
-          file.write(YAML::dump(record))
+        def extract_body(body)
+          array = []
+          body.each do |chunk|
+            array << chunk
+          end
+          body.rewind if body.respond_to?(:rewind)
+          array
+        end
+
+        def response_hash(response)
+          status, headers, body = *response
+
+          {
+            "status" => status,
+            "headers" => headers,
+            "body" => extract_body(body)
+          }
         end
       end
     end

data/lib/fluoride-collector/rails/railtie.rb

@@ -2,12 +2,20 @@ module Fluoride
   module Collector
     class Railtie < ::Rails::Railtie
       config.fluoride = ActiveSupport::OrderedOptions.new
+      config.fluoride.storage_limit = 250_000_000
       config.fluoride.tags = nil
       config.fluoride.directory = "fluoride-collector"
 
       initializer "fluoride-collector.add_middleware" do |app|
-        app.middleware.insert_after("ActionDispatch::ShowExceptions",
-                                    Fluoride::Collector::Middleware, config.fluoride.directory, config.fluoride.tags)
+        app.middleware.use(   Fluoride::Collector::Middleware::CollectExceptions,
+                              config.fluoride.directory,
+                              config.fluoride.storage_limit,
+                              config.fluoride.tags)
+        app.middleware.insert("Rack::Sendfile",
+                              Fluoride::Collector::Middleware::CollectExchanges,
+                              config.fluoride.directory,
+                              config.fluoride.storage_limit,
+                              config.fluoride.tags)
       end
     end
   end

data/spec/middleware.rb

@@ -11,8 +11,9 @@ describe Fluoride::Collector::Middleware do
 
   let :app do
     run_app = test_app
+    klass = middleware_class
     Rack::Builder.app do
-      use Fluoride::Collector::Middleware, "collections", "TEST"
+      use klass, "collections", 1500, "TEST"
       run run_app
     end
   end
@@ -26,6 +27,10 @@ describe Fluoride::Collector::Middleware do
       Class.new(Exception)
     end
 
+    let :middleware_class do
+      Fluoride::Collector::Middleware::CollectExceptions
+    end
+
     let :test_app do
       lambda{|env| raise test_ex_class, "test exception"}
     end
@@ -42,7 +47,7 @@ describe Fluoride::Collector::Middleware do
           app.call(env)
         rescue test_ex_class
         end
-      end.to change{collection_directory.each.to_a.grep(/collection.*/).size}
+      end.to change{collection_directory.each.to_a.grep(/[a-z].*/).size}
     end
 
     it "should keep using the same collection file" do
@@ -56,8 +61,7 @@ describe Fluoride::Collector::Middleware do
           app.call(env)
         rescue test_ex_class
         end
-        path = File::join(collection_directory.path, collection_directory.each.to_a.grep(/collection.*/).first)
-      end.not_to change{collection_directory.each.to_a.grep(/collection.*/).size}
+      end.not_to change{collection_directory.each.to_a.grep(/[a-z].*/).size}
     end
 
     describe "creates a file" do
@@ -66,12 +70,12 @@ describe Fluoride::Collector::Middleware do
           app.call(env)
         rescue test_ex_class
         end
-        path = File::join(collection_directory.path, collection_directory.each.to_a.grep(/collection.*/).first)
+        path = File::join(collection_directory.path, collection_directory.each.to_a.grep(/[a-z].*/).first)
         YAML.load_stream(File.read(path)).first
       end
 
       it "should have tags" do
-        yaml["tags"].should == "TEST"
+        expect(yaml["tags"]).to eq "TEST"
       end
     end
   end
@@ -85,33 +89,36 @@ describe Fluoride::Collector::Middleware do
       [200, {'Content-Type' => 'text/plain'}, ['Just a test']]
     end
 
+    let :middleware_class do
+      Fluoride::Collector::Middleware::CollectExchanges
+    end
+
     it "should not change the response" do
-      app.call(env).should == response
+      expect(app.call(env)).to eq response
     end
 
     it "should create a collection file" do
       expect do
         app.call(env)
-      end.to change{collection_directory.each.to_a.grep(/collection.*/).size}
+      end.to change{collection_directory.each.to_a.grep(/[a-z].*/).size}
     end
 
     it "should keep using the same collection file" do
       app.call(env)
       expect do
         app.call(env)
-        path = File::join(collection_directory.path, collection_directory.each.to_a.grep(/collection.*/).first)
-      end.not_to change{collection_directory.each.to_a.grep(/collection.*/).size}
+      end.not_to change{collection_directory.each.to_a.grep(/[a-z].*/).size}
     end
 
     describe "creates a file" do
       let :yaml do
         app.call(env)
-        path = File::join(collection_directory.path, collection_directory.each.to_a.grep(/collection.*/).first)
+        path = File::join(collection_directory.path, collection_directory.each.to_a.grep(/[a-z].*/).first)
         YAML.load_stream(File.read(path)).first
       end
 
       it "should have tags" do
-        yaml["tags"].should == "TEST"
+        expect(yaml["tags"]).to eq "TEST"
       end
     end
   end

data/spec/railtie.rb

@@ -1,10 +1,15 @@
 require 'railtie-help'
 
 describe Fluoride::Collector::Railtie do
-  it "should update the middleware stack" do
-    #Ugh :(
+  it "should add exception collection to the middleware stack" do
+    expect(Rails.application.middleware.middlewares).to include(Fluoride::Collector::Middleware::CollectExceptions)
+  end
 
-    Rails.application.middleware.middlewares.should include(Fluoride::Collector::Middleware)
+  it "should add exchange collection to the middleware stack" do
+    expect(Rails.application.middleware.middlewares).to include(Fluoride::Collector::Middleware::CollectExchanges)
   end
 
+  it "should put exchange collection at top of stack" do
+    expect(Rails.application.middleware.middlewares.first).to eq(Fluoride::Collector::Middleware::CollectExchanges)
+  end
 end

data/spec_help/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'rspec'
 require 'rspec/core/formatters/base_formatter'
-require 'cadre/rspec'
 require 'file-sandbox'
+require 'cadre/rspec3'
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
-  config.add_formatter(Cadre::RSpec::NotifyOnCompleteFormatter)
-  config.add_formatter(Cadre::RSpec::QuickfixFormatter)
+  config.add_formatter(Cadre::RSpec3::NotifyOnCompleteFormatter)
+  config.add_formatter(Cadre::RSpec3::QuickfixFormatter)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluoride-collector
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies: []
 description: |2
     Part of the Fluoride suite - tools for making your black box a bit whiter
@@ -38,7 +38,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- fluoride-collector-0.0.1 Documentation
+- fluoride-collector-0.0.2 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement