underscore_extensions 0.0.9 → 0.1.0

data/Gemfile

@@ -3,4 +3,4 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in underscore_extensions.gemspec
 gemspec
 
-gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git', :branch => '559658742421b00a7c48101375520d89199dba8a'
+gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git', :branch => 'ddeb56597c3507f068f9dfca4fd22d48e5a68253'

data/lib/assets/javascripts/underscore.extensions.js

@@ -63,10 +63,17 @@
     }
   });
 
-  if (this.hasOwnProperty('InflectionJS')) {
+  if (this.InflectionJS) {
     _.mixin({
-      pluralize: function(obj, options) {
+      pluralize: function(obj, number, options) {
+        if (!_(number).isNumber()) {
+          options = number;
+          number = 0;
+        }
         options = options || {};
+        if (number === 1) {
+          options.skip = obj;
+        }
         options.skip = options.skip || '';
         return InflectionJS.apply_rules(obj, InflectionJS.plural_rules, options.skip);
       },

data/lib/underscore_extensions/version.rb

@@ -1,5 +1,5 @@
 module UnderscoreExtensions
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
   UNDERSCORE_VERSION = '1.3.3'
   UNDERSCORE_STRING_VERSION  = '2.0.0'
 end

data/spec/javascripts/underscore.extensions_spec.js

@@ -96,18 +96,31 @@ describe('_', function() {
       expect(_('story').pluralize()).toEqual('stories');
     });
 
-    it("should pass the skip option", function() {
+    it('should pass the skip option', function() {
       expect(_('foo').pluralize({skip: 'foo'})).toEqual('foo');
     });
+
+    describe('when a number is provided', function() {
+      it('should not pluralize when the number is 1', function() {
+        expect(_('foo').pluralize(0)).toEqual('foos');
+        expect(_('foo').pluralize(1)).toEqual('foo');
+        expect(_('foo').pluralize(2)).toEqual('foos');
+      });
+
+      it('should pass the skip option', function() {
+        expect(_('foo').pluralize(2, {skip: 'bar'})).toEqual('foos');
+        expect(_('foo').pluralize(2, {skip: 'foo'})).toEqual('foo');
+      });
+    });
   });
 
   describe('#singularize', function() {
-    it("should singularize a model name", function() {
+    it('should singularize a model name', function() {
       expect(_('octopi').singularize()).toEqual('octopus');
       expect(_('stories').singularize()).toEqual('story');
     });
 
-    it("should pass the skip option", function() {
+    it('should pass the skip option', function() {
       expect(_('foos').singularize({skip: 'foos'})).toEqual('foos');
     });
   });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: underscore_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuubar
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: underscore_extensions
-rubygems_version: 1.8.21
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Extensions to underscore javascript library as a rails engine