localizable_db 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dee1d606b29733bb8654449c723e606fcdb5ac94c3c9e09b6d18f13599ef6113
-  data.tar.gz: 4ef4208c4a2ff9985dca5d3400aa17f327bb7debd9ed46909a3a573ec8374346
+  metadata.gz: 2417072f63e592da31beda3d43c51ee0892687e285523983a8def07561c7c30c
+  data.tar.gz: 7382beda5c96256617bc0f2a756ece69fa24a0d00d7f474b32637d13f8f848f5
 SHA512:
-  metadata.gz: e0245602e69ff7f44014edc0c02eafe57c6c680bd8ae7e390c9d17360441d4c671009645717c12c6915cf95f3aa989c9459cff371c26341233cff0fea4b8259b
-  data.tar.gz: a7a51028caf72158a145b1e9b6b6fc9ddcbf77a09993f78742be1dae560e9c0324a5a1cef19fed9233ec6b1843d14edab716d32cdd8e3f74cf9ca374ffb74de3
+  metadata.gz: df29f593085bac7f529115270766a118791546ae4af0957241d660a149a77b46caa91cc882aad4972f024f86bf3e7116a18de016e8f8f4561f09b5dac42913c3
+  data.tar.gz: 2e83139d802a037df6069c19e87befb3af3829168bd3d38579eb2cfb4ad88999dd27287622201ab38429c55215765248f48a30320dafb6cdea4e549c7d07871e

data/lib/localizable_db/localizable.rb

@@ -144,7 +144,8 @@ module LocalizableDb
 
           def with_languages(*with_languages)
             with_languages.flatten!
-            with_languages = LocalizableDb::Languages::SUPPORTED if with_languages.empty?
+            with_languages = with_languages - [LocalizableDb::Languages::DEFAULT] if with_languages.any?
+            with_languages = (LocalizableDb::Languages::SUPPORTED - [LocalizableDb::Languages::DEFAULT]) if with_languages.empty?
             attrs_to_select = "#{self.table_name}.*, "
             tables_to_select = "#{self.table_name}, "
             conditions_to_select = ""
@@ -154,13 +155,13 @@ module LocalizableDb
                 conditions_to_select += "#{language.to_s}_#{self.localized_table_name}.locale = '#{language.to_s}' AND "
                 conditions_to_select += "#{language.to_s}_#{self.localized_table_name}.localizable_object_id = #{self.table_name}.id "
                 attrs_to_select += ", " if localized_attribute != self.localized_attributes.last
-                conditions_to_select += "AND " if language != with_languages.last
+                conditions_to_select += "AND " if language != with_languages.last or localized_attribute != self.localized_attributes.last
               end
               tables_to_select += "#{self.localized_table_name} as #{language.to_s}_#{self.localized_table_name}"
               attrs_to_select += ", " if language != with_languages.last
               tables_to_select += ", " if language != with_languages.last
             end
-            result = unscope(:joins)
+            result = unscope(:joins).unscope(:select)
             .select(attrs_to_select)
             .from(tables_to_select)
             .where(conditions_to_select)

data/lib/localizable_db/version.rb

@@ -1,3 +1,3 @@
 module LocalizableDb
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localizable_db
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - yonga9121
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails