cldr-plurals 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59430246aed9b504a141819047e22ac4f8bd8b5c
-  data.tar.gz: f3ed5c3a87b64b5fe420007b4a25e2aaeabe8b2a
+  metadata.gz: de9e5324a2d08c79db6732520b97bc327ffe3f02
+  data.tar.gz: deefd40040f23526295eb1f896bf81a28a02a76a
 SHA512:
-  metadata.gz: 1f63dc50f4d0ed9891de5c01a5de8ed845ae28e8c74117381b75573cbb3b58a4e9d40468578ad90cc2b161fd982fab5ca5bf103fc64cae6f8b6ae6ebdaf2cfbd
-  data.tar.gz: e4c17f51182c16dea89dadc9c137478196284bf50551af68faa35a2f086ca9829acacd67ea7c9e01f72ef408f8ce60354a684b43b2f03a0436d99c65dc235903
+  metadata.gz: 72945352775128fad0bdf2a1422d2dfd0f299fe6fed4bc704f7411a1cc2b13909ba922ffc4df334af84b8bcd1c9b469aa3bbbbd70dfe609bd12d172d79078c54
+  data.tar.gz: 4db915e627d0a90d81b9f0b31d3f555ec896bfec440c6537a39de66c541bb17f54fbe6bbb7e4fd4d3f2811fe645d09eebc0c54c1a3f8e4ca0234e6e87ef0c55e

data/Gemfile

@@ -12,9 +12,7 @@ group :test do
   gem 'rspec'
   gem 'rr'
 
-  gem 'therubyracer', '~> 0.12.0'
-  gem 'cldr-plurals-runtime-rb', '~> 1.0.0'
-  gem 'cldr-plurals-runtime-js', '~> 1.0.0'
-
-  gem 'libv8', '= 3.16.14.11' # 2016-04-20 lock to older working version on Clang/OS X (3.16.14.13 won't compile)
+  gem 'therubyracer', '~> 0.12'
+  gem 'cldr-plurals-runtime-rb', '~> 1.0'
+  gem 'cldr-plurals-runtime-js', '~> 1.0'
 end

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.1
+
+* Wrap operands when emitting ranges in Ruby. (@sickp)
+
 == 1.1.0
 
 * Better, more accurate range handling according to TR-35.

data/lib/cldr-plurals/ruby_emitter.rb

@@ -32,11 +32,11 @@ module CldrPlurals
       end
 
       def emit_or_condition(cond)
-        "(#{emit(cond.left)} || #{emit(cond.right)})"
+        "((#{emit(cond.left)}) || (#{emit(cond.right)}))"
       end
 
       def emit_and_condition(cond)
-        "(#{emit(cond.left)} && #{emit(cond.right)})"
+        "((#{emit(cond.left)}) && (#{emit(cond.right)}))"
       end
 
       def emit_expression(expr)
@@ -84,7 +84,7 @@ module CldrPlurals
 
       def emit_range_check(range, operand)
         # a..b represents all *integers* between a and b, inclusive.
-        n = emit(operand)
+        n = "(#{emit(operand)})"
         "(#{n}.floor == #{n}) && (#{n} >= #{range.start}) && (#{n} <= #{range.finish})"
       end
 

data/lib/cldr-plurals/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module CldrPlurals
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/spec_helper.rb

@@ -8,6 +8,10 @@ RSpec.configure do |config|
   config.mock_with :rr
 end
 
+ADDITIONAL_SAMPLES = {
+  "ar" => { other: %w(3.1 3.2 3.3) } # improve test coverage for Arabic
+}
+
 def each_rule
   samples.each_pair do |locales, rules|
     rules.each do |rule|
@@ -19,6 +23,7 @@ def each_rule
   end
 end
 
+
 def each_rule_list
   samples.each_pair do |locales, rules|
     rule_list = CldrPlurals::Compiler::RuleList.new(locales)
@@ -35,6 +40,10 @@ def each_rule_list
       end
     end
 
+    (ADDITIONAL_SAMPLES[locales] || {}).each do |name, more_samples|
+      samples_per_name[name].concat(more_samples)
+    end
+
     yield rule_list, samples_per_name
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cldr-plurals
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies: []
 description: Tokenizes and parses CLDR plural rules and provides a mechanism for emitting
   them as source code
@@ -62,4 +62,3 @@ specification_version: 4
 summary: Tokenizes and parses CLDR plural rules and provides a mechanism for emitting
   them as source code
 test_files: []
-has_rdoc: true