valise 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: adb87f4f5568fa4acb5ffda1cb35bc7d11c3786f
+  data.tar.gz: f070549c2c75bef9a0996634f6a2ed7ab1b9f1f3
+SHA512:
+  metadata.gz: c84e48d6b133094c9a9592af7b83d9595aba2ca90f191884e3a454b15b179e049115ac071d2b52307d03c5c227f20412031270d9c2894d0ea607dbae04a15fa5
+  data.tar.gz: 97822fbf48bb4ae92e139f7e9a842d596e1337357a91f8e04f984eebe4a4b3f96dd4bafaec457e1eeb20ff76d6e3b122b34cad5ec1eb5ba7b0407ed2fb82a3a4

data/lib/valise/adapters/tilt.rb

@@ -30,18 +30,65 @@ module Valise
   end
 
   class Set
+    class TiltTemplateConfiguration
+      def initialize
+        @template_types = {}
+        @plain_files = true
+      end
+
+      attr_reader :template_types
+      attr_accessor :plain_files
+
+      def add_type(type, options)
+        template_types[type] = options
+      end
+
+      def extensions
+        template_types.keys.map{|type| ".#{type}"} + (@plain_files ? [""] : [])
+      end
+
+      def add_extenstions(set)
+        set.exts(*extensions)
+      end
+
+      def add_serializations(set)
+        template_types.each do |mapping, options|
+          set.add_serialization_handler("**.#{mapping}", :tilt, options)
+        end
+      end
+
+      def apply(set)
+        set = add_extenstions(set)
+        add_serializations(set)
+        set
+      end
+    end
+
+    def handle_templates(&block)
+      config = TiltTemplateConfiguration.new
+
+      if block.arity == 1
+        yield config
+      else
+        config.instance_eval(&block)
+      end
+
+      config.apply(self)
+    end
+
     def templates(rel_path=nil)
       rel_path ||= "templates"
       new_set = self.sub_set(rel_path)
-      new_set = new_set.exts(*([""] + Tilt.mappings.map{|mapping, _| "." + mapping}))
-      ::Tilt.mappings.each do |mapping, _|
-        options = nil
-        if block_given?
-          options = yield(mapping)
+      new_set = new_set.pfxs("", "_")
+      new_set.handle_templates do |config|
+        ::Tilt.mappings.each do |mapping, _|
+          options = nil
+          if block_given?
+            options = yield(mapping)
+          end
+          config.add_type(mapping, options)
         end
-        new_set.add_serialization_handler("**.#{mapping}", :tilt, options)
       end
-      new_set
     end
   end
 end

data/lib/valise/cache.rb

@@ -0,0 +1,49 @@
+require 'weakref'
+
+module Valise
+  class Cache
+    class Store
+      def initialize
+        @hash = {}
+      end
+
+      def []=(key, object)
+        @hash[key] = WeakRef.new(object)
+      end
+
+      def [](key)
+        ref = @hash.fetch(key) do
+          return nil
+        end
+        return live_ref(key, ref)
+      rescue WeakRef::RefError
+        nil
+      end
+
+      def live_ref(key, ref)
+        ref.__getobj__
+      rescue WeakRef::RefError
+        @hash.delete(key)
+        raise
+      end
+
+      def has_key?(key)
+        ref = @hash.fetch(key) do
+          false
+        end
+        live_ref(key, ref)
+        true
+      rescue WeakRef::RefError
+        false
+      end
+    end
+
+    def initialize
+      @stores = Hash.new{|h,k| h[k] = Store.new}
+    end
+
+    def domain(key)
+      @stores[key]
+    end
+  end
+end

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

@@ -2,19 +2,14 @@ require 'valise/set'
 
 module Valise
   class Set
-    class ExtensionsDecorator < Set
+    class Decorator < Set
       def initialize(set)
         @set = set
-        @extensions = []
       end
-      attr_accessor :extensions
+
       attr_reader :set
       protected :set
 
-      def inspect
-        super + "x#{extensions.inspect}"
-      end
-
       def search_roots
         set.search_roots
       end
@@ -26,6 +21,34 @@ module Valise
       def serialization
         set.serialization
       end
+    end
+
+    class PrefixesDecorator < Decorator
+      def initialize(set)
+        super
+        @prefixes = []
+      end
+      attr_accessor :prefixes
+
+      def inspect
+        "#{prefixes.inspect}x#{set.inspect}"
+      end
+
+      def get(path)
+        set.get(path).exts(*prefixes)
+      end
+    end
+
+    class ExtensionsDecorator < Decorator
+      def initialize(set)
+        super
+        @extensions = []
+      end
+      attr_accessor :extensions
+
+      def inspect
+        "#{set.inspect}x#{extensions.inspect}"
+      end
 
       def get(path)
         set.get(path).exts(*extensions)

data/lib/valise/set.rb

@@ -1,3 +1,4 @@
+require 'valise/cache'
 require 'valise/errors'
 require 'valise/search-root'
 require 'valise/utils'
@@ -16,6 +17,7 @@ module Valise
       @search_roots = []
       @merge_diff = PathMatcher.new
       @serialization = PathMatcher.new
+      @cache = Cache.new
     end
 
     def inspect
@@ -32,6 +34,12 @@ module Valise
       return exts
     end
 
+    def pfxs(*prefixes)
+      pfxs = PrefixesDecorator.new(self)
+      pfxs.prefixes = prefixes
+      return pfxs
+    end
+
     def transform
       set = self.class.new
       set.search_roots = yield search_roots
@@ -156,6 +164,10 @@ module Valise
       [merge_diff, serialization]
     end
 
+    def cached(domain, key)
+      @cache.domain(domain)[key] ||= yield
+    end
+
     def get(path)
       Stack.new(path, self)
     end

data/lib/valise/stack/decorator.rb

@@ -0,0 +1,37 @@
+require 'valise/stack'
+
+module Valise
+  class Stack
+    class Decorator < Stack
+      def initialize(stack)
+        @stack = stack
+        @stacks = Hash.new do |h,segments|
+          h[segments] = @stack.valise.get(segments)
+        end
+      end
+
+      def valise
+        @stack.valise
+      end
+
+      def merged(item)
+        item.stack.merged(item)
+      end
+
+      def diffed(item, value)
+        item.stack.diffed(item, value)
+      end
+
+      def rel_path
+        @stack.rel_path
+      end
+
+      def each
+        return enum_for(:each) unless block_given?
+        @stack.each do |item|
+          decorate_item(item){|decorated| yield(decorated)}
+        end
+      end
+    end
+  end
+end

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

@@ -1,24 +1,16 @@
-require 'valise/stack'
-
+require 'valise/stack/decorator'
 module Valise
   class Stack
-    class ExtensionsDecorator < Stack
+    class ExtensionsDecorator < Decorator
       def initialize(stack)
-        @stack = stack
+        super
         @extensions = []
-        @stacks = Hash.new do |h,segments|
-          h[segments] = @stack.valise.get(segments)
-        end
       end
 
       attr_accessor :extensions
 
       def inspect
-        @stack.inspect + "x#{extensions.inspect}"
-      end
-
-      def valise
-        @stack.valise
+        @stack.inspect + "xS#{extensions.inspect}"
       end
 
       def reget(root)
@@ -27,26 +19,11 @@ module Valise
         decorated
       end
 
-      def merged(item)
-        item.stack.merged(item)
-      end
-
-      def diffed(item, value)
-        item.stack.diffed(item, value)
-      end
-
-      def rel_path
-        @stack.rel_path
-      end
-
-      def each
-        return enum_for(:each) unless block_given?
-        @stack.each do |item|
-          @extensions.each do |ext|
-            dir, file = *item.segments.split
-            ext_stack = @stacks[dir + (file.to_s + ext)]
-            yield(ext_stack.item_for(item.root))
-          end
+      def decorate_item(item)
+        dir, file = *item.segments.split
+        @extensions.each do |ext|
+          ext_stack = @stacks[dir + (file.to_s + ext)]
+          yield(ext_stack.item_for(item.root))
         end
       end
     end

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

@@ -0,0 +1,31 @@
+require 'valise/stack/decorator'
+module Valise
+  class Stack
+    class PrefixesDecorator < Decorator
+      def initialize(stack)
+        super
+        @prefixes = []
+      end
+
+      attr_accessor :prefixes
+
+      def inspect
+        "P#{prefixes.inspect}x#{@stack.inspect}"
+      end
+
+      def reget(root)
+        decorated = self.new(super)
+        decorated.prefixes = self.prefixes
+        decorated
+      end
+
+      def decorate_item(item)
+        dir, file = *item.segments.split
+        @prefixes.each do |pfx|
+          dec_stack = @stacks[dir + (pfx + file.to_s)]
+          yield(dec_stack.item_for(item.root))
+        end
+      end
+    end
+  end
+end

data/lib/valise/stack.rb

@@ -2,6 +2,7 @@ require 'valise/utils'
 require 'valise/item-enum'
 require 'valise/strategies/merge-diff'
 require 'valise/stack/extensions-decorator'
+require 'valise/stack/prefixes-decorator'
 
 module Valise
   class Stack
@@ -55,10 +56,16 @@ module Valise
       valise.depth_of(item.root)
     end
 
-    def find
+    def raw_find
       item = present.first
       return item unless item.nil?
-      raise Errors::NotFound, "'#{rel_path}' not found in #{valise.inspect}"
+      raise Errors::NotFound, "#{self.inspect} not found"
+    end
+
+    def find
+      valise.cached(:find, rel_path) do
+        raw_find
+      end
     end
 
     def exts(*extensions)
@@ -67,6 +74,12 @@ module Valise
       return exts
     end
 
+    def pfxs(*prefixes)
+      pfxs = PrefixesDecorator.new(self)
+      pfxs.prefixes = prefixes
+      return pfxs
+    end
+
     def reget(root)
       root.get(@segments)
     end

data/spec_help/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rspec'
 #require 'cadre/rspec'
 
 RSpec.configure do |config|
-  config.backtrace_clean_patterns.delete(/gems/)
+  config.backtrace_exclusion_patterns.delete(/gems/)
   config.run_all_when_everything_filtered = true
 #  config.add_formatter(Cadre::RSpec::NotifyOnCompleteFormatter)
 #  config.add_formatter(Cadre::RSpec::QuickfixFormatter)

metadata

@@ -1,36 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: valise
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  type: :development
   name: corundum
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-description: ! "  Valise provides an API for accessing configuration and data files
-  for your\n  application, including the population of default values, and managing
-  search\n  paths.  Written to encourage a cross-platform approach to maintaining
-  configs\n  for an application.\n"
+description: |2
+    Valise provides an API for accessing configuration and data files for your
+    application, including the population of default values, and managing search
+    paths.  Written to encourage a cross-platform approach to maintaining configs
+    for an application.
 email:
 - nyarly@gmail.com
 executables: []
@@ -110,6 +108,7 @@ files:
 - lib/valise/utils.rb
 - lib/valise/errors.rb
 - lib/valise/adapters.rb
+- lib/valise/cache.rb
 - lib/valise/strategies/set.rb
 - lib/valise/strategies/merge-diff.rb
 - lib/valise/strategies/serialization.rb
@@ -120,6 +119,8 @@ files:
 - lib/valise/set/definer.rb
 - lib/valise/set/extensions-decorator.rb
 - lib/valise/stack.rb
+- lib/valise/stack/decorator.rb
+- lib/valise/stack/prefixes-decorator.rb
 - lib/valise/stack/extensions-decorator.rb
 - lib/valise/stem-decorator.rb
 - lib/valise/item.rb
@@ -202,33 +203,29 @@ files:
 homepage: http://valise.rubyforge.org/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --inline-source
 - --main
 - doc/README
 - --title
-- valise-1.0.0 RDoc
+- valise-1.1.0 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -884203725
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: valise
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Manage configuration and data files simply