hiera-redis 0.1.3 → 0.2.1

data/lib/hiera/backend/redis_backend.rb

@@ -2,12 +2,14 @@ class Hiera
   module Backend
     class Redis_backend
 
-      VERSION="0.1.3"
+      VERSION="0.2.1"
+
+      attr_reader :redis
 
       def initialize
 
         require 'redis'
-        Hiera.debug("Hiera Redis backend starting")
+        Hiera.debug("Hiera Redis backend #{VERSION} starting")
 
         # default values
         options = {:host => 'localhost', :port => 6379, :db => 0, :password => nil, :timeout => 3, :path => nil}
@@ -17,38 +19,45 @@ class Hiera
           options[k] = Config[:redis][k] if Config[:redis].has_key?(k)
         end
 
-        @r = Redis.new(options)
+        @redis = Redis.new(options)
       end
 
-      def lookup(key, scope, order_override, resolution_type)
-
-        answer = Backend.empty_answer(resolution_type)
-
-        Backend.datasources(scope, order_override) do |source|
+      def redis_query(args = {})
 
-          # convert our seperator in order to maintain yaml compatibility
-          rkey = []
-          rkey << source.split('/')
-          rkey << key
-          rkey = rkey.join(':')
+        # convert our seperator in order to maintain yaml compatibility
+        redis_key = args[:source].gsub('/', ':')
 
-          data = case @r.type(rkey)
+        if redis.type(redis_key) == "hash"
+          redis.hget(redis_key, args[:key])
+        else
+          redis_key << ":#{args[:key]}"
+          case redis.type(redis_key)
           when "set"
-            @r.smembers(rkey)
+            redis.smembers(redis_key)
           when "hash"
-            @r.hgetall(rkey)
+            redis.hgetall(redis_key)
           when "list"
-            @r.lrange(rkey, 0, -1)
+            redis.lrange(redis_key, 0, -1)
           when "string"
-            @r.get(rkey)
+            redis.get(redis_key)
           when "zset"
-            @r.zrange(rkey, 0, -1)
+            redis.zrange(redis_key, 0, -1)
           else
-            Hiera.debug("No such key: #{rkey}")
-            next
+            Hiera.debug("No such key: #{redis_key}")
+            nil
           end
+        end
+      end
 
-          next if data.empty?
+      def lookup(key, scope, order_override, resolution_type)
+
+        answer = Backend.empty_answer(resolution_type)
+
+        Backend.datasources(scope, order_override) do |source|
+
+          data = redis_query(:source => source, :key => key)
+
+          next unless data
           new_answer = Backend.parse_answer(data, scope)
 
           case resolution_type
@@ -65,7 +74,6 @@ class Hiera
         end
 
         answer
-        
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hiera-redis
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 21
   prerelease: 
   segments: 
   - 0
+  - 2
   - 1
-  - 3
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors: 
 - Adam Kosmin c/o Reliant Security, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: []
 
 description: Allows hiera functions to pull data from a Redis database.
@@ -58,9 +58,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - hiera
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Redis backend for Hiera.
 test_files: []
 
+has_rdoc: false