hiera-redis 1.0.0 → 1.0.2

data/lib/hiera/backend/redis_backend.rb

@@ -2,7 +2,7 @@ class Hiera
   module Backend
     class Redis_backend
 
-      VERSION="1.0.0"
+      VERSION="1.0.2"
 
       attr_reader :redis, :options
 
@@ -12,43 +12,43 @@ class Hiera
       end
 
       def deserialize(args = {})
-        return nil if args[:string].nil?
+        return nil if args[:data].nil?
+        return args[:data] unless args[:data].is_a? String
 
-        Hiera.debug("Found %s key in %s source" % [args[:key], args[:source]])
-        return args[:string] unless options.include? :deserialize
-
-        case options[:deserialize]
+        result = case options[:deserialize]
         when :json
-          Hiera.debug("Deserializing JSON")
           require 'json'
-
-          JSON.parse(args[:string])
+          JSON.parse args[:data]
         when :yaml
-          Hiera.debug("Deserializing YAML")
           require 'yaml'
-          YAML::load(args[:string])
+          YAML::load args[:data]
         else
-          Hiera.warn("Invalid configuration for :deserialize; found %s" % options[:deserialize])
-          args[:string]
+          Hiera.warn "Invalid configuration for :deserialize; found %s" % options[:deserialize]
+          args[:data]
         end
+
+        Hiera.debug "Deserialized %s" % options[:deserialize].to_s.upcase
+        result
+
       # when we try to deserialize a string
       rescue JSON::ParserError
-        args[:string]
+        args[:data]
       rescue => e
-        Hiera.warn("Exception raised: %s: %s" % [e.class, e.message])
+        Hiera.warn "Exception raised: %s: %s" % [e.class, e.message]
       end
 
       def lookup(key, scope, order_override, resolution_type)
         answer = nil
 
-        Hiera.debug("Looking up %s in Redis backend" % key)
-
         Backend.datasources(scope, order_override) do |source|
-          Hiera.debug("Looking for data source %s" % source)
+          redis_key = "%s" % [source.split('/'), key].join(options[:separator])
+          Hiera.debug "Looking for %s%s%s" % [source, options[:separator], key]
+
+          data = redis_query redis_key
 
-          data = deserialize(:string => redis_query(:source => source, :key => key),
-                             :source => source,
-                             :key => key)
+          data = deserialize(:data => data,
+                  :redis_key => redis_key,
+                  :key => key) if options.include? :deserialize
 
           next unless data
 
@@ -85,8 +85,7 @@ class Hiera
           :timeout => 3,
           :path => nil,
           :soft_connection_failure => false,
-          :separator => ':',
-          :json => false
+          :separator => ':'
         }.merge Config[:redis] || {}
 
         require 'redis'
@@ -96,20 +95,17 @@ class Hiera
         retry if require 'rubygems'
       end
 
-      def redis_query(args = {})
-
-        # convert our seperator in order to maintain yaml compatibility
-        redis_key = "%s" % [args[:source].split('/'), args[:key]].join(options[:separator])
+      def redis_query(redis_key)
 
-        case redis.type(redis_key)
+        case redis.type redis_key
         when 'set'
-          redis.smembers(redis_key)
+          redis.smembers redis_key
         when 'hash'
-          redis.hgetall(redis_key)
+          redis.hgetall redis_key
         when 'list'
           redis.lrange(redis_key, 0, -1)
         when 'string'
-          redis.get(redis_key)
+          redis.get redis_key
         when 'zset'
           redis.zrange(redis_key, 0, -1)
         else

metadata

@@ -1,81 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hiera-redis
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Adam Kosmin c/o Reliant Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hiera
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Allows hiera functions to pull data from a Redis database.
 email: heira-redis@reliantsecurity.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/hiera/backend/redis_backend.rb
 - COPYING
 homepage: http://github.com/reliantsecurity/hiera-redis
-licenses: 
+licenses:
 - GPL-3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Redis backend for Hiera.
 test_files: []
-
-has_rdoc: false