grosser-fast_gettext 0.2.2 → 0.2.3

data/README.markdown

@@ -58,13 +58,12 @@ then e.g. controllers, so set them inside your application_controller.
     ...
 
     #application_controller.rb
-    FastGettext.available_locales = ['de','en',...]
-    FastGettext.text_domain = 'frontend'
-    
     class ApplicationController ...
       include FastGettext
       before_filter :set_locale
       def set_locale
+        FastGettext.available_locales = ['de','en',...]
+        FastGettext.text_domain = 'frontend'
         sessions[:locale] = I18n.locale = FastGettext.locale = params[:locale] || sessions[:locale] || 'en'
       end
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 2
+:patch: 3
 :major: 0

data/lib/fast_gettext/mo_file.rb

@@ -4,7 +4,7 @@ module FastGettext
     PLURAL_SEPERATOR = "\000"
 
     def initialize(file)
-      @data = GetText::MOFile.open(file, "UTF-8")
+      @data = FastGettext::GetText::MOFile.open(file, "UTF-8")
       make_singular_and_plural_available
     end
 

data/vendor/mofile.rb

@@ -18,273 +18,275 @@
 require 'iconv'
 require 'stringio'
 
-module GetText
-  class MOFile < Hash 
-    class InvalidFormat < RuntimeError; end;
-
-    attr_reader :filename
-
-    Header = Struct.new(:magic,
-                        :revision,
-                        :nstrings,
-                        :orig_table_offset,
-                        :translated_table_offset,
-                        :hash_table_size,
-                        :hash_table_offset)
-
-    # The following are only used in .mo files 
-    # with minor revision >= 1.
-    class HeaderRev1 < Header
-      attr_accessor :n_sysdep_segments,
-      :sysdep_segments_offset,
-      :n_sysdep_strings,
-      :orig_sysdep_tab_offset,
-      :trans_sysdep_tab_offset
-    end
-
-    MAGIC_BIG_ENDIAN    = "\x95\x04\x12\xde"
-    MAGIC_LITTLE_ENDIAN = "\xde\x12\x04\x95"
+module FastGettext
+  module GetText
+    class MOFile < Hash
+      class InvalidFormat < RuntimeError; end;
+
+      attr_reader :filename
+
+      Header = Struct.new(:magic,
+                          :revision,
+                          :nstrings,
+                          :orig_table_offset,
+                          :translated_table_offset,
+                          :hash_table_size,
+                          :hash_table_offset)
+
+      # The following are only used in .mo files
+      # with minor revision >= 1.
+      class HeaderRev1 < Header
+        attr_accessor :n_sysdep_segments,
+        :sysdep_segments_offset,
+        :n_sysdep_strings,
+        :orig_sysdep_tab_offset,
+        :trans_sysdep_tab_offset
+      end
 
-    def self.open(arg = nil, output_charset = nil)
-      result = self.new(output_charset)
-      result.load(arg)
-    end
+      MAGIC_BIG_ENDIAN    = "\x95\x04\x12\xde"
+      MAGIC_LITTLE_ENDIAN = "\xde\x12\x04\x95"
 
-    def initialize(output_charset = nil)
-      @filename = nil
-      @last_modified = nil
-      @little_endian = true
-      @output_charset = output_charset
-      super()
-    end
+      def self.open(arg = nil, output_charset = nil)
+        result = self.new(output_charset)
+        result.load(arg)
+      end
 
-    def update!
-      if FileTest.exist?(@filename)
-        st = File.stat(@filename)
-        load(@filename) unless (@last_modified == [st.ctime, st.mtime])
-      else
-        warn "#{@filename} was lost." if $DEBUG
-        clear
+      def initialize(output_charset = nil)
+        @filename = nil
+        @last_modified = nil
+        @little_endian = true
+        @output_charset = output_charset
+        super()
       end
-      self
-    end
 
-    def load(arg)
-      if arg.kind_of? String
-        begin
-          st = File.stat(arg)
-          @last_modified = [st.ctime, st.mtime]
-        rescue Exception
+      def update!
+        if FileTest.exist?(@filename)
+          st = File.stat(@filename)
+          load(@filename) unless (@last_modified == [st.ctime, st.mtime])
+        else
+          warn "#{@filename} was lost." if $DEBUG
+          clear
         end
-        load_from_file(arg)
-      else
-        load_from_stream(arg)
+        self
       end
-      @filename = arg
-      self
-    end
 
-    def load_from_stream(io)
-      magic = io.read(4)
-      case magic
-      when MAGIC_BIG_ENDIAN
-        @little_endian = false
-      when MAGIC_LITTLE_ENDIAN
-        @little_endian = true
-      else
-        raise InvalidFormat.new(sprintf("Unknown signature %s", magic.dump))
+      def load(arg)
+        if arg.kind_of? String
+          begin
+            st = File.stat(arg)
+            @last_modified = [st.ctime, st.mtime]
+          rescue Exception
+          end
+          load_from_file(arg)
+        else
+          load_from_stream(arg)
+        end
+        @filename = arg
+        self
       end
 
-      endian_type6 = @little_endian ? 'V6' : 'N6'
-      endian_type_astr = @little_endian ? 'V*' : 'N*'
+      def load_from_stream(io)
+        magic = io.read(4)
+        case magic
+        when MAGIC_BIG_ENDIAN
+          @little_endian = false
+        when MAGIC_LITTLE_ENDIAN
+          @little_endian = true
+        else
+          raise InvalidFormat.new(sprintf("Unknown signature %s", magic.dump))
+        end
 
-      header = HeaderRev1.new(magic, *(io.read(4 * 6).unpack(endian_type6)))
+        endian_type6 = @little_endian ? 'V6' : 'N6'
+        endian_type_astr = @little_endian ? 'V*' : 'N*'
 
-      if header.revision == 1
-        # FIXME: It doesn't support sysdep correctly.
-        header.n_sysdep_segments = io.read(4).unpack(endian_type6)
-        header.sysdep_segments_offset = io.read(4).unpack(endian_type6)
-        header.n_sysdep_strings = io.read(4).unpack(endian_type6)
-        header.orig_sysdep_tab_offset = io.read(4).unpack(endian_type6)
-        header.trans_sysdep_tab_offset = io.read(4).unpack(endian_type6)
-      elsif header.revision > 1
-        raise InvalidFormat.new(sprintf("file format revision %d isn't supported", header.revision))
-      end
-      io.pos = header.orig_table_offset
-      orig_table_data = io.read((4 * 2) * header.nstrings).unpack(endian_type_astr)
+        header = HeaderRev1.new(magic, *(io.read(4 * 6).unpack(endian_type6)))
 
-      io.pos = header.translated_table_offset
-      trans_table_data = io.read((4 * 2) * header.nstrings).unpack(endian_type_astr)
+        if header.revision == 1
+          # FIXME: It doesn't support sysdep correctly.
+          header.n_sysdep_segments = io.read(4).unpack(endian_type6)
+          header.sysdep_segments_offset = io.read(4).unpack(endian_type6)
+          header.n_sysdep_strings = io.read(4).unpack(endian_type6)
+          header.orig_sysdep_tab_offset = io.read(4).unpack(endian_type6)
+          header.trans_sysdep_tab_offset = io.read(4).unpack(endian_type6)
+        elsif header.revision > 1
+          raise InvalidFormat.new(sprintf("file format revision %d isn't supported", header.revision))
+        end
+        io.pos = header.orig_table_offset
+        orig_table_data = io.read((4 * 2) * header.nstrings).unpack(endian_type_astr)
 
-      original_strings = Array.new(header.nstrings)
-      for i in 0...header.nstrings
-        io.pos = orig_table_data[i * 2 + 1]
-        original_strings[i] = io.read(orig_table_data[i * 2 + 0])
-      end
+        io.pos = header.translated_table_offset
+        trans_table_data = io.read((4 * 2) * header.nstrings).unpack(endian_type_astr)
 
-      clear
-      for i in 0...header.nstrings
-        io.pos = trans_table_data[i * 2 + 1]
-        str = io.read(trans_table_data[i * 2 + 0])
-
-        if (! original_strings[i]) || original_strings[i] == ""
-          if str
-            @charset = nil
-            @nplurals = nil
-            @plural = nil
-            str.each_line{|line|
-              if /^Content-Type:/i =~ line and /charset=((?:\w|-)+)/i =~ line
-                @charset = $1
-              elsif /^Plural-Forms:\s*nplurals\s*\=\s*(\d*);\s*plural\s*\=\s*([^;]*)\n?/ =~ line
-                @nplurals = $1
-                @plural = $2
-              end
-              break if @charset and @nplurals
-            }
-            @nplurals = "1" unless @nplurals
-            @plural = "0" unless @plural
-          end
-        else
-          if @output_charset
-            begin
-              str = Iconv.conv(@output_charset, @charset, str) if @charset
-            rescue Iconv::Failure
-              if $DEBUG
-                warn "@charset = ", @charset
-                warn"@output_charset = ", @output_charset
-                warn "msgid = ", original_strings[i]
-                warn "msgstr = ", str
+        original_strings = Array.new(header.nstrings)
+        for i in 0...header.nstrings
+          io.pos = orig_table_data[i * 2 + 1]
+          original_strings[i] = io.read(orig_table_data[i * 2 + 0])
+        end
+
+        clear
+        for i in 0...header.nstrings
+          io.pos = trans_table_data[i * 2 + 1]
+          str = io.read(trans_table_data[i * 2 + 0])
+
+          if (! original_strings[i]) || original_strings[i] == ""
+            if str
+              @charset = nil
+              @nplurals = nil
+              @plural = nil
+              str.each_line{|line|
+                if /^Content-Type:/i =~ line and /charset=((?:\w|-)+)/i =~ line
+                  @charset = $1
+                elsif /^Plural-Forms:\s*nplurals\s*\=\s*(\d*);\s*plural\s*\=\s*([^;]*)\n?/ =~ line
+                  @nplurals = $1
+                  @plural = $2
+                end
+                break if @charset and @nplurals
+              }
+              @nplurals = "1" unless @nplurals
+              @plural = "0" unless @plural
+            end
+          else
+            if @output_charset
+              begin
+                str = Iconv.conv(@output_charset, @charset, str) if @charset
+              rescue Iconv::Failure
+                if $DEBUG
+                  warn "@charset = ", @charset
+                  warn"@output_charset = ", @output_charset
+                  warn "msgid = ", original_strings[i]
+                  warn "msgstr = ", str
+                end
               end
             end
           end
+          self[original_strings[i]] = str.freeze
         end
-        self[original_strings[i]] = str.freeze
+        self
       end
-      self
-    end
 
-    # Is this number a prime number ?
-    # http://apidock.com/ruby/Prime
-    def prime?(number)
-      ('1' * number) !~ /^1?$|^(11+?)\1+$/
-    end
-
-    def next_prime(seed)
-      require 'mathn'
-      prime = Prime.new
-      while current = prime.succ
-        return current if current > seed
+      # Is this number a prime number ?
+      # http://apidock.com/ruby/Prime
+      def prime?(number)
+        ('1' * number) !~ /^1?$|^(11+?)\1+$/
       end
-    end
 
-    # From gettext-0.12.1/gettext-runtime/intl/hash-string.h
-    # Defines the so called `hashpjw' function by P.J. Weinberger
-    # [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-    # 1986, 1987 Bell Telephone Laboratories, Inc.] 
-    HASHWORDBITS = 32
-    def hash_string(str)
-      hval = 0
-      i = 0
-      str.each_byte do |b|
-        break if b == '\0'
-        hval <<= 4
-        hval += b.to_i
-        g = hval & (0xf << (HASHWORDBITS - 4))
-        if (g != 0)
-          hval ^= g >> (HASHWORDBITS - 8)
-          hval ^= g
+      def next_prime(seed)
+        require 'mathn'
+        prime = Prime.new
+        while current = prime.succ
+          return current if current > seed
         end
       end
-      hval
-    end
 
-    def save_to_stream(io)
-      #Save data as little endian format.
-      header_size = 4 * 7
-      table_size  = 4 * 2 * size
-
-      hash_table_size = next_prime((size * 4) / 3) 
-      hash_table_size = 3 if hash_table_size <= 2
-      header = Header.new(
-                          MAGIC_LITTLE_ENDIAN,          # magic
-                          0,                            # revision
-                          size,                         # nstrings
-                          header_size,                  # orig_table_offset
-                          header_size + table_size,     # translated_table_offset
-                          hash_table_size,              # hash_table_size
-                          header_size + table_size * 2  # hash_table_offset
-                          )
-      io.write(header.to_a.pack('a4V*'))
-
-      ary = to_a
-      ary.sort!{|a, b| a[0] <=> b[0]} # sort by original string
-
-      pos = header.hash_table_size * 4 + header.hash_table_offset
-
-      orig_table_data = Array.new()
-      ary.each{|item, _|
-        orig_table_data.push(item.size)
-        orig_table_data.push(pos)
-        pos += item.size + 1 # +1 is <NUL>
-      }
-      io.write(orig_table_data.pack('V*'))
-
-      trans_table_data = Array.new()
-      ary.each{|_, item|
-        trans_table_data.push(item.size)
-        trans_table_data.push(pos)
-        pos += item.size + 1 # +1 is <NUL>
-      }
-      io.write(trans_table_data.pack('V*'))
-
-      hash_tab = Array.new(hash_table_size)
-      j = 0
-      ary[0...size].each {|key, _|
-        hash_val = hash_string(key)
-        idx = hash_val % hash_table_size
-        if hash_tab[idx] != nil
-          incr = 1 + (hash_val % (hash_table_size - 2))
-          begin
-            if (idx >= hash_table_size - incr)
-              idx -= hash_table_size - incr
-            else
-              idx += incr
-            end
-          end until (hash_tab[idx] == nil)
+      # From gettext-0.12.1/gettext-runtime/intl/hash-string.h
+      # Defines the so called `hashpjw' function by P.J. Weinberger
+      # [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
+      # 1986, 1987 Bell Telephone Laboratories, Inc.]
+      HASHWORDBITS = 32
+      def hash_string(str)
+        hval = 0
+        i = 0
+        str.each_byte do |b|
+          break if b == '\0'
+          hval <<= 4
+          hval += b.to_i
+          g = hval & (0xf << (HASHWORDBITS - 4))
+          if (g != 0)
+            hval ^= g >> (HASHWORDBITS - 8)
+            hval ^= g
+          end
         end
-        hash_tab[idx] = j + 1
-        j += 1
-      }
-      hash_tab.collect!{|i| i ? i : 0}
+        hval
+      end
+
+      def save_to_stream(io)
+        #Save data as little endian format.
+        header_size = 4 * 7
+        table_size  = 4 * 2 * size
+
+        hash_table_size = next_prime((size * 4) / 3)
+        hash_table_size = 3 if hash_table_size <= 2
+        header = Header.new(
+                            MAGIC_LITTLE_ENDIAN,          # magic
+                            0,                            # revision
+                            size,                         # nstrings
+                            header_size,                  # orig_table_offset
+                            header_size + table_size,     # translated_table_offset
+                            hash_table_size,              # hash_table_size
+                            header_size + table_size * 2  # hash_table_offset
+                            )
+        io.write(header.to_a.pack('a4V*'))
+
+        ary = to_a
+        ary.sort!{|a, b| a[0] <=> b[0]} # sort by original string
+
+        pos = header.hash_table_size * 4 + header.hash_table_offset
+
+        orig_table_data = Array.new()
+        ary.each{|item, _|
+          orig_table_data.push(item.size)
+          orig_table_data.push(pos)
+          pos += item.size + 1 # +1 is <NUL>
+        }
+        io.write(orig_table_data.pack('V*'))
+
+        trans_table_data = Array.new()
+        ary.each{|_, item|
+          trans_table_data.push(item.size)
+          trans_table_data.push(pos)
+          pos += item.size + 1 # +1 is <NUL>
+        }
+        io.write(trans_table_data.pack('V*'))
+
+        hash_tab = Array.new(hash_table_size)
+        j = 0
+        ary[0...size].each {|key, _|
+          hash_val = hash_string(key)
+          idx = hash_val % hash_table_size
+          if hash_tab[idx] != nil
+            incr = 1 + (hash_val % (hash_table_size - 2))
+            begin
+              if (idx >= hash_table_size - incr)
+                idx -= hash_table_size - incr
+              else
+                idx += incr
+              end
+            end until (hash_tab[idx] == nil)
+          end
+          hash_tab[idx] = j + 1
+          j += 1
+        }
+        hash_tab.collect!{|i| i ? i : 0}
 
-      io.write(hash_tab.pack('V*'))
+        io.write(hash_tab.pack('V*'))
 
-      ary.each{|item, _| io.write(item); io.write("\0") }
-      ary.each{|_, item| io.write(item); io.write("\0") }
+        ary.each{|item, _| io.write(item); io.write("\0") }
+        ary.each{|_, item| io.write(item); io.write("\0") }
 
-      self
-    end
+        self
+      end
 
-    def load_from_file(filename)
-      @filename = filename
-      begin
-        File.open(filename, 'rb'){|f| load_from_stream(f)}
-      rescue => e
-        e.set_backtrace("File: #{@filename}")
-        raise e
+      def load_from_file(filename)
+        @filename = filename
+        begin
+          File.open(filename, 'rb'){|f| load_from_stream(f)}
+        rescue => e
+          e.set_backtrace("File: #{@filename}")
+          raise e
+        end
       end
-    end
 
-    def save_to_file(filename)
-      File.open(filename, 'wb'){|f| save_to_stream(f)}
-    end
+      def save_to_file(filename)
+        File.open(filename, 'wb'){|f| save_to_stream(f)}
+      end
 
-    def set_comment(msgid_or_sym, comment)
-      #Do nothing
-    end
+      def set_comment(msgid_or_sym, comment)
+        #Do nothing
+      end
 
 
-    attr_accessor :little_endian, :path, :last_modified
-    attr_reader :charset, :nplurals, :plural
+      attr_accessor :little_endian, :path, :last_modified
+      attr_reader :charset, :nplurals, :plural
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Michael Grosser