ruby-beautify 0.94.1 → 0.94.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d8f2666a10cd5f951233487ef5bcbc18226747
-  data.tar.gz: a43bca59db59c2aa94b1ea8538c7aa29ba0a19f8
+  metadata.gz: 0200f47ad7a7b3b4db0cc305cc01c58e5f33e06f
+  data.tar.gz: bbc3bb4107a01d04cecfefb3437388749cd7cf8c
 SHA512:
-  metadata.gz: 87e379a981c675498389680e58e60cc398d3709c2572bd4eef4cd39120a41679bb992663c86dae23ad02f2c06d0c3fcdba6fc28cfe7a115069f46c3356bc6a3a
-  data.tar.gz: 5a6dbf3aa9c9f2ab1e92e6d7c00006f0e92bc598093512d4e4d36ec882b464cebe4b776d2abd4854f24d5eca2463a36d7a31e0a217d9085cae05e532591cd562
+  metadata.gz: 159b269436d56dce50cd217743b5423f7b6206a5ae64368b0a0aa60461f58fb8d95f030447c75787bac7eadab920c86801765561ef131485fdcc1cdaf3360f9c
+  data.tar.gz: 3c03b30b349a34338caf00e6686eafe3f13ec49e30e18737c57daa058c20a55683c07688daebdfd9ae1404c4b757093f706fbcac062ca105398a8e677ef6c120

data/README.md

@@ -56,6 +56,9 @@ Please feel free to open issues, I am actively working on this project again, th
 * Add overwrite in place to files.
 * Add 'best guest' for files that fail syntax checking.
 * Add syntax checking to files rendered via STDIN.
+* Seperate the content of the main bin into a proper namespace/library (so it doesn't pollute by default).
+* Split up the spec into multiple specs.
+* remove the link to rbeautify (by 1.0).
 
 Longer term I'd like to do some more to assignment, line wrapping, and spacing in/around keywords.
 

data/WHATSNEW.md

@@ -1,4 +1,8 @@
-## 0.94.1 
+## 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).
+
+## 0.94.1
 * Multiline string and embedded doc support thanks to @veelenga.
 
 ## 0.94.0

data/bin/rbeautify

@@ -12,8 +12,8 @@ Options = OptionParser.new do |opts|
 end
 Options.parse!
 
-@open_block_start = ["module", "class", "begin", "def", 'if', 'while', 'unless']
-@both_block = ["else", "elsif", 'rescue']
+@open_block_start = ["module", "class", "begin", "def", 'if', 'while', 'unless', 'case']
+@both_block = ["else", "elsif", 'rescue', 'when']
 @open_block_do  = ['do', '{']
 @close_block = ['end', '}']
 
@@ -81,6 +81,7 @@ end
 
 # is the first word a key word?
 def starts_block?(line_lex)
+  return true if contains_block_assignment? line_lex
   line_lex.each do |x|
     # search for a first non-space token
     if not x[1] == :on_sp
@@ -147,6 +148,16 @@ def closing_assignment?(line_lex)
   return true if closes > opens
 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
+  if idx
+    return @open_block_start.include?(compacted_line[idx+1][2]) #check for if/begin block
+  end
+  return false
+end
+
 # is this ruby file valid syntax?
 def valid_syntax?(file)
   #ugly but fast, ruby returns stdout if it's ok, and stderr if not.

data/bin/ruby-beautify

@@ -12,8 +12,8 @@ Options = OptionParser.new do |opts|
 end
 Options.parse!
 
-@open_block_start = ["module", "class", "begin", "def", 'if', 'while', 'unless']
-@both_block = ["else", "elsif", 'rescue']
+@open_block_start = ["module", "class", "begin", "def", 'if', 'while', 'unless', 'case']
+@both_block = ["else", "elsif", 'rescue', 'when']
 @open_block_do  = ['do', '{']
 @close_block = ['end', '}']
 
@@ -81,6 +81,7 @@ end
 
 # is the first word a key word?
 def starts_block?(line_lex)
+  return true if contains_block_assignment? line_lex
   line_lex.each do |x|
     # search for a first non-space token
     if not x[1] == :on_sp
@@ -147,6 +148,16 @@ def closing_assignment?(line_lex)
   return true if closes > opens
 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
+  if idx
+    return @open_block_start.include?(compacted_line[idx+1][2]) #check for if/begin block
+  end
+  return false
+end
+
 # is this ruby file valid syntax?
 def valid_syntax?(file)
   #ugly but fast, ruby returns stdout if it's ok, and stderr if not.

data/lib/ruby-beautify/version.rb

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

data/spec/example.rb

@@ -92,3 +92,33 @@ puts "This is multi line interpolated string #{
 x
 }"
 end
+
+# Test to validate case statements
+def case_test opts=nil
+case test_case
+when 'Passing'
+call(:pass)
+when 'Failing'
+call(:fail)
+when 'Error'
+call(:error)
+end
+end
+
+# Test for variable assignment from an if statement
+@products = if params[:category]
+Category.find(params[:category]).products
+else
+Product.all
+end
+
+# Test for variable assignment from a block
+response = begin
+if true?
+api_call(test)
+else
+rejected
+end
+rescue
+'FALSE'
+end

data/spec/example_beautified.rb

@@ -92,3 +92,33 @@ def m (x)
 		x
 	}"
 end
+
+# Test to validate case statements
+def case_test opts=nil
+	case test_case
+	when 'Passing'
+		call(:pass)
+	when 'Failing'
+		call(:fail)
+	when 'Error'
+		call(:error)
+	end
+end
+
+# Test for variable assignment from an if statement
+@products = if params[:category]
+	Category.find(params[:category]).products
+else
+	Product.all
+end
+
+# Test for variable assignment from a block
+response = begin
+	if true?
+		api_call(test)
+	else
+		rejected
+	end
+rescue
+	'FALSE'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-beautify
 version: !ruby/object:Gem::Version
-  version: 0.94.1
+  version: 0.94.2
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake