carnivore 0.2.16 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 011ab8b22ae76b8be44ce315fcf7a9b1a1a136c4
-  data.tar.gz: aefffbceab3c592743e3a542cb5b226822cfaae1
+  metadata.gz: 95abd8e88a4967ca0085fbd0c14a5a768d0df98f
+  data.tar.gz: 5a34e744105ff3d482d8d98d5c2c1bba8c70a5f5
 SHA512:
-  metadata.gz: 15f085834d83fc162c2f3f937e695cd7a4ebafa3896103b2d73455c067f64f8211e1a97526527263c3805917428c87cae6b6cbb0d2bf79cd36c1f0a17c8433d3
-  data.tar.gz: 55dd49f607ce11a731c2d4155b3fbb758ebbf009c59917499e9222bc1df55cd1f0c5e6f67d197c5f4b99aab062adc46e070f4ec62e6062e172880805f55cca87
+  metadata.gz: f281d3203d532de93c3ff8164fd9ee25f390b82263759b6ca59a20a75c70a8ecd3a0c43aea349c3b6bfb1cb4a9b913b65aeddfff653439a8c250fda4062c8b37
+  data.tar.gz: c0a8cd07562ce92166f985007c6b3a053d73e10ad5055784971648d2689ffbefbb376aab6b878220ec82a5e52c1d21fa46dec34468ce20422642710b846d09bb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.0
+* Remove custom rolled configuration
+* Auto define configuration when not set prior to start
+
 # v0.2.16
 * Log incoming messages at info level
 * Add Source#touch method

data/README.md

@@ -16,8 +16,9 @@ stuff gets done. Super simple!
 3. Profit!
 
 ```ruby
+require 'carnivore'
 Carnivore.configure do
-  src = Source.build(:type => :test, :args => {})
+  src = Carnivore::Source.build(:type => :test, :args => {})
   src.add_callback(:print_message) do |msg|
     puts "Received message: #{msg}"
   end
@@ -111,4 +112,4 @@ end.start!
 ## Info
 
 * Repository: https://github.com/carnivore-rb/carnivore
-* IRC: Freenode @ #carnivore
+* IRC: Freenode @ #carnivore

data/carnivore.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license = 'Apache 2.0'
   s.require_path = 'lib'
   s.add_dependency 'celluloid'
-  s.add_dependency 'mixlib-config'
+  s.add_dependency 'bogo-config'
   s.add_dependency 'multi_json'
   s.add_dependency 'hashie'
   s.files = Dir['lib/**/*'] + %w(carnivore.gemspec README.md CHANGELOG.md)

data/lib/carnivore.rb

@@ -2,12 +2,13 @@
 autoload :Celluloid, 'celluloid'
 autoload :MultiJson, 'multi_json'
 
+require 'bogo-cli'
+require 'bogo-config'
 require 'carnivore/runner'
 require 'carnivore/version'
 
 # Message consumer and processor
 module Carnivore
-  autoload :Config, 'carnivore/config'
   autoload :Callback, 'carnivore/callback'
   autoload :Container, 'carnivore/container'
   autoload :Error, 'carnivore/errors'
@@ -17,5 +18,3 @@ module Carnivore
   autoload :Utils, 'carnivore/utils'
   autoload :Version, 'carnivore/version'
 end
-
-autoload :Smash, 'carnivore/utils/smash'

data/lib/carnivore/callback.rb

@@ -70,7 +70,7 @@ module Carnivore
           debug "Invalid message for this callback #{message})"
         end
       rescue => e
-        error "[callback: #{self}, source: #{message[:source]}, message: #{message[:message].object_id}]: #{e.class} - #{e}"
+        error "[callback: #{self}, source: #{message[:source]}, message: #{message}]: #{e.class} - #{e}"
         debug "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
         nil
       end

data/lib/carnivore/runner.rb

@@ -3,6 +3,24 @@ require 'carnivore'
 module Carnivore
   class << self
 
+    # Sets the global configuration
+    #
+    # @param path [String] configuration file or directory
+    # @return [Bogo::Config]
+    def configure!(*args)
+      if(defined?(Carnivore::Config))
+        if(!args.include?(:verify) && !args.include?(:force))
+          raise 'Global configuration has already been set!'
+        end
+        if(args.include?(:force))
+          Carnivore.send(:remove_const, :Config)
+        end
+      end
+      unless(defined?(Carnivore::Config))
+        Carnivore.const_set(:Config, Bogo::Config.new(args.first))
+      end
+    end
+
     # Add configuration to Carnivore
     #
     # @yield block of configuration
@@ -18,6 +36,7 @@ module Carnivore
       supervisor = nil
       begin
         require 'carnivore/supervisor'
+        configure!(:verify)
         supervisor = Carnivore::Supervisor.build!
         Celluloid::Logger.info 'Initializing all registered sources.'
         [].tap do |register|

data/lib/carnivore/utils/smash.rb

@@ -1,136 +1,3 @@
-require 'hashie'
+require 'carnivore'
 
-module Carnivore
-  module Utils
-
-    # Customized Hash
-    class Smash < Hash
-      include Hashie::Extensions::IndifferentAccess
-      include Hashie::Extensions::MergeInitializer
-      include Hashie::Extensions::DeepMerge
-      include Hashie::Extensions::Coercion
-
-      coerce_value Hash, Smash
-
-      # Create new instance
-      #
-      # @param args [Object] argument list
-      def initialize(*args)
-        base = nil
-        if(args.first.is_a?(::Hash))
-          base = args.shift
-        end
-        super *args
-        if(base)
-          self.replace(base.to_smash)
-        end
-      end
-
-      def merge!(hash)
-        hash = hash.to_smash unless hash.is_a?(::Smash)
-        super(hash)
-      end
-
-      # Get value at given path
-      #
-      # @param args [String, Symbol] key path to walk
-      # @return [Object, NilClass]
-      def retrieve(*args)
-        args.inject(self) do |memo, key|
-          if(memo.is_a?(Hash))
-            memo.to_smash[key]
-          else
-            nil
-          end
-        end
-      end
-      alias_method :get, :retrieve
-
-      # Fetch value at given path or return a default value
-      #
-      # @param args [String, Symbol, Object] key path to walk. last value default to return
-      # @return [Object] value at key or default value
-      def fetch(*args)
-        default_value = args.pop
-        retrieve(*args) || default_value
-      end
-
-      # Set value at given path
-      #
-      # @param args [String, Symbol, Object] key path to walk. set last value to given path
-      # @return [Object] value set
-      def set(*args)
-        unless(args.size > 1)
-          raise ArgumentError.new 'Set requires at least one key and a value'
-        end
-        value = args.pop
-        set_key = args.pop
-        leaf = args.inject(self) do |memo, key|
-          unless(memo[key].is_a?(Hash))
-            memo[key] = Smash.new
-          end
-          memo[key]
-        end
-        leaf[set_key] = value
-        value
-      end
-
-      # Convert to Hash
-      #
-      # @return [Hash]
-      def to_hash
-        self.to_type_converter(::Hash, :to_hash)
-      end
-
-    end
-  end
-
-end
-
-# Hook helper into toplevel `Hash`
-class Hash
-
-  # Convert to Smash
-  #
-  # @return [Smash]
-  def to_smash
-    self.to_type_converter(::Smash, :to_smash)
-  end
-  alias_method :hulk_smash, :to_smash
-
-  protected
-
-  # Convert to type
-  #
-  # @param type [Class] hash type
-  # @param convert_call [Symbol] builtin hash convert
-  # @return [Smash]
-  def to_type_converter(type, convert_call)
-    type.new.tap do |smash|
-      self.each do |k,v|
-        smash[k.is_a?(Symbol) ? k.to_s : k] = smash_conversion(v, convert_call)
-      end
-    end
-  end
-
-  # Convert object to smash if applicable
-  #
-  # @param obj [Object]
-  # @param convert_call [Symbol] builtin hash convert
-  # @return [Smash, Object]
-  def smash_conversion(obj, convert_call)
-    case obj
-    when Hash
-      obj.send(convert_call)
-    when Array
-      obj.map do |i|
-        smash_conversion(i, convert_call)
-      end
-    else
-      obj
-    end
-  end
-
-end
-
-Smash = Carnivore::Utils::Smash
+Carnivore::Utils::Smash = Bogo::Smash

data/lib/carnivore/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: bogo-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -77,7 +77,6 @@ files:
 - carnivore.gemspec
 - lib/carnivore.rb
 - lib/carnivore/callback.rb
-- lib/carnivore/config.rb
 - lib/carnivore/container.rb
 - lib/carnivore/errors.rb
 - lib/carnivore/message.rb

data/lib/carnivore/config.rb

@@ -1,92 +0,0 @@
-require 'mixlib/config'
-require 'carnivore'
-
-module Carnivore
-  # Configuration helper
-  class Config
-
-    extend Mixlib::Config
-
-    class << self
-
-      # Set/get automatic symbolization of hash keys
-      #
-      # @param v [Object] truthy or falsey value
-      # @return [TrueClass, FalseClass]
-      # v:: Boolean value
-      def auto_symbolize(v=nil)
-        unless(v.nil?)
-          @hash_symbolizer = !!v
-        end
-        @hash_symbolizer.nil? ? true : @hash_symbolizer
-      end
-
-      # Merge provided args into configuration
-      #
-      # @param args [Hash]
-      # @return [self]
-      def configure(args)
-        build(args[:config_path]) if args[:config_path]
-        self.merge!(args)
-        self
-      end
-
-      # Populates the configuration
-      #
-      # @param path_or_hash [String, Hash] Path to JSON file or configuration hash
-      # @return [self]
-      def build(path_or_hash)
-        if(path_or_hash.is_a?(Hash))
-          conf = path_or_hash
-        else
-          if(File.directory?(path_or_hash.to_s))
-            files = Dir.new(path_or_hash.to_s).find_all do |f|
-              File.extname(f) == '.json'
-            end.sort
-            conf = files.inject(Smash.new) do |memo, path|
-              memo.deep_merge!(
-                MultiJson.load(
-                  File.read(
-                    File.join(
-                      path_or_hash.to_s, path
-                    )
-                  )
-                ).to_smash
-              )
-            end
-            self.config_path = path_or_hash
-          elsif(File.exists?(path_or_hash.to_s))
-            conf = MultiJson.load(File.read(path_or_hash))
-            self.config_path = path_or_hash
-          else
-            raise "Failed to load configuration file: #{path_or_hash}"
-          end
-        end
-        conf.each do |k,v|
-          self.send(k, v)
-        end
-        self
-      end
-
-      # Fetch value from configuration
-      #
-      # @param ary [String, Symbol] list of strings or symbols as hash path
-      # @return [Object] return value or nil
-      # @example
-      #   Config.build(:my_app => {:port => 30})
-      #   Config.get(:my_app, :port) => 30
-      #   Config.get(:my_app, :host) => nil
-      #   Config.get(:other_app, :port) => nil
-      #   Config.get(:my_app, :mail, :server) => nil
-      def get(*ary)
-        value = Carnivore::Utils.retrieve(self, *ary)
-        if(value.is_a?(Hash) && auto_symbolize)
-          Smash.new(value)
-        else
-          value
-        end
-      end
-
-    end
-  end
-end