sorcerer 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8dcf3cdd1a1b69cbc70d2768c27dce5582958aaf
-  data.tar.gz: 25a67f7a15125bfba2759b37ccda0afeb9eaa5fb
+SHA256:
+  metadata.gz: '086949b9939c7dcc5b702d516b2c8c5050e1aec12a4f9e0b6f93bd16883b4311'
+  data.tar.gz: 8e98466c01a8758aa2a93a0f9b420bab5ab71b44855882a535d7713dbf6cccfb
 SHA512:
-  metadata.gz: 35d606b74d95f711284738d5d72878967ae569c664a25d2bc1f0f786fc06061df63cbcc66d7f870972176afc49a3ec95e0c4d41d66c12879f8ef244f00056653
-  data.tar.gz: 5fb9dbda6db23f37cbec9d5d823fd17cdee7a6ee88289bc484745480215fd511995f0711e61701578f28b5d9c7798ba12633e0a02d9111631fd1f382fa593f02
+  metadata.gz: 8d04f7f34a703da571ce0b5821f183ea25775bce5c95d10e8b98682f7c0e156f8d257dcf40f6f8d00fc915f0872f7b3264b24f645fab23e7d6563455704fbc2c
+  data.tar.gz: e959656fc9dbf13fe5c8a580a13330a40f259560fb16fc8e99746235f91c4047dd9b884a17fbc2cbbca7d792053c1df89b6a234e5c79519addfcab213f13f2fc

data/README.md

@@ -11,7 +11,7 @@ Sorcerer is targetted mainly at small snippets of Ruby code,
 expressable in a single line. Longer examples may be re-sourced, but
 they will be rendered in a single line format.
 
-**Version: 1.0.0**
+**Version: 2.0.0**
 
 ## Limitations
 

data/lib/sorcerer/resource.rb

@@ -101,7 +101,7 @@ module Sorcerer
           resource(sexp[2])     # Statements
         end
         if !void?(sexp[2])
-          soft_newline
+          soft_newline unless sexp[2].first == :bodystmt
         else
           emit(" ")
         end
@@ -186,7 +186,7 @@ module Sorcerer
       if sig.opts_arg
         first = emit_separator(", ", first)
         emit("**")
-        emit(sig.opts_arg[1])
+        DOESNT_WRAP_OPTS_ARG_IN_KWREST_PARAM ? emit(sig.opts_arg[1]) : resource(sig.opts_arg[1])
       end
       if sig.block_arg
         first = emit_separator(", ", first)
@@ -292,6 +292,17 @@ module Sorcerer
     MISSES_ARRAY_NODE_FOR_WORDS = RUBY_VERSION < '1.9.2' ||
       (RUBY_VERSION == '1.9.2' && RUBY_PATCHLEVEL < 320)
 
+    RUBY_MAJOR, RUBY_MINOR, RUBY_PATCH = RUBY_VERSION.split('.').map(&:to_i)
+
+    # As of 2.5, Ripper started wrapping **opts rest keyword args in a
+    # :kwrest_param s-expression
+    DOESNT_WRAP_OPTS_ARG_IN_KWREST_PARAM = RUBY_MAJOR < 2 || (RUBY_MAJOR == 2 && RUBY_MINOR < 5)
+
+    # As of 2.6, Ripper parses the period in fields and calls as s-expressions
+    # as opposed to raw strings
+    # See: https://github.com/rspec-given/sorcerer/pull/1
+    TREATS_MORE_PERIODS_AS_TEXT = RUBY_MAJOR < 2 || (RUBY_MAJOR == 2 && RUBY_MINOR < 6)
+
     HANDLERS = {
       # parser keywords
 
@@ -460,12 +471,15 @@ module Sorcerer
       },
       :call => lambda { |sexp|
         resource(sexp[1])
-        emit(sexp[2])
+        TREATS_MORE_PERIODS_AS_TEXT || !sexp?(sexp[2]) ? emit(sexp[2]) : resource(sexp[2])
         resource(sexp[3]) unless sexp[3] == :call
       },
       :case => lambda { |sexp|
-        emit("case ")
-        resource(sexp[1])
+        emit("case")
+        if sexp[1]
+          emit(" ")
+          resource(sexp[1])
+        end
         soft_newline
         indent do
           resource(sexp[2])
@@ -494,7 +508,7 @@ module Sorcerer
       },
       :command_call => lambda { |sexp|
         resource(sexp[1])
-        emit(sexp[2])
+        TREATS_MORE_PERIODS_AS_TEXT || !sexp?(sexp[2]) ? emit(sexp[2]) : resource(sexp[2])
         resource(sexp[3])
         emit(" ")
         resource(sexp[4])
@@ -579,7 +593,7 @@ module Sorcerer
       :fcall => PASS1,
       :field => lambda { |sexp|
         resource(sexp[1])
-        emit(sexp[2])
+        TREATS_MORE_PERIODS_AS_TEXT || !sexp?(sexp[2]) ? emit(sexp[2]) : resource(sexp[2])
         resource(sexp[3])
       },
       :for => lambda { |sexp|
@@ -765,7 +779,7 @@ module Sorcerer
       },
       :rest_param => lambda { |sexp|
         emit("*")
-        resource(sexp[1])
+        resource(sexp[1]) if sexp[1]
       },
       :retry => lambda { |sexp|
         emit("retry")
@@ -777,7 +791,15 @@ module Sorcerer
       :return0 => lambda { |sexp|
         emit("return")
       },
-      :sclass => NYI,
+      :sclass => lambda { |sexp|
+        emit("class << ")
+        resource(sexp[1])
+        newline
+        indent do
+          resource(sexp[2]) unless void?(sexp[2])
+        end
+        emit("end")
+      },
       :stmts_add => lambda { |sexp|
         if sexp[1] != [:stmts_new] && ! void?(sexp[1])
           resource(sexp[1])
@@ -793,7 +815,10 @@ module Sorcerer
         resource(sexp[2])
       },
       :string_content => NOOP,
-      :string_dvar => NYI,
+      :string_dvar => lambda { |sexp|
+        emit('#')
+        resource(sexp[1])
+      },
       :string_embexpr => lambda { |sexp|
         emit('#{')
         resource(sexp[1])
@@ -817,8 +842,10 @@ module Sorcerer
         words("I", sexp)
       },
       :symbols_new => NOOP,
-      :top_const_field => NYI,
-      :top_const_ref => NYI,
+      :top_const_ref => lambda { |sexp|
+        emit("::")
+        resource(sexp[1])
+      },
       :unary => lambda { |sexp|
         op = sexp[1].to_s
         op = op[0,1] if op =~ /^.@$/
@@ -916,10 +943,10 @@ module Sorcerer
 
       # Scanner keywords
 
-      :@CHAR => NYI,
+      :@CHAR => EMIT1,
       :@__end__ => NYI,
-      :@backref => NYI,
-      :@backtick => NYI,
+      :@backref => EMIT1,
+      :@backtick => EMIT1,
       :@comma => NYI,
       :@comment => NYI,
       :@const => EMIT1,
@@ -964,6 +991,7 @@ module Sorcerer
       :@words_sep => NYI,
     }
     HANDLERS[:bodystmt] = HANDLERS[:body_stmt]
+    HANDLERS[:top_const_field] = HANDLERS[:top_const_ref]
   end
 
 end

data/lib/sorcerer/version.rb

@@ -1,8 +1,8 @@
 module Sorcerer
   VERSION_NUMBERS = [
-    VERSION_MAJOR = 1,
+    VERSION_MAJOR = 2,
     VERSION_MINOR = 0,
-    VERSION_BUILD = 2,
+    VERSION_BUILD = 0,
   ]
 
   VERSION = VERSION_NUMBERS.join('.')

data/test/assert_resource_helper.rb

@@ -61,7 +61,7 @@ module AssertResource
     string.
       gsub(/\b THEN~/, "; ").
       gsub(/~/, "\n").
-      gsub(/; /, "\n").
+      gsub(/;\s+/, "\n").
       gsub(/#/,'') + "\n"
   end
 
@@ -69,7 +69,7 @@ module AssertResource
     string.
       gsub(/\b THEN~/, "; ").
       gsub(/~/, "\n").
-      gsub(/; /, "\n").
+      gsub(/;\s+/, "\n").
       gsub(/#/,'  ') + "\n"
   end
 

data/test/sorcerer/resource_test.rb

@@ -45,6 +45,7 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "A"
     assert_resource "Mod::X"
     assert_resource "Mod::NS::Y"
+    assert_resource "::Mod::NS::Y"
   end
 
   def test_can_source_keywords
@@ -55,8 +56,10 @@ class ResourceTest < Test::Unit::TestCase
 
   def test_can_source_constant_definition
     assert_resource "X = 1"
+    assert_resource "::X = 1"
     assert_resource "X::Y = 1"
     assert_resource "X::Y::Z = 1"
+    assert_resource "::X::Y::Z = 1"
   end
 
   def test_can_source_instance_variables
@@ -102,7 +105,11 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "obj.meth &code"
     assert_resource "obj.meth a, &code"
     assert_resource "obj.meth a, *args, &code"
-    assert_resource "obj.meth a, *args do |x| x.y end"
+    if RUBY_VERSION >= "2.5"
+      assert_resource "obj.meth a, *args do |x| x.y; end"
+    else
+      assert_resource "obj.meth a, *args do |x| x.y end"
+    end
   end
 
   def test_can_source_method_called_with_scope_op_without_parans
@@ -151,7 +158,11 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "meth &code"
     assert_resource "meth a, &code"
     assert_resource "meth a, *args, &code"
-    assert_resource "meth a, *args do |x| x.y end"
+    if RUBY_VERSION >= "2.5"
+      assert_resource "meth a, *args do |x| x.y; end"
+    else
+      assert_resource "meth a, *args do |x| x.y end"
+    end
   end
 
   def test_can_source_method_with_bare_assoc
@@ -172,7 +183,11 @@ class ResourceTest < Test::Unit::TestCase
   def test_can_source_method_with_do_block
     assert_resource_lines "meth do end"
     assert_resource_lines "meth do |a| end"
-    assert_resource_lines "meth(x, y, *rest, &code) do |a, b=1, c=x, *args, &block|~#one; #two; #three~end"
+    if RUBY_VERSION >= "2.5"
+      assert_resource_lines "meth(x, y, *rest, &code) do |a, b=1, c=x, *args, &block|~#one; #two; #three;~end"
+    else
+      assert_resource_lines "meth(x, y, *rest, &code) do |a, b=1, c=x, *args, &block|~#one; #two; #three~end"
+    end
   end
 
   def test_can_source_method_with_block
@@ -219,6 +234,11 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "3.14"
   end
 
+  def test_can_source_chars
+    assert_resource "?/"
+    assert_resource "?q"
+  end
+
   def test_can_source_strings
     assert_resource '"HI"'
     assert_equal '"HI"', source("'HI'")
@@ -234,6 +254,11 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource '"my name is #{x.a("B")}"'
   end
 
+  def test_can_source_string_dvars
+    assert_resource '"my program is #$0"'
+    assert_resource '"my global is #$glob"'
+  end
+
   def test_can_source_string_concat
     assert_resource '"a" "b"'
     assert_resource '"a" "b" "c"'
@@ -348,6 +373,11 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "not a"
   end
 
+  def test_can_source_backreferences
+    assert_resource "$1"
+    assert_resource "$9"
+  end
+
   def test_can_source_binary_expressions
     assert_resource "a + 1"
     assert_resource "a + b"
@@ -356,6 +386,10 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource "a / b"
     assert_resource "a && b"
     assert_resource "a || b"
+    assert_resource "a < b"
+    assert_resource "a <= b"
+    assert_resource "a > b"
+    assert_resource "a >= b"
   end
 
   def test_can_source_trinary_expressions
@@ -513,6 +547,7 @@ class ResourceTest < Test::Unit::TestCase
   end
 
   def test_can_source_case
+    assert_resource_lines "case~when b; #c; end"
     assert_resource_lines "case a~when b; #c; end"
     assert_resource_lines "case a~when b; #c when d; #e; end"
     assert_resource_lines "case a~when b; #c when d; #e~else~#f; end"
@@ -584,10 +619,12 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource_lines "def f(a); end"
     assert_resource_lines "def f(a, b); end"
     assert_resource_lines "def f(a, b=1); end"
+    assert_resource_lines "def f(a, *); end"
     assert_resource_lines "def f(a, *args); end"
     assert_resource_lines "def f(a, *args, &block); end"
     assert_resource_lines "def f(a); #x; end"
     assert_resource_lines "def f(a); #x; #y; end"
+    assert_resource_lines "def `(a); end"
   end
 
   def test_can_source_def_without_parens
@@ -651,6 +688,12 @@ class ResourceTest < Test::Unit::TestCase
     assert_resource_lines "class X; #def f(); #end; #private :f; end"
   end
 
+  def test_can_source_sclass
+    assert_resource_lines "class << self; end"
+    assert_resource_lines "class << a; end"
+    assert_resource_lines "class << self; #x; end"
+  end
+
   def test_can_source_module
     assert_resource_lines "module X; end"
     assert_resource_lines "module X; #x; end"

data/test/sorcerer/signature_test.rb

@@ -35,7 +35,11 @@ class SignatureTest < Test::Unit::TestCase
       assert_equal [[[:@ident, "b", [1, 11]], [:@int, "1", [1, 13]]]], sig.default_args
       assert_equal [:rest_param, [:@ident, "args", [1, 17]]], sig.rest_arg
       assert_equal [[[:@label, "c:", [1, 23]], [:@int, "2", [1, 26]]]], sig.keyword_args
-      assert_equal [:@ident, "opts", [1, 31]], sig.opts_arg
+      if RUBY_VERSION >= "2.5"
+        assert_equal [:kwrest_param, [:@ident, "opts", [1, 31]]], sig.opts_arg
+      else
+        assert_equal [:@ident, "opts", [1, 31]], sig.opts_arg
+      end
       assert_equal [:blockarg, [:@ident, "block", [1, 38]]], sig.block_arg
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorcerer
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies: []
 description: Generate the original Ruby source from a Ripper-style abstract syntax
   tree.
@@ -20,14 +20,14 @@ files:
 - README.md
 - Rakefile
 - doc/jamis.rb
-- rakelib/git.rake
-- rakelib/readme.rake
-- rakelib/testing.rake
 - lib/sorcerer.rb
 - lib/sorcerer/resource.rb
 - lib/sorcerer/signature.rb
 - lib/sorcerer/subexpression.rb
 - lib/sorcerer/version.rb
+- rakelib/git.rake
+- rakelib/readme.rake
+- rakelib/testing.rake
 - test/assert_resource_helper.rb
 - test/sorcerer/resource_test.rb
 - test/sorcerer/signature_test.rb
@@ -37,25 +37,24 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Rake -- Ruby Make
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sorcerer
-rubygems_version: 2.0.5
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate Source from Ripper ASTs