infopark_reactor 1.13.0 → 1.14.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/infopark_reactor.gemspec +1 -1
- data/lib/generators/cm/migration/migration_generator.rb +1 -1
- data/lib/infopark_reactor.rb +8 -0
- data/lib/reactor/attributes.rb +10 -5
- data/lib/reactor/persistence.rb +7 -7
- data/lib/reactor/version.rb +1 -1
- metadata +8 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5aded46ad784b7ded5b0ec6749781ebfce0489c4
|
4
|
+
data.tar.gz: ffc35216cfef893bb3787951e204f80ba47d0b9b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 85e8e9fb655e0c45256f63f49cf39c547f99e9f955cf9a25d224339a0f808255b2bbe0b03e133203ddbca27d34ff5d5c8394a4cb5c6f9352248d640ed649470d
|
7
|
+
data.tar.gz: a854315cd9355f1fd1c4e0c848d22eec08f978ce9d9f8dd22e9531fe8f8f072a57724c9ca903741eef8bf54a12730ff48b445e77dab42529c84f51d6807eadb7
|
data/infopark_reactor.gemspec
CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
|
|
20
20
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
21
21
|
s.require_paths = ["lib"]
|
22
22
|
|
23
|
-
s.add_dependency 'rails', '>= 3.0.10', '
|
23
|
+
s.add_dependency 'rails', '>= 3.0.10', '< 4.3.0'
|
24
24
|
#s.add_dependency 'infopark_rails_connector'
|
25
25
|
s.add_dependency 'nokogiri'
|
26
26
|
s.add_dependency 'term-ansicolor'
|
@@ -9,7 +9,7 @@ module Cm
|
|
9
9
|
|
10
10
|
source_root File.expand_path('../templates', __FILE__)
|
11
11
|
def create_migration_file
|
12
|
-
if Reactor.
|
12
|
+
if Reactor.rails4_x?
|
13
13
|
migration_template "template.rb", "cm/migrate/#{file_name}.rb"
|
14
14
|
else
|
15
15
|
migration_template "template.rb", "cm/migrate/#{file_name}"
|
data/lib/infopark_reactor.rb
CHANGED
@@ -21,6 +21,14 @@ module Reactor
|
|
21
21
|
::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 1
|
22
22
|
end
|
23
23
|
|
24
|
+
def self.rails4_2?
|
25
|
+
::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 2
|
26
|
+
end
|
27
|
+
|
28
|
+
def self.rails4_x?
|
29
|
+
::Rails::VERSION::MAJOR == 4 && [0,1,2].include?(::Rails::VERSION::MINOR)
|
30
|
+
end
|
31
|
+
|
24
32
|
def self.rails4_0_ge6?
|
25
33
|
::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 0 && ::Rails::VERSION::TINY >= 6
|
26
34
|
end
|
data/lib/reactor/attributes.rb
CHANGED
@@ -230,7 +230,7 @@ module Reactor
|
|
230
230
|
not_formated_value = value
|
231
231
|
formated_value = serialize_value(key, value)
|
232
232
|
crul_set(attr, formated_value, options)
|
233
|
-
active_record_set(key, formated_value) if
|
233
|
+
active_record_set(key, formated_value) if active_record_attr?(key)
|
234
234
|
rails_connector_set(key, formated_value)
|
235
235
|
send(key)
|
236
236
|
end
|
@@ -275,6 +275,10 @@ module Reactor
|
|
275
275
|
[:channels, :valid_from, :valid_until, :name, :obj_class, :content_type, :body, :blob, :suppress_export, :permalink, :title].include?(attr)
|
276
276
|
end
|
277
277
|
|
278
|
+
def active_record_attr?(attr)
|
279
|
+
[:valid_from, :valid_until, :name, :obj_class, :content_type, :suppress_export, :permalink].include?(attr)
|
280
|
+
end
|
281
|
+
|
278
282
|
def allowed_attr?(attr)
|
279
283
|
return true if builtin_attr?(attr)
|
280
284
|
|
@@ -339,10 +343,11 @@ module Reactor
|
|
339
343
|
end
|
340
344
|
|
341
345
|
def active_record_set(field, value)
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
+
if Reactor.rails4_2?
|
347
|
+
@attributes.write_from_user(field.to_s, value)
|
348
|
+
else
|
349
|
+
@attributes[field.to_s] = value
|
350
|
+
end
|
346
351
|
end
|
347
352
|
|
348
353
|
# Lazily sets values for crul interface. May be removed in later versions
|
data/lib/reactor/persistence.rb
CHANGED
@@ -231,7 +231,7 @@ module Reactor
|
|
231
231
|
super(attributes)
|
232
232
|
end
|
233
233
|
end
|
234
|
-
elsif Reactor.rails3_1? || Reactor.rails3_2? || Reactor.
|
234
|
+
elsif Reactor.rails3_1? || Reactor.rails3_2? || Reactor.rails4_x?
|
235
235
|
# It should excactly match ActiveRecord::Base.new in it's behavior
|
236
236
|
# @see ActiveRecord::Base.new
|
237
237
|
def initialize(attributes = nil, options={}, &block)
|
@@ -419,8 +419,8 @@ module Reactor
|
|
419
419
|
end
|
420
420
|
end
|
421
421
|
|
422
|
-
if Reactor.
|
423
|
-
if Reactor.rails4_0_ge6? || Reactor.rails4_1?
|
422
|
+
if Reactor.rails4_x?
|
423
|
+
if Reactor.rails4_0_ge6? || Reactor.rails4_1? || Reactor.rails4_2?
|
424
424
|
alias_method :_create_record, :create
|
425
425
|
else
|
426
426
|
alias_method :create_record, :create
|
@@ -435,8 +435,8 @@ module Reactor
|
|
435
435
|
end
|
436
436
|
end
|
437
437
|
|
438
|
-
if Reactor.
|
439
|
-
if Reactor.rails4_0_ge6? || Reactor.rails4_1?
|
438
|
+
if Reactor.rails4_x?
|
439
|
+
if Reactor.rails4_0_ge6? || Reactor.rails4_1? || Reactor.rails4_2?
|
440
440
|
alias_method :_update_record, :update
|
441
441
|
else
|
442
442
|
alias_method :update_record, :update
|
@@ -489,7 +489,7 @@ module Reactor
|
|
489
489
|
new_name
|
490
490
|
end
|
491
491
|
|
492
|
-
if Reactor.
|
492
|
+
if Reactor.rails4_x?
|
493
493
|
# Detect the subclass from the inheritance column of attrs. If the inheritance column value
|
494
494
|
# is not self or a valid subclass, raises ActiveRecord::SubclassNotFound
|
495
495
|
# If this is a StrongParameters hash, and access to inheritance_column is not permitted,
|
@@ -510,7 +510,7 @@ module Reactor
|
|
510
510
|
end
|
511
511
|
end
|
512
512
|
|
513
|
-
if Reactor.rails4_0_ge6? || Reactor.rails4_1?
|
513
|
+
if Reactor.rails4_0_ge6? || Reactor.rails4_1? || Reactor.rails4_2?
|
514
514
|
alias_method :subclass_from_attributes, :subclass_from_attrs
|
515
515
|
remove_method :subclass_from_attrs
|
516
516
|
end
|
data/lib/reactor/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: infopark_reactor
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.14.0.beta1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tomasz Przedmojski
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -17,9 +17,9 @@ dependencies:
|
|
17
17
|
- - '>='
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 3.0.10
|
20
|
-
- -
|
20
|
+
- - <
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 4.
|
22
|
+
version: 4.3.0
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -27,9 +27,9 @@ dependencies:
|
|
27
27
|
- - '>='
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: 3.0.10
|
30
|
-
- -
|
30
|
+
- - <
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 4.
|
32
|
+
version: 4.3.0
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: nokogiri
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -224,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
224
224
|
version: '0'
|
225
225
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
226
226
|
requirements:
|
227
|
-
- - '
|
227
|
+
- - '>'
|
228
228
|
- !ruby/object:Gem::Version
|
229
|
-
version:
|
229
|
+
version: 1.3.1
|
230
230
|
requirements: []
|
231
231
|
rubyforge_project:
|
232
232
|
rubygems_version: 2.0.14
|