unparser 0.5.7 → 0.6.0

data/lib/unparser/emitter.rb

@@ -5,7 +5,7 @@ module Unparser
 
   # Emitter base class
   class Emitter
-    include Adamantium::Flat, AbstractType, Constants, Generation, NodeHelpers
+    include Adamantium, AbstractType, Constants, Generation, NodeHelpers
     include Anima.new(:buffer, :comments, :node, :local_variable_scope)
 
     public :node

data/lib/unparser/emitter/index.rb

@@ -36,7 +36,7 @@ module Unparser
         handle :indexasgn
 
         VALUE_RANGE     = (1..-2).freeze
-        NO_VALUE_PARENT = IceNine.deep_freeze(%i[and_asgn op_asgn or_asgn].to_set)
+        NO_VALUE_PARENT = %i[and_asgn op_asgn or_asgn].to_set.freeze
 
         private_constant(*constants(false))
 

data/lib/unparser/emitter/op_assign.rb

@@ -7,10 +7,10 @@ module Unparser
     class BinaryAssign < self
       children :target, :expression
 
-      MAP = IceNine.deep_freeze(
+      MAP = {
         and_asgn: '&&=',
         or_asgn:  '||='
-      )
+      }.freeze
 
       handle(*MAP.keys)
 

data/lib/unparser/emitter/primitive.rb

@@ -28,11 +28,11 @@ module Unparser
         RATIONAL_FORMAT = 'i'.freeze
 
         MAP =
-          IceNine.deep_freeze(
+          {
             ::Float    => :float,
             ::Rational => :rational,
             ::Integer  => :int
-          )
+          }.freeze
 
       private
 

data/lib/unparser/emitter/simple.rb

@@ -4,7 +4,7 @@ module Unparser
   class Emitter
     # Emitter for simple nodes that generate a single token
     class Simple < self
-      MAP = IceNine.deep_freeze(
+      MAP = {
         __ENCODING__:      '__ENCODING__',
         __FILE__:          '__FILE__',
         __LINE__:          '__LINE__',
@@ -19,7 +19,7 @@ module Unparser
         self:              'self',
         true:              'true',
         zsuper:            'super'
-      )
+      }.freeze
 
       handle(*MAP.keys)
 

data/lib/unparser/equalizer.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Unparser
+  # Define equality, equivalence and inspection methods
+  #
+  # Original code before vendoring and reduction from: https://github.com/dkubb/equalizer.
+  class Equalizer < Module
+    # Initialize an Equalizer with the given keys
+    #
+    # Will use the keys with which it is initialized to define #cmp?,
+    # #hash, and #inspect
+    #
+    # @param [Array<Symbol>] keys
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    # rubocop:disable Lint/MissingSuper
+    def initialize(*keys)
+      @keys = keys
+      define_methods
+      freeze
+    end
+    # rubocop:enable Lint/MissingSuper
+
+    private
+
+    def included(descendant)
+      descendant.include(Methods)
+    end
+
+    def define_methods
+      define_cmp_method
+      define_hash_method
+      define_inspect_method
+    end
+
+    def define_cmp_method
+      keys = @keys
+      define_method(:cmp?) do |comparator, other|
+        keys.all? do |key|
+          __send__(key).public_send(comparator, other.__send__(key))
+        end
+      end
+      private :cmp?
+    end
+
+    def define_hash_method
+      keys = @keys
+      define_method(:hash) do
+        keys.map(&public_method(:__send__)).push(self.class).hash
+      end
+    end
+
+    def define_inspect_method
+      keys = @keys
+      define_method(:inspect) do
+        klass = self.class
+        name  = klass.name || klass.inspect
+        "#<#{name}#{keys.map { |key| " #{key}=#{__send__(key).inspect}" }.join}>"
+      end
+    end
+
+    # The comparison methods
+    module Methods
+      # Compare the object with other object for equality
+      #
+      # @example
+      #   object.eql?(other)  # => true or false
+      #
+      # @param [Object] other
+      #   the other object to compare with
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def eql?(other)
+        instance_of?(other.class) && cmp?(__method__, other)
+      end
+
+      # Compare the object with other object for equivalency
+      #
+      # @example
+      #   object == other  # => true or false
+      #
+      # @param [Object] other
+      #   the other object to compare with
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def ==(other)
+        instance_of?(other.class) && cmp?(__method__, other)
+      end
+    end # module Methods
+  end # class Equalizer
+end # Unparser

data/lib/unparser/node_details.rb

@@ -6,7 +6,7 @@ module Unparser
 
     def self.included(descendant)
       descendant.class_eval do
-        include Adamantium::Flat, Concord.new(:node)
+        include Adamantium, Concord.new(:node)
 
         extend DSL
       end

data/lib/unparser/validation.rb

@@ -3,7 +3,7 @@
 module Unparser
   # Validation of unparser results
   class Validation
-    include Adamantium::Flat, Anima.new(
+    include Adamantium, Anima.new(
       :generated_node,
       :generated_source,
       :identification,
@@ -64,7 +64,7 @@ module Unparser
 
       new(
         identification:   '(string)',
-        original_source:  MPrelude::Either::Right.new(original_source),
+        original_source:  Either::Right.new(original_source),
         original_node:    original_node,
         generated_source: generated_source,
         generated_node:   generated_node
@@ -86,7 +86,7 @@ module Unparser
       new(
         identification:   '(string)',
         original_source:  generated_source,
-        original_node:    MPrelude::Either::Right.new(original_node),
+        original_node:    Either::Right.new(original_node),
         generated_source: generated_source,
         generated_node:   generated_node
       )

data/lib/unparser/writer/binary.rb

@@ -3,7 +3,7 @@
 module Unparser
   module Writer
     class Binary
-      include Writer, Adamantium::Flat
+      include Writer, Adamantium
 
       children :left, :right
 

data/lib/unparser/writer/dynamic_string.rb

@@ -3,22 +3,20 @@
 module Unparser
   module Writer
     class DynamicString
-      include Writer, Adamantium::Flat
+      include Writer, Adamantium
 
-      PATTERNS_2 = IceNine.deep_freeze(
+      PATTERNS_2 =
         [
-          %i[str_empty begin],
-          %i[begin str_nl]
-        ]
-      )
+          %i[str_empty begin].freeze,
+          %i[begin str_nl].freeze
+        ].freeze
 
-      PATTERNS_3 = IceNine.deep_freeze(
+      PATTERNS_3 =
         [
-          %i[begin str_nl_eol str_nl_eol],
-          %i[str_nl_eol begin str_nl_eol],
-          %i[str_ws begin str_nl_eol]
-        ]
-      )
+          %i[begin str_nl_eol str_nl_eol].freeze,
+          %i[str_nl_eol begin str_nl_eol].freeze,
+          %i[str_ws begin str_nl_eol].freeze
+        ].freeze
 
       FLAT_INTERPOLATION = %i[ivar cvar gvar nth_ref].to_set.freeze
 

data/lib/unparser/writer/rescue.rb

@@ -3,7 +3,7 @@
 module Unparser
   module Writer
     class Rescue
-      include Writer, Adamantium::Flat
+      include Writer, Adamantium
 
       children :body, :rescue_body
 

data/lib/unparser/writer/send.rb

@@ -4,7 +4,7 @@ module Unparser
   module Writer
     # Writer for send
     class Send
-      include Writer, Adamantium::Flat, Constants, Generation
+      include Writer, Adamantium, Constants, Generation
 
       INDEX_ASSIGN    = :'[]='
       INDEX_REFERENCE = :'[]'
@@ -91,7 +91,11 @@ module Unparser
       end
 
       def parses_as_constant?
-        n_const?(Unparser.parse(selector.to_s))
+        test = Unparser.parse_either(selector.to_s).from_right do
+          fail InvalidNodeError.new("Invalid selector for send node: #{selector.inspect}", node)
+        end
+
+        n_const?(test)
       end
 
       def details

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: abstract_type
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-- !ruby/object:Gem::Dependency
-  name: adamantium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: anima
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: concord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-- !ruby/object:Gem::Dependency
-  name: mprelude
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -122,48 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: procto
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.22
+        version: 0.10.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.22
+        version: 0.10.25
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.22
+        version: 0.10.25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.22
+        version: 0.10.25
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -245,15 +147,23 @@ files:
 - README.md
 - bin/unparser
 - lib/unparser.rb
+- lib/unparser/abstract_type.rb
+- lib/unparser/adamantium.rb
+- lib/unparser/adamantium/method_builder.rb
+- lib/unparser/anima.rb
+- lib/unparser/anima/attribute.rb
+- lib/unparser/anima/error.rb
 - lib/unparser/ast.rb
 - lib/unparser/ast/local_variable_scope.rb
 - lib/unparser/buffer.rb
 - lib/unparser/cli.rb
 - lib/unparser/color.rb
 - lib/unparser/comments.rb
+- lib/unparser/concord.rb
 - lib/unparser/constants.rb
 - lib/unparser/diff.rb
 - lib/unparser/dsl.rb
+- lib/unparser/either.rb
 - lib/unparser/emitter.rb
 - lib/unparser/emitter/alias.rb
 - lib/unparser/emitter/args.rb
@@ -314,6 +224,7 @@ files:
 - lib/unparser/emitter/variable.rb
 - lib/unparser/emitter/xstr.rb
 - lib/unparser/emitter/yield.rb
+- lib/unparser/equalizer.rb
 - lib/unparser/finalize.rb
 - lib/unparser/generation.rb
 - lib/unparser/node_details.rb
@@ -353,7 +264,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubyforge_project:
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes