hiera-json 0.1.0 → 0.2.0

data/lib/hiera/backend/json_backend.rb

@@ -1,18 +1,3 @@
-#
-#   Copyright 2010, 2011 R.I.Pienaar
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
 class Hiera
     module Backend
         class Json_backend
@@ -23,37 +8,35 @@ class Hiera
             end
 
             def lookup(key, scope, order_override, resolution_type)
-                answer = nil
+                answer = Backend.empty_answer(resolution_type)
 
-                Hiera.debug("Looking up #{key} in JSON backup")
-
-                datadir = Backend.datadir(:json, scope)
-
-                raise "Cannot find data directory #{datadir}" unless File.directory?(datadir)
+                Hiera.debug("Looking up #{key} in JSON backend")
 
                 Backend.datasources(scope, order_override) do |source|
-                    unless answer
-                        Hiera.debug("Looking for data source #{source}")
-
-                        datafile = File.join([datadir, "#{source}.json"])
+                    Hiera.debug("Looking for data source #{source}")
 
-                        unless File.exist?(datafile)
-                            Hiera.warn("Cannot find datafile #{datafile}, skipping")
-                            next
-                        end
+                    jsonfile = Backend.datafile(:json, scope, source, "json") || next
 
-                        data = JSON.parse(File.read(datafile))
+                    data = JSON.parse(File.read(jsonfile))
 
-                        next if data.empty?
-                        next unless data.include?(key)
+                    next if data.empty?
+                    next unless data.include?(key)
 
-                        answer = Backend.parse_string(data[key], scope)
+                    # for array resolution we just append to the array whatever
+                    # we find, we then goes onto the next file and keep adding to
+                    # the array
+                    #
+                    # for priority searches we break after the first found data item
+                    case resolution_type
+                    when :array
+                        answer << Backend.parse_answer(data[key], scope)
                     else
+                        answer = Backend.parse_answer(data[key], scope)
                         break
                     end
                 end
 
-                answer
+                return answer
             end
         end
     end

data/spec/json_backend_spec.rb

@@ -0,0 +1,82 @@
+$:.insert(0, File.join([File.dirname(__FILE__), "..", "lib"]))
+
+require 'rubygems'
+require 'rspec'
+require 'rspec/mocks'
+require 'mocha'
+require 'hiera/backend/json_backend'
+
+RSpec.configure do |config|
+    config.mock_with :mocha
+end
+
+class Hiera
+    module Backend
+        describe Json_backend do
+            before do
+                Hiera.stubs(:debug)
+                Hiera.stubs(:warn)
+                Hiera::Backend.stubs(:empty_answer).returns(nil)
+                @backend = Json_backend.new
+            end
+
+            describe "#initialize" do
+                it "should announce its creation" do # because other specs checks this
+                    Hiera.expects(:debug).with("Hiera JSON backend starting")
+                    Json_backend.new
+                end
+            end
+
+            describe "#lookup" do
+                it "should look for data in all sources" do
+                    Backend.expects(:datasources).multiple_yields(["one"], ["two"])
+                    Backend.expects(:datafile).with(:json, {}, "one", "json").returns(nil)
+                    Backend.expects(:datafile).with(:json, {}, "two", "json").returns(nil)
+
+                    @backend.lookup("key", {}, nil, :priority)
+                end
+
+                it "should pick data earliest source that has it for priority searches" do
+                    scope = {"rspec" => "test"}
+                    Backend.stubs(:parse_answer).with('answer', scope).returns("answer")
+                    Backend.stubs(:parse_answer).with('test_%{rspec}', scope).returns("test_test")
+                    Backend.expects(:datasources).multiple_yields(["one"], ["two"])
+                    Backend.expects(:datafile).with(:json, scope, "one", "json").returns("/nonexisting/one.json")
+                    Backend.expects(:datafile).with(:json, scope, "two", "json").returns(nil).never
+                    File.expects(:read).with("/nonexisting/one.json").returns("one.json")
+                    JSON.expects(:parse).with("one.json").returns({"key" => "test_%{rspec}"})
+
+                    @backend.lookup("key", scope, nil, :priority).should == "test_test"
+                end
+
+                it "should build an array of all data sources for array searches" do
+                    Hiera::Backend.stubs(:empty_answer).returns([])
+                    Backend.stubs(:parse_answer).with('answer', {}).returns("answer")
+                    Backend.expects(:datafile).with(:json, {}, "one", "json").returns("/nonexisting/one.json")
+                    Backend.expects(:datafile).with(:json, {}, "two", "json").returns("/nonexisting/two.json")
+
+                    Backend.expects(:datasources).multiple_yields(["one"], ["two"])
+
+                    File.expects(:read).with("/nonexisting/one.json").returns("one.json")
+                    File.expects(:read).with("/nonexisting/two.json").returns("two.json")
+
+                    JSON.expects(:parse).with("one.json").returns({"key" => "answer"})
+                    JSON.expects(:parse).with("two.json").returns({"key" => "answer"})
+
+                    @backend.lookup("key", {}, nil, :array).should == ["answer", "answer"]
+                end
+
+                it "should parse the answer for scope variables" do
+                    Backend.stubs(:parse_answer).with('test_%{rspec}', {'rspec' => 'test'}).returns("test_test")
+                    Backend.expects(:datasources).yields("one")
+                    Backend.expects(:datafile).with(:json, {"rspec" => "test"}, "one", "json").returns("/nonexisting/one.json")
+
+                    File.expects(:read).with("/nonexisting/one.json").returns("one.json")
+                    JSON.expects(:parse).with("one.json").returns({"key" => "test_%{rspec}"})
+
+                    @backend.lookup("key", {"rspec" => "test"}, nil, :priority).should == "test_test"
+                end
+            end
+        end
+    end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 +01:00
+date: 2011-06-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -83,5 +83,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: JSON backend for the Hiera hierarcical data store
-test_files: []
-
+test_files: 
+- spec/json_backend_spec.rb