i18n-js 1.0.2 → 1.1.0

data/spec/i18n_spec.rb

@@ -57,9 +57,14 @@ describe SimplesIdeias::I18n do
     SimplesIdeias::I18n.config.should_not be_empty
   end
 
+  it "sets empty hash as configuration when no file is found" do
+    SimplesIdeias::I18n.config?.should be_false
+    SimplesIdeias::I18n.config.should == {}
+  end
+
   it "exports messages to default path when configuration file doesn't exist" do
     SimplesIdeias::I18n.export!
-    File.should be_file(Rails.root.join("public/javascripts/translations.js"))
+    Rails.root.join(SimplesIdeias::I18n.export_dir, "translations.js").should be_file
   end
 
   it "exports messages using the default configuration file" do
@@ -154,6 +159,42 @@ describe SimplesIdeias::I18n do
     File.read(SimplesIdeias::I18n.javascript_file).should == "UPDATED"
   end
 
+  describe "#auto_export?" do
+    it "returns true for development mode" do
+      Rails.env = stub(:development? => true)
+      SimplesIdeias::I18n.should be_auto_export
+    end
+
+    it "returns false for production mode" do
+      Rails.env = stub(:production? => true, :development? => false)
+      SimplesIdeias::I18n.should_not be_auto_export
+    end
+
+    it "returns true for production when configuration is set" do
+      Rails.env = stub(:production? => true, :development? => false)
+      SimplesIdeias::I18n.stub :config? => true, :config => {:auto_export => true}
+      SimplesIdeias::I18n.should be_auto_export
+    end
+  end
+
+  describe "#export_dir" do
+    it "detects Rails 3.1" do
+      Rails.version = "3.1"
+      SimplesIdeias::I18n.export_dir == "vendor/assets/javascripts"
+    end
+
+    it "acts as older Rails when asset pipeline is disabled" do
+      Rails.version = "3.1"
+      SimplesIdeias::I18n.stub :config => {:asset_pipeline => false}
+      SimplesIdeias::I18n.export_dir == "public/javascripts"
+    end
+
+    it "detects older Rails" do
+      Rails.version = "3.0.9"
+      SimplesIdeias::I18n.export_dir.to_s.should == "public/javascripts"
+    end
+  end
+
   private
   # Set the configuration as the current one
   def set_config(path)

data/spec/resources/locales.yml

@@ -20,7 +20,7 @@ en:
     abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
     month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
     abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
-    order: [ :year, :month, :day ]
+    # order: [ :year, :month, :day ]
   time:
     formats:
       default: "%a, %d %b %Y %H:%M:%S %z"
@@ -47,7 +47,7 @@ fr:
     abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
     month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
     abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
-    order: [ :day, :month, :year ]
+    # order: [ :day, :month, :year ]
   time:
     formats:
       default: "%d %B %Y %H:%M"

data/{source → vendor/assets/javascripts}/i18n.js

@@ -145,12 +145,24 @@ I18n.localize = function(scope, value) {
   }
 };
 
-I18n.parseDate = function(d) {
-  var matches, date;
-  matches = d.toString().match(/(\d{4})-(\d{2})-(\d{2})(?:[ |T](\d{2}):(\d{2}):(\d{2}))?(Z)?/);
+I18n.parseDate = function(date) {
+  var matches, convertedDate;
+
+  // we have a date, so just return it.
+  if (typeof(date) == "object") {
+    return date;
+  };
+
+  // it matches the following formats:
+  //   yyyy-mm-dd
+  //   yyyy-mm-dd[ T]hh:mm::ss
+  //   yyyy-mm-dd[ T]hh:mm::ss
+  //   yyyy-mm-dd[ T]hh:mm::ssZ
+  //   yyyy-mm-dd[ T]hh:mm::ss+0000
+  //
+  matches = date.toString().match(/(\d{4})-(\d{2})-(\d{2})(?:[ T](\d{2}):(\d{2}):(\d{2}))?(Z|\+0000)?/);
 
   if (matches) {
-    // date/time strings: yyyy-mm-dd hh:mm:ss or yyyy-mm-dd or yyyy-mm-ddThh:mm:ssZ
     for (var i = 1; i <= 6; i++) {
       matches[i] = parseInt(matches[i], 10) || 0;
     }
@@ -159,21 +171,25 @@ I18n.parseDate = function(d) {
     matches[2] -= 1;
 
     if (matches[7]) {
-      date = new Date(Date.UTC(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]));
+      convertedDate = new Date(Date.UTC(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]));
     } else {
-      date = new Date(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]);
+      convertedDate = new Date(matches[1], matches[2], matches[3], matches[4], matches[5], matches[6]);
     }
-  } else if (typeof(d) == "number") {
+  } else if (typeof(date) == "number") {
     // UNIX timestamp
-    date = new Date();
-    date.setTime(d);
+    convertedDate = new Date();
+    convertedDate.setTime(date);
+  } else if (date.match(/\d+ \d+:\d+:\d+ [+-]\d+ \d+/)) {
+    // a valid javascript format with timezone info
+    convertedDate = new Date();
+    convertedDate.setTime(Date.parse(date))
   } else {
     // an arbitrary javascript string
-    date = new Date();
-    date.setTime(Date.parse(d));
+    convertedDate = new Date();
+    convertedDate.setTime(Date.parse(date));
   }
 
-  return date;
+  return convertedDate;
 };
 
 I18n.toTime = function(scope, d) {
@@ -230,6 +246,7 @@ I18n.strftime = function(date, format) {
   f = f.replace("%b", options.abbr_month_names[month]);
   f = f.replace("%B", options.month_names[month]);
   f = f.replace("%d", padding(day));
+  f = f.replace("%e", day);
   f = f.replace("%-d", day);
   f = f.replace("%H", padding(hour));
   f = f.replace("%-H", hour);

metadata

@@ -1,105 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: i18n-js
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154603060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154603060
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2154602640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154602640
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2154602140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154602140
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2154601640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2154601640
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &2154601260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: spec-js
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2154601260
+- !ruby/object:Gem::Dependency
+  name: spec-js
+  requirement: &2154600720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.0.beta.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *2154600720
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2154600220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *2154600220
 description: It's a small library to provide the Rails I18n translations on the Javascript.
-email: 
+email:
 - fnando.vieira@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
 - Rakefile
+- config/i18n-js.yml
 - i18n-js.gemspec
 - lib/i18n-js.rb
+- lib/i18n-js/engine.rb
 - lib/i18n-js/railtie.rb
+- lib/i18n-js/rake.rb
 - lib/i18n-js/version.rb
-- lib/tasks/i18n-js_tasks.rake
-- source/i18n-js.yml
-- source/i18n.js
 - spec/i18n_spec.js
 - spec/i18n_spec.rb
 - spec/resources/custom_path.yml
@@ -110,34 +118,38 @@ files:
 - spec/resources/no_scope.yml
 - spec/resources/simple_scope.yml
 - spec/spec_helper.rb
+- vendor/assets/javascripts/i18n.js
 homepage: http://rubygems.org/gems/i18n-js
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -4305660274068506457
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -4305660274068506457
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: It's a small library to provide the Rails I18n translations on the Javascript.
-test_files: 
+test_files:
 - spec/i18n_spec.js
 - spec/i18n_spec.rb
 - spec/resources/custom_path.yml

data/source/i18n-js.yml

@@ -1,4 +0,0 @@
-# Find more details about this configuration file at http://github.com/fnando/i18n-js
-translations:
-  - file: "public/javascripts/translations.js"
-    only: "*"