unparser 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcc5300960fb746ffaeee812c9d21214d27abe4f
-  data.tar.gz: 44b23113a26b5621647687ede360f478a561f56d
+  metadata.gz: 5a584013dc79bab624a49c0ce4e8b788d8b62412
+  data.tar.gz: b43573081cef30e216c7ee0caf856d51b97b20f2
 SHA512:
-  metadata.gz: ea844db930580529a6e45a935b6fd756da832c8578251040303deffe7057bb62efdca72e700cdb03d96c623744aacc3f7fb4b540203690a17e10a92fa5805edf
-  data.tar.gz: d398a4881888cc974bcaef1ecd255d5ef382b71f0061c8f2816a159383aa162b9d92f927e1eef6d7a59858156631842f02c753b82131bc18c4d187f3c32127af
+  metadata.gz: 34c5b966271853e563b7f3b9d6126aff72234e85f32ba3358bdc3dab4530d9a3041762ae94c184e88f191511bcd4e85e16ac09c3006e9f9011ad4cec9d4a9c56
+  data.tar.gz: ea0188da6b1b3311dbe36363b092905b336b4555c9536301f83f7b6406553b06f6cf7aba089230117b0819f356d6f97f65381a41650c29ebbce94e85e1c71eca

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
-eval File.read('Gemfile.devtools')
+eval_gemfile 'Gemfile.devtools'

data/Gemfile.devtools

@@ -3,7 +3,7 @@
 group :development do
   gem 'rake',  '~> 10.1.0'
   gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.6.2'
+  gem 'yard',  '~> 0.8.7'
 end
 
 group :yard do
@@ -14,11 +14,11 @@ group :guard do
   gem 'guard',         '~> 1.8.1'
   gem 'guard-bundler', '~> 1.0.0'
   gem 'guard-rspec',   '~> 3.0.2'
-  # gem 'guard-rubocop', '~> 0.2.0'
+  gem 'guard-rubocop', '~> 0.2.0'
   gem 'guard-mutant',  '~> 0.0.1'
 
   # file system change event handling
-  gem 'listen',     '~> 1.2.2'
+  gem 'listen',     '~> 1.3.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -31,21 +31,17 @@ end
 
 group :metrics do
   gem 'coveralls', '~> 0.6.7'
-  gem 'flay',      '~> 2.3.1'
+  gem 'flay',      '~> 2.4.0'
   gem 'flog',      '~> 4.1.1'
-  gem 'reek',      '~> 1.3.1',  git: 'https://github.com/troessner/reek.git'
-  # gem 'rubocop',   '~> 0.10.0', git: 'https://github.com/bbatsov/rubocop.git'
+  gem 'reek',      '~> 1.3.2'
+  gem 'rubocop',   '~> 0.11.0'
   gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.6'
+  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant',          '~> 0.3.0.beta17'
+    gem 'mutant', git: 'https://github.com/mbj/mutant.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
-
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.2'
-  end
 end
 
 group :benchmarks do

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 13
-total_score: 377
+total_score: 383

data/config/reek.yml

@@ -19,7 +19,8 @@ TooManyMethods:
   enabled: true
   max_methods: 10
 UncommunicativeMethodName:
-  accept: []
+  accept:
+  - s
   exclude: []
   enabled: true
   reject:
@@ -58,6 +59,7 @@ NestedIterators:
   ignore_iterators: []
   exclude:
   - Unparser::Emitter#self.children
+  - Unparser::Emitter::Literal::Regexp#dispatch
   enabled: true
   max_allowed_nesting: 1
 TooManyStatements:

data/lib/unparser/constants.rb

@@ -9,7 +9,7 @@ module Unparser
     BINARY_OPERATORS = %w(
       + - * / & | && || << >> ==
       === != <= < <=> > >= =~ !~ ^
-      **
+      ** %
     ).map(&:to_sym).to_set
 
     WS       = ' '

data/lib/unparser/emitter.rb

@@ -138,8 +138,6 @@ module Unparser
     #
     attr_reader :node
 
-  private
-
     # Return buffer
     #
     # @return [Buffer] buffer
@@ -158,6 +156,8 @@ module Unparser
     attr_reader :parent
     protected :parent
 
+  private
+
     # Emit contents of block within parentheses
     #
     # @return [undefined]
@@ -334,6 +334,18 @@ module Unparser
       parent && parent.node && parent.node.type
     end
 
+    # Helper for building nodes
+    #
+    # @param [Symbol]
+    #
+    # @return [Parser::AST::Node]
+    #
+    # @api private
+    #
+    def s(type, *children)
+      Parser::AST::Node.new(type, *children)
+    end
+
     # Emitter that fully relies on parser source maps
     class SourceMap < self
 

data/lib/unparser/emitter/flipflop.rb

@@ -8,7 +8,7 @@ module Unparser
         :eflipflop => '...',
       ).freeze
 
-      handle *MAP.keys
+      handle(*MAP.keys)
 
       children :left, :right
 

data/lib/unparser/emitter/hookexe.rb

@@ -8,7 +8,7 @@ module Unparser
         :postexe => K_POSTEXE
       }.freeze
 
-      handle *MAP.keys
+      handle(*MAP.keys)
 
       children :body
 

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

@@ -8,6 +8,29 @@ module Unparser
         OPEN = '#{'.freeze
         CLOSE = '}'.freeze
 
+        # Emitter for interpolated nodes
+        class Interpolation < self
+
+          handle :interpolated
+
+          children :subject
+
+        private
+
+          # Perform dispatch
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def dispatch
+            write(OPEN)
+            visit(subject)
+            write(CLOSE)
+          end
+
+        end
+
       private
 
         # Perform dispatch

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

@@ -9,7 +9,7 @@ module Unparser
           :erange => '...'
         )
 
-        handle *TOKENS.keys
+        handle(*TOKENS.keys)
 
         children :begin_node, :end_node
 

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

@@ -18,11 +18,42 @@ module Unparser
         #
         def dispatch
           parentheses(DELIMITER, DELIMITER) do
-            visit(dynamic_body)
+            # stupid for now
+            body.each do |child|
+              write_body(child)
+            end
+            #visit(dynamic_body)
           end
           visit(children.last)
         end
 
+        # Return non regopt children
+        #
+        # @return [Array<Parser::AST::Node>]
+        #
+        # @api private
+        #
+        def body
+          children[0..-2]
+        end
+
+        # Write specific body component
+        #
+        # @param [Parser::AST::Node] node
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def write_body(node)
+          case node.type
+          when :str
+            write(escape(node).children.first)
+          else
+            visit(s(:interpolated, [node]))
+          end
+        end
+
         # Return dynamic body
         #
         # @return [undefined]

data/lib/unparser/emitter/op_assign.rb

@@ -11,7 +11,7 @@ module Unparser
         :or_asgn  => '||='
       )
 
-      handle *MAP.keys
+      handle(*MAP.keys)
 
     private
 

data/lib/unparser/emitter/repetition.rb

@@ -13,7 +13,7 @@ module Unparser
         :until_post => K_UNTIL
       }.freeze
 
-      handle *MAP.keys
+      handle(*MAP.keys)
 
       # Perform dispatch
       #
@@ -36,7 +36,7 @@ module Unparser
         :until => K_UNTIL
       }.freeze
 
-      handle *MAP.keys
+      handle(*MAP.keys)
 
       children :condition, :body
 

data/spec/integration/unparser/spike_spec.rb

@@ -120,7 +120,10 @@ describe Unparser, 'spike' do
       assert_source '/foo/'
       assert_source %q(/[^-+',.\/:@[:alnum:]\[\]\x80-\xff]+/)
       assert_source '/foo#{@bar}/'
-      assert_source '/foo#{@bar}/im'
+      assert_source '/foo#{@bar}/imx'
+      assert_source "/\n/"
+      assert_source '/\n/'
+      assert_source "/\n/x"
       assert_generates '%r(/)', '/\//'
       assert_generates '%r(\))', '/)/'
       assert_generates '%r(#{@bar}baz)', '/#{@bar}baz/'

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.0.15'
+  s.version  = '0.0.16'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w(README.md)
   s.executables      = [ 'test-unparser' ]
 
-  s.add_dependency('parser',        '~> 2.0.0.pre5')
+  s.add_dependency('parser',        '~> 2.0.0.pre6')
   s.add_dependency('concord',       '~> 0.1.1')
   s.add_dependency('adamantium',    '~> 0.0.10')
   s.add_dependency('equalizer',     '~> 0.0.5')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement