opener-daemons 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b7be7e62ee26df448d1eab7ef16b439fc68200
-  data.tar.gz: ecee4827ada3b9b70d5411628b2eebf48a955e2e
+  metadata.gz: cd43444725d72e2076b674d5c1a4ae46b7c2a514
+  data.tar.gz: a315f9989260c5c36efbe29d412120abcef97802
 SHA512:
-  metadata.gz: fcf4c032d995b86df844c3fed445c56292e4a7139f74c153aa968f018a0dcfc1a240b500c74f516b10f16fc538de4cb6f15bc7326154d0055ac2a7d474dbc5e3
-  data.tar.gz: c4f90bac71ab8ca51dbc92eaac7c107c226f005754932dfa96006faa520072bbee58a58a7474f5d5b1dbb0e57594f517648e7f9dffe5a6d3526ef3f4b636af31
+  metadata.gz: 29f9b444314f438ab37d2732f2d3dd115993122a31bc4dd63b3b2b7e98d6b4a8d12ff2f159fc57b16d501635d8d05db244717af95874ab4243a87be49c211f5a
+  data.tar.gz: 0f9ce2a6d61f73eeac95b24045b75dfe628e2bdad9ce3e780fa50a287d63597e8138ca44d2f11455b343d22c1d85f8e403aff3dc7597b0e60b523c64039c8f06

data/README.md

@@ -58,9 +58,12 @@ corresponding constant. For example, for the language identifier:
 
     daemon.start
 
-If the component takes extra arguments, such as a resource path, these should be
-set in the `initialize` method of the component using the actual environment
-variables.
+Extra arguments for the component can be specified as a Hash in the second
+argument of the `Daemon.new` method:
+
+    daemon = Opener::Daemons::Daemon.new(Opener::LanguageIdentifier, :kaf => false)
+
+These options will be passed to every individual instance of the component.
 
 ## Requirements
 

data/lib/opener/daemons/configuration.rb

@@ -6,6 +6,9 @@ module Opener
     # @!attribute [r] component
     #  @return [Class]
     #
+    # @!attribute [r] component_options
+    #  @return [Hash]
+    #
     # @!attribute [r] input_url
     #  @return [String]
     #
@@ -16,10 +19,13 @@ module Opener
     #  @return [Hash]
     #
     class Configuration
-      attr_reader :component, :input_url, :callbacks, :metadata
+      attr_reader :component, :component_options, :input_url, :callbacks,
+        :metadata
 
       ##
-      # @param [Class] component
+      # @param [Class] component The component to use.
+      # @param [Hash] component_options Options to pass to the component.
+      #
       # @param [Hash] options
       #
       # @option options [String] :input_url
@@ -27,8 +33,9 @@ module Opener
       # @option options [Array] :callbacks
       # @option options [Hash] :metadata
       #
-      def initialize(component, options = {})
-        @component = component
+      def initialize(component, component_options = {}, options = {})
+        @component         = component
+        @component_options = component_options
 
         options.each do |key, value|
           instance_variable_set("@#{key}", value) if respond_to?(key)
@@ -47,6 +54,15 @@ module Opener
       def identifier
         return @identifier ||= SecureRandom.hex
       end
+
+      ##
+      # Returns a new instance of the component.
+      #
+      # @return [Object]
+      #
+      def component_instance
+        return component.new(component_options)
+      end
     end # Configuration
   end # Daemons
 end # Opener

data/lib/opener/daemons/daemon.rb

@@ -7,8 +7,11 @@ module Opener
     # @!attribute [r] component
     #  @return [Class]
     #
+    # @!attribute [r] component_options
+    #  @return [Hash]
+    #
     class Daemon < Oni::Daemons::SQS
-      attr_reader :component
+      attr_reader :component, :component_options
 
       set :worker, Worker
       set :mapper, Mapper
@@ -21,9 +24,11 @@ module Opener
 
       ##
       # @param [Class] component The component to run in the worker.
+      # @param [Hash] options Extra options to pass to the component.
       #
-      def initialize(component)
-        @component = component
+      def initialize(component, options = {})
+        @component         = component
+        @component_options = options
 
         super() # keep parenthesis, parent method doesn't take arguments.
       end
@@ -58,7 +63,7 @@ module Opener
           raise ArgumentError, 'No mapper has been set in the `:mapper` option'
         end
 
-        return option(:mapper).new(component)
+        return option(:mapper).new(component, component_options)
       end
 
       ##

data/lib/opener/daemons/mapper.rb

@@ -7,8 +7,11 @@ module Opener
     # @!attribute [r] component
     #  @return [Class]
     #
+    # @!attribute [r] component_options
+    #  @return [Hash]
+    #
     class Mapper < Oni::Mapper
-      attr_reader :component
+      attr_reader :component, :component_options
 
       ##
       # The directory containing JSON schema files.
@@ -26,9 +29,11 @@ module Opener
 
       ##
       # @param [Class] component
+      # @param [Hash] component_options
       #
-      def initialize(component)
-        @component = component
+      def initialize(component, component_options = {})
+        @component         = component
+        @component_options = component_options
       end
 
       ##
@@ -40,7 +45,7 @@ module Opener
 
         validate_input!(decoded)
 
-        return Configuration.new(component, decoded)
+        return Configuration.new(component, component_options, decoded)
       end
 
       ##

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = '2.0.2'
+    VERSION = '2.1.0'
   end # Daemons
 end # Opener

data/lib/opener/daemons/worker.rb

@@ -42,8 +42,7 @@ module Opener
         add_newrelic_attributes
 
         input    = downloader.download(config.input_url)
-        instance = config.component.new
-        output   = instance.run(input)
+        output   = config.component_instance.run(input)
         object   = uploader.upload(config.identifier, output, config.metadata)
 
         Syslog.info(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Wilco van Duinkerken