chef-zero 1.2.1 → 1.3

data/lib/chef_zero/solr/query/binary_operator.rb

@@ -26,12 +26,11 @@ module ChefZero
             left.matches_doc?(doc)
           when ':'
             if left.respond_to?(:literal_string) && left.literal_string
-              value = doc[left.literal_string]
-              right.matches_values?([value])
+              values = doc[left.literal_string]
             else
               values = doc.matching_values { |key| left.matches_values?([key]) }
-              right.matches_values?(values)
             end
+            right.matches_values?(values)
           end
         end
 

data/lib/chef_zero/solr/query/regexpable_query.rb

@@ -14,8 +14,7 @@ module ChefZero
         attr_reader :regexp
 
         def matches_doc?(doc)
-          value = doc[DEFAULT_FIELD]
-          return value ? matches_values?([value]) : false
+          matches_values?(doc[DEFAULT_FIELD])
         end
         def matches_values?(values)
           values.any? { |value| !@regexp.match(value).nil? }

data/lib/chef_zero/solr/solr_doc.rb

@@ -9,31 +9,22 @@ module ChefZero
       end
 
       def [](key)
-        values = matching_values { |match_key| match_key == key }
-        values[0]
+        matching_values { |match_key| match_key == key }
       end
 
       def matching_values(&block)
-        result = {}
+        result = []
         key_values(nil, @json) do |key, value|
           if block.call(key)
-            if result.has_key?(key)
-              result[key] << value.to_s
-            else
-              result[key] = value.to_s.clone
-            end
+            result << value.to_s
           end
         end
         # Handle manufactured value(s)
         if block.call('X_CHEF_id_CHEF_X')
-          if result.has_key?('X_CHEF_id_CHEF_X')
-            result['X_CHEF_id_CHEF_X'] << @id.to_s
-          else
-            result['X_CHEF_id_CHEF_X'] = @id.to_s.clone
-          end
+          result << @id.to_s
         end
 
-        result.values
+        result.uniq
       end
 
       private

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.2.1'
+  VERSION = '1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: '1.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -104,7 +104,6 @@ files:
 - Rakefile
 - lib/chef_zero/cookbook_data.rb
 - lib/chef_zero/data_normalizer.rb
-- lib/chef_zero/data_store/chef_fs_store.rb
 - lib/chef_zero/data_store/data_already_exists_error.rb
 - lib/chef_zero/data_store/data_error.rb
 - lib/chef_zero/data_store/data_not_found_error.rb

data/lib/chef_zero/data_store/chef_fs_store.rb

@@ -1,96 +0,0 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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.
-#
-
-require 'chef_fs/file_system'
-require 'chef_fs/file_system/not_found_error'
-require 'chef_zero/data_store/data_already_exists_error'
-require 'chef_zero/data_store/data_not_found_error'
-
-module ChefZero
-  module DataStore
-    class ChefFSStore
-      def initialize(chef_fs)
-        @chef_fs = chef_fs
-      end
-
-      def create_dir(path, name, *options)
-        parent = get_dir(path, options.include?(:create_dir))
-        parent.create_child(name, nil)
-      end
-
-      def create(path, name, data, *options)
-        if !data.is_a?(String)
-          raise "set only works with strings"
-        end
-
-        parent = get_dir(path, options.include?(:create_dir))
-        parent.create_child(name, data)
-      end
-
-      def get(path)
-        begin
-          ChefFS::FileSystem.resolve_path(path.join('/')).read
-        rescue ChefFS::FileSystem::NotFoundError => e
-          raise DataNotFoundError.new(path, e)
-        end
-      end
-
-      def set(path, data, *options)
-        if !data.is_a?(String)
-          raise "set only works with strings: #{path} = #{data.inspect}"
-        end
-
-        parent = get_dir(path[0..-2], options.include?(:create_dir))
-        parent.create_child(path[-1], data)
-      end
-
-      def delete(path)
-        begin
-          ChefFS::FileSystem.resolve_path(path.join('/')).delete
-        rescue ChefFS::FileSystem::NotFoundError => e
-          raise DataNotFoundError.new(path, e)
-        end
-      end
-
-      def list(path)
-        begin
-          ChefFS::FileSystem.resolve_path(path.join('/')).children.map { |c| c.name }.sort
-        rescue ChefFS::FileSystem::NotFoundError => e
-          raise DataNotFoundError.new(path, e)
-        end
-      end
-
-      def exists?(path)
-        ChefFS::FileSystem.resolve_path(path.join('/')).exists?
-      end
-
-      private
-
-      def get_dir(path, create=false)
-        result = Chef::FileSystem.resolve_path('/' + path.join('/'))
-        if result.exists?
-          result
-        elsif create
-          get_dir(path[0..-2], create).create_child(result.name, nil)
-        else
-          raise DataNotFoundError.new(path)
-        end
-      end
-    end
-  end
-end