activerecord-mlang 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65f9c56074f0f729bbf21d7792fb41cb2185c6a5
-  data.tar.gz: c0e5bf520d0a6deaf49c9a5fe7ccc7d62ecb252e
+  metadata.gz: b6d876dfc4e28efbff05f9aca3a14d3cbc650bbd
+  data.tar.gz: cb092b2200010930203be266e1f07fdf0db32b0c
 SHA512:
-  metadata.gz: c7a9b0374bbdeface0a84c3abd75ea74898faeca6aad3bee4628d12cac890c9eaec31a21925874510870b0fc8e256158d753debef302dccb718d54a7bc2c4912
-  data.tar.gz: ef1a59ce54638d120638d1adc86da2f02f1a1e3c88a5b21838cae9d1de1ad5bd2b71f7050fe27a32644ca64ef7b2ead39576d17cf2bb85c828459dcc4a1c34e0
+  metadata.gz: bd7ecb212e4db96e99f1f96ef4fb479a848d53a72bd3dcf2f52f6250945472e4ab05a080db6597e24dce8faa28679297b32d13770bdf5af9ca124f593f55492a
+  data.tar.gz: fdebe50f6d39be6e9f49610dc5420d28676e437969444f7b336a2dd89244b246d444c56741b3231f915178d1df617a13a447bd7cd4514687c95a9647702a2297

data/lib/active_record/mlang.rb

@@ -51,19 +51,13 @@ module ActiveRecord
       end
     end
 
-    def text(local_or_lang_id=nil)
+    def text(locale_or_lang_id=nil)
       return nil if !self.persisted?
-      local_or_lang_id ||= I18n.locale || 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
-        lang_id = Lang[local_or_lang_id].try(:id)
-      end
 
-      return nil if !lang_id
+      locale_or_lang_id ||= I18n.locale || I18n.default_locale
+      return nil if !(lang = Lang[locale_or_lang_id])
 
-      texts.find_or_create_by(lang_id: lang_id)
+      texts.find_or_create_by(lang_id: lang.id)
     end
   end
 end

data/lib/active_record/mlang/lang.rb

@@ -3,8 +3,12 @@ module ActiveRecord
   module Mlang
     class Lang < ActiveRecord::Base
       include ActiveRecord::Mlang
-      def self.[] code
-        find_by(code: code)
+      def self.[] locale_or_lang_id
+        if locale_or_lang_id.kind_of? Integer
+          self.find_by(id: locale_or_lang_id)
+        else
+          self.find_by(code: locale_or_lang_id)
+        end
       end
     end
   end

data/lib/activerecord/mlang/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Mlang
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

metadata

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