translates_to_french 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3727b9b96def1fc17503fdd87d3903baa7a6e9
-  data.tar.gz: 3744eb02a0c6996ecdd1b9da4348a5a97ebd601c
+  metadata.gz: 9364cde1e0aaaf39d879020062bcf280f3256298
+  data.tar.gz: f4fd6a7f37f80cd220ec04e5f52707e486d94de3
 SHA512:
-  metadata.gz: c315f426de36ce24bfc606e9c083afa11b305208f76aa16f46bfba65bd7b36ed1999e33a4b49f0653a198dd5ff21a36557b1987edee2824741ee2b141923ce8c
-  data.tar.gz: 293f59a78f7113cb9eea6fd83fe1dc6e5d3a3df71ea8c57d635165bdb169ad603b503d616d9ee0d8aad6f1d381ae70efbd7a1a4c33cbbf794592aebda3824d10
+  metadata.gz: 523d42390adb01e853d973395685d7509315f98521705e4ae9f05de5289451ae36a362e0f2cbef8c8ec7a311a5527cf29a1f89040f212406cd20d37de2d954bb
+  data.tar.gz: d6001332e594dab129064fe672801fdfbd4a81ca258708183c2f89313673b37272007f6c031cd723b88b7351091440e6814b4f68d36a08dccb24ffae65c2e525

data/lib/translates_to_french.rb

@@ -1,61 +1,64 @@
 require "translates_to_french/version"
 
-module TranslatesToFrench
-
-  def self.included(base)  
-    base.extend ClassMethods
-    base.extend InstanceMethods
-  end  
-
-  module ClassMethods
-   
-    def translates_to_french(*columns)
-      columns.each do |column|
-        define_method column do
-          column_value column
+module TranslatesTo
+
+  module TranslatesToFrench
+    
+    extend ActiveSupport::Concern
+    
+    included do
+    end
+
+    module ClassMethods
+
+      def translates_to_french(*columns)
+        include TranslatesTo::TranslatesToFrench::InstanceMethods
+        columns.each do |column|
+          define_method column do
+            column_value column
+          end
         end
       end
+      
     end
-    
-  end
 
-  module InstanceMethods
+    module InstanceMethods
 
-    def column_value column
-        if self[column_name_translated(column)]
-         translated_value_if_available column
-        else
-           regular_value column
-        end
-    end    
+      def column_value column
+          if self[column_name_translated(column)]
+           translated_value_if_available column
+          else
+             regular_value column
+          end
+      end    
 
-    def translated_value_if_available column        
-       if self[column_name_translated(column)].length > 0
-          translated_value column
-        else
-          regular_value column
-        end
-    end
+      def translated_value_if_available column        
+         if self[column_name_translated(column)].length > 0
+            translated_value column
+          else
+            regular_value column
+          end
+      end
 
-    def translated_value column
-       self[column_name_translated(column)]
-    end
+      def translated_value column
+         self[column_name_translated(column)]
+      end
 
-    def regular_value column
-       self[column]
-    end
+      def regular_value column
+         self[column]
+      end
 
-    def column_name_translated(name)
-      if I18n.locale == 'fr' || I18n.locale == :fr
-        column_name = "#{name}_fr"
+      def column_name_translated(name)
+        if I18n.locale == 'fr' || I18n.locale == :fr
+          column_name = "#{name}_fr"
+        end
+        self.class.column_names.include?(column_name) ? column_name.to_sym : "#{name}".to_sym
       end
-      self.class.column_names.include?(column_name) ? column_name.to_sym : "#{name}".to_sym
+       
     end
-     
+
   end
 
 end
 
-class ActiveRecord::Base  
-  include TranslatesToFrench
-end  
+ActiveRecord::Base.send :include, TranslatesTo::TranslatesToFrench

data/lib/translates_to_french/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translates_to_french
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gordon B. Isnor