sorcerer 0.3.1 → 0.3.2

data/lib/sorcerer.rb

@@ -12,4 +12,5 @@ end
 
 require 'sorcerer/resource'
 require 'sorcerer/subexpression'
+require 'sorcerer/version'
 

data/lib/sorcerer/resource.rb

@@ -74,7 +74,6 @@ module Sorcerer
     end
 
     def resource(sexp)
-      sexp = sexp.first if nested_sexp?(sexp)
       fail NotSexpError, "Not an S-EXPER: #{sexp.inspect}" unless sexp?(sexp)
       handler = HANDLERS[sexp.first]
       raise NoHandlerError.new(sexp.first) unless handler
@@ -492,7 +491,16 @@ module Sorcerer
         resource(sexp[1])
         emit(")")
       },
-      :defs => NYI,
+      :defs => lambda { |sexp|
+        emit("def ")
+        resource(sexp[1])
+        resource(sexp[2])
+        resource(sexp[3])
+        opt_parens(sexp[4])
+        newline
+        indent do resource(sexp[5]) end
+        emit("end")
+      },
       :do_block => lambda { |sexp|
         emit_block(sexp, "do", "end")
       },
@@ -903,7 +911,7 @@ module Sorcerer
       :@lparen => NYI,
       :@nl => NYI,
       :@op => EMIT1,
-      :@period => NYI,
+      :@period => EMIT1,
       :@qwords_beg => NYI,
       :@rbrace => NYI,
       :@rbracket => NYI,

data/lib/sorcerer/version.rb

@@ -1,7 +1,7 @@
 module Sorcerer
   VERSION_MAJOR = 0
   VERSION_MINOR = 3
-  VERSION_BUILD = 1
+  VERSION_BUILD = 2
   VERSION_BETA  = 0
 
   VERSION_NUMBERS = [VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD] +

data/test/sorcerer/resource_test.rb

@@ -33,9 +33,21 @@ class SourcerTest < Test::Unit::TestCase
   # string in single line and multi-line modes.
   #
   def assert_resource_lines(string, options={})
-    assert_resource_for_mode(string, options.merge(multiline: false)) { |s| for_single_line(s) }
-    assert_resource_for_mode(string, options.merge(multiline: true))  { |s| for_multi_line(s) }
-    assert_resource_for_mode(string, options.merge(indent: true))     { |s| for_indented(s) }
+    assert_resource_for_mode(
+      string,
+      options.merge(multiline: false)) { |s|
+      for_single_line(s)
+    }
+    assert_resource_for_mode(
+      string,
+      options.merge(multiline: true)) { |s|
+      for_multi_line(s)
+    }
+    assert_resource_for_mode(
+      string,
+      options.merge(indent: true)) { |s|
+      for_indented(s)
+    }
   end
 
   # Assert the string is correctly resourced given the options and the
@@ -81,7 +93,13 @@ class SourcerTest < Test::Unit::TestCase
       puts
       puts "***************************** options: #{options.inspect}"
     end
-    sexp = quietly { Ripper::SexpBuilder.new(string).parse }
+    sexp = quietly {
+      if options[:quick]
+        Ripper.sexp(string)
+      else
+        Ripper::SexpBuilder.new(string).parse
+      end
+    }
     fail "Failed to parts '#{string}'" if sexp.nil?
     Sorcerer.source(sexp, options)
   end
@@ -99,6 +117,12 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource "Mod::NS::Y"
   end
 
+  def test_can_source_keywords
+    assert_resource "true"
+    assert_resource "false"
+    assert_resource "nil"
+  end
+
   def test_can_source_constant_definition
     assert_resource "X = 1"
     assert_resource "X::Y = 1"
@@ -583,6 +607,13 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource_lines "def f(a); #x; #y; end"
   end
 
+  def test_can_source_def_self
+    assert_resource_lines "def self.f; end"
+    assert_resource_lines "def self.f(a, *args, &block); #x; #y; end"
+    assert_resource_lines "def Mod.f; end"
+    assert_resource_lines "def Mod.f(a, *args, &block); #x; #y; end"
+  end
+
   def test_can_source_class_without_parent
     assert_resource_lines "class X; end"
     assert_resource_lines "class X; #x; end"
@@ -630,11 +661,6 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource_lines "Then {~#a == b; #x~}"
   end
 
-  def test_can_use_ripper_sexp_output
-    sexp = quietly { Ripper.sexp("a = 1") }
-    assert_equal "a = 1", Sorcerer.source(sexp)
-  end
-
   def test_can_handle_missing_statements
     sexp = [:bodystmt, [:stmts_add, [:stmts_new]], nil, nil, nil]
     assert_equal "", Sorcerer.source(sexp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcerer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-14 00:00:00.000000000 Z
 dependencies: []
 description: Generate the original Ruby source from a Ripper-style abstract syntax
   tree.