whowas 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a92b53b7bef30819cd2501c2435b13b10be15708
-  data.tar.gz: 4f038b70ab9fd3bd78a3132a8d82f012737a4c48
+  metadata.gz: 8f18c072668284649883a05ad1bbebe28c610a3b
+  data.tar.gz: 8f9e494556ac732fafbc724f3e2c4c1365733bd2
 SHA512:
-  metadata.gz: 0ca98edc334537e9ead70ad1b847a7457d417535aa31179e71764e4f4414df0bb46b51a1388a3f161162a24b668f977078924e0371b0d346bbebf87bd90f4008
-  data.tar.gz: 35a057c905f6d486312239c80449473071138ebe17144845b3f47cfe0d7439563df2289d933b4d5aa4564990b781cb76e6fa54996dea555947d3f4b6b0f53806
+  metadata.gz: 9446751954db0d0894d12f15ebd33fe07a9894f0283d482c49f9bac472ea6590c81bb16769d9d3d497032b885893608542a32ddaa8845d379c731636fb09a1f3
+  data.tar.gz: f8f7fdda8c3b564c8ddcc8d6b68f128d883fb80ecb069e8fed6076688f5fdebab31b75372f87d68a165bfa22715940ead1c139b8427c1e9a32d218391de4ba6b

data/lib/adapters/splunk.rb

@@ -11,8 +11,12 @@ module Whowas
     # Whowas.splunk_config is configured via define_setting in the initializer.
     # See configuration.rb for more information.
     def self.connection(config: Whowas.splunk_config)
-      @@connection ||= ::Splunk::connect(config)
-    rescue => e
+      if @@connection && @@connection.token
+        @@connection = ::Splunk::Service.new(config.merge(token: @@connection.token))
+      else
+        @@connection = ::Splunk::connect(config)
+      end
+    rescue StandardError => e
       raise Whowas::Errors::ServiceUnavailable, "#{self.class.name}: #{e}"
     end
         
@@ -47,6 +51,6 @@ module Whowas
       else
         ""
       end
-    end
+    end    
   end
 end

data/lib/whowas.rb

@@ -40,17 +40,16 @@ module Whowas
   define_setting :recipe_class, Whowas::Recipes
   
   # configuration defaults
-  define_setting :splunk_config, nil  
+  define_setting :splunk_config, nil
   
   def self.search(input)
+    validate_configuration
     recipe = recipe_class.select(input) || Whowas.recipe_table[:default]
     env = {input: input, results: []}
     self.send(recipe).call(env)
     env
   end
   
-  private
-  
   # Uses the recipe_table hash to match up the input to the correct recipe type.
   # If there is an IP address in the input, it tries to match the IP address
   # against any keys that are valid CIDR blocks.
@@ -58,5 +57,14 @@ module Whowas
   # Otherwise, it falls back to :default.
   def select_recipe(input)
   end
-    
+  
+  # Ensure that the user has configured the recipe table and initialized the whowas
+  # directory in the overarching app.
+  # Does not prove the app is properly configured -- this is the bare minimum, meant to
+  # be an alert for users who don't realize they have to configure anything at all.
+  def self.validate_configuration
+    if recipe_table == {} || !recipe_table.include?(:default)
+      raise Whowas::Errors::ConfigurationError, "Please configure Whowas as described at https://github.com/TuftsUniversity/whowas"
+    end
+  end 
 end

data/lib/whowas/errors.rb

@@ -5,6 +5,10 @@ module Whowas
   end
   
   module Errors
+    # Will be thrown when Whowas is not configured or configured improperly.
+    class ConfigurationError < Whowas::Error
+    end
+    
     # Will be thrown when input is invalid.
     class InvalidInput < Whowas::Error
     end

data/lib/whowas/version.rb

@@ -1,3 +1,3 @@
 module Whowas
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whowas
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jess Frisch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleware