rails_db_localize 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25cc17c7090ec4fb582e7b218e31d250ce4d5ae
-  data.tar.gz: 00db1f61ce8fdbd786b1ba8ff794529150746b92
+  metadata.gz: 5ffe7275fcadc410cdb449128a78f0fcda3f8a25
+  data.tar.gz: 549306712cdcfc50321a5d1838adfbe6f683253f
 SHA512:
-  metadata.gz: ce2d3536b7dbeb3577fb9c0be67aabc23530017b2624896441709eb6025e87126c79ad6debb821517dc882c23533a128c8471fe1e2ff63d6c50c834a7884a97c
-  data.tar.gz: 7791e979ef7f93d9a7e71f4770e6145ce06172c1a3493b4986eb9bf14805669ef7f071b10734347da7eb3f7234c7563a3ed21763d9bf7addd8effe74c50432ec
+  metadata.gz: 541b730cce0772dbf5ba8cffe78808d66aef4b55f1d49a7dc1dbae7ddafdf95832f442e66fb537f850b8c9b350805f42f19fef89dea3ce30c8f6ed8ca27618dd
+  data.tar.gz: 772a936d176975a6a0d9eddeab8de5c70b0299c33854da622c3bd30210878a7a9691a1ff4055800199ffa95147d517fbb433f56490f572df747c9f8162b3dbe1

data/app/models/rails_db_localize/translation.rb

@@ -18,7 +18,7 @@ class RailsDbLocalize::Translation < ActiveRecord::Base
 
   def self.generate_ck resource_type, resource_id
     hash_long = [resource_type.to_s.underscore, resource_id].join("|").chars.map(&:ord).inject(5381) do |h, v|
-      h = ((h<<5)+h)+v
+      h += ((h<<5)+h)+v
     end
 
     #Keep it signed 32bits.

data/lib/ext/active_record_ext.rb

@@ -2,88 +2,91 @@ class ActiveRecord::Base
   class << self
 
     def has_translations *fields
+      class_eval do
+
+        unless respond_to?(:missing_translation)
+            # Register it mostly to remove the translations once you delete an object
+            has_many :translations, class_name: "RailsDbLocalize::Translation", as: :resource, dependent: :destroy
+
+            scope :__rails_db_translations_sub_query, lambda{ |lang|
+              ttable = RailsDbLocalize::Translation.arel_table.name
+              number_of_fields_to_translates = RailsDbLocalize.schema[self.to_s].count
+
+              # We can unscope, but problems tend to appears
+              # with some gems like paranoid.
+              table = respond_to?(:klass) ? table.klass : self
+
+              table.select(:id).joins("INNER JOIN \"#{ttable}\"
+                ON (\"#{ttable}\".resource_id = \"#{arel_table.name}\".id
+                AND \"#{ttable}\".resource_type = '#{to_s}')")
+              .group(:resource_type, :resource_id)
+              .having("COUNT(*) == #{number_of_fields_to_translates}")
+              .where(:"rails_db_localize_translations.lang" => lang)
+            }
+
+            # Return all rows with missing translation for a selected language.
+            scope :missing_translation, lambda{ |lang|
+              where("\"#{arel_table.name}\".id NOT IN (#{__rails_db_translations_sub_query(lang).to_sql})")
+            }
+
+            # Return all rows with translation OK for a selected language.
+            scope :having_translation, lambda{ |lang|
+              where("\"#{arel_table.name}\".id IN (#{__rails_db_translations_sub_query(lang).to_sql})")
+            }
+
+            def self.preload_translations
+              RailsDbLocalize::TranslationCache.instance.prefetch_collections(self)
+              self
+            end
+          end
 
-      unless respond_to?(:missing_translation)
-
-        # Register it mostly to remove the translations once you delete an object
-        self.has_many :translations, class_name: "RailsDbLocalize::Translation", as: :resource, dependent: :destroy
-
-        scope :__rails_db_translations_sub_query, lambda{ |lang|
-          ttable = RailsDbLocalize::Translation.arel_table.name
-          number_of_fields_to_translates = RailsDbLocalize.schema[self.to_s].count
 
-          # We can unscope, but problems tend to appears
-          # with some gems like paranoid.
-          table = respond_to?(:klass) ? table.klass : self
+        fields.each do |field|
+          # Add a marker to the schema of the application translations.
+          RailsDbLocalize::add_to_schema(self, field)
 
-          table.select(:id).joins("INNER JOIN \"#{ttable}\"
-            ON (\"#{ttable}\".resource_id = \"#{arel_table.name}\".id
-            AND \"#{ttable}\".resource_type = '#{to_s}')")
-          .group(:resource_type, :resource_id)
-          .having("COUNT(*) == #{number_of_fields_to_translates}")
-          .where(:"rails_db_localize_translations.lang" => lang)
-        }
+          # Not sure if I would have to put dependent: :destroy here.
+          self.has_many :"#{field}_translations", -> { where(field: field)  }, as: :resource
 
-        # Return all rows with missing translation for a selected language.
-        self.scope :missing_translation, lambda{ |lang|
-          where("\"#{arel_table.name}\".id NOT IN (#{__rails_db_translations_sub_query(lang).to_sql})")
-        }
+          # Making the magic happends.
+          # I should really learn how to use the Reflection helpers in ActiveRecord, because
+          # ruby eval is not the most readable stuff... :o)
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{field}_translated_exists?(lang=nil)
+              lang ||= I18n.locale
+              !!RailsDbLocalize::TranslationCache.instance.get_translation_for(self.class, self.id, "#{field}", lang, nil )
+            end
 
-        # Return all rows with translation OK for a selected language.
-        self.scope :having_translation, lambda{ |lang|
-          where("\"#{arel_table.name}\".id IN (#{__rails_db_translations_sub_query(lang).to_sql})")
-        }
+            def #{field}_translated (lang=nil)
+              lang ||= I18n.locale
+              RailsDbLocalize::TranslationCache.instance.get_translation_for(self.class, self.id, "#{field}", lang, self.#{field} )
+            end
 
-        def self.preload_translations
-          RailsDbLocalize::TranslationCache.instance.prefetch_collections(self)
-          self
+            def #{field}_translated= args
+              if args.is_a?(Array)
+                value, lang = args
+              else
+                value = args
+                lang = I18n.locale
+              end
+
+              if self.id
+                translated = RailsDbLocalize::Translation.where(
+                  resource_type: self.class.to_s, resource_id: self.id,  field: "#{field}", lang: lang
+                ).first_or_create
+
+                translated.content = value
+
+                translated.save!
+              else
+                translations.build field: "#{field}", lang: lang, content: value
+              end
+            end
+          RUBY
         end
 
       end
 
-      fields.each do |field|
-        # Add a marker to the schema of the application translations.
-        RailsDbLocalize::add_to_schema(self, field)
-
-        # Not sure if I would have to put dependent: :destroy here.
-        self.has_many :"#{field}_translations", -> { where(field: field)  }, as: :resource
-
-        # Making the magic happends.
-        # I should really learn how to use the Reflection helpers in ActiveRecord, because
-        # ruby eval is not the most readable stuff... :o)
-        self.class_eval <<-CODE, __FILE__, __LINE__ + 1
-          def #{field}_translated_exists?(lang=nil)
-            lang ||= I18n.locale
-            !!RailsDbLocalize::TranslationCache.instance.get_translation_for(self.class, self.id, "#{field}", lang, nil )
-          end
-
-          def #{field}_translated (lang=nil)
-            lang ||= I18n.locale
-            RailsDbLocalize::TranslationCache.instance.get_translation_for(self.class, self.id, "#{field}", lang, self.#{field} )
-          end
-
-          def #{field}_translated= args
-            if args.is_a?(Array)
-              value, lang = args
-            else
-              value = args
-              lang = I18n.locale
-            end
-
-            if self.id
-              translated = RailsDbLocalize::Translation.where(
-                resource_type: self.class.to_s, resource_id: self.id,  field: "#{field}", lang: lang
-              ).first_or_create
-
-              translated.content = value
-
-              translated.save!
-            else
-              translations.build field: "#{field}", lang: lang, content: value
-            end
-          end
-        CODE
-      end
     end
   end
 end

data/lib/rails_db_localize/version.rb

@@ -1,3 +1,3 @@
 module RailsDbLocalize
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_db_localize
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yacine PETITPREZ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails