refinerycms-i18n 0.9.9.14 → 0.9.9.15

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.14'
+version = '0.9.9.15'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem(spec)?$/
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.authors           = %w(Resolve\\ Digital)
   s.require_paths     = %w(lib)
 
-  s.add_dependency    'refinerycms-core', '>= 0.9.9.8'
+  s.add_dependency    'refinerycms-core', '>= 0.9.9.10'
   s.add_dependency    'routing-filter', '>= 0.2.3'
 
   s.files             = [

data/lib/refinery/i18n-js.rb

@@ -1,15 +1,21 @@
+require "FileUtils" unless defined?(FileUtils)
+
 module SimplesIdeias
   module I18n
     extend self
 
+    require File.expand_path("../i18n-js/railtie", __FILE__) if Rails.version >= "3.0"
+
     # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
     MERGER = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2 }
 
-    # Set configuration file path
-    CONFIG_FILE = Rails.root.join("config/i18n-js.yml")
+    def config_file
+      Rails.root.join('config', 'i18n-js.yml')
+    end
 
-    # Set i18n.js output path
-    JAVASCRIPT_FILE = Rails.root.join("public/javascripts/i18n.js")
+    def javascript_file
+      Rails.root.join('public', 'javascripts', 'i18n.js')
+    end
 
     # Export translations to JavaScript, considering settings
     # from configuration file
@@ -33,26 +39,32 @@ module SimplesIdeias
     # Load configuration file for partial exporting and
     # custom output directory
     def config
-      HashWithIndifferentAccess.new YAML.load_file(CONFIG_FILE)
+      yaml = HashWithIndifferentAccess.new
+
+      [config_file].flatten.each do |config|
+        yaml.deep_merge!(YAML.load_file(config))
+      end
+
+      yaml
     end
 
     # Check if configuration file exist
     def config?
-      File.file? CONFIG_FILE
+      [config_file].flatten.any?{|f| File.file?(f.to_s) }
     end
 
     # Copy configuration and JavaScript library files to
-    # <tt>SimplesIdeias::I18n::CONFIG_FILE</tt> and <tt>public/i18n.js</tt>.
+    # <tt>config/i18n-js.yml</tt> and <tt>public/javascripts/i18n.js</tt>.
     def setup!
-      FileUtils.cp File.dirname(__FILE__) + "/i18n.js", JAVASCRIPT_FILE
-      FileUtils.cp(File.dirname(__FILE__) + "/i18n-js.yml", CONFIG_FILE) unless config?
+      FileUtils.cp File.dirname(__FILE__) + "/../source/i18n.js", javascript_file
+      FileUtils.cp(File.dirname(__FILE__) + "/../source/i18n-js.yml", config_file) unless config?
     end
 
     # Retrieve an updated JavaScript library from Github.
     def update!
       require "open-uri"
       contents = open("http://github.com/fnando/i18n-js/raw/master/lib/i18n.js").read
-      File.open(JAVASCRIPT_FILE, "w+") {|f| f << contents}
+      File.open(javascript_file, "w+") {|f| f << contents}
     end
 
     # Convert translations to JSON string and save file.
@@ -63,7 +75,7 @@ module SimplesIdeias
       File.open(file, "w+") do |f|
         f << %(var I18n = I18n || {};\n)
         f << %(I18n.translations = );
-        f << sorted_hash(translations).to_json
+        f << translations.to_json
         f << %(;)
       end
     end
@@ -112,21 +124,5 @@ module SimplesIdeias
     def deep_merge!(target, hash) # :nodoc:
       target.merge!(hash, &MERGER)
     end
-
-    # Taken from http://seb.box.re/2010/1/15/deep-hash-ordering-with-ruby-1-8/
-    def sorted_hash(object, deep = false) # :nodoc:
-      if object.is_a?(Hash)
-        res = returning(ActiveSupport::OrderedHash.new) do |map|
-          object.each {|k, v| map[k] = deep ? sorted_hash(v, deep) : v }
-        end
-        return res.class[res.sort {|a, b| a[0].to_s <=> b[0].to_s } ]
-      elsif deep && object.is_a?(Array)
-        array = Array.new
-        object.each_with_index {|v, i| array[i] = sorted_hash(v, deep) }
-        return array
-      else
-        return object
-      end
-    end
   end
-end
+end

data/lib/refinery/i18n-js.yml

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

data/lib/refinery/i18n-js/railtie.rb

@@ -0,0 +1,9 @@
+module SimplesIdeias
+  module I18n
+    class Railtie < Rails::Railtie
+      rake_tasks do
+        load File.dirname(__FILE__) + "../../../tasks/i18n-js_tasks.rake"
+      end
+    end
+  end
+end

data/lib/refinery/i18n-js/version.rb

@@ -0,0 +1,10 @@
+module SimplesIdeias
+  module I18n
+    module Version
+      MAJOR = 1
+      MINOR = 0
+      PATCH = 1
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+    end
+  end
+end

data/lib/refinery/i18n.rb

@@ -21,6 +21,10 @@ module Refinery
 
       config.to_prepare do
         ::ApplicationController.class_eval do
+          before_filter lambda {|c|
+            ::SimplesIdeias::I18n.export! if Rails.env.development?
+          }
+
           def default_url_options(options={})
             ::Refinery::I18n.enabled? ? { :locale => ::I18n.locale } : {}
           end

data/lib/tasks/i18n-js_tasks.rake

@@ -13,4 +13,4 @@ namespace :i18n do
   task :update => :environment do
     SimplesIdeias::I18n.update!
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-i18n
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.14
+  version: 0.9.9.15
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +13:00
+date: 2011-03-24 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.8
+        version: 0.9.9.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,8 @@ files:
 - i18n-js-readme.rdoc
 - lib/gemspec.rb
 - lib/refinery/i18n-filter.rb
+- lib/refinery/i18n-js/railtie.rb
+- lib/refinery/i18n-js/version.rb
 - lib/refinery/i18n-js.rb
 - lib/refinery/i18n-js.yml
 - lib/refinery/i18n.js