dire 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ce56a38011061077ffc3a256d72050176ab80382ecaf6ac3febfac060cee877
-  data.tar.gz: e19678d4c894844c7f46df26aa89bce0bf7629160ba86a636f569183afbcd9db
+  metadata.gz: be6f93fb0a1456e69128bc968babaad69ac2a126985441470660d3e6467b383c
+  data.tar.gz: 560ead570a52d7fa967c7b54290b17875fc0d7568d95178547c6b787d0a534c8
 SHA512:
-  metadata.gz: df15ddb2eb3edf5f31865a338672ba4e1a710224920cfe4dab1f51d125cd459da816a09cef3dab076af8ca51c47ae59c4cba96a5d6ab05a0f419eb33d2306fb6
-  data.tar.gz: 378045dc2b030912a0b5bf1ae42771c5e46786cf09614aaffc8b53ff62a8aca7e91a893b5b6a6ebc267d5542e07f063f3d6bf6a1bef2894723654f881b8818c5
+  metadata.gz: 2c76d776150fdb1411c97a4b36eff6aa037cf2c19271c1e8784a52dfea5a0c7e7c2b12f4fd616ab76bde04f97c407d1c55ecc13ba57e8f987cad2331a2987bd3
+  data.tar.gz: 8708281c65f24db613e9de7663b705fcd9022a048fe7a306529a4f1e512f470a5d5c34058fe8262d11842dfd3bfa8366a385c0ccd8434cc623aca830f14364ae

data/lib/dire/dir.rb

@@ -1,12 +1,12 @@
 module Dire
   class Dir < Node
-    @@invalid_link_handler = -> (nodes, path) {}
+    @@invalid_link_handler = -> (root, nodes, path) {}
 
     def self.invalid_link_handler= lambda
       @@invalid_link_handler = lambda
     end
 
-    @@invalid_path_handler = -> (nodes, path) {}
+    @@invalid_path_handler = -> (root, nodes, path) {}
 
     def self.invalid_path_handler= lambda
       @@invalid_path_handler = lambda
@@ -38,16 +38,16 @@ module Dire
       return @nodes if @nodes
 
       @nodes = absolute_path.glob '*', ::File::FNM_DOTMATCH
-      @nodes = @nodes.each_with_object(Array.new) do |node, nodes|
-        next if ignore? node
+      @nodes = @nodes.each_with_object(Array.new) do |path, nodes|
+        next if ignore? path
 
-        if absolute_path.to_s < node.to_s
+        if absolute_path.to_s < path.to_s
           begin
-            nodes.push get(node)
+            nodes.push get(path)
           rescue Dire::Error::InvalidLink
-            @@invalid_link_handler.(nodes, node)
+            @@invalid_link_handler.(root, nodes, path)
           rescue Dire::Error::InvalidPath
-            @@invalid_path_handler.(nodes, node)
+            @@invalid_path_handler.(root, nodes, path)
           end
         end
       end

data/lib/dire/file.rb

@@ -5,7 +5,7 @@ module Dire
     def binary?
       return @binary if @binary
 
-      unless %w(application text).include? mime.mediatype
+      if mime && !['application', 'text'].include?(mime.mediatype)
         return @binary = true
       end
 

data/lib/dire/module/check.rb

@@ -0,0 +1,21 @@
+module Dire::Module::Check
+  def == other
+    path.to_s == other.path.to_s
+  end
+
+  def broken?
+    false
+  end
+
+  def known?
+    true
+  end
+
+  def parent? node
+    parent == node
+  end
+
+  def root?
+    false
+  end
+end

data/lib/dire/module/path.rb

@@ -0,0 +1,37 @@
+module Dire::Module::Path
+  def absolute_path
+    path
+  end
+
+  def name
+    absolute_path.basename.to_s
+  end
+
+  def param
+    relative_path.to_s
+  end
+
+  def relative_path
+    chop path
+  end
+
+  private
+
+  def chop pth
+    expand(pth).relative_path_from(root)
+  end
+
+  def expand pth
+    path.join(pth).expand_path
+  end
+
+  def ignore? path
+    Dire::IGNORE.any? do |ignore|
+      File.fnmatch? ignore, path, File::FNM_DOTMATCH | File::FNM_PATHNAME
+    end
+  end
+
+  def inside? path
+    expand(path).to_s.index(root.to_s) == 0
+  end
+end

data/lib/dire/module/validity.rb

@@ -0,0 +1,29 @@
+module Dire::Module::Validity
+  def validate!
+    begin
+      if ignore? path
+        raise Errno::ENOENT if ignore? path
+      end
+
+      path.lstat
+    rescue Errno::ENOENT
+      raise Dire::Error::InvalidPath, 'Not found'
+    end
+
+    unless inside? path
+      raise Dire::Error::InvalidPath, 'Outside root'
+    end
+
+    true
+  end
+
+  private
+
+  def validate_type! name
+    unless type == name
+      raise Dire::Error::InvalidPath, 'Node missmatch'
+    end
+
+    true
+  end
+end

data/lib/dire/node.rb

@@ -1,18 +1,17 @@
 module Dire
   class Node
-    include Mixin::Check
-    include Mixin::Path
+    include Module::Check, Module::Path, Module::Validity
 
     attr_reader :path, :root
 
-    def initialize node, root, validate = true
+    def initialize node, root, validate: true
       @path = str2abs node
       @root = plant root
 
       validate! if validate
     end
 
-    def get path, validate = true
+    def get path, validate: true
       path = expand path
       type = path.ftype rescue nil
 
@@ -24,12 +23,12 @@ module Dire
         else Other
       end
 
-      const.new path, root, validate
+      const.new path, root, validate: validate
     end
 
     def parent
       Dire::Dir.new absolute_path.join('..'), root
-    rescue Error::InvalidPath
+    rescue Dire::Error::InvalidPath
       nil
     end
 

data/lib/dire/version.rb

@@ -1,3 +1,3 @@
 module Dire
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dire
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Filip Pyda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mimemagic
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -71,8 +71,9 @@ files:
 - lib/dire/error/invalid_root.rb
 - lib/dire/file.rb
 - lib/dire/link.rb
-- lib/dire/mixin/check.rb
-- lib/dire/mixin/path.rb
+- lib/dire/module/check.rb
+- lib/dire/module/path.rb
+- lib/dire/module/validity.rb
 - lib/dire/node.rb
 - lib/dire/other.rb
 - lib/dire/version.rb

data/lib/dire/mixin/check.rb

@@ -1,57 +0,0 @@
-module Dire::Mixin::Check
-  def == other
-    path.to_s == other.path.to_s
-  end
-
-  def broken?
-    false
-  end
-
-  def known?
-    true
-  end
-
-  def parent? node
-    parent == node
-  end
-
-  def root?
-    false
-  end
-
-  def validate!
-    begin
-      raise Errno::ENOENT if ignore? path
-
-      path.lstat
-    rescue Errno::ENOENT
-      raise Dire::Error::InvalidPath, 'Not found'
-    end
-
-    unless inside? path
-      raise Dire::Error::InvalidPath, 'Outside root'
-    end
-
-    true
-  end
-
-  private
-
-  def ignore? path
-    Dire::IGNORE.any? do |ignore|
-      File.fnmatch? ignore, path, File::FNM_PATHNAME
-    end
-  end
-
-  def inside? path
-    expand(path).to_s.index(root.to_s) == 0
-  end
-
-  def validate_type! name
-    unless type == name
-      raise Dire::Error::InvalidPath, 'Node missmatch'
-    end
-
-    true
-  end
-end

data/lib/dire/mixin/path.rb

@@ -1,23 +0,0 @@
-module Dire::Mixin::Path
-  def absolute_path
-    path
-  end
-
-  def param
-    relative_path.to_s
-  end
-
-  def relative_path
-    chop path
-  end
-
-  private
-
-  def chop pth
-    expand(pth).relative_path_from(root)
-  end
-
-  def expand pth
-    path.join(pth).expand_path
-  end
-end