ruby-beautify 0.94.2 → 0.95.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0200f47ad7a7b3b4db0cc305cc01c58e5f33e06f
-  data.tar.gz: bbc3bb4107a01d04cecfefb3437388749cd7cf8c
+  metadata.gz: 795337833ac1e0a311d095cd06e138e090e813e0
+  data.tar.gz: a24f9b486bca041b900d19d5ca3d72d2857d5d16
 SHA512:
-  metadata.gz: 159b269436d56dce50cd217743b5423f7b6206a5ae64368b0a0aa60461f58fb8d95f030447c75787bac7eadab920c86801765561ef131485fdcc1cdaf3360f9c
-  data.tar.gz: 3c03b30b349a34338caf00e6686eafe3f13ec49e30e18737c57daa058c20a55683c07688daebdfd9ae1404c4b757093f706fbcac062ca105398a8e677ef6c120
+  metadata.gz: 2cc470ec899d8073ba989c921f1025f72a8a2728efc644386441c44df1231615e2c139940d6614d67d5d60dfb71472ab45cc92c219915d265c2d10d003c163c2
+  data.tar.gz: 1a1821d12d0c711842bc2838e6d1096ebd3a5cd62cff37ec85ca225d123533a7ed707fc7206b0a3ae49a57b85f27fbee04945b7b10ba718bd2c7740f3124f794

data/WHATSNEW.md

@@ -1,3 +1,7 @@
+## 0.95.0
+* Merged a quick fix from @pkuykendall to catch block assignments with ||=
+* Added a required version to the gemspec.
+
 ## 0.94.2
 * Support for case statements thanks to @pkuykendall.
 * @pkuykendall also brings us proper syntax formatting for assignments from the return value of an if check (that's a mouth full).

data/bin/rbeautify

@@ -151,7 +151,7 @@ end
 # test for assignment from a block
 def contains_block_assignment?(line_lex)
   compacted_line = line_lex.reject{|x| x[1] == :on_sp} #remove spaces
-  idx = compacted_line.find_index{|x| x[2] == '='} #find first equal sign
+  idx = compacted_line.rindex{|x| ['=', '||='].include? x[2]} #find last equal
   if idx
     return @open_block_start.include?(compacted_line[idx+1][2]) #check for if/begin block
   end

data/bin/ruby-beautify

@@ -151,7 +151,7 @@ end
 # test for assignment from a block
 def contains_block_assignment?(line_lex)
   compacted_line = line_lex.reject{|x| x[1] == :on_sp} #remove spaces
-  idx = compacted_line.find_index{|x| x[2] == '='} #find first equal sign
+  idx = compacted_line.rindex{|x| ['=', '||='].include? x[2]} #find last equal
   if idx
     return @open_block_start.include?(compacted_line[idx+1][2]) #check for if/begin block
   end

data/lib/ruby-beautify/version.rb

@@ -1,3 +1,3 @@
 module RBeautify
-  VERSION = "0.94.2"
+  VERSION = "0.95.0"
 end

data/ruby-beautify.gemspec

@@ -1,6 +1,7 @@
 require File.expand_path('../lib/ruby-beautify/version', __FILE__)
 
 Gem::Specification.new do |gem|
+  gem.required_ruby_version = '>= 2.0'
   gem.name        = 'ruby-beautify'
   gem.summary     = "a cli tool (and module) to beautify ruby code."
   gem.description = gem.summary

data/spec/example.rb

@@ -122,3 +122,25 @@ end
 rescue
 'FALSE'
 end
+
+# Test or-equals
+def expensive_value
+@expensive_value ||= begin
+if conn.active?
+expensive_call
+else
+:none
+end
+end
+end
+
+# Test multiple or-equals
+def expensive_value
+@expensive_value ||= @cached_value ||= begin
+if conn.active?
+expensive_call
+else
+:none
+end
+end
+end

data/spec/example_beautified.rb

@@ -122,3 +122,25 @@ response = begin
 rescue
 	'FALSE'
 end
+
+# Test or-equals
+def expensive_value
+	@expensive_value ||= begin
+		if conn.active?
+			expensive_call
+		else
+			:none
+		end
+	end
+end
+
+# Test multiple or-equals
+def expensive_value
+	@expensive_value ||= @cached_value ||= begin
+		if conn.active?
+			expensive_call
+		else
+			:none
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-beautify
 version: !ruby/object:Gem::Version
-  version: 0.94.2
+  version: 0.95.0
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="