nrser 0.2.0.pre.0 → 0.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51533291e377070a1f4cac954fc49eee602d178
-  data.tar.gz: 57c89f078878e050a01dfd8a1b1c00a345de7cb5
+  metadata.gz: 942988b83ec5c05fed5f15e87869dd0f20044db8
+  data.tar.gz: 57bc680b81ffe4f7650b1200d0aa21a8579be60a
 SHA512:
-  metadata.gz: 6305b4adf84631b859377ed9c30d065b617b157299c066a0f8333f9133d979ccf37424cdc16ce3c6cef0219a95e769294cd19148b299f48358bb7934715b7003
-  data.tar.gz: 5cbf8bb41e319263a4eda303cdf0651080f628a566f723ca185136b198b3089e89b74b22b3b46f815b553ecb0a770eb48b28c09f935148dde7bd0338dc4201e6
+  metadata.gz: eec00863e1a07aa333d71a66139773d7f198efcfa137e6aa57607d619431854a2850e54e7ae59c8e1dbbc28f9bd887969f36aef584d703bb0830a345e1540bb9
+  data.tar.gz: 3129461e852e4a830e7dcf0dd097c32e017fa4e99541ed76f1bb9670025575a6ec9f3570ad9390a397f6ca733a051b5349d0865a5103656a0bf22be5948e4f7c

data/lib/nrser/functions/hash/symbolize_keys.rb

@@ -50,7 +50,7 @@ module NRSER
   #   @todo Document return value.
   # 
   def self.deep_symbolize_keys object, &block
-    deep_transform_keys( object ) { key.to_sym rescue key }
+    deep_transform_keys( object ) { |key| key.to_sym rescue key }
   end # .deep_symbolize_keys
   
 

data/lib/nrser/types/combinators.rb

@@ -31,19 +31,41 @@ module NRSER::Types
     end
     
     
-    # a combinator may attempt to parse from a string if any of it's types
-    # can do so
-    def has_from_s?
-      @types.any? {|type| type.has_from_s?}
-    end
-    
-    
-    # a combinator iterates through each of it's types, trying the
-    # conversion and seeing if the result satisfies the combinator type
-    # itself. the first such value found is returned.
+    # Parse a satisfying value from a {String} or raise a {TypeError}.
+    # 
+    # If this type has it's own `@from_s` that was provided via the `from_s:`
+    # keyword at construction, then that and **only** that is **always** used
+    # - the type will never try any of the combined types' `#from_s`.
+    # 
+    # It's considered *the* way to parse a string into a value that satisfies
+    # the type. If it fails, a {TypeError} will be raised (or any error the
+    # `@from_s` proc itself raises before we get to checking it).
+    # 
+    # If the type doesn't have it's own `@from_s`, each of the combined types'
+    # `#from_s` will be tried in sequence, and the first value that satisfies
+    # the combined type will be returned.
+    # 
+    # This is obviously much less efficient, but provides a nice automatic
+    # mechanism for parsing from strings for combined types. If none of the
+    # combined types' `#from_s` succeed (or if there are none) a {TypeError}
+    # is raised.
+    # 
+    # @param [String] s
+    #   String to parse.
+    # 
+    # @return [Object]
+    #   Object that satisfies the type.
+    # 
+    # @raise [TypeError]
+    #   See write up above.
+    # 
     def from_s s
+      unless @from_s.nil?
+        return check @from_s.call( s )
+      end
+      
       @types.each { |type|
-        if type.respond_to? :from_s
+        if type.has_from_s?
           begin
             return check type.from_s(s)
           rescue TypeError => e
@@ -57,15 +79,20 @@ module NRSER::Types
     end
     
     
-    # Overridden to delegate functionality to the combined types:
+    # Overridden to delegate functionality to the combined types.
+    # 
+    # A combinator may attempt to parse from a string if:
+    # 
+    # 1.  It has it's own `@from_s` provided at construction.
+    # 
+    # 2.  Any of it's combined types can parse from a string.
     # 
-    # A combinator may attempt to parse from a string if any of it's types
-    # can do so.
+    # See {#from_s} for details of how it actually happens.
     # 
     # @return [Boolean]
     # 
     def has_from_s?
-      @types.any? {|type| type.has_from_s?}
+      super() || @types.any? { |type| type.has_from_s? }
     end # has_from_s
     
     

data/lib/nrser/types/is.rb

@@ -21,7 +21,9 @@ module NRSER::Types
     end
     
     def == other
-      equal?(other) || @value === other.value
+      equal?(other) ||
+      ( self.class == other.class &&
+        @value == other.value )
     end
     
     # @return [String]

data/lib/nrser/types/paths.rb

@@ -104,6 +104,7 @@ module NRSER::Types
         path,
         where { |path| path.to_pn.absolute? },
         name: name,
+        from_s: ->( s ) { File.expand_path s },
         **options
     end
     

data/lib/nrser/version.rb

@@ -18,7 +18,7 @@ module NRSER
   # 
   # @return [String]
   # 
-  VERSION = "0.2.0.pre.0"
+  VERSION = "0.2.0.pre.1"
   
   
   module Version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrser
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.0
+  version: 0.2.0.pre.1
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamster
@@ -431,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: basic ruby utils i use in a lot of stuff.