carnivore 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ebd582b172d7f8a172e53b246fb649662b62f4
-  data.tar.gz: daa0ee227892628fdcc56bd3e045d7740aa5535a
+  metadata.gz: f174c035064f92e9c034561667159f358152c09d
+  data.tar.gz: af6561fd2a8de3753cd4bc257e6d9bc2dba3e2c6
 SHA512:
-  metadata.gz: 9536220e9976707a1b05c7af17b340e0ff04077ce4956b28ea4e3444783da856f371c8c796a4d7637c9f1f7985558027e8754e1de46ac36cd128ced3b300247b
-  data.tar.gz: 93b87e705f41946c55eeee4387066f731f8f99e190e8ca9d302629de8b87005fb1c16e09c9fe1bcca6659e259f23a87f9344444b5bf63897c56271b50c085126
+  metadata.gz: 530cba3b2a2be5b5d19ad82c376b5b94239bcaacedc81facb9f144b6d7de6d1a067ba3a2b5948a68268f6a8c3d12621e9d83713e0660a7f3461939ec4820942b
+  data.tar.gz: 5627c21026d731dc1c896e4c3b82e67d9915859fa1d1daf0171fff6fab40cab6a409012929069d33a96b1f07dbf083821383940e355f7b4641ef58a60975a688

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.3.6
+* Add `Carnivore::Source.clear!` helper
+* Integrate memoization helpers
+* Fix up config specs to proper load in config
+
 # v0.3.4
 * Remove loading of unused CLI library
 * Only terminate callback supervisor if alive

data/lib/carnivore/source.rb

@@ -10,6 +10,8 @@ module Carnivore
 
     class << self
 
+      include Bogo::Memoization
+
       # Builds a source container
       #
       # @param args [Hash] source configuration
@@ -31,14 +33,27 @@ module Carnivore
         inst
       end
 
+      # @return [Smash] Source class information
+      def source_classes
+        memoize(:source_classes, :global) do
+          Smash.new
+        end
+      end
+
+      # @return [Smash] Registered source information
+      def sources_registry
+        memoize(:sources, :global) do
+          Smash.new
+        end
+      end
+
       # Register a new source type
       #
       # @param type [Symbol] name of source type
       # @param require_path [String] path to require when requested
       # @return [TrueClass]
       def provide(type, require_path)
-        @source_klass ||= Smash.new
-        @source_klass[type] = require_path
+        source_classes[type] = require_path
         true
       end
 
@@ -47,8 +62,7 @@ module Carnivore
       # @param type [String, Symbol] name of source type
       # @return [String, NilClass]
       def require_path(type)
-        @source_klass ||= Smash.new
-        @source_klass[type]
+        source_classes[type]
       end
 
       # Register the container
@@ -57,8 +71,7 @@ module Carnivore
       # @param inst [SourceContainer]
       # @return [TrueClass]
       def register(name, inst)
-        @sources ||= Smash.new
-        @sources[name] = inst
+        sources_registry[name] = inst
         true
       end
 
@@ -67,8 +80,8 @@ module Carnivore
       # @param name [String, Symbol] name of source
       # @return [SourceContainer]
       def source(name)
-        if(@sources && @sources[name.to_sym])
-          @sources[name.to_sym]
+        if(sources_registry[name])
+          sources_registry[name]
         else
           Celluloid.logger.error "Source lookup failed (name: #{name})"
           abort KeyError.new("Requested named source is not registered: #{name}")
@@ -77,7 +90,12 @@ module Carnivore
 
       # @return [Array<SourceContainer>] registered source containers
       def sources
-        @sources ? @sources.values : []
+        sources_registry.values
+      end
+
+      # @return [NilClass] Remove any registered sources
+      def clear!
+        sources_registry.clear
       end
 
       # Reset communication methods within class
@@ -207,7 +225,12 @@ module Carnivore
     # Ensure we cleanup our internal supervisor before bailing out
     def teardown_cleanup
       warn 'Termination request received. Tearing down!'
-      callback_supervisor.terminate if callback_supervisor.alive?
+      if(callback_supervisor && callback_supervisor.alive?)
+        warn "Tearing down callback supervisor! (#{callback_supervisor})"
+        callback_supervisor.terminate
+      else
+        warn 'Callback supervisor is not alive. No teardown issued'
+      end
     end
 
     # @return [TrueClass, FalseClass] automatic message confirmation enabled

data/lib/carnivore/version.rb

@@ -1,4 +1,4 @@
 module Carnivore
   # Current version of library
-  VERSION = Gem::Version.new('0.3.4')
+  VERSION = Gem::Version.new('0.3.6')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid