sexp2ruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6521d5161ee2027c4a9fcfbfa58a6f8800a1032
-  data.tar.gz: dd984a8d70a35a285dae0b591e4cc523424c1417
+  metadata.gz: 0a0f686a975b672835e136dc5ebb67483658f4ed
+  data.tar.gz: b5f1433cb9d3356d37628587b7a81f7c554c7593
 SHA512:
-  metadata.gz: f87f34c8f9ca2006e15738e8329289ae087bc928b2d0c0eb06e9d813f20f7346796c0935347f0913841ff466cbe5b0f486856264944ee9e87dca4af76f2e77b2
-  data.tar.gz: 43e0e32832b2a01b3966770a812c917bc130f3489bb29d4900c5d554d110ee80badd8b50967a245c170aec0e15c510772277b00feb2dc12a2e6b7a6f3c9d2fd0
+  metadata.gz: a3d6da332f6456aeb084a610e1ec44ed1797a89b85e05fd23812e6a00c57de6f74a82226ae64e91c9cb55eea83d504accd54f62ccc815330734a42d9ac52b9fe
+  data.tar.gz: aadb54bb3269ad6936e99c0cbf3af50b1226ac20714498ccdc72f728208cccd9d1f5a1cb7ac5cf31a2a7229b40ae5789a0184369be08dbe2258e7dce7219faac

data/CHANGELOG.md

@@ -1,3 +1,32 @@
-=== 0.0.1 / 2015-05-31
+Change Log
+==========
+
+This project follows [semver 2.0.0][1] and the recommendations
+of [keepachangelog.com][2].
+
+0.0.3
+-----
+
+### Changed
+- Configuration
+  - Changed default of `:hash_syntax` from `:ruby18` to `:ruby19`
+
+### Added
+- Do not wrap subhash in parentheses
+- Configuration
+  - Added `:no_paren_methods` omit argument parentheses
+
+0.0.2
+-----
+
+### Changed
+- Normalize block arguments.  See [ruby_parser PR 189][3] (Ryan Davis)
+
+0.0.1
+-----
 
 Initial version.  Just claiming the gem name.
+
+[1]: http://semver.org/spec/v2.0.0.html
+[2]: http://keepachangelog.com/
+[3]: https://github.com/seattlerb/ruby_parser/pull/189

data/README.md

@@ -6,10 +6,10 @@ sexp2ruby
 `sexp2ruby` generates ruby from RubyParser S-expressions.
 It is a fork of [ruby2ruby][1] with slightly different goals.
 
-- Generates ruby that follows [ruby-style-guide][3] where possible
+- Follows [ruby-style-guide][3] where possible
 - Prefers OO design over performance
 - Drops support for ruby 1.8.7
-- Depends on [activesupport][4]
+- Depends on (a small subset of) [activesupport][4]
 - Uses bundler instead of hoe
 - Uses rspec instead of minitest
 
@@ -29,7 +29,24 @@ Sexp2Ruby::Processor.new.process(sexp.deep_clone)
 ```
 
 As with all `SexpProcessor`s, `Sexp2Ruby#process` destroys its input,
-so `deep_clone` if you need to preserve it.
+so `deep_clone` as shown above if you need to preserve it.
+
+Configuration
+-------------
+
+Configure output by passing options to `Sexp2Ruby::Processor.new`:
+
+```ruby
+hash = s(:hash, s(:lit, :a), s(:lit, 1))
+Sexp2Ruby::Processor.new(hash_syntax: :ruby18).process
+# => "{ :a => 1 }"
+Sexp2Ruby::Processor.new(hash_syntax: :ruby19).process
+# => "{ a: 1 }"
+```
+
+- `:hash_syntax` - either `:ruby18` or `:ruby19`. Default is `:ruby19`.
+- `:no_paren_methods` - an array of symbols, these methods
+  will omit argument parentheses. Default is `[]`.
 
 [1]: https://github.com/seattlerb/ruby2ruby
 [2]: http://docs.seattlerb.org/ruby2ruby

data/lib/sexp2ruby/node/base.rb

@@ -17,6 +17,7 @@ module Sexp2Ruby
         :indent,
         :indent_lvl,
         :finish,
+        :no_paren_methods,
         :parenthesize,
         :process,
         :process_arglist,

data/lib/sexp2ruby/node/call.rb

@@ -56,15 +56,29 @@ module Sexp2Ruby
         when :"+@" then
           "+#{receiver}"
         else
-          args     = nil                    if args.empty?
-          args     = "(#{args.join(', ')})" if args
-          receiver = "#{receiver}."         if receiver
-
+          args = arguments(args, name)
+          receiver = "#{receiver}." if receiver
           "#{receiver}#{name}#{args}"
         end
       ensure
         call_pop
       end
+
+      private
+
+      def arguments(args, name)
+        if args.empty?
+          ""
+        else
+          fmt = argument_parentheses?(name) ? "(%s)" : " %s"
+          str = "#{args.join(', ')}"
+          fmt % str
+        end
+      end
+
+      def argument_parentheses?(name)
+        !no_paren_methods.include?(name.to_sym)
+      end
     end
   end
 end

data/lib/sexp2ruby/node/hash.rb

@@ -12,6 +12,7 @@ module Sexp2Ruby
       HASH_VAL_NO_PAREN = [
         :call,
         :false,
+        :hash,
         :lit,
         :lvar,
         :nil,

data/lib/sexp2ruby/processor.rb

@@ -29,7 +29,10 @@ module Sexp2Ruby
     HASH_SYNTAXES = [:ruby18, :ruby19]
     RUBY_19_HASH_KEY = /\A[a-z][_a-zA-Z0-9]+\Z/
 
-    CONSTRUCTOR_OPTIONS = [:hash_syntax]
+    CONSTRUCTOR_OPTIONS = [
+      :hash_syntax,
+      :no_paren_methods
+    ]
 
     NODES = [
       :alias,
@@ -118,16 +121,19 @@ module Sexp2Ruby
       :zsuper
     ]
 
-    attr_reader :hash_syntax, :indent_lvl
+    attr_reader :hash_syntax, :indent_lvl, :no_paren_methods
 
     # Options:
     #
-    # - `:hash_syntax` - either `:ruby18` or `:ruby19`
+    # - `:hash_syntax` - either `:ruby18` or `:ruby19`.  Default is `:ruby19`.
+    # - `:no_paren_methods` - an array of symbols, these methods
+    #   will omit argument parentheses.  Default is `[]`.
 
     def initialize(option = {})
       super()
       check_option_keys(option)
-      @hash_syntax = extract_option(HASH_SYNTAXES, option[:hash_syntax], :ruby18)
+      @hash_syntax = extract_option(HASH_SYNTAXES, option[:hash_syntax], :ruby19)
+      @no_paren_methods = option[:no_paren_methods] || []
       @indent_lvl = "  "
       self.auto_shift_type = true
       self.strict = true

data/lib/sexp2ruby/version.rb

@@ -1,3 +1,3 @@
 module Sexp2Ruby
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/processor_spec.rb

@@ -54,6 +54,101 @@ module Sexp2Ruby
     end
 
     describe "#process" do
+      context "call" do
+        it "kwsplat" do
+          inn = s(:call, nil, :test_splat, s(:hash, s(:kwsplat, s(:call, nil, :testing))))
+          out = "test_splat(**testing)"
+          compare(inn, out, processor)
+        end
+
+        it "arg_assoc_kwsplat" do
+          inn = s(:call, nil, :f,
+            s(:lit, 1),
+            s(:hash, s(:lit, :kw), s(:lit, 2), s(:kwsplat, s(:lit, 3))))
+          out = "f(1, kw: 2, **3)"
+
+          compare(inn, out, processor)
+        end
+
+        it "kwsplat_x" do
+          inn = s(:call, nil, :a, s(:hash, s(:kwsplat, s(:lit, 1))))
+          out = "a(**1)"
+
+          compare(inn, out, processor)
+        end
+
+        it "self_index" do
+          compare(s(:call, nil, :[], s(:lit, 42)), "self[42]", processor)
+        end
+
+        it "self_index_equals" do
+          inp = s(:attrasgn, s(:self), :[]=, s(:lit, 42), s(:lit, 24))
+          compare(inp, "self[42] = 24", processor)
+        end
+
+        it "self_index_equals_array" do
+          inp = s(:attrasgn, s(:self), :[]=, s(:lit, 1), s(:lit, 2), s(:lit, 3))
+          compare(inp, "self[1, 2] = 3", processor)
+        end
+
+        it "arglist_hash_first" do
+          inn = s(:call, nil, :method,
+            s(:hash, s(:lit, :a), s(:lit, 1)),
+            s(:call, nil, :b))
+          out = "method({ :a => 1 }, b)"
+
+          compare(inn, out, processor)
+        end
+
+        it "arglist_hash_first_last" do
+          inn = s(:call, nil, :method,
+            s(:hash, s(:lit, :a), s(:lit, 1)),
+            s(:call, nil, :b),
+            s(:hash, s(:lit, :c), s(:lit, 1)))
+          out = "method({ :a => 1 }, b, :c => 1)"
+
+          compare(inn, out, processor)
+        end
+
+        it "arglist_hash_last" do
+          inn = s(:call, nil, :method,
+            s(:call, nil, :b),
+            s(:hash, s(:lit, :a), s(:lit, 1)))
+          out = "method(b, :a => 1)"
+
+          compare(inn, out, processor)
+        end
+
+        it "arglist_if" do
+          inn = s(:call,
+            s(:call, nil, :a),
+            :+,
+            s(:if,
+              s(:call, nil, :b),
+              s(:call, nil, :c),
+              s(:call, nil, :d)))
+
+          out = "(a + (b ? (c) : (d)))"
+          compare(inn, out, processor)
+        end
+
+        context "when configured to omit parentheses for method x" do
+          let(:processor) { described_class.new(no_paren_methods: [:x]) }
+
+          it "omits parentheses for method x" do
+            inp = s(:call, nil, :x, s(:lit, 1))
+            out = "x 1"
+            compare(inp, out, processor)
+          end
+
+          it "includes parentheses for method y" do
+            inp = s(:call, nil, :y, s(:lit, 1))
+            out = "y(1)"
+            compare(inp, out, processor)
+          end
+        end
+      end
+
       context "hash" do
         it "ruby19_one_pair" do
           inp = s(:hash, s(:lit, :foo), s(:str, "bar"))
@@ -112,6 +207,12 @@ module Sexp2Ruby
             compare(inp, out, processor)
           end
 
+          it "does not wrap hash in parens" do
+            inp = s(:hash, s(:lit, :a), s(:hash, s(:lit, :b), s(:nil)))
+            out = "{ :a => { :b => nil } }"
+            compare(inp, out, processor)
+          end
+
           it "wraps method call with block (iter) in parens" do
             iter = s(:iter, s(:call, nil, :foo), 0, s(:str, "bar"))
             inp = s(:hash, s(:lit, :k), iter)
@@ -199,28 +300,6 @@ module Sexp2Ruby
         compare(inp, '/blah\/blah/', processor, false, /blah\/blah/)
       end
 
-      it "call_kwsplat" do
-        inn = s(:call, nil, :test_splat, s(:hash, s(:kwsplat, s(:call, nil, :testing))))
-        out = "test_splat(**testing)"
-        compare(inn, out, processor)
-      end
-
-      it "call_arg_assoc_kwsplat" do
-        inn = s(:call, nil, :f,
-          s(:lit, 1),
-          s(:hash, s(:lit, :kw), s(:lit, 2), s(:kwsplat, s(:lit, 3))))
-        out = "f(1, :kw => 2, **3)"
-
-        compare(inn, out, processor)
-      end
-
-      it "call_kwsplat_x" do
-        inn = s(:call, nil, :a, s(:hash, s(:kwsplat, s(:lit, 1))))
-        out = "a(**1)"
-
-        compare(inn, out, processor)
-      end
-
       it "defn_kwargs" do
         inn = s(:defn, :initialize,
           s(:args, :arg, s(:kwarg, :keyword, s(:nil)), :"**args"),
@@ -242,61 +321,6 @@ module Sexp2Ruby
         compare(inn, out, processor)
       end
 
-      it "call_self_index" do
-        compare(s(:call, nil, :[], s(:lit, 42)), "self[42]", processor)
-      end
-
-      it "call_self_index_equals" do
-        inp = s(:attrasgn, s(:self), :[]=, s(:lit, 42), s(:lit, 24))
-        compare(inp, "self[42] = 24", processor)
-      end
-
-      it "call_self_index_equals_array" do
-        inp = s(:attrasgn, s(:self), :[]=, s(:lit, 1), s(:lit, 2), s(:lit, 3))
-        compare(inp, "self[1, 2] = 3", processor)
-      end
-
-      it "call_arglist_hash_first" do
-        inn = s(:call, nil, :method,
-          s(:hash, s(:lit, :a), s(:lit, 1)),
-          s(:call, nil, :b))
-        out = "method({ :a => 1 }, b)"
-
-        compare(inn, out, processor)
-      end
-
-      it "call_arglist_hash_first_last" do
-        inn = s(:call, nil, :method,
-          s(:hash, s(:lit, :a), s(:lit, 1)),
-          s(:call, nil, :b),
-          s(:hash, s(:lit, :c), s(:lit, 1)))
-        out = "method({ :a => 1 }, b, :c => 1)"
-
-        compare(inn, out, processor)
-      end
-
-      it "call_arglist_hash_last" do
-        inn = s(:call, nil, :method,
-          s(:call, nil, :b),
-          s(:hash, s(:lit, :a), s(:lit, 1)))
-        out = "method(b, :a => 1)"
-
-        compare(inn, out, processor)
-      end
-
-      it "call_arglist_if" do
-        inn = s(:call,
-          s(:call, nil, :a),
-          :+,
-          s(:if,
-            s(:call, nil, :b),
-            s(:call, nil, :c),
-            s(:call, nil, :d)))
-
-        out = "(a + (b ? (c) : (d)))"
-        compare(inn, out, processor)
-      end
-
       it "defn_kwsplat" do
         inn = s(:defn, :test, s(:args, :"**testing"), s(:nil))
         out = "def test(**testing)\n  # do nothing\nend"
@@ -446,17 +470,13 @@ module Sexp2Ruby
       end
 
       it "call_binary_call_with_hash_arg" do
-        # if 42
-        #   args << {:key => 24}
-        # end
-
         inn = s(:if, s(:lit, 42),
           s(:call, s(:call, nil, :args),
             :<<,
             s(:hash, s(:lit, :key), s(:lit, 24))),
           nil)
 
-        out = "(args << { :key => 24 }) if 42"
+        out = "(args << { key: 24 }) if 42"
 
         compare(inn, out, processor)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp2ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryan Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport