arel_extensions 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8dec1f213ad0c9708bec8dba67bf1f1e69a08c
-  data.tar.gz: 0d14b1fab3067c427d370cf0e7b005f3ff285349
+  metadata.gz: 3b36bcf361cb8f97341795d3259a5d1b29a9b046
+  data.tar.gz: 67c3eafebe0c53790bf4c0f057d90c4fd773311d
 SHA512:
-  metadata.gz: 0af7b4d42096aebda99cf375a2757275dfe04820ebc9d54916018eb335b22e086d23a17e0b9e48559add9bc49830c60001e96a9e68aaf84ad17eb8f750b4800d
-  data.tar.gz: 4b747e27a9d89aef3fa764625f19210f166bf8bcd81996728e4818fb62a3fb154322159494e90ca67dccc386fa5c13ebeee2b94957146c65f2f3aab7974e2773
+  metadata.gz: 844f8c6fecf320902f0ea8d07a52182423ce660307019d8b50a93757332edbc9251549b26f2f091206f79988e923eb437c45cdb5900aa6957325073e52da31a4
+  data.tar.gz: 62b98ce10a839b8aab63a613be066b50356de269f292a1b9d44e4d74b33e2295878b5385e4eba24e090367f4682cce7611a491824050072963ed8daf26e8ad2a

data/lib/arel_extensions/nodes/case.rb

@@ -6,6 +6,9 @@ module ArelExtensions
 				include Arel::OrderPredications
 				include ArelExtensions::Comparators
 				include ArelExtensions::Predications
+				include ArelExtensions::MathFunctions
+				include ArelExtensions::StringFunctions
+				include ArelExtensions::NullFunctions
 
 				attr_accessor :case, :conditions, :default
 

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/oracle.rb

@@ -9,7 +9,7 @@ module ArelExtensions
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
       }
-      Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ', ' }
+      Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', ' }
       
 	  def visit_ArelExtensions_Nodes_Log10 o, collector
         collector << "LOG("
@@ -521,9 +521,14 @@ module ArelExtensions
 		col = o.left
 		comma = Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING[o.locale] || '.,'
 		comma_in_format = o.precision == 0 ? '' : 'D'
-		options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+"'")		
 		nines_after = (1..o.precision).map{'9'}.join('')
-		nines_before = (1..16).map{'9'}.join('')
+		if comma.length == 1
+			options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+" '")
+			nines_before = ("999"*4+"990")
+		else
+			options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+"'")
+			nines_before = ("999G"*4+"990")
+		end
 		sign = ArelExtensions::Nodes::Case.new.when(col<0).
 							then('-').
 							else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
@@ -538,7 +543,7 @@ module ArelExtensions
 						options								
 					])	
 			if o.type == 'e'
-			number = number.replace('E','e')
+				number = number.replace('E','e')
 			end
 		else			
 			number = Arel::Nodes::NamedFunction.new('TO_CHAR',[

data/lib/arel_extensions/visitors/postgresql.rb

@@ -8,7 +8,7 @@ module ArelExtensions
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz' # seconds, subseconds
       }
-      Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING = { 'en_US' => '.', 'fr_FR' => ',' }
+      Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', ' }
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "RANDOM("
@@ -281,9 +281,11 @@ module ArelExtensions
 
 	  def visit_ArelExtensions_Nodes_FormattedNumber o, collector	
 			col = o.left
-			comma = o.precision == 0 ? '' : (Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale] || '.')			
+			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('')
-			nines_before = (1..16).map{'9'}.join('')
+			nines_before = ("999#{thousand_separator}"*4+"990")
+
 			sign = ArelExtensions::Nodes::Case.new.when(col<0).
 								then('-').
 								else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
@@ -291,21 +293,24 @@ module ArelExtensions
 			
 			if o.scientific_notation 
 				number = ArelExtensions::Nodes::Concat.new([
-								Arel::Nodes::NamedFunction.new('TO_CHAR',[
-									col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
-									Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
-								]),
+								Arel::Nodes::NamedFunction.new('TRIM',[
+									Arel::Nodes::NamedFunction.new('TO_CHAR',[
+										col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
+										Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
+									])]),
 								o.type, 
-								Arel::Nodes::NamedFunction.new('TO_CHAR',[
-									col.abs.log10.floor,
-									Arel::Nodes.build_quoted('FM'+nines_before)
-								])
-							])			
+								Arel::Nodes::NamedFunction.new('TRIM',[
+									Arel::Nodes::NamedFunction.new('TO_CHAR',[
+										col.abs.log10.floor,
+										Arel::Nodes.build_quoted('FM'+nines_before)
+									])])
+							])
 			else			
-				number = Arel::Nodes::NamedFunction.new('TO_CHAR',[
-							Arel::Nodes.build_quoted(col.abs),
-							Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
-						])				
+				number = Arel::Nodes::NamedFunction.new('TRIM',[
+							Arel::Nodes::NamedFunction.new('TO_CHAR',[
+								Arel::Nodes.build_quoted(col.abs),
+								Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
+							])])
 			end
 			
 			repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().

data/test/with_ar/all_agnostic_test.rb

@@ -520,9 +520,13 @@ module ArelExtensions
 		assert_equal "$    65,6 €" , t(@arthur, @score.format_number("$ % 7.1f €","fr_FR"))
 		assert_equal "$  +65,62 €" , t(@arthur, @score.format_number("$ % +7.2f €","fr_FR"))		
 		assert_equal "$ +065,62 €" , t(@arthur, @score.format_number("$ %0+7.2f €","fr_FR"))
-		assert_includes ["$ 6,56e1 €","$ 6,56e+01 €"], t(@arthur, @score.format_number("$ %.2e €","fr_FR"))			
-		assert_includes ["$ 6,56E1 €","$ 6,56E+01 €"], t(@arthur, @score.format_number("$ %.2E €","fr_FR"))			
+		assert_includes ["$ 6,56e1 €","$ 6,56e+01 €"], t(@arthur, @score.format_number("$ %.2e €","fr_FR"))
+		assert_includes ["$ 6,56E1 €","$ 6,56E+01 €"], t(@arthur, @score.format_number("$ %.2E €","fr_FR"))
 		assert_includes ["$ 6,562E1 €","$ 6,562E+01 €"], t(@arthur, @score.format_number("$ %.3E €","fr_FR"))
+		assert_equal "123 456 765,6" , t(@arthur, (@score+123456700).format_number("%.1f","sv_SE"))
+		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"))
 	  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.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel