ixtlan-gettext 0.1.0 → 0.1.2

data/lib/ixtlan/gettext/crawler.rb

@@ -27,7 +27,7 @@ module Ixtlan
 
       def crawl
         keys.clear
-        Dir[File.join('app', 'views', '**', '*rb')].each do |f|
+        Dir[File.join('app', '**', '*rb')].each do |f|
           File.read(f).each_line do |line|
             extract_key(line) if line =~ /_[ (]/
           end
@@ -58,4 +58,4 @@ module Ixtlan
       end
     end
   end
-end
+end

data/lib/ixtlan/gettext/crawler.rb~

@@ -1,69 +1,61 @@
-class NewLocale
-
-  def initialize(lang)
-    @lang = lang
-    @file = "config/locales/#{lang}.yml"
-    @trans = if File.exists? @file
-               YAML.load_file(@file)[lang]
-             else
-               {}
-             end
-  end
-
-  def crawl
-    Dir[File.join('app', 'views', '**/*rb')].each do |f|
-      File.read(f).each do |line|
-        extract_key(line) if line =~ /_[ (]/
+#
+# ixtlan_gettext - helper to use fast_gettext with datamapper/ixtlan
+# Copyright (C) 2012 Christian Meier
+#
+# This file is part of ixtlan_gettext.
+#
+# ixtlan_gettext is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# ixtlan_gettext is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with ixtlan_gettext.  If not, see <http://www.gnu.org/licenses/>.
+#
+module Ixtlan
+  module Gettext
+    class Crawler
+
+      def self.crawl
+        Crawler.new.crawl
       end
-    end
-  end
 
-  def dump
-    merge
-    result = {}
-    result[@lang] = @trans
-    lines = result.to_yaml.sub(/---\s*\n/, '').gsub(/  -\s*\n/, '').split /\n/
-    lines.sort!{|n,m| n.sub(/^  /, "zz") <=> m.sub(/^  /, "zz") }
-    File.open(@file, 'w') do |f|
-      lines.each do |l|
-        f.puts l
-        f.puts "  -" if l =~ /^  .*: $/
+      def crawl
+        keys.clear
+        Dir[File.join('app', 'views', '**', '*rb')].each do |f|
+          File.read(f).each_line do |line|
+            extract_key(line) if line =~ /_[ (]/
+          end
+        end
+        keys.sort!
+        keys.uniq!
+        keys
       end
-    end
-  end
-
-  def self.doit(lang)
-    l = new(lang)
-    l.crawl
-    l.dump
-  end
+      
+      private
 
-  private
-
-  def merge
-    keys.each do |k|
-      @trans[k] = k unless @trans.key? k
-    end
-    @trans.keys.each do |k|
-      @trans[" Deleted-Key-#{k}"] = @trans.delete(k) if !keys.member?(k) && (k =~ /^ Deleted-Key-/).nil?
-    end
-  end
-
-  def keys
-    @keys ||= []
-  end
-
-  def extract_key(line)
-    line.gsub!(/_[^ (]/, '-')
-    extract(line, "'")
-    extract(line, '"')
-  end
-
-  def extract(line, sep)
-    if line =~ /.*_[ (][#{sep}]/
-      k = line.sub(/[^_]*_[ (][#{sep}]/, '').sub(/[#{sep}].*\n/, '')
-      keys << k; puts k unless keys.member? k
-      extract_key(line.sub(/[^_]*_[ (][#{sep}][^#{sep}]+[#{sep}]/, ''))
+      def keys
+        @keys ||= []
+      end
+      
+      def extract_key(line)
+        extract(line, "'")
+        extract(line, '"')
+      end
+      
+      def extract(line, sep)
+        if line =~ /.*_[ (][#{sep}]/
+          # non-greedy +? and *? vs. greedy + and *
+          k = line.sub( /.*?_[ (][#{sep}]/, '').sub(/[#{sep}].*\n/, '')
+          keys << k; puts k unless keys.member? k
+          extract_key(line.sub(/[^_]*_[ (][#{sep}][^#{sep}]+[#{sep}]/, ''))
+        end
+      end
     end
   end
-end
+end

data/lib/ixtlan/gettext/translation.rake

@@ -11,6 +11,7 @@ namespace :ixtlan do
       puts Ixtlan::Gettext::Crawler.crawl.join( "\n\t" )
     end
 
+    desc 'crawls the local filesystem for _(...) method calls and sends them'
     task :update => :environment do
       puts 'crawling files . . .'
       data = {:translation_keys => Ixtlan::Gettext::Crawler.crawl }
@@ -20,12 +21,14 @@ namespace :ixtlan do
       Ixtlan::Gettext::TranslationKey.update_all(keys)
     end
 
+    desc 'commit the last update, i.e. the keys from last update are the only keys now'
     task :commit => :environment do
       keys = Rails.application.config.rest.update(Ixtlan::Gettext::TranslationKey, :commit, nil)
       puts "updating local database with #{keys.size} keys . . ."
       Ixtlan::Gettext::TranslationKey.update_all(keys)
     end
 
+    desc 'rollback the last update, i.e. undo all the changes done by last update'
     task :rollback => :environment do
       keys = Rails.application.config.rest.update(Ixtlan::Gettext::TranslationKey, :rollback, nil)
       puts "updating local database with #{keys.size} keys . . ."

data/lib/ixtlan/gettext/translation.rake~

@@ -1,23 +1,37 @@
-# --*-- ruby-mode --*--
+# -*- mode: ruby -*-
+
+require 'ixtlan/gettext/crawler'
+
 namespace :ixtlan do
 
-  namespace :translations do
-    desc 'crawls the local filesystem for _(...) method calls and sends the collected translation keys to the remote service'
+  namespace :gettext do
+    desc 'crawls the local filesystem for _(...) method calls and dumps them to the console'
+    task :keys => :environment do
+      print "\t"
+      puts Ixtlan::Gettext::Crawler.crawl.join( "\n\t" )
+    end
+
     task :update => :environment do
-      data = {:translation_keys => ENV['KEYS'].split(/,/)}
-      keys = Rails.application.config.restserver.update(data)
+      puts 'crawling files . . .'
+      data = {:translation_keys => Ixtlan::Gettext::Crawler.crawl }
+      puts "sending #{data[:translation_keys].size} keys to gettext server . . ."
+      keys = Rails.application.config.rest.update(Ixtlan::Gettext::TranslationKey, data)
+      puts "updating local database with #{keys.size} keys . . ."
       Ixtlan::Gettext::TranslationKey.update_all(keys)
     end
 
     task :commit => :environment do
-      keys = Rails.application.config.restserver.update(:translation_keys, :commit)
+      keys = Rails.application.config.rest.update(Ixtlan::Gettext::TranslationKey, :commit, nil)
+      puts "updating local database with #{keys.size} keys . . ."
       Ixtlan::Gettext::TranslationKey.update_all(keys)
     end
 
     task :rollback => :environment do
-      keys = Rails.application.config.restserver.update(:translation_keys, :rollback)
+      keys = Rails.application.config.rest.update(Ixtlan::Gettext::TranslationKey, :rollback, nil)
+      puts "updating local database with #{keys.size} keys . . ."
       Ixtlan::Gettext::TranslationKey.update_all(keys)
     end
   end
 
 end
+# vim: syntax=Ruby

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan-gettext
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Christian Meier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-31 00:00:00 Z
+date: 2013-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ixtlan-remote