sexp2ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0f686a975b672835e136dc5ebb67483658f4ed
-  data.tar.gz: b5f1433cb9d3356d37628587b7a81f7c554c7593
+  metadata.gz: e85bdfc910bdea5229b1808b0751e8d75277199d
+  data.tar.gz: 8d280d6b355022806feba17979c97a3d273ca996
 SHA512:
-  metadata.gz: a3d6da332f6456aeb084a610e1ec44ed1797a89b85e05fd23812e6a00c57de6f74a82226ae64e91c9cb55eea83d504accd54f62ccc815330734a42d9ac52b9fe
-  data.tar.gz: aadb54bb3269ad6936e99c0cbf3af50b1226ac20714498ccdc72f728208cccd9d1f5a1cb7ac5cf31a2a7229b40ae5789a0184369be08dbe2258e7dce7219faac
+  metadata.gz: 701652fb216fd8b7bf4df826d177675b932ecfd270c65a5d982e28f0c94fa33ab14380ec352c6aeaa5c9b072a84172e87b78fb3c9cc97e094582109dc6d862c0
+  data.tar.gz: ef682dec8338256d2552fc14164442384c76a07c47cf52249dbe785c6cd977c3db618b34e21ffa8f80f6177f3ec2afc7c8a3655bb5ca227b18c44766a308a455

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.6
   - 2.2.2
+  - 2.3.1
 script: bundle exec rspec --require spec_helper
 notifications:
   email: false

data/CHANGELOG.md

@@ -4,10 +4,25 @@ Change Log
 This project follows [semver 2.0.0][1] and the recommendations
 of [keepachangelog.com][2].
 
-0.0.3
------
+## 0.0.4
 
-### Changed
+### Breaking Changes
+
+None
+
+### Added
+
+None
+
+### Fixed
+
+- Iter whitespace: an empty body should render as `{}`, not `{ }`.
+- A bug where a one-line iter whose call matches no_paren_methods produced
+  invalid output. Example: `a B {}` is now `a B do\nend`
+
+## 0.0.3
+
+### Breaking Changes
 - Configuration
   - Changed default of `:hash_syntax` from `:ruby18` to `:ruby19`
 
@@ -16,14 +31,12 @@ of [keepachangelog.com][2].
 - Configuration
   - Added `:no_paren_methods` omit argument parentheses
 
-0.0.2
------
+## 0.0.2
 
 ### Changed
 - Normalize block arguments.  See [ruby_parser PR 189][3] (Ryan Davis)
 
-0.0.1
------
+## 0.0.1
 
 Initial version.  Just claiming the gem name.
 

data/lib/sexp2ruby/node/call.rb

@@ -1,10 +1,44 @@
 module Sexp2Ruby
   module Node
+    # A method call.
+    #
+    # Examples:
+    #
+    # ```
+    # a
+    # s(:call, nil, :a)
+    #
+    # A.b
+    # s(:call, s(:const, :A), :b)
+    #
+    # a(b)
+    # s(:call, nil, :a, s(:call, nil, :b))
+    #
+    # a(b, c: d, &e)
+    # s(
+    #   :call,
+    #   nil,
+    #   :a,
+    #   s(:call, nil, :b),
+    #   s(:hash, s(:lit, :c), s(:call, nil, :d)),
+    #   s(:block_pass, s(:call, nil, :e))
+    # )
+    #
+    # a = :a; a.b
+    # s(
+    #   :block,
+    #   s(:lasgn, :a, s(:lit, :a)),
+    #   s(:call, s(:lvar, :a), :b)
+    # )
+    # ```
     class Call < Base
-
       # binary operation messages
       BINARY = [:<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :**, :'!=']
 
+      def arguments?(exp)
+        exp.length > 2 # 1. receiver, 2. method name, 3+ arguments
+      end
+
       def to_s(exp)
         receiver_node_type = exp.first.nil? ? nil : exp.first.first
         receiver = process exp.shift

data/lib/sexp2ruby/node/iter.rb

@@ -1,9 +1,35 @@
 module Sexp2Ruby
   module Node
+    # An `Iter`, AFAICT, is a `Call` with a block.
+    #
+    # Example:
+    #
+    # ```
+    # # ruby
+    # derp(foo) { |bar| herp }
+    #
+    # # sexp
+    # s(
+    #   :iter,
+    #   s(:call, nil, :a, s(:call, nil, :b)),
+    #   s(:args, :c),
+    #   s(:call, nil, :d)
+    # )
+    # ```
+    #
     class Iter < Base
       def to_s(exp)
-        iter = process exp.shift
+        call_sexp = exp.shift
+
+        # Process the `Call`. The Sexp is not consumed here (it is cloned)
+        # because we will need to refer to it later, when determining which
+        # block delimiters to use (brackets vs. do/end).
+        iter = process(call_sexp.deep_clone)
+
+        # The block arguments (as opposed to the `Call` arguments)
         args = exp.shift
+
+        # The body of the block.
         body = exp.empty? ? nil : process(exp.shift)
 
         args = case args
@@ -25,15 +51,16 @@ module Sexp2Ruby
         result = []
         result << "#{iter} {"
         result << args
-        if body
-          result << " #{body.strip} "
-        else
-          result << ' '
-        end
+        result << (body ? " #{body.strip} " : "")
         result << "}"
         result = result.join
-        return result if result !~ /\n/ and result.size < LINE_LENGTH
 
+        # Can we squeeze the block onto the same line as the call?
+        if same_line_bracket_block?(result, iter, call_sexp.deep_clone)
+          return result
+        end
+
+        # We will not try to squeeze the block onto one line.
         result = []
         result << "#{iter} #{b}"
         result << args
@@ -45,6 +72,22 @@ module Sexp2Ruby
         result << e
         result.join
       end
+
+      private
+
+      # Given `iter` (a rendered `Call`), and `result`, should we try to
+      # squeeze the body (`result`) onto the same line as `iter`? There are two
+      # considerations.
+      #
+      # - Syntactic - did the `Call` parenthesize its arguments?
+      # - Stylistic - would it exceed the line length
+      #
+      def same_line_bracket_block?(result, iter, call_sexp)
+        call_sexp.shift # discard the sexp_type, as the processor would
+        syntactic = !Call.new(processor).arguments?(call_sexp) || iter.end_with?(")")
+        stylistic = result !~ /\n/ && result.size < LINE_LENGTH
+        syntactic && stylistic
+      end
     end
   end
 end

data/lib/sexp2ruby/version.rb

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

data/sexp2ruby.gemspec

@@ -26,8 +26,8 @@ It is a fork of ruby2ruby with slightly different goals.
   spec.add_runtime_dependency "activesupport", "~> 4.2"
   spec.add_runtime_dependency "sexp_processor", "~> 4.6"
 
-  spec.add_development_dependency "rspec-core", "~> 3.2"
-  spec.add_development_dependency "rspec-expectations", "~> 3.2"
-  spec.add_development_dependency "rspec-mocks", "~> 3.2"
+  spec.add_development_dependency "rspec-core", "~> 3.4"
+  spec.add_development_dependency "rspec-expectations", "~> 3.4"
+  spec.add_development_dependency "rspec-mocks", "~> 3.4"
   spec.add_development_dependency "ruby_parser", "~> 3.7"
 end

data/spec/lib/processor_spec.rb

@@ -149,6 +149,25 @@ module Sexp2Ruby
         end
       end
 
+      context "iter" do
+        context "empty body" do
+          it "does not put spaces inside brackets" do
+            inp = s(:iter, s(:call, nil, :x, s(:lit, 1)), 0)
+            out = "x(1) {}"
+            compare(inp, out, processor)
+          end
+        end
+
+        context "when configured to omit parentheses for method x" do
+          it "uses do/end because brackets would be invalid" do
+            pro = described_class.new(no_paren_methods: [:x])
+            inp = s(:iter, s(:call, nil, :x, s(:lit, 1)), 0)
+            out = "x 1 do\nend"
+            compare(inp, out, pro)
+          end
+        end
+      end
+
       context "hash" do
         it "ruby19_one_pair" do
           inp = s(:hash, s(:lit, :foo), s(:str, "bar"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp2ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -45,42 +45,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generates ruby from RubyParser S-expressions