unparser 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb5573681eec41d2aa209f031b3df7d661396098
-  data.tar.gz: 093c81030d89b0e97c49f7336f23479d4de7e8f0
+  metadata.gz: 72b3825e97d60720db496c242e5357cfb754ce0e
+  data.tar.gz: e0323d215ba4c0acf5652ca4c0403ef2442f27ce
 SHA512:
-  metadata.gz: 7daf56a27b08facf64be33437d5f1ba12b2f2419e730a119bd3791ccf9dcd5518884a43fec8535c5d5aacffbd0027514d9cc305987b2d6a78503813a11c59991
-  data.tar.gz: effaf9c5ec7e85b7e4135d8d4b8eb5443dcdd610cc48bb94c38164a69a2951e842e9001b5280fad86f2702e4929fffb2de3b6d268bb4c8624c0c561f9baa734a
+  metadata.gz: 2f2fa16b0648154c56234c76ceaaabdcd4ca1e5d41d0472cc498a4539245e1a05da12d85629cfa42e8aa4bcd3f7f9ceb1fcaa23796edb0b0b359138a468d30df
+  data.tar.gz: 2861a96bb2e77e0d5f3c7eecdfbcf4a314680e1ddfa4bff2ce7e3c7ffde05ec6d0b691044206200dc22f39ea6c61e699ff8e3f0a34b0325826029bb986757d69

data/.travis.yml

@@ -2,9 +2,9 @@ sudo: false
 language: ruby
 script: 'bundle exec rake ci'
 rvm:
-  - 2.0.0
-  - 2.1.4
-  - 2.2.0
+  - '2.0'
+  - '2.1'
+  - '2.2'
   - rbx-2
 matrix:
   include:

data/Changelog.md

@@ -1,3 +1,7 @@
+# v0.2.3 2015-04-28
+
+* Compatibility with parser ~>2.2.2, >2.2.2.2
+
 # v0.2.2 2015-01-14
 
 * Really add back unofficial support for 1.9.3

data/Gemfile

@@ -9,4 +9,3 @@ gem 'morpher', '~> 0.2.2'
 
 gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 gem 'mutant',   git: 'https://github.com/mbj/mutant.git'
-eval_gemfile 'Gemfile.devtools'

data/README.md

@@ -29,6 +29,38 @@ ast, comments = Parser::CurrentRuby.parse_with_comments(your_source)
 Unparser.unparse(ast, comments) # => "the code # with comments"
 ```
 
+Passing in manually constructed AST:
+```ruby
+require 'parser/current'
+require 'unparser'
+
+module YourHelper
+  def s(type, *children)
+    Parser::AST::Node.new(type, children)
+  end
+end
+
+include YourHelper
+
+node = s(:def,
+  :foo,
+  s(:args,
+    s(:arg, :x)
+  ),
+  s(:send,
+    s(:lvar, :x),
+    :+,
+    s(:int, 3)
+  )
+)
+
+Unparser.unparse(node) # => "def foo(x)\n  x + 3\nend"
+```
+
+Note: DO NOT attempt to pass in nodes generated via `AST::Sexp#s`, these ones return
+API incompatible `AST::Node` instances, unparser needs `Parser::AST::Node` instances.
+
+
 Equivalent vs identical:
 
 ```ruby

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: '2.1'
+    version: '2.2'
 test:
   override:
     - bundle exec rake ci

data/lib/unparser.rb

@@ -16,7 +16,7 @@ module Unparser
 
   # Unparse an AST (and, optionally, comments) into a string
   #
-  # @param [Parser::Node, nil] node
+  # @param [Parser::AST::Node, nil] node
   # @param [Array] comment_array
   #
   # @return [String]

data/lib/unparser/emitter/literal/dynamic_body.rb

@@ -47,7 +47,7 @@ module Unparser
 
         # Emit segment
         #
-        # @param [Parser::Node] node
+        # @param [Parser::AST::Node] node
         #
         # @return [undefined]
         #
@@ -73,7 +73,7 @@ module Unparser
 
         # Emit str segment
         #
-        # @param [Parser::Node] node
+        # @param [Parser::AST::Node] node
         #
         # @return [undefined]
         #
@@ -90,7 +90,7 @@ module Unparser
 
         # Emit interpolated segment
         #
-        # @param [Parser::Node] node
+        # @param [Parser::AST::Node] node
         #
         # @return [undefined]
         #

data/spec/unit/unparser_spec.rb

@@ -189,7 +189,8 @@ describe Unparser do
 
       context 'regexp' do
         assert_terminated '/foo/'
-        assert_terminated %q(/[^-+',.\/:@[:alnum:]\[\]\x80-\xff]+/)
+        assert_terminated %q(/[\x80-\xff]+/), %w(1.9)
+        assert_terminated %q(/[^-+',.\/:@[:alnum:]\[\]]+/)
         assert_terminated '/foo#{@bar}/'
         assert_terminated '/foo#{@bar}/imx'
         assert_terminated '/#{"\x00"}/', %w(1.9)
@@ -205,7 +206,7 @@ describe Unparser do
           end
         RUBY
         assert_generates '%r(/)', '/\//'
-        assert_generates '%r(\))', '/)/'
+        assert_generates '%r(\))', '/\)/'
         assert_generates '%r(#{@bar}baz)', '/#{@bar}baz/'
         assert_terminated '/\/\//x'
       end

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name     = 'unparser'
-  gem.version  = '0.2.2'
+  gem.version  = '0.2.3'
 
   gem.authors  = ['Markus Schirp']
   gem.email    = 'mbj@schir-dso.com'
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency('parser',        '~> 2.2.0.2')
+  gem.add_dependency('parser',        '~> 2.2.2', '>= 2.2.2.2')
   gem.add_dependency('procto',        '~> 0.0.2')
   gem.add_dependency('concord',       '~> 0.1.5')
   gem.add_dependency('adamantium',    '~> 0.2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: 2.2.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0.2
+        version: 2.2.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.2.2
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +128,6 @@ files:
 - ".travis.yml"
 - Changelog.md
 - Gemfile
-- Gemfile.devtools
 - Guardfile
 - LICENSE
 - README.md

data/Gemfile.devtools

@@ -1,39 +0,0 @@
-group :development do
-  platform :rbx do
-    gem 'rubysl-singleton', '~> 2.0.0'
-  end
-end
-
-group :guard do
-  gem 'guard',         '~> 2.10.3'
-  gem 'guard-bundler', '~> 2.1.0'
-  gem 'guard-rspec',   '~> 4.5.0'
-  gem 'guard-rubocop', '~> 1.2.0'
-
-  # file system change event handling
-  gem 'listen',     '~> 2.8.4'
-  gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.4', require: false
-  gem 'rb-inotify', '~> 0.9.5', require: false
-
-  # notification handling
-  gem 'libnotify',               '~> 0.9.0', require: false
-  gem 'rb-notifu',               '~> 0.0.4', require: false
-  gem 'terminal-notifier-guard', '~> 1.6.4', require: false
-end
-
-group :metrics do
-  platform :rbx do
-    gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.12'
-    gem 'rubysl-logger',      '~> 2.1.0'
-    gem 'rubysl-open-uri',    '~> 2.0.0'
-    gem 'rubysl-prettyprint', '~> 2.0.3'
-  end
-end
-
-platform :jruby do
-  group :jruby do
-    gem 'jruby-openssl', '~> 0.9.4'
-  end
-end