psychgus 1.2.2 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a27bbbad046bb56766bbbf05da64314757237a44b3f941105b848e178391625
-  data.tar.gz: 61b3437d298d84718a226be9ee5e904cd0f46bde245200f0b239bcd3e0a6ba83
+  metadata.gz: dfe0fe918cc179a21aa9a7c37e0172344ef80b9f5c07c31e127ba97c79a5e69f
+  data.tar.gz: e0b7107993830b4366c6d332756c1771af7fab396fdc77deb713db01fae0c4e7
 SHA512:
-  metadata.gz: 2af6115edfa0e408141e709331d308b6de33c338d1febbd924bf7e2fdd138abf65f1463d129a59799e50bfa57b2e6b631ef811c06e7a60ee8a23506f4087d104
-  data.tar.gz: 31056d1397820d97b490aee89acef035f29424ba78f05d0d9ab0520b6898b9255e5284367b7f9c02fc6d54c2506abfad625b262415d7dc992b46e879234bc405
+  metadata.gz: 17ace1a7d1a8e6ddea35de17efdad5ce5250b1a8fe5a1e4a16a7f97c5b6100b5fb39acafcdd5e85e65aa3b90fccca09b8a13e8d272156eae63d07c4f5c82305d
+  data.tar.gz: 4f6598c2bff80330603f087df0c83e629063457eff41c6bcdd3dc11450d6e53fbb548d493ba33c56cc9cd93bedaa57d7f539ec448c76124b64ad81098529d79a

data/CHANGELOG.md

@@ -2,7 +2,18 @@
 
 Format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [[Unreleased]](https://github.com/esotericpig/psychgus/compare/v1.2.2...master)
+## [[Unreleased]](https://github.com/esotericpig/psychgus/compare/v1.3.2...master)
+
+## [v1.3.2] - 2020-04-23
+
+### Changed
+- SuperSniffer::Parent
+    - Changed to use Delegator to delegate all methods of `node`
+- Psychgus.dump_file()/parse_file()
+    - Changed `opt` to expect a Hash
+
+### Fixed
+- Fixed some Ruby 2.7 warnings in tests
 
 ## [v1.2.2] - 2020-03-15
 

data/README.md

@@ -1,6 +1,8 @@
 # Psychgus
 
-[![Gem Version](https://badge.fury.io/rb/psychgus.svg)](https://badge.fury.io/rb/psychgus) ![ruby tests](https://github.com/esotericpig/psychgus/workflows/ruby%20tests/badge.svg)
+[![Gem Version](https://badge.fury.io/rb/psychgus.svg)](https://badge.fury.io/rb/psychgus)
+[![Build Status](https://travis-ci.org/esotericpig/psychgus.svg?branch=master)](https://travis-ci.org/esotericpig/psychgus)
+[![Doc Coverage](http://inch-ci.org/github/esotericpig/psychgus.svg?branch=master)](https://inch-ci.org/github/esotericpig/psychgus)
 
 [![Documentation](https://img.shields.io/badge/doc-yard-%23A0522D.svg)](https://esotericpig.github.io/docs/psychgus/yardoc/index.html)
 [![Source Code](https://img.shields.io/badge/source-github-%23211F1F.svg)](https://github.com/esotericpig/psychgus)

data/lib/psychgus/super_sniffer/parent.rb

@@ -47,7 +47,7 @@ module Psychgus
     # @see SuperSniffer#end_parent SuperSniffer#end_parent
     # @see Styler
     ###
-    class Parent
+    class Parent < Delegator
       # Calling the getter is fine; calling the setter is *not* and could cause weird results.
       # 
       # @return [Integer] the next child's position
@@ -80,47 +80,9 @@ module Psychgus
         @position = sniffer.position
       end
       
-      # @see Psych::Nodes::Alias#anchor=
-      # @see Psych::Nodes::Mapping#anchor=
-      # @see Psych::Nodes::Scalar#anchor=
-      # @see Psych::Nodes::Sequence#anchor=
-      def anchor=(anchor)
-        @node.anchor = anchor
-      end
-      
-      # @see Psych::Nodes::Scalar#plain=
-      def plain=(plain)
-        @node.plain = plain
-      end
-      
-      # @see Psych::Nodes::Scalar#quoted=
-      def quoted=(quoted)
-        @node.quoted = quoted
-      end
-      
-      # @see Psych::Nodes::Mapping#style=
-      # @see Psych::Nodes::Scalar#style=
-      # @see Psych::Nodes::Sequence#style=
-      def style=(style)
-        @node.style = style
-      end
-      
-      # @see Psych::Nodes::Node#tag=
-      def tag=(tag)
-        @node.tag = tag
-      end
-      
-      # @see Psych::Nodes::Scalar#value=
-      def value=(value)
-        @node.value = value
-      end
-      
-      # @see Psych::Nodes::Alias#anchor
-      # @see Psych::Nodes::Mapping#anchor
-      # @see Psych::Nodes::Scalar#anchor
-      # @see Psych::Nodes::Sequence#anchor
-      def anchor()
-        return @node.anchor
+      # @api private
+      def __getobj__
+        return @node
       end
       
       # Check if the children of this parent are keys to a Mapping.
@@ -141,21 +103,6 @@ module Psychgus
         return @child_type == :value
       end
       
-      # @see Psych::Nodes::Stream#encoding
-      def encoding()
-        return @node.encoding
-      end
-      
-      # @see Psych::Nodes::Node#end_column
-      def end_column()
-        return @node.end_column
-      end
-      
-      # @see Psych::Nodes::Node#end_line
-      def end_line()
-        return @node.end_line
-      end
-      
       # @see Psych::Nodes::Document#implicit
       # @see Psych::Nodes::Mapping#implicit
       # @see Psych::Nodes::Sequence#implicit
@@ -183,54 +130,12 @@ module Psychgus
         return @node.quoted
       end
       
-      # @see Psych::Nodes::Node#start_column
-      def start_column()
-        return @node.start_column
-      end
-      
-      # @see Psych::Nodes::Node#start_line
-      def start_line()
-        return @node.start_line
-      end
-      
-      # @see Psych::Nodes::Mapping#style
-      # @see Psych::Nodes::Scalar#style
-      # @see Psych::Nodes::Sequence#style
-      def style()
-        return @node.style
-      end
-      
-      # @see Psych::Nodes::Node#tag
-      def tag()
-        return @node.tag
-      end
-      
-      # @see Psych::Nodes::Document#tag_directives
-      def tag_directives()
-        return @node.tag_directives
-      end
-      
-      # @see Psych::Nodes::Scalar#value
-      def value()
-        return @node.value
-      end
-      
-      # @see Psych::Nodes::Document#version
-      def version()
-        return @node.version
-      end
-      
       # @note If this method is modified, then tests will fail
       # 
       # @return [String] a String representation of this class for debugging and testing
       def to_s()
         return "<#{@debug_tag}:(#{@level}:#{@position}):#{@child_type}:(:#{@child_position})>"
       end
-      
-      alias_method :implicit,:implicit?
-      alias_method :implicit_end,:implicit_end?
-      alias_method :plain,:plain?
-      alias_method :quoted,:quoted?
     end
   end
 end

data/lib/psychgus/version.rb

@@ -23,5 +23,5 @@
 
 module Psychgus
   # Version of this gem in "#.#.#" format
-  VERSION = '1.2.2'
+  VERSION = '1.3.2'
 end

data/lib/psychgus.rb

@@ -413,8 +413,7 @@ module Psychgus
   #                              [+'a:UTF-16'+] create a new file or append to an existing file
   #                                             and use UTF-16 encoding
   # @param perm [Integer] the permission bits to use (platform dependent)
-  # @param opt [Symbol] the option(s) to use, more readable alternative to +mode+;
-  #                     examples: +:textmode+, +:autoclose+
+  # @param opt [Hash] Hash of keyword args to pass to +File.open()+
   # @param options [Hash] the options (or keyword args) to use; see {.dump_stream}
   # 
   # @see .dump_stream
@@ -422,7 +421,9 @@ module Psychgus
   # @see IO.new
   # @see https://ruby-doc.org/core/IO.html#method-c-new
   def self.dump_file(filename,*objects,mode: 'w',perm: nil,opt: nil,**options)
-    File.open(filename,mode,perm,opt) do |file|
+    opt = Hash(opt)
+    
+    File.open(filename,mode,perm,**opt) do |file|
       file.write(dump_stream(*objects,**options))
     end
   end
@@ -625,6 +626,7 @@ module Psychgus
   # @param filename [String] the name of the YAML file (and path) to parse
   # @param fallback [Object] the return value when nothing is parsed
   # @param mode [String,Integer] the IO open mode to use; example: +'r:BOM|UTF-8'+
+  # @param opt [Hash] Hash of keyword args to pass to +File.open()+
   # @param kargs [Hash] the keyword args to use; see {.parse_stream}
   # 
   # @return [Psych::Nodes::Document] the parsed Document node
@@ -634,8 +636,10 @@ module Psychgus
   # @see Psych::Nodes::Document
   # @see File.open
   # @see IO.new
-  def self.parse_file(filename,fallback: false,mode: 'r:BOM|UTF-8',**kargs)
-    result = File.open(filename,mode) do |file|
+  def self.parse_file(filename,fallback: false,mode: 'r:BOM|UTF-8',opt: nil,**kargs)
+    opt = Hash(opt)
+    
+    result = File.open(filename,mode,**opt) do |file|
       parse(file,filename: filename,**kargs)
     end
     

data/psychgus.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new() do |spec|
   # - https://github.com/ruby/psych/commit/712a65a53f3c15105cd86e8ad3ee3c779050ada4
   spec.add_runtime_dependency 'psych','>= 3.0'
   
-  spec.add_development_dependency 'bundler'   ,'~> 1.17'
+  spec.add_development_dependency 'bundler'   ,'~> 2.1'
   spec.add_development_dependency 'minitest'  ,'~> 5.14' # For testing
   spec.add_development_dependency 'rake'      ,'~> 13.0'
   spec.add_development_dependency 'rdoc'      ,'~> 6.2'  # For RDoc for YARD (*.rb)

data/test/psychgus_test.rb

@@ -86,15 +86,28 @@ Toppings:
     Tempfile.create(['Psychgus','.yaml']) do |file|
       puts "Testing #{self.class.name} w/ temp file: #{file.path}"
       
-      Psychgus.dump_file(file,BURGERS_DATA,stylers: @flow_styler)
+      Psychgus.dump_file(file,BURGERS_DATA,
+        mode: File::CREAT | File::RDWR,
+        opt: {textmode: true},
+        #perm: 644, # Unix only
+        stylers: @flow_styler,
+      )
       
       file.rewind()
+      
       lines = file.readlines().join()
       assert_equal EXPECTED_BURGERS,lines
       
       file.rewind()
+      file.close()
+      
       data = Psych.load_file(file)
       refute_equal false,data
+      refute_equal nil,data
+      
+      data = Psychgus.parse_file(file)
+      refute_equal false,data
+      refute_equal nil,data
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psychgus
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.2
 platform: ruby
 authors:
 - Jonathan Bradley Whited (@esotericpig)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement