pathtree 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa0b4b00d649556ade2438672e8f579096425641c87dc12904c0b1e83896f4c
-  data.tar.gz: a20dc412a32816c46688ae0ee426f1ee19d954290d3def13f64d50099a737956
+  metadata.gz: 06e46ecc4b58e4553042302669756be661ac48184b80ed5dd54da22dc8697b5f
+  data.tar.gz: d73d5937c003469eede446f6e700657b594083a09b5d4f9d886df3ecc3369a48
 SHA512:
-  metadata.gz: 19b2cf1822c9380fbd6161ee50b3fd57990811d93331ddd22530982907654b2e6dee118715da9ccd76c5921afd01249a7fa1357b30886cab3f4ce45430f2f53f
-  data.tar.gz: 01bda1e63a6dcc19803a10857cb581d7457a87329e1c2592cfb355a6f5a4e235e301eea171f22a4fd613afcdaff69a6369433824c5e4595160ceee3660d6fd94
+  metadata.gz: 9b2c4e1e4f15378a564e3db49d93b77126d55900a913435b74e71206195153f723785369f800d107a3c3bb3d4966a0a44c47c9d5a18322a48886d9e8413a7294
+  data.tar.gz: d76946784f32750357ab5bbe6145f114b5207c6204fdd3f2663c2d7da5d322aa25d5e3047fc0a514d1749e33164f30323dd4564f3c2a3953366215ab3c31de8f

data/CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed in 0.4.1
+
+* It is now possible to define identically named paths in different hierarchies.
+  In 0.4.0, duplicate names caused an exception.
+
+```ruby
+directory :aaa do
+  file :xxx
+
+  directory :bbb do
+    file :xxx # OK
+  end
+end
+```
+
 ## 0.4.0 - 2022-05-14
 
 ### Changed in 0.4.0

data/lib/pathtree/dsl.rb

@@ -16,10 +16,8 @@ module Pathtree
     # * Otherwise, +path+ itself is used.
     def file(name, path = nil)
       check_name(name)
-      path = normalize(name: name, path: path)
-      path = @root / path if @root
-      @names << name
-      define_singleton_method(name) { path }
+      path = normalize(path, name: name).then { nest(_1) }
+      sprout(name: name, path: path)
     end
 
     # Grows directory branch from the branch.
@@ -27,23 +25,16 @@ module Pathtree
     # This method has optional block, which represents nested file structure.
     def directory(name, path = nil, &block)
       check_name(name)
-      path = normalize(name: name, path: path)
-      path = @root / path if @root
-      @names << name
-
-      define_singleton_method(name) do
-        path.tap do |p|
-          Dsl.extend(p, root: path)
-          p.instance_eval(&block) if block
-        end
-      end
+      path = normalize(path, name: name).then { nest(_1) }
+                                        .then { Dsl.extend(_1) }
+                                        .tap { _1.instance_eval(&block) if block }
+      sprout(name: name, path: path)
     end
 
     alias dir directory
 
-    def self.extend(path, root: nil)
+    def self.extend(path)
       path.instance_variable_set(:@names, [])
-      path.instance_variable_set(:@root, root)
       path.extend(Dsl)
       path
     end
@@ -54,16 +45,23 @@ module Pathtree
       raise MethodDuplicationError, name if respond_to?(name)
     end
 
-    def normalize(name:, path: nil)
+    def normalize(path, name:)
       if path.nil?
         Pathname(name.to_s)
       elsif path.is_a?(String)
         Pathname(path)
       elsif path.respond_to?(:call)
-        path.call(name).then { normalize(name: _1) }
+        path.call(name).to_s.then { Pathname(_1) }
       else
         path
       end
     end
+
+    def nest(path) = is_a?(Trunk) ? path : self / path
+
+    def sprout(name:, path:)
+      define_singleton_method(name) { path }
+      @names << name
+    end
   end
 end

data/lib/pathtree/trunk.rb

@@ -10,7 +10,6 @@ module Pathtree
 
     def initialize
       @names = []
-      @root = nil
     end
   end
 end

data/lib/pathtree/version.rb

@@ -3,5 +3,5 @@
 require 'pathname'
 
 module Pathtree
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/pathtree.rb

@@ -25,7 +25,7 @@ module Pathtree
 
     def to_path(value)
       value = Pathname(value) if value.is_a?(String)
-      Dsl.extend(value, root: value)
+      Dsl.extend(value)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathtree
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - gemmaro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies: []
 description: Pathname DSL
 email: