to_source 0.2.11 → 0.2.12

data/Changelog.md

@@ -1,8 +1,14 @@
 # v0.2.11 2013-01-9
 
+* [fixed] Emit edge cases with dynamic literals correctly
+
+[Compare v0.2.11..v0.2.12](https://github.com/mbj/to_source/compare/v0.2.11...v0.2.12)
+
+# v0.2.11 2013-01-9
+
 * [fixed] Allow all nodes to be entrypoints
 
-[Compare v0.2.10..v0.2.11](https://github.com/mbj/to_source/compare/v0.2.9...v0.2.11)
+[Compare v0.2.10..v0.2.11](https://github.com/mbj/to_source/compare/v0.2.10...v0.2.11)
 
 # v0.2.10 2013-01-7
 

data/lib/to_source.rb

@@ -7,6 +7,7 @@ require 'to_source/command'
 require 'to_source/state'
 require 'to_source/emitter'
 require 'to_source/emitter/literal'
+require 'to_source/emitter/literal/dynamic'
 require 'to_source/emitter/access'
 require 'to_source/emitter/formal_arguments'
 require 'to_source/emitter/actual_arguments'

data/lib/to_source/emitter/literal.rb

@@ -130,99 +130,6 @@ module ToSource
         end
       end
 
-      class Dynamic < self
-
-        def dispatch
-          emit(node.string.inspect[0..-2])
-          array.each_with_index do |member, index|
-            emit_member(member, index)
-          end
-        end
-
-        def array
-          node.array
-        end
-
-        def max
-          array.length - 1
-        end
-        memoize :max
-
-        def emit_primitive_member(member, index)
-          last = index < max ? -2 : -1
-          range = 1..last
-          emit(member.string.inspect[range])
-        end
-
-        def emit_member(member, index)
-          case member
-          when Rubinius::AST::StringLiteral
-            emit_primitive_member(member, index)
-          else
-            visit(member)
-          end
-        end
-
-        class Symbol < self
-
-          handle(Rubinius::AST::DynamicSymbol)
-
-          def dispatch
-            emit(':')
-            super
-          end
-
-        end
-
-        class String < self
-
-          handle(Rubinius::AST::DynamicString)
-
-        end
-
-        class Execute < self
-
-          handle(Rubinius::AST::DynamicExecuteString)
-
-          def dispatch
-            emit('`')
-            emit(node.string.inspect[1..-2])
-            array.each_with_index do |member, index|
-              emit_member(member, index)
-            end
-            emit('`')
-          end
-
-          def emit_primitive_member(member, index)
-            last = index < max ? -3 : -2
-            range = 1..last
-            emit(member.string.inspect[range])
-          end
-
-        end
-
-        class Regex < self
-
-          handle(Rubinius::AST::DynamicRegex)
-
-          def dispatch
-            emit('/')
-            emit(Regexp.new(node.string).inspect[1..-2])
-            array.each_with_index do |member, index|
-              emit_member(member, index)
-            end
-            emit('/')
-          end
-
-          def emit_primitive_member(member, index)
-            last = index < max ? -3 : -2
-            range = 1..last
-            emit(Regexp.new(member.string).inspect[range])
-          end
-
-        end
-      end
-
 
       class PassThrough < self
 

data/lib/to_source/emitter/literal/dynamic.rb

@@ -0,0 +1,103 @@
+module ToSource
+  class Emitter
+    class Literal
+      class Dynamic < self
+
+      private
+
+        def dispatch
+          emit_open
+          emit_first
+          emit_segments
+          emit_close
+        end
+
+        def emit_open
+          emit(self.class::OPEN)
+        end
+
+        def emit_close
+          emit(self.class::CLOSE)
+        end
+
+        def first_value
+          node.string
+        end
+
+        def emit_literal(literal)
+          emit(literal.inspect[1..-2])
+        end
+        
+        def emit_literal_node(node)
+          emit_literal(node.string)
+        end
+
+        def emit_first
+          emit_literal(first_value)
+        end
+
+        def emit_segments
+          array.each_with_index do |segment, index|
+            emit_segment(segment, index)
+          end
+        end
+
+        def emit_segment(segment, index)
+          case segment
+          when Rubinius::AST::StringLiteral
+            emit_literal_node(segment)
+          else
+            visit(segment)
+          end
+        end
+
+        def array
+          node.array
+        end
+
+        def max
+          array.length - 1
+        end
+        memoize :max
+
+        class Symbol < self
+
+          handle(Rubinius::AST::DynamicSymbol)
+
+          OPEN = ':"'
+          CLOSE = '"'
+
+        end
+
+        class String < self
+
+          handle(Rubinius::AST::DynamicString)
+
+          OPEN = CLOSE = '"'.freeze
+
+        end
+
+        class Execute < self
+
+          handle(Rubinius::AST::DynamicExecuteString)
+
+          OPEN = CLOSE = '`'.freeze
+
+        end
+
+        class Regex < self
+
+          OPEN = CLOSE = '/'.freeze
+
+          handle(Rubinius::AST::DynamicRegex)
+
+          def emit_literal(literal)
+            emit(Regexp.new(literal).source)[1..-2]
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/spec/unit/to_source/class_methods/run_spec.rb

@@ -357,6 +357,14 @@ describe ToSource,'.to_source' do
       context 'with escapes' do
         assert_source '"fo\no#{bar}b\naz"'
       end
+
+      context 'with dynamic segment in the front' do
+        assert_source '"#{bar}foo"'
+      end
+
+      context 'with dynamic segment in the end' do
+        assert_source '"foo#{bar}"'
+      end
     end
 
     context 'dynamic symbol' do
@@ -367,6 +375,14 @@ describe ToSource,'.to_source' do
       context 'with escapes' do
         assert_source ':"fo\no#{bar}b\naz"'
       end
+
+      context 'with dynamic segment in the front' do
+        assert_source ':"#{bar}foo"'
+      end
+
+      context 'with dynamic segment in the end' do
+        assert_source ':"foo#{bar}"'
+      end
     end
 
     context 'dynamic execute' do
@@ -377,6 +393,14 @@ describe ToSource,'.to_source' do
       context 'with escapes' do
         assert_source '`fo\no#{bar}b\naz`'
       end
+
+      context 'with dynamic segment in the front' do
+        assert_source '`#{bar}foo`'
+      end
+
+      context 'with dynamic segment in the end' do
+        assert_source '`foo#{bar}`'
+      end
     end
 
     context 'dynamic regexp' do
@@ -387,6 +411,14 @@ describe ToSource,'.to_source' do
       context 'with escapes' do
         assert_source '/fo\no#{bar}b\naz/'
       end
+
+      context 'with dynamic segment in the front' do
+        assert_source '/#{bar}foo/'
+      end
+
+      context 'with dynamic segment in the end' do
+        assert_source '/foo#{bar}/'
+      end
     end
   end
 

data/to_source.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name               = 'to_source'
-  s.version            = '0.2.11'
+  s.version            = '0.2.12'
   s.authors            = ['Markus Schirp']
   s.email              = ['mbj@seonic.net']
   s.homepage           = 'http://github.com/mbj/to_source'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_source
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -134,6 +134,7 @@ files:
 - lib/to_source/emitter/iter.rb
 - lib/to_source/emitter/keyword_value.rb
 - lib/to_source/emitter/literal.rb
+- lib/to_source/emitter/literal/dynamic.rb
 - lib/to_source/emitter/match3.rb
 - lib/to_source/emitter/module.rb
 - lib/to_source/emitter/multiple_assignment.rb