gettext_column_mapping 0.2.2 → 0.2.3

data/.gitignore

@@ -3,3 +3,4 @@
 test/locale/
 coverage
 rdoc
+pkg

data/README.rdoc

@@ -73,7 +73,7 @@ All Rails
         my_label: Label
       
 
-See a working {gettext_column_mapping rails examples}[http://github.com/hallelujah/gettext_column_mapping_rails_example.git]
+See a working {gettext_column_mapping rails examples}[http://github.com/hallelujah/gettext_column_mapping_example_rails.git]
 
 Rails is not mandatory, you can use it in your other project taht satisfies all requirements above !!
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/gettext_column_mapping.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_column_mapping}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hallelujah"]

data/init.rb

@@ -1,10 +1,2 @@
 # coding: utf-8
-# Include hook code here
-# HOOK inspired by gettext_i18n_rails
-begin
-  require 'config/initializers/session_store'
-rescue LoadError
-  # weird bug, when run with rake rails reports error that session
-  # store is not configured, this fixes it somewhat...
-end
 require 'gettext_column_mapping'

data/lib/gettext_column_mapping/model_attributes_finder.rb

@@ -4,6 +4,14 @@ module GettextColumnMapping
   #write all found models/columns to a file where GetTexts ruby parser can find them
   def self.store_model_attributes(options)
     file = options[:to] || 'data/model_attributes.rb'
+    unless options[:separate_files]
+      write_to_unique_file(file,options)
+    else
+      write_to_separate_files(file,options)
+    end
+  end
+
+  def self.write_to_unique_file(file,options)
     File.open(file,'w') do |f|
       f.puts "# coding: utf-8"
       f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
@@ -31,14 +39,47 @@ module GettextColumnMapping
             end
           end
         end
-        # For each selected class, batch 200 include parents with key
-        # f.puts(instance.msgid_for_attribute(column))
       end
 
       f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
     end
   end
 
+  def self.write_to_separate_files(dir,options)
+    ModelAttributesFinder.new.find(options).each do |model,column_names|
+      file = File.join(dir,model.name.underscore) + ".rb"
+      FileUtils.mkdir_p(File.dirname(file))
+      File.open(file,'w') do |f|
+        f.puts "# coding: utf-8"
+        f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+        #all columns namespaced under the model
+        column_names.each do |attribute|
+          translation = model.gettext_translation_for_attribute_name(attribute)
+          f.puts("s_('#{translation}')")
+        end
+
+        if GettextColumnMapping.config.use_parent_level
+          # Select all classes with parent level
+          GettextColumnMapping::ParentLevel.item_config(model.name) do |klass_name,columns,parent_association,parent_key,conditions|
+            model = klass_name.constantize
+            options_hash = {}
+            if parent_association
+              options_hash.merge!(:conditions => conditions, :include => parent_association)
+            end
+            model.find_each do |record|
+              columns.each do |column|
+                f.puts("s_('#{record.msgid_for_attribute(column)}')")
+              end
+            end
+          end
+      end
+
+      f.puts "#DO NOT MODIFY! AUTOMATICALLY GENERATED FILE!"
+
+      end
+    end
+  end
+
   class ModelAttributesFinder
 
     def initialize

data/lib/gettext_column_mapping/parent_level/attr_methods.rb

@@ -9,7 +9,7 @@ module GettextColumnMapping
               self.inherited_without_column_mapping_parent_level(subclass)
 
               parent = GettextColumnMapping::ParentLevel.parent_attributes_translation(subclass.to_s)
-              attributes = GettextColumnMapping::ParentLevel.column_attributes_translation(subclass)
+              attributes = GettextColumnMapping::ParentLevel.column_attributes_translation(subclass.to_s)
               subclass.gettext_column_mapping_accessor(attributes,parent)
             end
             alias_method_chain :inherited, :column_mapping_parent_level

data/lib/gettext_column_mapping/parent_level.rb

@@ -43,20 +43,26 @@ module GettextColumnMapping
       end
 
       def translate_key_for_column?(klass, column)
-        column_attributes_translation(klass)[column]
+        column_attributes_translation(klass.name)[column]
       end
 
       def each_config(&block)
         @column_attributes_translation.each do |klass_name,columns| 
-          parent = parent_attributes_translation(klass_name)
-          if parent
-            parent_key = parent[:key]
-            parent_association = parent[:association]
-            conditions = parent[:conditions]
-          end
-          yield(klass_name,columns,parent_association, parent_key,conditions)
+          yield(*item_config(klass_name))
         end
+      end
 
+      def item_config(klass_name)
+        columns =  column_attributes_translation(klass_name)
+        parent = parent_attributes_translation(klass_name)
+        if parent
+          parent_key = parent[:key]
+          parent_association = parent[:association]
+          conditions = parent[:conditions]
+        end
+        results = [klass_name,columns,parent_association,parent_key,conditions]
+        yield(*results) if block_given?
+        results
       end
 
       def attributes_translation(klass_name)
@@ -67,8 +73,8 @@ module GettextColumnMapping
         attributes_translation(klass_name) && attributes_translation(klass_name)[:parent]
       end
 
-      def column_attributes_translation(klass)
-        @column_attributes_translation[klass.name] ||= (attributes_translation(klass.name) && attributes_translation(klass.name)[:columns]) || []
+      def column_attributes_translation(klass_name)
+        @column_attributes_translation[klass_name] ||= (attributes_translation(klass_name) && attributes_translation(klass_name)[:columns]) || []
       end
 
     end

data/tasks/gettext_column_mapping.rake

@@ -1,132 +1 @@
-require 'activesupport'
-
-def load_gettext
-  require 'gettext'
-  require 'gettext/utils'
-  require 'gettext_column_mapping' # Include this library in order to unable column mapping and untranslating
-end
-
-@application = "aimfar"
-@version = ENV['VERSION'] || "0.0.1"
-@application_domain = "Adperf Publisher"
-
-def directory_for_lang(lang)
-  File.join('po',lang)
-end
-
-task :ensure_environment_defined do
-  @po_dir = 'po'
-  @lang =  ENV['GLANG']
-
-  if @lang.blank?
-    puts "*** The 'GLANG' environment variable must be precised. E.g. rake gettext:create_lang GLANG=es_ES ***"
-    exit
-  else
-    @lang.split('_').first
-  end
-end
-
-task :create_directory => :ensure_environment_defined do
-  dir =directory_for_lang(@lang)
-  unless File.exist?(dir)
-    puts "### Creating directory #{dir} ###"
-    FileUtils.mkdir_p(dir) 
-  else
-    puts "### Directory #{dir} already exists! Not creating. ###"
-  end
-end
-
-def out_file(f)
-  File.join(@po_dir,@lang,File.basename(f,'.pot') + '.po')
-end
-
-namespace :gettext do 
-
-  desc "Update pot/po files."
-  task :updatepo => [:environment] do
-    load_gettext
-    require 'gettext_i18n_rails/haml_parser'
-
-
-    unless ENV['NO_EXTRACT_DB']
-      Rake::Task['gettext:store_model_columns'].invoke
-    end
-    puts "### Updating po/pot files. ###"
-    FileUtils.rm_f("po/#{@application}.pot")
-
-    if GetText.respond_to? :update_pofiles_org
-      GetText.update_pofiles_org(@application, Dir.glob("{app,lib,bin,data,static_data}/**/*.{builder,rb,erb,rjs}"), "#{@application_domain} #{@version}", :msgmerge => [:no_wrap,:sort_by_file, :no_fuzzy_matching, :previous],:verbose => true)
-    else
-      puts "install new GetText with gettext:install to gain more features..."
-      #kill ar parser...
-      require 'gettext/parser/active_record'
-      module GetText
-        module ActiveRecordParser
-          module_function
-          def init(x);end
-        end
-      end
-
-      GetText.update_pofiles(@application, Dir.glob("{app,lib,bin,data,static_data}/**/*.{builder,rb,erb,rjs}"), "#{@application_domain} #{@version}")#, :msgmerge => [:no_wrap,:sort_by_file, :no_fuzzy_matching, :previous],:verbose => true)
-    end
-  end
-
-  desc "Create mo-files"
-  task :makemo => [:environment] do
-    load_gettext
-    puts "### Creating mo-files. ###"
-    GetText.create_mofiles(true, "po", "locale")
-    #    GetText.create_mofiles(true, "po", "locale")
-  end
-
-  desc "Create a language file for lang GLANG (fr_FR,en_US etc..)."  
-  task :create_lang  => :create_directory do
-
-    #  LANG=es_ES msginit -i ../site.pot -o site.po
-    pot_files = Dir.glob(File.join(@po_dir,'*.pot'))
-    if pot_files.blank?
-      puts 'Unable to find pot files' 
-      exit 1
-    end
-    pot_files.each do |f|
-      out_f = out_file(f)
-      unless File.exist?(out_f) # Prevent from erasing the old .po
-        puts "### Creating #{out_f} ! ###"  
-        exec "`msginit -i #{f} -o #{out_f} -l #{@lang} --no-wrap`" 
-      else
-        puts "### #{out_f} already present! Not created. ###"  
-      end
-    end
-
-  end
-
-  desc "Extract needed data from DB for gettext"
-  task :extract_db do
-    puts "Extracting data from databases"
-    # don't require this file since it loads all rails framework. 
-    # Also use system because exec exits as finished
-    system("ruby utils/extract_data_from_db_for_gettext.rb") 
-
-  end
-
-  # This is just an example 
-  # Please be inspired!!! :D
-
-  desc "write the data/model_attributes.rb"
-  task :store_model_columns  => [:extract_db,:environment] do # => [ :extract_db] do
-    require 'gettext_column_mapping/model_attributes_finder'
-    FastGettext.silence_errors
-    storage_file = 'data/model_attributes.rb'
-    puts "writing model translations to: #{storage_file}"
-    ignore_tables = [/^sitemap_/, /_versions$/, 'schema_migrations', 'sessions']
-
-    #    GettextColumnMapping::ModelAttributesFinder.new
-    #    puts ActiveRecord::Base.send(:subclasses).size
-    GettextColumnMapping.store_model_attributes(
-      :to => storage_file,
-      :ignore_columns => ['id', 'type', 'created_at', 'updated_at'],
-      :ignore_tables => ignore_tables
-    )
-
-  end
-end
+require 'gettext_column_mapping/tasks'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - hallelujah