cfbundle 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f16e3d2efd09474b84de78953ebe736859ecad2
-  data.tar.gz: cdb73bed933efd9a3ae0ad1648354eed14f104bb
+  metadata.gz: a0afca942ade636782524dc8764f0a5d1e01b70b
+  data.tar.gz: 8f6343b059fbb5654636cdb51073776940eee1df
 SHA512:
-  metadata.gz: 6ed47abda281fc8ba40c337504226b93e2cd05952418892699135c8c5d569ffb0512e0ea4b1a5bdeab1f06408744d8b88bb5336a76db76805354aca10739515b
-  data.tar.gz: 3f878a953002dcf55920628a2d506404a582478ffad62da7156d22813f987598abc916c112066ad3856bfd6e85d425b9a4ce8cb4dc81ebe68f2a14918fd24851
+  metadata.gz: 92514490813b48735c35d649dc8c104f48b8d3d89b7f2acda5887526246ec15505bf7e62723683859a6d3ed6fbb1f856f3dc5bd24e3ec9f12a3ae7873a398843
+  data.tar.gz: bd0ed63235589bd34826c83ffd04d94ead7753e0ad02b790612cb8a2536add13fbec6c433a046ad48727572e7319b92e81c4e309e42709ce563e213b37d4e91a

data/lib/cfbundle/path_utils.rb

@@ -31,13 +31,16 @@ module CFBundle
       # extension. The product is either empty or starts with a tilde. The
       # extension is either empty or starts with a dot.
       # @param path [String] The path to the resource.
+      # @param expected_product [String?] The expected value for product.
       # @return [Array]
       # @see join_resource
-      def split_resource(path)
+      def split_resource(path, expected_product)
         directory = File.dirname(path)
         extension = File.extname(path)
         basename = File.basename(path, extension)
-        name, product = split_resource_name_and_product(basename)
+        name, product = split_resource_name_and_product(
+          basename, expected_product
+        )
         [directory, name, product, extension]
       end
 
@@ -57,12 +60,14 @@ module CFBundle
 
       private
 
-      def split_resource_name_and_product(basename)
-        name, _, product = basename.rpartition('~')
-        if name.empty? || product.empty?
+      def split_resource_name_and_product(basename, expected_product)
+        parts = basename.rpartition('~')
+        name = parts[0]
+        product = parts[1] + parts[2]
+        if name.empty? || product != expected_product
           [basename, '']
         else
-          [name, '~' + product]
+          [name, product]
         end
       end
     end

data/lib/cfbundle/resource.rb

@@ -16,7 +16,6 @@ module CFBundle
     def initialize(bundle, path)
       @bundle = bundle
       @path = path
-      @directory, @name, @product, @extension = PathUtils.split_resource(path)
     end
 
     # Opens the resource for reading.
@@ -57,41 +56,12 @@ module CFBundle
         predicate = Predicate.new(name, extension, product)
         loop do
           resource = enumerator.next
-          y << resource if resource.send(:match?, predicate)
+          y << resource if predicate.match?(resource)
         end
       end
       enumerator.each(&block)
     end
 
-    private
-
-    def match?(predicate)
-      return false unless name_match?(predicate) &&
-                          extension_match?(predicate) &&
-                          product_match?(predicate)
-      predicate.uniq?(@name, @extension)
-    end
-
-    def name_match?(predicate)
-      return true if predicate.name.nil?
-      return predicate.name.match? @name if predicate.name.is_a?(Regexp)
-      predicate.name == @name
-    end
-
-    def extension_match?(predicate)
-      predicate.extension.nil? || @extension == predicate.extension
-    end
-
-    def product_match?(predicate)
-      return true if @product == predicate.product
-      return false unless @product.empty?
-      !bundle.storage.exist?(path_with_product(predicate.product))
-    end
-
-    def path_with_product(product)
-      PathUtils.join_resource(@directory, @name, product, @extension)
-    end
-
     # @private
     #
     # Performs the enumeration of a bundle's resources.
@@ -179,10 +149,43 @@ module CFBundle
         @keys = Set.new
       end
 
-      # Ensures the given name and extension are unique during the enumeration.
+      # Returns whether the predicate matches a given resource.
+      #
+      # A predicate ensures resource unicity by the caching the filename of
+      # previsouly matched resources. Therefore this method always returns
+      # when invoked twice with the same resource.
       #
-      # @param name [String] The resource name.
-      # @param extension [String] The resource extension.
+      # @param resource [Resource] The resource to test.
+      # @return [Boolean]
+      def match?(resource)
+        directory, name, product, extension = PathUtils.split_resource(
+          resource.path, @product
+        )
+        extension_match?(extension) &&
+          name_match?(name) &&
+          product_match?(directory, name, product, extension, resource) &&
+          uniq?(name, extension)
+      end
+
+      private
+
+      def extension_match?(extension)
+        @extension.nil? || @extension == extension
+      end
+
+      def name_match?(name)
+        @name.nil? || @name === name
+      end
+
+      def product_match?(directory, name, product, extension, resource)
+        return true if @product == product
+        return false unless product.empty?
+        exact_path = PathUtils.join_resource(
+          directory, name, @product, extension
+        )
+        !resource.bundle.storage.exist?(exact_path)
+      end
+
       def uniq?(name, extension)
         key = [name, extension].join
         return false if @keys.include?(key)
@@ -190,8 +193,6 @@ module CFBundle
         true
       end
 
-      private
-
       def extension_for(extension)
         return extension if extension.nil? || extension.empty?
         extension.start_with?('.') ? extension : '.' + extension

data/lib/cfbundle/version.rb

@@ -1,3 +1,3 @@
 module CFBundle
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfbundle
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nicolas Bachschmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList