ixtlan-gettext 0.1.2 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/fast_gettext/translation_repository/ixtlan.rb +1 -1
  2. data/lib/ixtlan/gettext/manager.rb +1 -1
  3. data/lib/ixtlan/gettext/models.rb +3 -3
  4. data/spec/manager_spec.rb +7 -2
  5. metadata +148 -160
data/lib/fast_gettext/translation_repository/ixtlan.rb CHANGED
@@ -58,7 +58,7 @@ module FastGettext
58
58
  private
59
59
 
60
60
  def domain
61
- @domain ||= ::Ixtlan::UserManagement::Domain.first_or_create( :name => @name ) if @name != ::Ixtlan::Gettext::Manager::DEFAULT
61
+ @domain ||= ::Ixtlan::UserManagement::Domain.first_or_create( :name => @name )
62
62
  end
63
63
  end
64
64
  end
data/lib/ixtlan/gettext/manager.rb CHANGED
@@ -22,7 +22,7 @@ module Ixtlan
22
22
  module Gettext
23
23
  class Manager
24
24
 
25
- DEFAULT = 'default'
25
+ DEFAULT = 'DEFAULT' # should match ::Ixtlan::UserManagement::Domain.DEFAULT.name
26
26
 
27
27
  def initialize
28
28
  @default_repo = build( DEFAULT )
data/lib/ixtlan/gettext/models.rb CHANGED
@@ -62,9 +62,9 @@ module Ixtlan
62
62
  'gettext_texts'
63
63
  end
64
64
 
65
- belongs_to :translation_key, TranslationKey.to_s, :key => true
66
- belongs_to :locale, Locale.to_s,:key => true
67
- belongs_to :domain, Ixtlan::UserManagement::Domain.to_s, :required => false, :key => true
65
+ belongs_to :translation_key, TranslationKey, :key => true
66
+ belongs_to :locale, Locale,:key => true
67
+ belongs_to :domain, Ixtlan::UserManagement::Domain, :key => true
68
68
 
69
69
  property :text, Text, :length => 4096
70
70
 
data/spec/manager_spec.rb CHANGED
@@ -33,6 +33,9 @@ describe Ixtlan::Gettext::Manager do
33
33
  :updated_at => date )
34
34
  @de = Ixtlan::Gettext::Locale.first_or_create( :code => 'de',
35
35
  :updated_at => date )
36
+ # get the predefined in place
37
+ Ixtlan::UserManagement::Domain.ALL
38
+ @default = Ixtlan::UserManagement::Domain.DEFAULT
36
39
  @test = Ixtlan::UserManagement::Domain.first_or_create( :name => 'test',
37
40
  :updated_at => date )
38
41
  @key = Ixtlan::Gettext::TranslationKey.first_or_create( :name => 'word',
@@ -40,7 +43,8 @@ describe Ixtlan::Gettext::Manager do
40
43
  @word = Ixtlan::Gettext::Translation.first_or_create( :text => 'word_en_default',
41
44
  :updated_at => date,
42
45
  :translation_key => key,
43
- :locale => @en )
46
+ :locale => @en,
47
+ :domain => @default )
44
48
  @word_test = Ixtlan::Gettext::Translation.first_or_create( :text => 'word_en_test',
45
49
  :updated_at => date,
46
50
  :translation_key => key,
@@ -49,7 +53,8 @@ describe Ixtlan::Gettext::Manager do
49
53
  @wort = Ixtlan::Gettext::Translation.first_or_create( :text => 'wort_de_default',
50
54
  :updated_at => date,
51
55
  :translation_key => key,
52
- :locale => @de )
56
+ :locale => @de,
57
+ :domain => @default )
53
58
  @wort_test = Ixtlan::Gettext::Translation.first_or_create( :text => 'wort_de_test',
54
59
  :updated_at => date,
55
60
  :translation_key => key,
metadata CHANGED
@@ -1,179 +1,174 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: ixtlan-gettext
3
- version: !ruby/object:Gem::Version
4
- hash: 31
5
- prerelease:
6
- segments:
7
- - 0
8
- - 1
9
- - 2
10
- version: 0.1.2
3
+ version: !ruby/object:Gem::Version
4
+ prerelease:
5
+ version: 0.1.3
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Christian Meier
14
- autorequire:
9
+ autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2013-01-16 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2013-02-09 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: ixtlan-remote
16
+ version_requirements: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - "~>"
19
+ - !ruby/object:Gem::Version
20
+ version: '0.1'
21
+ none: false
22
+ requirement: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: '0.1'
27
+ none: false
22
28
  prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
24
- none: false
25
- requirements:
26
- - - ~>
27
- - !ruby/object:Gem::Version
28
- hash: 9
29
- segments:
30
- - 0
31
- - 1
32
- version: "0.1"
33
29
  type: :runtime
34
- version_requirements: *id001
35
- - !ruby/object:Gem::Dependency
30
+ - !ruby/object:Gem::Dependency
36
31
  name: fast_gettext
32
+ version_requirements: !ruby/object:Gem::Requirement
33
+ requirements:
34
+ - - "~>"
35
+ - !ruby/object:Gem::Version
36
+ version: '0.6'
37
+ none: false
38
+ requirement: !ruby/object:Gem::Requirement
39
+ requirements:
40
+ - - "~>"
41
+ - !ruby/object:Gem::Version
42
+ version: '0.6'
43
+ none: false
37
44
  prerelease: false
38
- requirement: &id002 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - ~>
42
- - !ruby/object:Gem::Version
43
- hash: 7
44
- segments:
45
- - 0
46
- - 6
47
- version: "0.6"
48
45
  type: :runtime
49
- version_requirements: *id002
50
- - !ruby/object:Gem::Dependency
46
+ - !ruby/object:Gem::Dependency
51
47
  name: rake
52
- prerelease: false
53
- requirement: &id003 !ruby/object:Gem::Requirement
54
- none: false
55
- requirements:
56
- - - ~>
57
- - !ruby/object:Gem::Version
58
- hash: 75
59
- segments:
60
- - 10
61
- - 0
62
- - 2
48
+ version_requirements: !ruby/object:Gem::Requirement
49
+ requirements:
50
+ - - "~>"
51
+ - !ruby/object:Gem::Version
63
52
  version: 10.0.2
53
+ none: false
54
+ requirement: !ruby/object:Gem::Requirement
55
+ requirements:
56
+ - - "~>"
57
+ - !ruby/object:Gem::Version
58
+ version: 10.0.2
59
+ none: false
60
+ prerelease: false
64
61
  type: :development
65
- version_requirements: *id003
66
- - !ruby/object:Gem::Dependency
62
+ - !ruby/object:Gem::Dependency
67
63
  name: minitest
68
- prerelease: false
69
- requirement: &id004 !ruby/object:Gem::Requirement
70
- none: false
71
- requirements:
72
- - - ~>
73
- - !ruby/object:Gem::Version
74
- hash: 51
75
- segments:
76
- - 4
77
- - 3
78
- - 0
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
79
68
  version: 4.3.0
69
+ none: false
70
+ requirement: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - "~>"
73
+ - !ruby/object:Gem::Version
74
+ version: 4.3.0
75
+ none: false
76
+ prerelease: false
80
77
  type: :development
81
- version_requirements: *id004
82
- - !ruby/object:Gem::Dependency
78
+ - !ruby/object:Gem::Dependency
83
79
  name: dm-sqlite-adapter
84
- prerelease: false
85
- requirement: &id005 !ruby/object:Gem::Requirement
86
- none: false
87
- requirements:
88
- - - "="
89
- - !ruby/object:Gem::Version
90
- hash: 31
91
- segments:
92
- - 1
93
- - 2
94
- - 0
80
+ version_requirements: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - '='
83
+ - !ruby/object:Gem::Version
84
+ version: 1.2.0
85
+ none: false
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - '='
89
+ - !ruby/object:Gem::Version
95
90
  version: 1.2.0
91
+ none: false
92
+ prerelease: false
96
93
  type: :development
97
- version_requirements: *id005
98
- - !ruby/object:Gem::Dependency
94
+ - !ruby/object:Gem::Dependency
99
95
  name: dm-migrations
100
- prerelease: false
101
- requirement: &id006 !ruby/object:Gem::Requirement
102
- none: false
103
- requirements:
104
- - - "="
105
- - !ruby/object:Gem::Version
106
- hash: 31
107
- segments:
108
- - 1
109
- - 2
110
- - 0
96
+ version_requirements: !ruby/object:Gem::Requirement
97
+ requirements:
98
+ - - '='
99
+ - !ruby/object:Gem::Version
100
+ version: 1.2.0
101
+ none: false
102
+ requirement: !ruby/object:Gem::Requirement
103
+ requirements:
104
+ - - '='
105
+ - !ruby/object:Gem::Version
111
106
  version: 1.2.0
107
+ none: false
108
+ prerelease: false
112
109
  type: :development
113
- version_requirements: *id006
114
- - !ruby/object:Gem::Dependency
110
+ - !ruby/object:Gem::Dependency
115
111
  name: dm-validations
116
- prerelease: false
117
- requirement: &id007 !ruby/object:Gem::Requirement
118
- none: false
119
- requirements:
120
- - - "="
121
- - !ruby/object:Gem::Version
122
- hash: 31
123
- segments:
124
- - 1
125
- - 2
126
- - 0
112
+ version_requirements: !ruby/object:Gem::Requirement
113
+ requirements:
114
+ - - '='
115
+ - !ruby/object:Gem::Version
116
+ version: 1.2.0
117
+ none: false
118
+ requirement: !ruby/object:Gem::Requirement
119
+ requirements:
120
+ - - '='
121
+ - !ruby/object:Gem::Version
127
122
  version: 1.2.0
123
+ none: false
124
+ prerelease: false
128
125
  type: :development
129
- version_requirements: *id007
130
- - !ruby/object:Gem::Dependency
126
+ - !ruby/object:Gem::Dependency
131
127
  name: dm-timestamps
132
- prerelease: false
133
- requirement: &id008 !ruby/object:Gem::Requirement
134
- none: false
135
- requirements:
136
- - - "="
137
- - !ruby/object:Gem::Version
138
- hash: 31
139
- segments:
140
- - 1
141
- - 2
142
- - 0
128
+ version_requirements: !ruby/object:Gem::Requirement
129
+ requirements:
130
+ - - '='
131
+ - !ruby/object:Gem::Version
132
+ version: 1.2.0
133
+ none: false
134
+ requirement: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - '='
137
+ - !ruby/object:Gem::Version
143
138
  version: 1.2.0
139
+ none: false
140
+ prerelease: false
144
141
  type: :development
145
- version_requirements: *id008
146
- - !ruby/object:Gem::Dependency
142
+ - !ruby/object:Gem::Dependency
147
143
  name: copyright-header
144
+ version_requirements: !ruby/object:Gem::Requirement
145
+ requirements:
146
+ - - "~>"
147
+ - !ruby/object:Gem::Version
148
+ version: '1.0'
149
+ none: false
150
+ requirement: !ruby/object:Gem::Requirement
151
+ requirements:
152
+ - - "~>"
153
+ - !ruby/object:Gem::Version
154
+ version: '1.0'
155
+ none: false
148
156
  prerelease: false
149
- requirement: &id009 !ruby/object:Gem::Requirement
150
- none: false
151
- requirements:
152
- - - ~>
153
- - !ruby/object:Gem::Version
154
- hash: 15
155
- segments:
156
- - 1
157
- - 0
158
- version: "1.0"
159
157
  type: :development
160
- version_requirements: *id009
161
158
  description: helper to use fast_gettext with datamapper/ixtlan
162
- email:
159
+ email:
163
160
  - m.kristian@web.de
164
161
  executables: []
165
-
166
162
  extensions: []
167
-
168
163
  extra_rdoc_files: []
169
-
170
- files:
164
+ files:
171
165
  - lib/ixtlan-gettext.rb
166
+ - lib/ixtlan-gettext.rb~
172
167
  - lib/fast_gettext/translation_repository/ixtlan.rb
173
168
  - lib/fast_gettext/translation_repository/ixtlan.rb~
174
- - lib/ixtlan-gettext.rb~
175
169
  - lib/ixtlan/gettext.rb
176
170
  - lib/ixtlan/gettext.rb~
171
+ - lib/ixtlan/railtie.rb~
177
172
  - lib/ixtlan/gettext/translation_models.rb~
178
173
  - lib/ixtlan/gettext/locale_serializer.rb
179
174
  - lib/ixtlan/gettext/controller.rb
@@ -192,7 +187,6 @@ files:
192
187
  - lib/ixtlan/gettext/railtie.rb
193
188
  - lib/ixtlan/gettext/locale_resource.rb
194
189
  - lib/ixtlan/gettext/translation.rake~
195
- - lib/ixtlan/railtie.rb~
196
190
  - spec/manager_spec.rb~
197
191
  - spec/sync_spec.rb~
198
192
  - spec/manager_spec.rb
@@ -200,37 +194,31 @@ files:
200
194
  - README.md
201
195
  - Gemfile
202
196
  homepage: https://github.com/mkristian/ixtlan-gettext
203
- licenses:
197
+ licenses:
204
198
  - AGPL3
205
- post_install_message:
199
+ post_install_message:
206
200
  rdoc_options: []
207
-
208
- require_paths:
201
+ require_paths:
209
202
  - lib
210
- required_ruby_version: !ruby/object:Gem::Requirement
211
- none: false
212
- requirements:
203
+ required_ruby_version: !ruby/object:Gem::Requirement
204
+ requirements:
213
205
  - - ">="
214
- - !ruby/object:Gem::Version
215
- hash: 3
216
- segments:
217
- - 0
218
- version: "0"
219
- required_rubygems_version: !ruby/object:Gem::Requirement
206
+ - !ruby/object:Gem::Version
207
+ version: !binary |-
208
+ MA==
220
209
  none: false
221
- requirements:
210
+ required_rubygems_version: !ruby/object:Gem::Requirement
211
+ requirements:
222
212
  - - ">="
223
- - !ruby/object:Gem::Version
224
- hash: 3
225
- segments:
226
- - 0
227
- version: "0"
213
+ - !ruby/object:Gem::Version
214
+ version: !binary |-
215
+ MA==
216
+ none: false
228
217
  requirements: []
229
-
230
- rubyforge_project:
231
- rubygems_version: 1.8.15
232
- signing_key:
218
+ rubyforge_project:
219
+ rubygems_version: 1.8.24
220
+ signing_key:
233
221
  specification_version: 3
234
- summary: ""
235
- test_files:
222
+ summary: ''
223
+ test_files:
236
224
  - spec/manager_spec.rb