zlocalize 4.2.0 → 6.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd7d0e00b29df94e177bcc0846a7baf7ad47b7e8
-  data.tar.gz: 5ba24f8718b66e38f85816fdbc26fa5e6390bae9
+SHA256:
+  metadata.gz: a47c635f843a5cc385159f1fa491346ba12a2503a08f17e995e25788a09f914f
+  data.tar.gz: e3f2502d435a73b291b20a637b2d824816f6057f451f2f3ae5f9d0364459018c
 SHA512:
-  metadata.gz: 9e608ee25898b040885ee9fd9bfd238613ab354fe555211e86b5376bee673089824e3d84ce72ca54e8c37ec7a6e5c0921528532bb2ad90b72dc6f75bdac78abe
-  data.tar.gz: 40836d8344fc7172bcbc7d023d934235b1a1fd75b869593b13770212e4ea3154e673fd0994329b239d8d191e67496643f27a1c677af6d73e1b6c2b963399ebe2
+  metadata.gz: dff3e7f314e2a344879dac586d001493464acd6c5cafa8aef784a4c4355e318a4655c5195d062a91bc02e1acceab257908e1cae63b77b1ae1b27a5db5ec10ad6
+  data.tar.gz: 2d28dc426ab248f8d368e7f393211f9e5dbd4f61ce15b5ab196472bcd1b3d73d873db71b6a97d7a0cb41894729040422d2fe69b702f0c8f9a244c957cd5ba2d2

data/lib/zlocalize.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 zlocalize_path = File.expand_path(File.dirname(__FILE__))
 $:.unshift(zlocalize_path) if File.directory?(zlocalize_path) && !$:.include?(zlocalize_path)
 

data/lib/zlocalize/backend.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'yaml'
 require 'zlocalize/translation_file'
 require 'zlocalize/config'
@@ -151,7 +149,7 @@ module ZLocalize
     end
 
     def reload!(force = false)
-      if force || !@initialized || (self.config.reload_per_request[Rails.env.to_sym] == true)
+      if force || !@initialized
         @initialized = false
         @translations = nil
         @translation_procs = nil

data/lib/zlocalize/config.rb

@@ -1,31 +1,28 @@
-# -*- encoding : utf-8 -*-
 module ZLocalize
 
   class Config
 
-    attr_reader :reload_per_request
     attr_reader :return_source_on_missing
-    attr_reader :reload_per_request
     attr_reader :locales
     attr_reader :define_gettext_methods
+    attr_reader :harvest_paths
 
     def initialize
-      @reload_per_request = { :development => true, :test => false, :production => false, :staging => false }
       @return_source_on_missing = { :development => true, :test => false, :production => false, :staging => false }
+      @harvest_paths = [
+        "app/channels/**/*.rb",
+        "app/controllers/**/*.rb",
+        "app/helpers/**/*.rb",
+        "app/models/**/*.rb",
+        "app/views/**/*.erb",
+        "app/mailers/**/*.rb",
+        "app/jobs/**/*.rb",
+        "lib/**/*.rb"
+      ]
       @locales = {}
       @use_global_gettext_methods = true
     end
 
-    def reload_per_request=(value)
-      if value === true || value === false
-        [:development,:test,:production,:staging].each do |env|
-          @reload_per_request[env] = value
-        end
-      elsif value.is_a?(Hash)
-        @reload_per_request.merge!(value)
-      end
-    end
-
     def return_source_on_missing=(value)
       if value === true || value === false
         [:development,:test,:production,:staging].each do |env|

data/lib/zlocalize/harvester.rb

@@ -1,122 +1,101 @@
-# -*- encoding : utf-8 -*-
-
 require 'rubygems'
-require 'erb'
-require File.join(File.dirname(__FILE__),'source_parser')
+require File.join(File.dirname(__FILE__),'source_processor')
 require File.join(File.dirname(__FILE__),'translation_file')
 
 module ZLocalize
 
-   INDENT_STEP = 3
-
-   class HarvesterError < StandardError
-   end
-
-   # Harvester will parse and extract all calls to translation methods in "app/models/",
-   # "app/controllers/" and "app/views/"
-   class Harvester
-
-     attr_accessor :rails_root
-
-     DEFAULT_HARVEST_OPTIONS = { :models => true, :controllers => true,
-                                 :views => true, :helpers => true,
-                                 :output => 'config/locales/app-strings.yml',
-                                 :overwrite_existing => false,
-                                 :add_paths   => [],
-                                 :silent => false,
-                                 :purge => false }
-
-     HARVEST_SECTIONS = { :models      => [ "app/models/**/*.rb" ],
-                          :controllers => [ "app/controllers/**/*.rb" ],
-                          :helpers     => [ "app/helpers/**/*.rb" ],
-                          :views       => [ "app/views/**/*.erb", "app/views/**/*.rhtml" ],
-                          :lib         => [ "lib/**/*.rb"]
-                        }
-
-     def initialize(rails_root, options = {})
-        @rails_root = rails_root
-        @options = DEFAULT_HARVEST_OPTIONS.merge(options)
-     end
-
-     def progress(msg)
-        print msg unless @options[:silent]
-     end
-
-     def harvest_section(section,filespecs)
-       progress("Harvesting localizable strings from #{section}:\n")
-       filespecs.each do |spec|
-         progress("#{spec}: ")
-         Dir.glob(File.join(@rails_root,spec)) do |f|
-           progress('.')
-           collect_entries(f,@rails_root,is_erb?(f))
-         end
-         progress("\n")
-       end
-     end
-
-     def is_erb?(filename)
-       ['.erb','.rhtml'].include?(File.extname(filename))
-     end
-
-     def harvest
-        @new_entries = TranslationEntryCollection.new
-        HARVEST_SECTIONS.each_pair do |section,paths|
-          harvest_section(section,paths)
-          progress("\n")
-        end
-        if @options[:add_paths].is_a?(Array) && @options.size > 0
-          harvest_section("additional paths",@options[:add_paths])
-          progress("\n")
-        end
-
-        @translation_file = ZLocalize::TranslationFile.new
-        unless @options[:overwrite_existing]
-           progress("Merging existing translations from #{@options[:output]}...\n")
-           begin
-             @translation_file.load(File.join(@rails_root,@options[:output]))
-           rescue
-           end
+  INDENT_STEP = 3
+
+  class HarvesterError < StandardError
+  end
+
+  # Harvester will parse and extract all calls to translation methods in "app/models/",
+  # "app/controllers/" and "app/views/"
+  class Harvester
+
+    attr_accessor :rails_root
+
+    DEFAULT_HARVEST_OPTIONS = { :output => 'config/locales/app-strings.yml',
+                                :overwrite_existing => false,
+                                :add_paths   => [],
+                                :silent => false,
+                                :purge => false }
+
+    def initialize(rails_root, options = {})
+      @rails_root = rails_root
+      @options = { paths: ZLocalize.config.harvest_paths }.merge(DEFAULT_HARVEST_OPTIONS).merge(options).with_indifferent_access
+    end
+
+    def progress(msg)
+       print msg unless @options[:silent]
+    end
+
+    def harvest_path(filespec)
+      progress("Harvesting localizable strings from #{filespec}:\n")
+      Dir.glob(File.join(@rails_root,filespec)) do |f|
+        progress('.')
+        collect_entries(f,@rails_root,is_erb?(f))
+      end
+      progress("\n")
+    end
+
+    def is_erb?(filename)
+      ['.erb','.rhtml'].include?(File.extname(filename))
+    end
+
+    def harvest
+      @new_entries = TranslationEntryCollection.new
+      @options[:paths].each do |path|
+        harvest_path(path)
+        progress("\n")
+      end
+
+      @translation_file = ZLocalize::TranslationFile.new
+      unless @options[:overwrite_existing]
+        progress("Merging existing translations from #{@options[:output]}...\n")
+        begin
+          @translation_file.load(File.join(@rails_root,@options[:output]))
+        rescue
         end
-
-        @translation_file.entries.synchronize_with(@new_entries,@options[:purge])
-
-        progress("Writing new translation file...\n")
-        File.open(File.join(@rails_root,@options[:output]),"w") do |f|
-           f.write(@translation_file.to_yaml)
-        end
-
-        progress("Done!\n\n")
-     end
-
-     def harvest_file(filename)
-       @new_entries = TranslationEntryCollection.new
-       collect_entries(filename,@rails_root,false)
-
-       @translation_file = ZLocalize::TranslationFile.new
-       # merge
-       @translation_file.load(File.join(@rails_root,@options[:output]))
-       @translation_file.entries.synchronize_with(@new_entries,@options[:purge])
-       File.open(File.join(@rails_root,@options[:output]),"w") do |f|
-          f.write(@translation_file.to_yaml)
-       end
-     end
-
-     # collect entries in a source file
-     def collect_entries(filename,root,is_erb = false)
-        sp = ZLocalize::SourceParser.new(filename,root,is_erb)
-        sp.parse
-        sp.translation_entries.each do |key,te|
-          if @new_entries[key]
-             te.references.each do |ref|
-                @new_entries[key].add_reference(ref)
-             end
-          else
-            @new_entries[key] = te.dup
+      end
+
+      @translation_file.entries.synchronize_with(@new_entries,@options[:purge])
+
+      progress("Writing new translation file...\n")
+      File.open(File.join(@rails_root,@options[:output]),"w") do |f|
+        f.write(@translation_file.to_yaml)
+      end
+      progress("Done!\n\n")
+    end
+
+    def harvest_file(filename)
+      @new_entries = TranslationEntryCollection.new
+      collect_entries(filename,@rails_root,false)
+
+      @translation_file = ZLocalize::TranslationFile.new
+      # merge
+      @translation_file.load(File.join(@rails_root,@options[:output]))
+      @translation_file.entries.synchronize_with(@new_entries,@options[:purge])
+      File.open(File.join(@rails_root,@options[:output]),"w") do |f|
+        f.write(@translation_file.to_yaml)
+      end
+    end
+
+    # collect entries in a source file
+    def collect_entries(filename,root,is_erb = false)
+      sp = ZLocalize::SourceProcessor.new(filename,root,is_erb)
+      sp.translation_entries.each do |key,te|
+        if @new_entries[key]
+          te.references.each do |ref|
+            @new_entries[key].add_reference(ref)
           end
+        else
+          @new_entries[key] = te.dup
         end
-     end
+      end
+    end
 
-   end
+  end
 
 end # module Harvester
 

data/lib/zlocalize/rails/active_record.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 
 require 'zlocalize/rails/attached_translations'
 ActiveRecord::Base.send(:include, ZLocalize::Translatable::AttachedTranslations)
@@ -8,6 +7,3 @@ ActiveRecord::Base.send(:include, ZLocalize::Translatable::TranslatedColumns)
 
 require 'zlocalize/rails/decimal_attributes'
 ActiveRecord::Base.send(:include, ZLocalize::Translatable::LocalizedDecimalAttributes)
-
-require 'zlocalize/rails/translated_attributes_serializer'
-ActiveRecord::Base.send(:include, ZLocalize::Translatable::TranslatedAttributesSerializer)

data/lib/zlocalize/rails/attached_translations.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 #
 #  === Translation of attributes values for ActiveRecord ===
 #

data/lib/zlocalize/rails/decimal_attributes.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 #  == Localized Decimal Attributes ==
 #
 # Provides a way to ensure Float attributes on ActiveRecord are converted to the internal format

data/lib/zlocalize/rails/generators/initializer.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'rails/generators/base'
 
 # module here is deliberately named Zlocalize (as opposed to ZLocalize), for consistency

data/lib/zlocalize/rails/generators/templates/initializer_template.rb

@@ -1,24 +1,20 @@
-# -*- encoding : utf-8 -*-
-
 # ZLocalize configuration.
 
 # ZLocalize is bound to use I18n.locale, I18n.default_locale, as to remain consistent
 # with the locale used by the Rails framework itself
-I18n.default_locale = :fr
+I18n.default_locale = :en
 
 # define_gettext_methods will add _ and n_ methods to the Object class (so that they are globally accessible)
 # if you do not define the gettext methods, you will need to use ZLocalize.translate and ZLocalize.pluralize
 ZLocalize.config.define_gettext_methods = true
 
-# specify which Rails environments will reload the translation files on each request
-ZLocalize.config.reload_per_request = { :development => false, :test => false,
-                                        :production => false, :staging => false }
+# specify which Rails environments will return the source (untranslated) string when no translation is found.
+# Defaults to false for all environments, meaning a missing translation will raise a ZLocalize::TranslationMissing error
+ZLocalize.config.return_source_on_missing = { development: false, test: false,
+                                              production: false, staging: false }
 
-# specify which Rails environments will return the source string when a translation is not found
-# when false. Defaults to false for all environments, meaning a missing translation will raise
-# a ZLocalize::TranslationMissing error
-ZLocalize.config.return_source_on_missing = { :development => true, :test => true,
-                                              :production => true, :staging => true }
+# If you have additional paths to scan for translation calls, add them here.
+# ZLocalize.config.harvest_paths << 'app/pdf_producers/**/*.rb'
 
 # +ZLocalize.config.locales+ is the configuration of locales supported by your application.
 # each locale must be a Hash with the configuration values for that locale.
@@ -37,16 +33,16 @@ ZLocalize.config.return_source_on_missing = { :development => true, :test => tru
 # simply return the string itself.
 
 ZLocalize.config.locales = {
-  :en => {
-     :plural_select     => lambda { |n| n <= 0 ? 0 : (n > 1 ? 2 : 1) },
-     :translations      => File.join(Rails.root,'config/locales/en.strings.yml'),
-     :convert_float     => lambda { |s| s.to_s.gsub(',','') }
+  en: {
+     plural_select:     -> (n) { n <= 0 ? 0 : (n > 1 ? 2 : 1) },
+     translations:      File.join(Rails.root,'config/locales/en.strings.yml'),
+     convert_float:     -> (s) { s.to_s.gsub(',','') }
   },
-#  :fr => {
-#     :plural_select    => lambda { |n| n <= 0 ? 0 : (n > 1 ? 2 : 1) },
-#     :translations     => File.join(Rails.root,'config/locales/fr.strings.yml'),
-#     :titleize         => lambda { |s| s.capitalize.to_s },
-#     :convert_float    => lambda { |s| s.to_s.gsub(' ','').gsub(',','.') }
+#  fr: {
+#     plural_select:    -> (n) { n <= 0 ? 0 : (n > 1 ? 2 : 1) },
+#     translations:     File.join(Rails.root,'config/locales/fr.strings.yml'),
+#     titleize:         -> (s) { s.capitalize.to_s },
+#     convert_float:    -> (s) { s.to_s.gsub(' ','').gsub(',','.') }
 #  }
 }
 

data/lib/zlocalize/rails/generators/templates/translations_migration_template.rb

@@ -1,7 +1,6 @@
-# -*- encoding : utf-8 -*-
+class CreateTranslationsTable < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
 
-class CreateZLocalizeTranslationsTable < ActiveRecord::Migration
-   def self.up
+   def change
      create_table :translations do |t|
        t.string :translated_type
        t.integer :translated_id
@@ -11,11 +10,8 @@ class CreateZLocalizeTranslationsTable < ActiveRecord::Migration
 
        t.timestamps
     end
-    add_index 'translations', ['translated_type','translated_id'], :name => 'index_on_translated'
-    add_index 'translations', ['name','locale'], :name => 'index_for_lookup'
+    add_index 'translations', ['translated_type','translated_id'], name: 'index_on_translated'
+    add_index 'translations', ['name','locale'], name: 'index_for_lookup'
   end
 
-  def self.down
-    drop_table :translations
-  end
 end

data/lib/zlocalize/rails/generators/translations_migration.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'rails/generators/base'
 require 'rails/generators/migration'
 

data/lib/zlocalize/rails/railtie.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 require 'zlocalize'
 require 'rails'
 require 'active_record'

data/lib/zlocalize/rails/tasks/harvest.rake

@@ -1,6 +1,4 @@
-# -*- encoding : utf-8 -*-
-
-require 'zlocalize/harvester'
+require 'zlocalize/harvester' 
 
 namespace :zlocalize do
 
@@ -12,18 +10,18 @@ namespace :zlocalize do
        "  clear=true|false       Clearing the existing translations in output file (if it exists). (default: false)\n" +
        "  silent=true|false      If true, do not report progress. (default: false)\n" +
        "  add_paths              Comma-separated list of path specs (relative to Rails.root) to harvest in addition to default paths"
-
+       
   task :harvest => :environment do
     options = { :clear      => ['1','true'].include?(ENV['clear']),
                 :purge      => ['1','true'].include?(ENV['purge']),
                 :output     => ENV['output'].to_s.empty? ? 'config/locales/app-strings.yml' : ENV['output'],
-                :add_paths  => ENV['add_paths'].to_s.empty? ? [] : ENV['add_paths'].split(','),
+                :add_paths  => ENV['add_paths'].to_s.empty? ? [] : ENV['add_paths'].split(','), 
                 :silent     => ['1','true'].include?(ENV['silent']) }
-
+     
     h = ZLocalize::Harvester.new(File.expand_path(Rails.root), options)
     h.harvest
   end
-
+  
   desc "Display which entries are not translated in given file\n\n" +
        "Usage: rake zlocalize:check_untranslated file=FILE_PATH\n\n" +
        "where FILE_PATH is the path to the YAML translation file relative to Rails.Root\n"

data/lib/zlocalize/rails/translated_columns.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 #
 # === Translated columns ====
 #
@@ -38,7 +36,7 @@ module ZLocalize
 
       module ClassMethods
 
-        def translates_columns(column_names)
+        def translates_columns(*column_names)
 
           [column_names].flatten.each do |col_name|
             class_eval "def #{col_name}(options = {})

data/lib/zlocalize/rails/translation.rb

@@ -1,10 +1,8 @@
-# -*- encoding : utf-8 -*-
-
 class Translation < ActiveRecord::Base
    belongs_to :translated, :polymorphic => true
-
+   
    def to_s
      return self.value
    end
-
+   
 end

data/lib/zlocalize/rails/translation_validator.rb

@@ -1,7 +1,13 @@
-# -*- encoding : utf-8 -*-
-
 class TranslationValidator < ActiveModel::EachValidator
 
+  def initialize(options = {})
+    # create a virtual attribute accessor for the expected translations
+    options[:attributes].each do |attr_name|
+      options[:class].attr_accessor attr_name
+    end
+    super
+  end
+
   def evaluate_required_locales(locales,record,attr_name,value)
     case locales
       when Symbol then record.send(locales)
@@ -9,7 +15,8 @@ class TranslationValidator < ActiveModel::EachValidator
       when String then [locales]
       else
          if locales.respond_to?("call")
-           locales.call(record,attr_name,value)
+            args = [record,attr_name,value].slice(0,locales.arity)
+            locales.call(*args)
          else
             raise(
               ActiveRecord::ActiveRecordError,
@@ -21,7 +28,7 @@ class TranslationValidator < ActiveModel::EachValidator
   end
 
   def validate_each(record,attr_name,value)
-    configuration = { :message => 'is missing its translation in {{locales}}',
+    configuration = { :message => :missing_translations,
                       :required_locales => record.respond_to?(:get_required_locales) ? :get_required_locales : [] }
     configuration.update(options)
     locales = evaluate_required_locales(configuration[:required_locales],record,attr_name,value)
@@ -29,7 +36,7 @@ class TranslationValidator < ActiveModel::EachValidator
     if locales.is_a?(Array)
       locales.each do |loc|
         begin
-          s = record.translate(attr_name,loc)
+          s = record.translate(attr_name.to_sym,loc)
         rescue ZLocalize::Translatable::TranslationError
           s = nil
         end
@@ -37,6 +44,7 @@ class TranslationValidator < ActiveModel::EachValidator
       end
     end
     if missing_locales.size > 0
+      # m = configuration[:message].to_s.gsub()
       record.errors.add(attr_name, configuration[:message], { :locales => missing_locales.to_sentence })
     end
   end

data/lib/zlocalize/{source_parser.rb → rdoc_source_parser.rb}

@@ -1,5 +1,9 @@
 # -*- encoding : utf-8 -*-
 
+# This file is no longer used starting from Ruby 2.5, since rdoc does not use ruby_lex anymore.
+# see ./source_processor.rb which replaces this parser with the `parser` gem.
+#
+
 require 'rdoc'
 require 'rdoc/options'
 require 'rdoc/ruby_lex'

data/lib/zlocalize/source_processor.rb

@@ -0,0 +1,120 @@
+require 'parser/all'
+require 'action_view/template/handlers/erb'
+require File.join(File.dirname(__FILE__),'translation_file')
+require File.join(File.dirname(__FILE__),'harvester')
+
+module ZLocalize
+
+  class SourceProcessor
+
+    def initialize(filename, root, is_erb = false)
+      @in_hash = 0
+      @translate_calls = []
+      @root = File.join(File.expand_path(root).downcase,'/') # add a trailing /
+      @filename = File.expand_path(filename).downcase
+      @relative_filename = @filename.gsub(@root,'')
+      content = File.open(filename, "r") { |f| f.read }
+      if is_erb
+        content = ActionView::Template::Handlers::ERB::Erubi.new(content, escape: true, trim: true).src
+      end
+      @parser = create_parser_for_ruby_version
+      @stree = @parser.parse(content)
+      process(@stree)
+    end
+
+    def create_parser_for_ruby_version
+      md = RUBY_VERSION.match(/^(\d)\.(\d)/)
+      begin
+        kls = Object.const_get('Parser').const_get("Ruby#{md[1]}#{md[2]}")
+      rescue
+        raise "Unsupported Ruby version #{RUBY_VERSION}"
+      end
+    end
+
+    def process(node)
+      return unless node.is_a?(AST::Node)
+      if node.type == :send
+        if node.children[0] == nil
+          if node.children[1] == :_
+            process_translate_call(node) and return
+          elsif node.children[1] == :n_
+            process_pluralize_call(node) and return
+          end
+        elsif is_zlocalize_const?(node)
+          if node.children[1] == :translate
+            process_translate_call(node) and return
+          elsif node.children[1] == :pluralize
+            process_pluralize_call(node) and return
+          end
+        end
+      end
+      node.children.each do |n|
+        process(n)
+      end
+    end
+
+    def is_zlocalize_const?(node)
+      return node.is_a?(AST::Node) && node.type == :const && node.children[1] == :ZLocalize
+    end
+
+    def get_string_node_value(node)
+      unless node.is_a?(AST::Node) && node.type  == :str
+        raise ArgumentError.new("String Expected but got: #{node.inspect}")
+      end
+      return node.children[0]
+    end
+
+    def get_string_array_node_value(node)
+      unless node.is_a?(AST::Node) || node.type != :array
+        raise ArgumentError.new("Array expected but got: #{node.inspect}")
+      end
+      a = []
+      for i in 0..node.children.size - 1
+        a << get_string_node_value(node.children[i])
+      end
+      a
+    end
+
+    def process_translate_call(node)
+      @translate_calls << { name: node.children[1].to_s,
+                            line_no: node.loc.selector.line,
+                            char_no: node.loc.selector.column+1,
+                            parameter: get_string_node_value(node.children[2]) }
+      for i in 3..node.children.size-1
+        process(node.children[i])
+      end
+    end
+
+    def process_pluralize_call(node)
+      @translate_calls << { name: node.children[1].to_s,
+                            line_no: node.loc.selector.line,
+                            char_no: node.loc.selector.column+1,
+                            parameter: get_string_array_node_value(node.children[2]) }
+      for i in 3..node.children.size-1
+        process(node.children[i])
+      end
+    end
+
+    def make_translation_entry(h)
+      TranslationEntry.new('plural'     => h[:name] == 'n_' || h[:name] == 'pluralize',
+                           'source'     => h[:parameter],
+                           'references' => [ "#{@relative_filename}:#{h[:line_no]}" ])
+    end
+
+    # return a Hash of all translation entries we collected
+    def translation_entries
+      entries = {}
+      @translate_calls.each do |c|
+        e = make_translation_entry(c)
+        if entries[e.source]
+          entries[e.source].references += e.references
+        else
+          entries[e.source] = e
+        end
+      end
+      entries
+    end
+
+  end
+
+end

data/lib/zlocalize/translation_file.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 # Memory representation of a list of translation strings in a given language
 # Reads and writes each entry with a list of references to occurences in source files.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zlocalize
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 6.0.1.1
 platform: ruby
 authors:
 - Charles Bedard
@@ -9,64 +9,84 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.1
 description: 
 email:
 - zzeligg@gmail.com
@@ -75,6 +95,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/zlocalize.rb
 - lib/zlocalize/backend.rb
 - lib/zlocalize/config.rb
 - lib/zlocalize/harvester.rb
@@ -87,15 +108,15 @@ files:
 - lib/zlocalize/rails/generators/translations_migration.rb
 - lib/zlocalize/rails/railtie.rb
 - lib/zlocalize/rails/tasks/harvest.rake
-- lib/zlocalize/rails/translated_attributes_serializer.rb
 - lib/zlocalize/rails/translated_columns.rb
 - lib/zlocalize/rails/translation.rb
 - lib/zlocalize/rails/translation_validator.rb
-- lib/zlocalize/source_parser.rb
+- lib/zlocalize/rdoc_source_parser.rb
+- lib/zlocalize/source_processor.rb
 - lib/zlocalize/translation_file.rb
-- lib/zlocalize.rb
-homepage: 
-licenses: []
+homepage: https://github.com/zzeligg/zlocalize
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -103,17 +124,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Translation engine for Rails applications

data/lib/zlocalize/rails/translated_attributes_serializer.rb

@@ -1,58 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module ZLocalize
-  module Translatable #:nodoc:
-
-    module TranslatedAttributesSerializer #:nodoc:
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-
-        def serialize_translations(attribute_names,options = {})
-
-          serialize :translated_attributes, HashWithIndifferentAccess
-
-          [attribute_names].flatten.each do |attr_name|
-            class_eval "def #{attr_name}(options = {})
-                          read_translated_attribute('#{attr_name}',(options[:locale] || ZLocalize.locale).to_s)
-                        end"
-          end
-
-          class_eval "after_initialize do
-                        self.translated_attributes ||= HashWithIndifferentAccess.new
-                      end
-
-                      def translated_attributes=(value)
-                        self.translations = value
-                      end"
-
-          include ZLocalize::Translatable::TranslatedAttributesSerializer::InstanceMethods
-        end
-      end
-
-      module InstanceMethods
-
-        def read_translated_attribute(attr_name,locale)
-          s = self.translated_attributes[locale]
-          s.is_a?(Hash) ? s[attr_name] : nil
-        end
-
-        alias :translate :read_translated_attribute
-
-        def translations=(locales)
-          locales.each do |locale,terms|
-            self.translated_attributes[locale] ||= HashWithIndifferentAccess.new
-            terms.each do |name,value|
-              self.translated_attributes[locale][name] = value
-            end
-          end
-        end
-
-      end # module InstanceMethods
-
-    end # module TranslatedAttributesSerializer
-  end # module Translatable
-end # module ZLocalize