to_source 0.2.19 → 0.2.20

data/Changelog.md

@@ -1,3 +1,9 @@
+# v0.2.19 2013-03-30
+
+* [fix] Op assign 2 operators (self.foo ||= bar, etc) [nevir]
+
+[Compare v0.2.19..v0.2.20](https://github.com/mbj/to_source/compare/v0.2.18...v0.2.20)
+
 # v0.2.19 2013-03-1
 
 * [change] Bump dependencies
@@ -6,144 +12,144 @@
 
 # v0.2.18 2013-01-29
 
-* [fixed] Emit ranges in parantheses to resolve ambiguity
+* [fix] Emit ranges in parantheses to resolve ambiguity
 
 [Compare v0.2.17..v0.2.18](https://github.com/mbj/to_source/compare/v0.2.17...v0.2.18)
 
 # v0.2.17 2013-01-26
 
-* [fixed] Fix op assign 1 operators with implicit index array[] ||= etc
-* [fixed] Fix op assign 1 operators with explicit index array[foo] ||= etc
-* [fixed] Add support regexp in if statements with implicit haystack (Rubinius::AST::Match)
-* [fixed] Add support for Rubionius::AST::Flip{2,3} (flip flops)
-* [fixed] Add support for Rubionius::AST::VAlias
-* [fixed] Fix multiple edge cases with array literals and splats
-* [fixed] Add support for mixed splat arguments 
-* [fixed] Add support for __ENCODING__
-* [fixed] Fix emit of splat arguments to binary method operators
-* [fixed] Fix multiple assigments when assigning to element with splat index
-* [fixed] Add support for retry
-* [fixed] Add support for redo
-* [fixed] Add support rubinius specific type constant
-* [fixed] Add support for dynamic once literal
-* [fixed] Emit regexp options for single and dynamic literals
-* [fixed] Add support for undef keyword
-* [fixed] Add support toplevel module name
-* [fixed] Fix regexp emitter for edge cases
-* [fixed] Fix element reference with splat arguments
-* [fixed] Add support for construct
-* [fixed] Add support splat assigmnent in multiple assignment
-* [fixed] Add support for /s/ =~ foo (Rubinius::AST::Match2)
-* [fixed] Add support for $` (Rubinius::AST::BackRef)
-* [fixed] Support multiple assignments also for attribute and element assignments
+* [fix] Fix op assign 1 operators with implicit index array[] ||= etc
+* [fix] Fix op assign 1 operators with explicit index array[foo] ||= etc
+* [fix] Add support regexp in if statements with implicit haystack (Rubinius::AST::Match)
+* [fix] Add support for Rubionius::AST::Flip{2,3} (flip flops)
+* [fix] Add support for Rubionius::AST::VAlias
+* [fix] Fix multiple edge cases with array literals and splats
+* [fix] Add support for mixed splat arguments 
+* [fix] Add support for __ENCODING__
+* [fix] Fix emit of splat arguments to binary method operators
+* [fix] Fix multiple assigments when assigning to element with splat index
+* [fix] Add support for retry
+* [fix] Add support for redo
+* [fix] Add support rubinius specific type constant
+* [fix] Add support for dynamic once literal
+* [fix] Emit regexp options for single and dynamic literals
+* [fix] Add support for undef keyword
+* [fix] Add support toplevel module name
+* [fix] Fix regexp emitter for edge cases
+* [fix] Fix element reference with splat arguments
+* [fix] Add support for construct
+* [fix] Add support splat assigmnent in multiple assignment
+* [fix] Add support for /s/ =~ foo (Rubinius::AST::Match2)
+* [fix] Add support for $` (Rubinius::AST::BackRef)
+* [fix] Support multiple assignments also for attribute and element assignments
 
 [Compare v0.2.16..v0.2.17](https://github.com/mbj/to_source/compare/v0.2.16...v0.2.17)
 
 # v0.2.16 2013-01-25
 
-* [fixed] Handle Rubinius::AST::Case
+* [fix] Handle Rubinius::AST::Case
 
 [Compare v0.2.15..v0.2.16](https://github.com/mbj/to_source/compare/v0.2.15...v0.2.16)
 
 # v0.2.15 2013-01-24
 
-* [fixed] Emit dynamic regexp literals with split groups correctly
+* [fix] Emit dynamic regexp literals with split groups correctly
 
 [Compare v0.2.14..v0.2.15](https://github.com/mbj/to_source/compare/v0.2.14...v0.2.15)
 
 # v0.2.14 2013-01-09
 
-* [fixed] Emit send with arguments and body correctly
+* [fix] Emit send with arguments and body correctly
 
 [Compare v0.2.13..v0.2.14](https://github.com/mbj/to_source/compare/v0.2.13...v0.2.14)
 
 # v0.2.13 2013-01-09
 
-* [fixed] Emit send with arguments and body correctly
+* [fix] Emit send with arguments and body correctly
 
 [Compare v0.2.12..v0.2.13](https://github.com/mbj/to_source/compare/v0.2.12...v0.2.13)
 
 # v0.2.12 2013-01-09
 
-* [fixed] Emit edge cases with dynamic literals correctly
+* [fix] 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-09
 
-* [fixed] Allow all nodes to be entrypoints
+* [fix] Allow all nodes to be entrypoints
 
 [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-07
 
 * [Changed] Rewrote internals compleatly, no outer API change
-* [fixed] Emit indentation of complex nested structures with rescue statements correctly
+* [fix] Emit indentation of complex nested structures with rescue statements correctly
 
 [Compare v0.2.9..v0.2.10](https://github.com/mbj/to_source/compare/v0.2.9...v0.2.10)
 
 # v0.2.9 2013-01-04
 
-* [fixed] Handle regexp literals containing slashes in non shash delimiters %r(/) correctly
+* [fix] Handle regexp literals containing slashes in non shash delimiters %r(/) correctly
 
 [Compare v0.2.8..v0.2.9](https://github.com/mbj/to_source/compare/v0.2.8...v0.2.9)
 
 # v0.2.8 2013-01-03
 
 * [Changed] Emit many times more ugly code, but correctnes > beautifulnes
-* [fixed] Emit break with parantheses
-* [fixed] Emit op assign and as "&&="
-* [fixed] Emit op assign or as "||="
+* [fix] Emit break with parantheses
+* [fix] Emit op assign and as "&&="
+* [fix] Emit op assign or as "||="
 
 [Compare v0.2.7..v0.2.8](https://github.com/mbj/to_source/compare/v0.2.7...v0.2.8)
 
 # v0.2.7 2013-01-02
 
-* [fixed] Emit super with blocks correctly
+* [fix] Emit super with blocks correctly
 
 [Compare v0.2.6..v0.2.7](https://github.com/mbj/to_source/compare/v0.2.6...v0.2.7)
 
 # v0.2.6 2013-01-01
 
-* [fixed] Emit super vs super() correctly
+* [fix] Emit super vs super() correctly
 
 [Compare v0.2.5..v0.2.6](https://github.com/mbj/to_source/compare/v0.2.5...v0.2.6)
 
 # v0.2.5 2012-12-14
 
-* [fixed] Emit unary operators correctly
-* [fixed] Define with optional splat and block argument
-* [fixed] Emit arguments to break keyword
+* [fix] Emit unary operators correctly
+* [fix] Define with optional splat and block argument
+* [fix] Emit arguments to break keyword
 * [change] Uglify output of binary operators with unneded paranteses. Correct output > nice output.
-* [fixed] Emit nested binary operators correctly.
-* [fixed] Emit element reference on self correctly. self[foo].
+* [fix] Emit nested binary operators correctly.
+* [fix] Emit element reference on self correctly. self[foo].
 
 [Compare v0.2.4..v0.2.5](https://github.com/mbj/to_source/compare/v0.2.4...v0.2.5)
 
 # v0.2.4 2012-12-07
 
 * [feature] Allow to emit pattern variables as root node
-* [fixed] Emit send with splat and block argument correctly
+* [fix] Emit send with splat and block argument correctly
 
 [Compare v0.2.3..v0.2.4](https://github.com/mbj/to_source/compare/v0.2.3...v0.2.4)
 
 # v0.2.3 2012-12-07
 
-* [fixed] Nuke dangling require  (sorry for not running specs after gemspec change)
+* [fix] Nuke dangling require  (sorry for not running specs after gemspec change)
 
 [Compare v0.2.2..v0.2.3](https://github.com/mbj/to_source/compare/v0.2.2...v0.2.3)
 
 # v0.2.2 2012-12-07
 
-* [fixed] Emit of pattern arguments with no formal arguments present
-* [fixed] Missed to require set
+* [fix] Emit of pattern arguments with no formal arguments present
+* [fix] Missed to require set
 
 [Compare v0.2.1..v0.2.2](https://github.com/mbj/to_source/compare/v0.2.1...v0.2.2)
 
 # v0.2.1 2012-12-07
 
-* [fixed] Emit of def on splat with block
-* [fixed] Emit of pattern args 
+* [fix] Emit of def on splat with block
+* [fix] Emit of pattern args 
 
 [Compare v0.2.0..v0.2.1](https://github.com/mbj/to_source/compare/v0.2.0...v0.2.1)
 
@@ -151,10 +157,10 @@
 
 * [BRAKING CHANGE] Remove core extension Rubinius::AST::Node#to_source (mbj)
 * [feature] Add support for MRI via melbourne gem (mbj)
-* [fixed] 100% Yard covered documentation (mbj)
-* [fixed] Emit most binary operators without parantheses (mbj)
+* [fix] 100% Yard covered documentation (mbj)
+* [fix] Emit most binary operators without parantheses (mbj)
 * [feature] Port tests to rspec2 and greatly improve coverage and layout of these.
 * [feature] Introduce metric tools via devtools
-* [fixed] Lots of transitvity edge cases
+* [fix] Lots of transitvity edge cases
 
 [Compare v0.1.3..v0.2.0](https://github.com/mbj/to_source/ompare/v0.1.3...v0.2.0)

data/lib/to_source/emitter/op_assign2.rb

@@ -18,10 +18,26 @@ module ToSource
         visit(util.receiver)
         emit('.')
         emit(util.name)
-        emit(' |= ')
+        emit(" #{operator} ")
         visit(util.value)
       end
 
+      MAPPING = {
+        :or =>  :'||',
+        :and => :'&&'
+      }.freeze
+
+      # Return operator
+      #
+      # @return [String]
+      #
+      # @api private
+      #
+      def operator
+        op = node.op
+        "#{MAPPING.fetch(op, op)}="
+      end
+
     end
   end
 end

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

@@ -182,12 +182,15 @@ describe ToSource,'.to_source' do
     end
   end
 
-  context 'conditional element assignment' do
-    assert_source 'foo[key] ||= bar'
-  end
 
-  context 'attribute assignment on merge' do
-    assert_source 'self.foo |= bar'
+  %w(|= ||= &= &&= += -= *= /= **= %=).each do |op|
+    context "conditional attribute #{op} assignment" do
+      assert_source "self.foo #{op} bar"
+    end
+
+    context "conditional element #{op} assignment" do
+      assert_source "foo[key] #{op} bar"
+    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.19'
+  s.version            = '0.2.20'
   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.19
+  version: 0.2.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium