has_localization_table 0.3.11 → 0.3.12

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- Zjk0OGNmNzA2ZWY4MjdiM2VhZGM3YTNhYjczOGEzMDljOTJlYzUzOA==
4
+ MzFkNDcyZjc2NTQ0ODU3ZDFjODk1MDYwMTg3Yjk5ZGVkYmMyYWUyMg==
5
5
  data.tar.gz: !binary |-
6
- NzBhM2JmZjQ3MDNhNDMyYjhiMjNkOWU0Yjc1YTljNTI1NzA3N2Q1Zg==
6
+ NDRkNDMxYTU1NTJkNzgyMTU2OTI0Y2IxNDY0N2QwYzRmZjlmYmJiOA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YzcwZDRhMmZhZWUxYmZjMjg5ZjAzZTQ0NzdlMmJlOTFlODNmYTZlYjI2NTkw
10
- NjU4ZmVmMjE4YjEwNjViN2UyNDk1NDkyM2M0YWJlZDJjYTM2MWQxMDBhOTE0
11
- OTY3MDUwZjE1ZGVhYmMwMzllYjk0MjVmNTIzNDljZTZiM2Y5NjE=
9
+ ZTc0YTRjZmU4MDQ4ZWY5MTEwNzEwMDFmMzRlZjIyNWY3ZTQ3ZmM4ZDYzYzli
10
+ NDcwZTU0NTAyNDY3NWMxOTZhZjJmOTdlZTIwNTA4NmJmOTgwODBhZTc3N2Qy
11
+ NTdiZTc5YjVhNWU4ZWQxNGFhNGFjZmFkMmE3NDg4NDJkMDg1YzE=
12
12
  data.tar.gz: !binary |-
13
- MDJhYzI2ZjYwMzRhZjU1NTA1N2RjODg4OTA2NDJjNzFmOTc4NDg0N2NlMjZj
14
- ZjA4OTliZTFiMmQzMTIxMzE5MjE5ZmFjYzQ5Nzc3MmMyMGI5NGZiY2I5MWNm
15
- YjYwZWRkOTczYzUxMTI1NmZlNTRjZDY4OTNhMWU3YWNjMjcyYTU=
13
+ NDY1YzI2MDQ3YjgzNmQzYjlhM2JmMjA5ODYxODM4YzcxNzg3OTVlNmI3Njcw
14
+ MjhmMmUxOTc3MzFlZTA0NjRjYjk5NTM5YTM4OTNlNTZiNDI3YjYxOGU5ZjM5
15
+ NTExZWJmZmU4MThlNmZiNDE3Yzg2MDRjYjc4YTE0M2YyNjJmZGY=
@@ -7,7 +7,7 @@ module HasLocalizationTable
7
7
  obj = self
8
8
  localization_class.class_eval do
9
9
  validates attribute, presence: { message: :custom_this_field_is_required },
10
- if: proc { |model| obj.name.constantize.localized_attribute_required?(attribute) && model.send(HasLocalizationTable.locale_foreign_key) == HasLocalizationTable.current_locale.id }
10
+ if: proc { |model| obj.name.constantize.localized_attribute_required?(attribute) && model.send(HasLocalizationTable.locale_foreign_key) == HasLocalizationTable.primary_locale.id }
11
11
  end
12
12
  end
13
13
 
@@ -1,3 +1,3 @@
1
1
  module HasLocalizationTable
2
- VERSION = "0.3.11"
2
+ VERSION = "0.3.12"
3
3
  end
@@ -35,6 +35,29 @@ describe HasLocalizationTable do
35
35
  end
36
36
  end
37
37
 
38
+ describe 'when the current locale is not the primary locale' do
39
+ before do
40
+ HasLocalizationTable.configure do |c|
41
+ c.current_locale = Locale.where(name: 'French').first
42
+ end
43
+
44
+ Article.has_localization_table required: true
45
+ end
46
+
47
+ it 'should not be valid if only the current language is provided' do
48
+ a = Article.new(name: "French Name", description: "French Description")
49
+ refute a.valid?
50
+ end
51
+
52
+ it 'should be valid if only the primary language is provided' do
53
+ a = Article.new
54
+ s = a.localizations.detect{ |l| l.locale_id == Locale.first.id }
55
+ s.name = "Name"
56
+ s.description = "Description"
57
+ assert a.valid?
58
+ end
59
+ end
60
+
38
61
  it "should not add validations if given required: false" do
39
62
  Article.has_localization_table required: false
40
63
  a = Article.new
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: has_localization_table
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.11
4
+ version: 0.3.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Vandersluis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-16 00:00:00.000000000 Z
11
+ date: 2015-04-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  type: :runtime