activerecord-mlang 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc96cdbf093253128b133b2e05db04eb641c9b63
-  data.tar.gz: e991fdbbc2b94853eabfa31dc252ebdd8b9a5cdf
+  metadata.gz: a19710b7c3a22a255dbe5ec007599dff63fb5f8d
+  data.tar.gz: 54e3895862efbe44127e9ff93d8ff9d7afd830e1
 SHA512:
-  metadata.gz: 5f73a39be9d4e06ee3340d861a9d1fb4b48e2a2df73b4ec62c45abc314ba9c60674bd9b529133a3e07c2fedb2840fa9ad4b3b88d291f42c8082cf3c33549ab50
-  data.tar.gz: 49fe1aadbacd582979fc8773d2e800b2cc4eab2ca8c01d6ab416affe7c742da440498f3a33a78e64fe50a6a24d45e8d99ace7265e3960fea87bd9a984ad622db
+  metadata.gz: 1f6f3adf6dd0c220667eb1fdc914b0022a7cfdba843d7599ffb37e11d9c33a9048f32f63be0e2df3348a25af2bb116d3191a1e39bf28cb7c2620dc737662d013
+  data.tar.gz: aa4bb0d026fb8a5ceb213b741895fb6d916b783c90b475c5a2bb9240c252c0ccf57ddbe6163a37a4173311b8c0fd7b66d04e8e91d7ba28f1e37538017972f5bc

data/lib/active_record/mlang.rb

@@ -51,13 +51,19 @@ module ActiveRecord
       end
     end
 
-    def text(locale=nil)
-      locale ||= I18n.default_locale
-      if self.persisted? && lang = Lang[locale]
-        texts.find_or_create_by(lang_id: lang.id)
+    def text(local_or_lang_id=nil)
+      return nil if !self.persisted?
+      local_or_lang_id ||= I18n.default_locale
+      lang_id = nil
+      if local_or_lang_id.kind_of? Integer
+        lang_id = local_or_lang_id if Lang.exists?(id: local_or_lang_id)
       else
-        nil
+        lang_id = Lang[local_or_lang_id].try(:id)
       end
+
+      return nil if !lang_id
+
+      texts.find_or_create_by(lang_id: lang_id)
     end
   end
 end

data/lib/activerecord/mlang/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Mlang
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mlang
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Shinjiro Itagaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler