valise 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455879a100dafe54e0baa03a50d495b22bc34e78
-  data.tar.gz: 3fb179de644e34d38e4680bd50f730fc824c0cc3
+  metadata.gz: 43aa7bebaf1a29a47ba022062399b53bac5c6428
+  data.tar.gz: aa6e0e3491bc16a2e8d09383cc5d255a65eef84d
 SHA512:
-  metadata.gz: b35098b0c0587b040bb0bbeee1f7e1b2c2f41d9c28e4bf5f7753449a88909a969297f3d7fb887ed1690034f12a9cf557748d3c4af5b88a8ea9f09bde296ba19f
-  data.tar.gz: e1acc62569e4318f638ef414753380f88ca4a250db916ca4cdb67138ee2204b5090a4be3ab5195d7b02d0b0f01d08f745d5bcc2b98ab5ae0d2eab9f3d1138d45
+  metadata.gz: 9715824ab262db5a6b001d123191d51afc33df8e6136de77cb3f08f77c4b98ec3eb716cdc8718dbef2957cc0b157a5d10eb50855a17378f4fbe8d9eeaebea456
+  data.tar.gz: 05e6ba644e9408c95a676f87e5bce891a465d9ae500bc3317577c41594fea0574953a1da78b5af6131b91b2403b613935747ee4abe8cd251a27ab3dfa5bbd7e2

data/lib/valise/path-matcher.rb

@@ -5,16 +5,57 @@ module Valise
     include Unpath
     include Enumerable
 
-    def self.build(path, value = true)
+    class Pattern
+      FLAG_NAMES = {
+        :extended => File::FNM_EXTGLOB,
+        :noextended => ~File::FNM_EXTGLOB,
+        :case => ~File::FNM_CASEFOLD,
+        :nocase => File::FNM_CASEFOLD,
+        :pathname => File::FNM_PATHNAME,
+        :nopathname => ~File::FNM_PATHNAME,
+        :escape => ~File::FNM_NOESCAPE,
+        :noescape => File::FNM_NOESCAPE,
+        :dotmatch => File::FNM_DOTMATCH,
+        :nodotmatch => ~File::FNM_DOTMATCH,
+      }
+
+      def initialize(match, include, flags)
+        @match, @include = match, include
+        @flags = 0
+        set_flags(flags)
+      end
+      attr_accessor :match, :include, :flags
+
+      def set_flags(flags)
+        if flags.is_a?(Array)
+          flags = flags.reduce(0) do |flags, name|
+            flag = FLAG_NAMES.fetch(name) do
+              raise "Path match flag name #{name.inspect} not in recognized list: #{FLAG_NAMES.keys.inspect}"
+            end
+            if flag < 0
+              flags & flag
+            else
+              flags | flag
+            end
+          end
+        end
+        @flags = flags
+      end
+    end
+
+    def self.build(path, value = true, flags = nil)
       return path if PathMatcher === path
       path = Unpath::make_pathname(path).to_s
-      self.new(path, value)
+      self.new(path, value, flags)
     end
 
-    def initialize(first_pattern=nil, first_value=true)
+    DEFAULT_FLAGS = File::FNM_EXTGLOB
+    def initialize(first_pattern=nil, first_value=true, first_flags = nil)
       @pattern_pairs = []
-      set(first_pattern, first_value) unless first_pattern.nil?
+      @default_flags = DEFAULT_FLAGS
+      set(first_pattern, first_value, first_flags) unless first_pattern.nil?
     end
+    attr_accessor :default_flags
 
     def ===(path)
       path = make_pathname(path)
@@ -25,9 +66,9 @@ module Valise
     end
 
     def fetch(path)
-      @pattern_pairs.each do |pattern, value|
-        if path.fnmatch?(pattern)
-          return value
+      @pattern_pairs.each do |pattern|
+        if path.fnmatch?(pattern.match, pattern.flags || default_flags)
+          return pattern.include
         end
       end
       raise KeyError, "No pattern matches #{path.to_s}"
@@ -39,23 +80,25 @@ module Valise
       nil
     end
 
-    def set(pattern, value)
-      @pattern_pairs.delete_if do |old_pattern, _|
-        pattern == old_pattern
-      end
-      @pattern_pairs << [pattern.to_s, value]
+    def set(pattern, value, flags = nil)
+      add_pattern(Pattern.new(pattern.to_s, value, flags))
     end
     alias []= set
 
-    def each_pair
-      @pattern_pairs.each do |pattern, value|
-        yield pattern, value
+    def add_pattern(pattern)
+      @pattern_pairs.delete_if do |old_pattern|
+        pattern.match == old_pattern.match
       end
+      @pattern_pairs << pattern
+    end
+
+    def each(&block)
+      @pattern_pairs.each(&block)
     end
 
     def merge!(other)
-      other.each_pair do |pattern, value|
-        set(pattern, value)
+      other.each do |pattern|
+        add_pattern(pattern)
       end
     end
   end

data/lib/valise/set-filter.rb

@@ -0,0 +1,35 @@
+require 'valise/path-matcher'
+
+module Valise
+  class SetFilter
+    def initialize
+      @path_matcher = PathMatcher.new
+      @set = nil
+    end
+    attr_reader :path_matcher
+    attr_accessor :set
+
+    def include(pattern, flags = nil)
+      path_matcher.set(pattern, true, flags)
+    end
+
+    def exclude(pattern, flags = nil)
+      path_matcher.set(pattern, false, flags)
+    end
+
+    def files
+      visited = {}
+      set.each do |root|
+        root.each do |segments|
+          next unless path_matcher === segments
+          unless visited.has_key?(segments)
+            item = set.get(segments).present.first
+            visited[segments] = item
+            yield(item)
+          end
+        end
+      end
+      return visited
+    end
+  end
+end

data/lib/valise/set.rb

@@ -7,6 +7,7 @@ require 'valise/path-matcher'
 require 'valise/stem-decorator'
 require 'valise/set/definer'
 require 'valise/set/extensions-decorator'
+require 'valise/set-filter'
 
 module Valise
   class Set
@@ -184,28 +185,25 @@ module Valise
       search_roots.each(&block)
     end
 
-    def glob(path_matcher)
+    def filter(glob = nil, flags = nil)
+      filter = SetFilter.new
+      filter.set = self
+      unless glob.nil?
+        filter.include(glob, flags)
+      end
+      yield filter if block_given?
+      return filter
+    end
+
+    def glob(path_matcher, &block)
       unless block_given?
         return self.enum_for(:glob, path_matcher)
       end
 
-      visited = {}
-      path_matcher = PathMatcher.build(path_matcher)
-
-      search_roots.each do |root|
-        root.each do |segments|
-          next unless path_matcher === segments
-          unless visited.has_key?(segments)
-            item = get(segments).present.first
-            visited[segments] = item
-            yield(item)
-          end
-        end
-      end
-      return visited
+      filter(path_matcher).files(&block)
     end
 
-    ALL_FILES = PathMatcher.build("**")
+    ALL_FILES = "**"
     def files(&block)
       glob(ALL_FILES, &block)
     end

data/lib/valise/stack.rb

@@ -1,3 +1,4 @@
+
 require 'valise/utils'
 require 'valise/item-enum'
 require 'valise/strategies/merge-diff'

data/spec/fileset.rb

@@ -55,7 +55,7 @@ describe Valise do
     end
   end
 
-  share_examples_for "a populating Valise" do
+  shared_examples_for "a populating Valise" do
     it "should create files on populate" do
       pending
 

data/spec/item.rb

@@ -17,18 +17,18 @@ describe "Invidual items in the set" do
 
   subject { set.find("item") }
 
-  its (:full_path) { should == "root/item" }
+  it { expect(subject.full_path).to eq "root/item" }
 
   describe "#contents=" do
-    its (:contents) { should == "testing" }
+    it { expect(subject.contents).to eq "testing" }
 
     it "raw_file" do
-      subject.raw_file.path.should == "root/item"
+      expect(subject.raw_file.path).to eq "root/item"
     end
 
     it "should make contents available" do
       subject.open do |file|
-        file.read.should == "testing"
+        expect(file.read).to eq "testing"
       end
     end
   end

data/spec/search-root.rb

@@ -15,10 +15,10 @@ describe Valise::SearchRoot do
   end
 
   it "should find a file in the root" do
-    search_root.present?(%w{file}).should be_true
+    expect(search_root.present?(%w{file})).to eq true
   end
 
   it "should raise PathNotInRoot if path isn't in root" do
-    search_root.present?(%w{nothere}).should be_false
+    expect(search_root.present?(%w{nothere})).to eq false
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valise
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
@@ -102,27 +102,91 @@ extra_rdoc_files:
 files:
 - doc/README
 - doc/Specification
+- doc/Specifications
+- doc/coverage/assets/0.5.3/app.js
+- doc/coverage/assets/0.5.3/fancybox/blank.gif
+- doc/coverage/assets/0.5.3/fancybox/fancy_close.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_loading.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_nav_left.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_nav_right.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_e.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_n.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_ne.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_nw.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_s.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_se.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_sw.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_w.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_title_left.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_title_main.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_title_over.png
+- doc/coverage/assets/0.5.3/fancybox/fancy_title_right.png
+- doc/coverage/assets/0.5.3/fancybox/fancybox-x.png
+- doc/coverage/assets/0.5.3/fancybox/fancybox-y.png
+- doc/coverage/assets/0.5.3/fancybox/fancybox.png
+- doc/coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.css
+- doc/coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.pack.js
+- doc/coverage/assets/0.5.3/favicon_green.png
+- doc/coverage/assets/0.5.3/favicon_red.png
+- doc/coverage/assets/0.5.3/favicon_yellow.png
+- doc/coverage/assets/0.5.3/highlight.css
+- doc/coverage/assets/0.5.3/highlight.pack.js
+- doc/coverage/assets/0.5.3/jquery-1.6.2.min.js
+- doc/coverage/assets/0.5.3/jquery.dataTables.min.js
+- doc/coverage/assets/0.5.3/jquery.timeago.js
+- doc/coverage/assets/0.5.3/jquery.url.js
+- doc/coverage/assets/0.5.3/loading.gif
+- doc/coverage/assets/0.5.3/magnify.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_dadada_1x400.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_222222_256x240.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_2e83ff_256x240.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_454545_256x240.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_888888_256x240.png
+- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_cd0a0a_256x240.png
+- doc/coverage/assets/0.5.3/smoothness/jquery-ui-1.8.4.custom.css
+- doc/coverage/assets/0.5.3/stylesheet.css
+- doc/coverage/index.html
+- doc/coverage/jquery-1.3.2.min.js
+- doc/coverage/jquery.tablesorter.min.js
+- doc/coverage/lib-fileset-errors_rb.html
+- doc/coverage/lib-fileset-item_rb.html
+- doc/coverage/lib-fileset-populator_rb.html
+- doc/coverage/lib-fileset-search-root_rb.html
+- doc/coverage/lib-fileset-utils_rb.html
+- doc/coverage/lib-fileset_rb.html
+- doc/coverage/print.css
+- doc/coverage/rcov.js
+- doc/coverage/screen.css
+- doc/overview-diagram.svg
 - lib/valise.rb
-- lib/valise/item-enum.rb
-- 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
 - lib/valise/adapters/tilt.rb
+- lib/valise/cache.rb
+- lib/valise/errors.rb
+- lib/valise/item-enum.rb
+- lib/valise/item.rb
 - lib/valise/path-matcher.rb
 - lib/valise/search-root.rb
+- lib/valise/set-filter.rb
 - lib/valise/set.rb
 - 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/stack/prefixes-decorator.rb
 - lib/valise/stem-decorator.rb
-- lib/valise/item.rb
+- lib/valise/strategies/merge-diff.rb
+- lib/valise/strategies/serialization.rb
+- lib/valise/strategies/set.rb
+- lib/valise/utils.rb
 - spec/addable.rb
 - spec/dump-load.rb
 - spec/error-handling.rb
@@ -137,69 +201,6 @@ files:
 - spec_help/gem_test_suite.rb
 - spec_help/spec_helper.rb
 - spec_help/ungemmer.rb
-- doc/overview-diagram.svg
-- doc/Specifications
-- doc/coverage/lib-fileset-utils_rb.html
-- doc/coverage/rcov.js
-- doc/coverage/jquery-1.3.2.min.js
-- doc/coverage/index.html
-- doc/coverage/jquery.tablesorter.min.js
-- doc/coverage/assets/0.5.3/highlight.css
-- doc/coverage/assets/0.5.3/favicon_yellow.png
-- doc/coverage/assets/0.5.3/jquery.dataTables.min.js
-- doc/coverage/assets/0.5.3/stylesheet.css
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_sw.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_e.png
-- doc/coverage/assets/0.5.3/fancybox/blank.gif
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_n.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_s.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_w.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_title_over.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_close.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_loading.png
-- doc/coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.pack.js
-- doc/coverage/assets/0.5.3/fancybox/fancybox-x.png
-- doc/coverage/assets/0.5.3/fancybox/fancybox-y.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_nav_right.png
-- doc/coverage/assets/0.5.3/fancybox/fancybox.png
-- doc/coverage/assets/0.5.3/fancybox/jquery.fancybox-1.3.1.css
-- doc/coverage/assets/0.5.3/fancybox/fancy_title_right.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_title_left.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_ne.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_title_main.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_nw.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_nav_left.png
-- doc/coverage/assets/0.5.3/fancybox/fancy_shadow_se.png
-- doc/coverage/assets/0.5.3/favicon_green.png
-- doc/coverage/assets/0.5.3/magnify.png
-- doc/coverage/assets/0.5.3/smoothness/jquery-ui-1.8.4.custom.css
-- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_888888_256x240.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_2e83ff_256x240.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_454545_256x240.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_cd0a0a_256x240.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-icons_222222_256x240.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- doc/coverage/assets/0.5.3/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- doc/coverage/assets/0.5.3/jquery.url.js
-- doc/coverage/assets/0.5.3/app.js
-- doc/coverage/assets/0.5.3/favicon_red.png
-- doc/coverage/assets/0.5.3/highlight.pack.js
-- doc/coverage/assets/0.5.3/jquery.timeago.js
-- doc/coverage/assets/0.5.3/loading.gif
-- doc/coverage/assets/0.5.3/jquery-1.6.2.min.js
-- doc/coverage/lib-fileset-item_rb.html
-- doc/coverage/lib-fileset-search-root_rb.html
-- doc/coverage/lib-fileset_rb.html
-- doc/coverage/lib-fileset-errors_rb.html
-- doc/coverage/lib-fileset-populator_rb.html
-- doc/coverage/screen.css
-- doc/coverage/print.css
 homepage: http://valise.rubyforge.org/
 licenses:
 - MIT
@@ -210,7 +211,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- valise-1.1.4 RDoc
+- valise-1.2.0 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: valise
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 3
 summary: Manage configuration and data files simply