valise 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a283caacd236ce4be21dd9f0e2d3df40948c3bdb
-  data.tar.gz: 49c285b29cded418465616fc560392a5d05dda71
+  metadata.gz: 455879a100dafe54e0baa03a50d495b22bc34e78
+  data.tar.gz: 3fb179de644e34d38e4680bd50f730fc824c0cc3
 SHA512:
-  metadata.gz: 8a36a7e75ec4ee6e1b83105d3b675b2289a2d4f11a343876a8b84c37cdb9f2aa275fcb71a436fb9f2983e3725bb8e4a76a0fd5a0f90e51e6939ac4147d245781
-  data.tar.gz: 00b1168bfa5f39af1d09f9b686f7ec0951fff8e3289b93254b0ddf153de17cb854f91cae3a5da1984ac5d813dfecd964803a2dbc648f86f4963b0ef9f31817fd
+  metadata.gz: b35098b0c0587b040bb0bbeee1f7e1b2c2f41d9c28e4bf5f7753449a88909a969297f3d7fb887ed1690034f12a9cf557748d3c4af5b88a8ea9f09bde296ba19f
+  data.tar.gz: e1acc62569e4318f638ef414753380f88ca4a250db916ca4cdb67138ee2204b5090a4be3ab5195d7b02d0b0f01d08f745d5bcc2b98ab5ae0d2eab9f3d1138d45

data/lib/valise/set/extensions-decorator.rb

@@ -21,6 +21,14 @@ module Valise
       def serialization
         set.serialization
       end
+
+      def add_serialization_handler(pattern, serializer, options = nil)
+        set.add_serialization_handler(pattern, serializer, options)
+      end
+
+      def add_merge_handler(pattern, merger, options = nil)
+        set.add_merge_handler(pattern, merger, options)
+      end
     end
 
     class PrefixesDecorator < Decorator

data/lib/valise/stack.rb

@@ -25,11 +25,11 @@ module Valise
     end
 
     def merge_diff
-      @valise.merge_diff_for(self)
+      valise.merge_diff_for(self)
     end
 
     def dump_load
-      @valise.serialization_for(self)
+      valise.serialization_for(self)
     end
 
     def merged(item)
@@ -81,7 +81,7 @@ module Valise
     end
 
     def reget(root)
-      root.get(@segments)
+      root.get(segments)
     end
 
     def item_for(root)

data/lib/valise/stack/decorator.rb

@@ -5,21 +5,19 @@ module Valise
     class Decorator < Stack
       def initialize(stack)
         @stack = stack
-        @stacks = Hash.new do |h,segments|
-          h[segments] = @stack.valise.get(segments)
-        end
+        @stacks = {}
       end
 
-      def valise
-        @stack.valise
+      def sub_stack(segments)
+        @stacks[segments] ||= @stack.valise.get(segments)
       end
 
-      def merged(item)
-        item.stack.merged(item)
+      def segments
+        @stack.segments
       end
 
-      def diffed(item, value)
-        item.stack.diffed(item, value)
+      def valise
+        @stack.valise
       end
 
       def rel_path

data/lib/valise/stack/extensions-decorator.rb

@@ -14,18 +14,44 @@ module Valise
       end
 
       def reget(root)
-        decorated = self.new(super)
+        decorated = self.class.new(super(root))
         decorated.extensions = self.extensions
         decorated
       end
 
+      def sub_stack(stack, ext)
+        SingleExtensionDecorator.new(stack, self, ext)
+      end
+
       def decorate_item(item)
-        dir, file = *item.segments.split
         @extensions.each do |ext|
-          ext_stack = @stacks[dir + (file.to_s + ext)]
+          ext_stack = sub_stack(item.stack, ext)
           yield(ext_stack.item_for(item.root))
         end
       end
     end
+
+    class SingleExtensionDecorator < Decorator
+      def initialize(stack, lead_decco, ext)
+        super(stack)
+        @leader = lead_decco
+        @ext = ext
+
+        dir, file = *(stack.segments.split.map(&:to_s))
+        @segments = make_pathname([dir, (file.to_s + ext)])
+      end
+
+      def inspect
+        @stack.inspect + @ext
+      end
+
+      def segments
+        @segments
+      end
+
+      def reget(root)
+        @leader.reget(root)
+      end
+    end
   end
 end

data/lib/valise/stack/prefixes-decorator.rb

@@ -19,13 +19,39 @@ module Valise
         decorated
       end
 
+      def sub_stack(stack, pfx)
+        SinglePrefixDecorator.new(stack, self, pfx)
+      end
+
       def decorate_item(item)
-        dir, file = *item.segments.split
         @prefixes.each do |pfx|
-          dec_stack = @stacks[dir + (pfx + file.to_s)]
+          dec_stack = sub_stack(item.stack, pfx)
           yield(dec_stack.item_for(item.root))
         end
       end
     end
+
+    class SinglePrefixDecorator < Decorator
+      def initialize(stack, lead_decco, pfx)
+        super(stack)
+        @leader = lead_decco
+        @pfx = pfx
+
+        dir, file = *(stack.segments.split.map(&:to_s))
+        @segments = make_pathname([dir, (pfx + file.to_s)])
+      end
+
+      def inspect
+        @stack.inspect + "^#@pfx"
+      end
+
+      def segments
+        @segments
+      end
+
+      def reget(root)
+        @leader.reget(root)
+      end
+    end
   end
 end

data/lib/valise/strategies/merge-diff.rb

@@ -24,11 +24,11 @@ module Valise
         register :hash_merge
 
         def merge(item)
-          merge_stack(@stack.not_above(item).reverse)
+          merge_stack(@stack.not_above(item))
         end
 
         def merge_stack(stack)
-          stack.present.inject({}) do |hash, item|
+          stack.present.reverse_each.inject({}) do |hash, item|
             deep_merge(hash, item.load_contents)
           end
         end

data/lib/valise/utils.rb

@@ -129,7 +129,7 @@ module Valise
       when ::File
         parts = parts.path
       else
-        raise ArgumentError, "path must be String, Array of Strings or File"
+        raise ArgumentError, "path must be String, Array of Strings or File, was: #{parts.inspect} (#{parts.class})"
       end
       pathname = clean_pathname(Pathname.new(parts))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valise
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Judson Lester
@@ -210,7 +210,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- valise-1.1.3 RDoc
+- valise-1.1.4 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement