fluq 0.7.1 → 0.7.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 240ecd9e84a3fea2591a68753d3d19ac51cd3d16
+  data.tar.gz: e7bf2c74811db0f04aa038005bb20e740184c627
+SHA512:
+  metadata.gz: 32e440e6093f7561aa8eb24934657fdaa3b7d20d63e9683e313af0e2b845f8e6eba3a26d980c9e8a34ca98f80fbedc56e17d899651db79376ca704dff54b8fa6
+  data.tar.gz: f719ef726e7712087ee14316086e1bc1a350c6f2b9369548ae86e5f35c7c4f629cc03f249a2e48b716ad036fb3a7c4c6b405e2d61930ff106d9f60e967d2dd57

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluq (0.7.1)
+    fluq (0.7.3)
       eventmachine-le
       msgpack (~> 0.5.0)
       oj (>= 2.0.10)
@@ -11,20 +11,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.4)
-    eventmachine-le (1.1.5)
-    msgpack (0.5.5)
-    oj (2.1.3)
+    eventmachine-le (1.1.6)
+    msgpack (0.5.6)
+    oj (2.1.7)
     rake (10.1.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.4)
     timed_lru (0.3.1)
-    yard (0.8.6.2)
+    yard (0.8.7.2)
 
 PLATFORMS
   java

data/lib/fluq.rb

@@ -8,6 +8,7 @@ require 'eventmachine'
 require 'msgpack'
 require 'oj'
 require 'timed_lru'
+require 'timeout'
 
 module FluQ
   %w'version error mixins'.each do |name|

data/lib/fluq/dsl/options.rb

@@ -1,4 +1,4 @@
-class FluQ::DSL::Options
+class FluQ::DSL::Options < ::BasicObject
 
   # Constructor
   # @yield options assigment
@@ -18,7 +18,7 @@ class FluQ::DSL::Options
       value = args[0]
       if value && block
         @opts[name.to_sym] = value
-        @opts[:"#{name}_options"] = self.class.new(&block).to_hash
+        @opts[:"#{name}_options"] = ::FluQ::DSL::Options.new(&block).to_hash
       else
         @opts[name.to_sym] = value || block || true
       end

data/lib/fluq/handler/base.rb

@@ -44,7 +44,7 @@ class FluQ::Handler::Base
   # @param [Array<FluQ::Event>] events
   # @return [Array<FluQ::Event>] matching events
   def select(events)
-    events.select &method(:match?)
+    events.select {|e| match?(e) }
   end
 
   # @abstract callback, called on each event
@@ -56,7 +56,7 @@ class FluQ::Handler::Base
 
     # Configuration defaults
     def defaults
-      { pattern: /./ }
+      { pattern: /./, timeout: 60 }
     end
 
     # @return [String] generated name

data/lib/fluq/mixins/logger.rb

@@ -23,4 +23,4 @@ module FluQ::Mixins::Logger
     end
   end
 
-end
+end

data/lib/fluq/reactor.rb

@@ -65,8 +65,12 @@ class FluQ::Reactor
           matching = handler.select(events)
           next if matching.empty?
 
-          handler.on_events(matching)
+          ::Timeout.timeout handler.config[:timeout] do
+            handler.on_events(matching)
+          end
           logger.info { "#{handler.name} processed #{matching.size}/#{events.size} events in #{((Time.now - start) * 1000).round}ms" }
+        rescue Timeout::Error => tx
+          logger.crash "#{handler.class.name} #{handler.name} timeout out after #{handler.config[:timeout]}s", tx
         rescue => ex
           logger.crash "#{handler.class.name} #{handler.name} failed: #{ex.class.name} #{ex.message}", ex
         end

data/lib/fluq/testing.rb

@@ -2,6 +2,7 @@ require 'fluq'
 
 module FluQ::Testing
   extend self
+  EXCEPTION_TRACKER = ->ex { FluQ::Testing.exceptions.push(ex) }
 
   def wait_until(opts = {}, &block)
     tick = opts[:tick] || 0.01
@@ -9,6 +10,16 @@ module FluQ::Testing
     Timeout.timeout(max) { sleep(tick) until block.call }
   rescue Timeout::Error
   end
+
+  def exceptions
+    @exceptions ||= []
+  end
+
+  def track_exceptions!(logger = FluQ.logger)
+    return if logger.exception_handlers.include?(EXCEPTION_TRACKER)
+    logger.exception_handler(&EXCEPTION_TRACKER)
+  end
+
 end
 
 class FluQ::Handler::Test < FluQ::Handler::Base
@@ -23,4 +34,6 @@ class FluQ::Handler::Test < FluQ::Handler::Base
     raise RuntimeError, "Test Failure!" if events.any? {|e| e.tag == "error.event" }
     @events.concat events
   end
+
 end
+

data/lib/fluq/version.rb

@@ -1,3 +1,3 @@
 module FluQ
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

data/spec/fluq/dsl/options_spec.rb

@@ -7,6 +7,11 @@ describe FluQ::DSL::Options do
     subject.to_hash.should == { val: 42 }
   end
 
+  it 'should not collide with globals' do
+    subject = described_class.new { timeout 43 }
+    subject.to_hash.should == { timeout: 43 }
+  end
+
   it 'should store block options' do
     subject = described_class.new { val { 42 } }
     subject.to_hash[:val].().should == 42

data/spec/fluq/handler/base_spec.rb

@@ -7,7 +7,7 @@ describe FluQ::Handler::Base do
   it { should respond_to(:on_events) }
   it { should be_a(FluQ::Mixins::Loggable) }
   its(:reactor) { should be(reactor) }
-  its(:config)  { should == { pattern: /./ } }
+  its(:config)  { should == { pattern: /./, timeout: 60 } }
   its(:pattern) { should == /./ }
   its(:name)    { should == "base-AxPGxv" }
 
@@ -67,4 +67,4 @@ describe FluQ::Handler::Base do
     ]
   end
 
-end
+end

data/spec/fluq/handler/log_spec.rb

@@ -10,7 +10,7 @@ describe FluQ::Handler::Log do
   before     { FileUtils.rm_rf(root); FileUtils.mkdir_p(root) }
 
   it { should be_a(FluQ::Handler::Base) }
-  its("config.keys") { should =~ [:convert, :path, :pattern, :rewrite, :cache_max, :cache_ttl] }
+  its("config.keys") { should =~ [:convert, :path, :pattern, :rewrite, :cache_max, :cache_ttl, :timeout] }
 
   it "can log events" do
     subject.on_events [event]

data/spec/fluq/reactor_spec.rb

@@ -4,6 +4,7 @@ describe FluQ::Reactor do
 
   its(:handlers)    { should == [] }
   its(:inputs)      { should == [] }
+  before            { FluQ::Testing.exceptions.clear }
 
   def events(*tags)
     tags.map do |tag|
@@ -53,6 +54,16 @@ describe FluQ::Reactor do
     subject.process(events("error.event"))
     10.times { subject.process(events("ok.now")) }
     h1.should have(20).events
+    FluQ::Testing.should have(1).exceptions
+    FluQ::Testing.exceptions.last.should be_instance_of(RuntimeError)
   end
 
-end
+  it "should recover timeouts" do
+    h1 = subject.register(FluQ::Handler::Test, timeout: 0.001)
+    h1.events.should_receive(:concat).and_return {|*| sleep(0.01) }
+    subject.process [FluQ::Event.new("ok.event", Time.now.to_i, "sleep" => 0.05)]
+    FluQ::Testing.should have(1).exceptions
+    FluQ::Testing.exceptions.last.should be_instance_of(Timeout::Error)
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'fluq/testing'
 
 FluQ.logger = Logger.new(FluQ.root.join("log", "fluq.log").to_s)
+FluQ::Testing.track_exceptions!
 
 $LOAD_PATH.unshift FluQ.root.join('lib')
 Random.srand(1234)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fluq
 version: !ruby/object:Gem::Version
-  version: 0.7.1
-  prerelease: 
+  version: 0.7.3
 platform: ruby
 authors:
 - Black Square Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,113 +27,99 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine-le
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: timed_lru
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The minimalistic stream processor
@@ -215,27 +198,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/bsm/fluq
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: FluQ
 test_files: []
 has_rdoc: