arel_extensions 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b36bcf361cb8f97341795d3259a5d1b29a9b046
-  data.tar.gz: 67c3eafebe0c53790bf4c0f057d90c4fd773311d
+  metadata.gz: 68ee590a18210a1a5692c9ba7c4caf3c47a11f4e
+  data.tar.gz: a78126c03105531c7e0c25cee082c34c18eb7fdd
 SHA512:
-  metadata.gz: 844f8c6fecf320902f0ea8d07a52182423ce660307019d8b50a93757332edbc9251549b26f2f091206f79988e923eb437c45cdb5900aa6957325073e52da31a4
-  data.tar.gz: 62b98ce10a839b8aab63a613be066b50356de269f292a1b9d44e4d74b33e2295878b5385e4eba24e090367f4682cce7611a491824050072963ed8daf26e8ad2a
+  metadata.gz: fd66f0377b2c25fe6e18c3ee250e1fc55e699d6a423e43c65fee38749752955e1e3f33ca58f31200d9ed26fcc818da44c2d1f02c7ee11e05c9a7756f5a560f1f
+  data.tar.gz: d7b6f047370c4cc2af72b632adb10678ed70ba9ef2e58e6a1630d1672ed8a3dc562f093a2787cd15611454a92c2be1f94f98b74f877e48bdf49420107129f7a1

data/lib/arel_extensions/nodes/concat.rb

@@ -25,6 +25,15 @@ module ArelExtensions::Nodes
       super(tab)
     end
 
+	def self.new expr
+		o = super(expr)
+		if o.expressions.length == 1
+			o.expressions[0]
+		else
+			o
+		end
+	end
+
     #def +(other)
     #  Concat.new(self.expressions + [other])
     #end

data/lib/arel_extensions/string_functions.rb

@@ -108,12 +108,7 @@ module ArelExtensions
     end
     
 	def concat other
-		res = ArelExtensions::Nodes::Concat.new [self, other]
-		if res.expressions.length == 1
-			res.expressions.first
-		else
-			res
-		end
+		ArelExtensions::Nodes::Concat.new [self, other]
 	end
 
     def group_concat sep = nil

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.1.2".freeze
+  VERSION = "1.1.3".freeze
 end

data/lib/arel_extensions/visitors/mysql.rb

@@ -307,7 +307,7 @@ module ArelExtensions
 		end	
 			
 		def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
-			col = o.left
+			col = o.left.coalesce(0)
 			params = o.locale ? [o.precision,Arel::Nodes.build_quoted(o.locale)] : [o.precision]
 			sign = ArelExtensions::Nodes::Case.new.when(col<0).
 								then('-').
@@ -339,15 +339,13 @@ module ArelExtensions
 			before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
 			middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
 			after  = o.flags.include?('-') ? repeated_char : ''
-			full_number =  col.when(0).then('0').else(
-				ArelExtensions::Nodes::Concat.new([
+			full_number = ArelExtensions::Nodes::Concat.new([
 					before,
 					sign,
 					middle,
 					number,
 					after
 				])
-			)				
 			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
 			collector		
 		end

data/lib/arel_extensions/visitors/oracle.rb

@@ -518,10 +518,10 @@ module ArelExtensions
 	
 
 	def visit_ArelExtensions_Nodes_FormattedNumber o, collector		
-		col = o.left
+		col = o.left.coalesce(0)
 		comma = Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING[o.locale] || '.,'
 		comma_in_format = o.precision == 0 ? '' : 'D'
-		nines_after = (1..o.precision).map{'9'}.join('')
+		nines_after = (1..o.precision-1).map{'9'}.join('')+'0'
 		if comma.length == 1
 			options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+" '")
 			nines_before = ("999"*4+"990")
@@ -563,16 +563,14 @@ module ArelExtensions
 		before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
 		middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
 		after  = o.flags.include?('-') ? repeated_char : ''
-		full_number =  col.when(0).then('0').else(
-			ArelExtensions::Nodes::Concat.new([
+		full_number = ArelExtensions::Nodes::Concat.new([
 				before,
 				sign,
 				middle,
 				number,
 				after
 			])
-		)				
-		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector		
+		collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector
 		collector		
 	end
 

data/lib/arel_extensions/visitors/postgresql.rb

@@ -280,7 +280,7 @@ module ArelExtensions
 	  end
 
 	  def visit_ArelExtensions_Nodes_FormattedNumber o, collector	
-			col = o.left
+			col = o.left.coalesce(0)
 			comma = o.precision == 0 ? '' : (Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale][0] || '.')
 			thousand_separator = Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale][1] || (Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale] ? '' : 'G')
 			nines_after = (1..o.precision).map{'9'}.join('')
@@ -323,15 +323,13 @@ module ArelExtensions
 			before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
 			middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
 			after  = o.flags.include?('-') ? repeated_char : ''
-			full_number =  col.when(0).then('0').else(
-				ArelExtensions::Nodes::Concat.new([
+			full_number = ArelExtensions::Nodes::Concat.new([
 					before,
 					sign,
 					middle,
 					number,
 					after
 				])
-			)				
 			collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector
 			collector
 	  end

data/test/with_ar/all_agnostic_test.rb

@@ -527,6 +527,8 @@ module ArelExtensions
 		assert_equal "123456765,6" , t(@arthur, (@score+123456700).format_number("%.1f","fr_FR"))
 		assert_equal "123,456,765.6" , t(@arthur, (@score+123456700).format_number("%.1f","en_US"))
 		assert_equal "   123,456,765.6" , t(@arthur, (@score+123456700).format_number("%16.1f","en_US"))
+		assert_equal "$ 0,00 €" , t(@arthur, @score.when(65.62).then(Arel.sql("null")).else(1).format_number("$ %.2f €","fr_FR"))
+		assert_equal "$ 0,00 €" , t(@arthur, (@score-65.62).format_number("$ %.2f €","fr_FR"))
 	  end
 	  
 	  def test_accent_insensitive

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Yann Azoury