fast_gettext 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac283f35f54466e64db6ad5655786bf4e1468d5
-  data.tar.gz: ee2a9e46dd0a4137420ce9ed119baa6eb47f0e9a
+  metadata.gz: f1c679c3594754eaf0836fe85d8727b4a104127f
+  data.tar.gz: 65b5ca0ccd954bc5b173d3076c0094f7cbfa8e83
 SHA512:
-  metadata.gz: 31b81c071588437a83e164c9c901293baab9a619a5f29c024547506311fb4549a6566943c4e935995483ec8d3c21902f115ecf7f1a389bba3725a74c0b14b954
-  data.tar.gz: 47486431368e3d66e2e20182c1e3168be9f4b028a30d79e3df4649f3c12f5851a94d2b5cdeff881e78674fc41106e2c54af715cba1548d2b6730351c2a3b202d
+  metadata.gz: 641ee741ba7027c9e85cdf8bd83f4cc1877bebe583633b52be941e0de1cb2794944fadea3916bcf929559faed7d00889aa85c362b6ad1892f4665016fbc05d7a
+  data.tar.gz: 304487d75a07a5b33e6b4241e332225b37e3e647e474fe77fd56aa23c4437a548a084a43d5b669dc6af0630815af209d875c320c6651d2f85b91c096c0db1886

data/lib/fast_gettext/mo_file.rb

@@ -6,17 +6,13 @@ module FastGettext
     PLURAL_SEPERATOR = "\000"
 
     # file => path or FastGettext::GetText::MOFile
-    def initialize(file)
-      if file.is_a? FastGettext::GetText::MOFile
-        @data = file
-      else
-        @data = FastGettext::GetText::MOFile.open(file, "UTF-8")
-      end
-      make_singular_and_plural_available
+    def initialize(file, options={})
+      @filename = file
+      load_data if options[:eager_load]
     end
 
     def [](key)
-      @data[key]
+      data[key]
     end
 
     #returns the plural forms or all singular translations that where found
@@ -28,7 +24,7 @@ module FastGettext
     def pluralisation_rule
       #gettext uses 0 as default rule, which would turn off all pluralisation, very clever...
       #additionally parsing fails when directly accessing po files, so this line was taken from gettext/mofile
-      (@data['']||'').split("\n").each do |line|
+      (data['']||'').split("\n").each do |line|
         return lambda{|n|eval($2)} if /^Plural-Forms:\s*nplurals\s*\=\s*(\d*);\s*plural\s*\=\s*([^;]*)\n?/ =~ line
       end
       nil
@@ -40,6 +36,20 @@ module FastGettext
 
     private
 
+    def data
+      load_data if @data.nil?
+      @data
+    end
+
+    def load_data
+      @data = if @filename.is_a? FastGettext::GetText::MOFile
+        @filename
+      else
+        FastGettext::GetText::MOFile.open(@filename, "UTF-8")
+      end
+      make_singular_and_plural_available
+    end
+
     #(if plural==singular, prefer singular)
     def make_singular_and_plural_available
       data = {}

data/lib/fast_gettext/po_file.rb

@@ -2,8 +2,28 @@ require 'fast_gettext/mo_file'
 module FastGettext
   # Responsibility:
   #  - abstract po files for Po Repository
-  class PoFile
+  class PoFile < MoFile
+    def initialize(file, options={})
+      @options = options
+      super
+    end
+
     def self.to_mo_file(file, options={})
+      MoFile.new(parse_po_file(file, options))
+    end
+
+    protected
+
+    def load_data
+      @data = if @filename.is_a? FastGettext::GetText::MOFile
+        @filename
+      else
+        FastGettext::PoFile.parse_po_file(@filename, @options)
+      end
+      make_singular_and_plural_available
+    end
+
+    def self.parse_po_file(file, options={})
       require 'fast_gettext/vendor/poparser'
       parser = FastGettext::GetText::PoParser.new
 
@@ -13,7 +33,7 @@ module FastGettext
 
       mo_file = FastGettext::GetText::MOFile.new
       parser.parse(File.read(file), mo_file)
-      MoFile.new(mo_file)
+      mo_file
     end
   end
 end

data/lib/fast_gettext/translation_repository.rb

@@ -4,14 +4,13 @@ module FastGettext
   module TranslationRepository
     extend self
 
-    # only single-word types supported atm (mytype works, MyType will not)
     def build(name, options)
       type = options[:type] || :mo
-      class_name = type.to_s.capitalize
+      class_name = type.to_s.split('_').map(&:capitalize).join
       unless FastGettext::TranslationRepository.constants.map{|c|c.to_s}.include?(class_name)
-        require "fast_gettext/translation_repository/#{type}" 
+        require "fast_gettext/translation_repository/#{type}"
       end
       eval(class_name).new(name,options)
     end
   end
-end
+end

data/lib/fast_gettext/translation_repository/mo.rb

@@ -7,6 +7,7 @@ module FastGettext
     class Mo < Base
       def initialize(name,options={})
         super
+        @eager_load = options.fetch(:eager_load, false)
         reload
       end
 
@@ -28,7 +29,7 @@ module FastGettext
       def find_and_store_files(name,options)
         # parse all .mo files with the right name, that sit in locale/LC_MESSAGES folders
         find_files_in_locale_folders(File.join('LC_MESSAGES',"#{name}.mo"), options[:path]) do |locale,file|
-          MoFile.new(file)
+          MoFile.new(file, eager_load: @eager_load)
         end
       end
 

data/lib/fast_gettext/translation_repository/po.rb

@@ -10,7 +10,7 @@ module FastGettext
       def find_and_store_files(name, options)
         require 'fast_gettext/po_file'
         find_files_in_locale_folders("#{name}.po", options[:path]) do |locale,file|
-          PoFile.to_mo_file(file, options)
+          PoFile.new(file, options)
         end
       end
     end

data/lib/fast_gettext/version.rb

@@ -1,3 +1,3 @@
 module FastGettext
-  VERSION = Version = '1.0.0'
+  VERSION = Version = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText