infopark_reactor 1.13.0 → 1.14.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0dc4909f67ad98599bf95e3ee6704ded12afe2b
-  data.tar.gz: 291f54855d8900e799ae3c278e2bd1371dbe1534
+  metadata.gz: 5aded46ad784b7ded5b0ec6749781ebfce0489c4
+  data.tar.gz: ffc35216cfef893bb3787951e204f80ba47d0b9b
 SHA512:
-  metadata.gz: a09584c51b669e5c19327223536e1862d35148323cfae7692c13931e617a20219dbeaa4de2039da68c9fe0f723d3e830a16f8e2fb78f6d64887106ecb60525a2
-  data.tar.gz: cc5823a445bcc36edd25c6db8f985c62a4fd7b7454b76d0351d5ee76657336de51b24cf51fdcd97efa99710426869d936853ba9d579a4c2f367fc5d733a9a48f
+  metadata.gz: 85e8e9fb655e0c45256f63f49cf39c547f99e9f955cf9a25d224339a0f808255b2bbe0b03e133203ddbca27d34ff5d5c8394a4cb5c6f9352248d640ed649470d
+  data.tar.gz: a854315cd9355f1fd1c4e0c848d22eec08f978ce9d9f8dd22e9531fe8f8f072a57724c9ca903741eef8bf54a12730ff48b445e77dab42529c84f51d6807eadb7

data/infopark_reactor.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '>= 3.0.10', '<= 4.2.0'
+  s.add_dependency 'rails', '>= 3.0.10', '< 4.3.0'
   #s.add_dependency 'infopark_rails_connector'
   s.add_dependency 'nokogiri'
   s.add_dependency 'term-ansicolor'

data/lib/generators/cm/migration/migration_generator.rb

@@ -9,7 +9,7 @@ module Cm
 
       source_root File.expand_path('../templates', __FILE__)
       def create_migration_file
-        if Reactor.rails4_0? || Reactor.rails4_1?
+        if Reactor.rails4_x?
           migration_template "template.rb", "cm/migrate/#{file_name}.rb"
         else
           migration_template "template.rb", "cm/migrate/#{file_name}"

data/lib/infopark_reactor.rb

@@ -21,6 +21,14 @@ module Reactor
     ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 1
   end
 
+  def self.rails4_2?
+    ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 2
+  end
+
+  def self.rails4_x?
+    ::Rails::VERSION::MAJOR == 4 && [0,1,2].include?(::Rails::VERSION::MINOR)
+  end
+
   def self.rails4_0_ge6?
     ::Rails::VERSION::MAJOR == 4 && ::Rails::VERSION::MINOR == 0 && ::Rails::VERSION::TINY >= 6
   end

data/lib/reactor/attributes.rb

@@ -230,7 +230,7 @@ module Reactor
         not_formated_value = value
         formated_value = serialize_value(key, value)
         crul_set(attr, formated_value, options)
-        active_record_set(key, formated_value) if builtin_attr?(key)
+        active_record_set(key, formated_value) if active_record_attr?(key)
         rails_connector_set(key, formated_value)
         send(key)
       end
@@ -275,6 +275,10 @@ module Reactor
         [:channels, :valid_from, :valid_until, :name, :obj_class, :content_type, :body, :blob, :suppress_export, :permalink, :title].include?(attr)
       end
 
+      def active_record_attr?(attr)
+        [:valid_from, :valid_until, :name, :obj_class, :content_type, :suppress_export, :permalink].include?(attr)
+      end
+
       def allowed_attr?(attr)
         return true if builtin_attr?(attr)
 
@@ -339,10 +343,11 @@ module Reactor
       end
 
       def active_record_set(field, value)
-        #method = :"#{field}="
-        #send(method, value) if self.respond_to? method
-        #value
-        @attributes[field.to_s] = value
+        if Reactor.rails4_2?
+          @attributes.write_from_user(field.to_s, value)
+        else
+          @attributes[field.to_s] = value
+        end
       end
 
       # Lazily sets values for crul interface. May be removed in later versions

data/lib/reactor/persistence.rb

@@ -231,7 +231,7 @@ module Reactor
             super(attributes)
           end
         end
-      elsif Reactor.rails3_1? || Reactor.rails3_2? || Reactor.rails4_0? || Reactor.rails4_1?
+      elsif Reactor.rails3_1? || Reactor.rails3_2? || Reactor.rails4_x?
         # It should excactly match ActiveRecord::Base.new in it's behavior
         # @see ActiveRecord::Base.new
         def initialize(attributes = nil, options={}, &block)
@@ -419,8 +419,8 @@ module Reactor
         end
       end
 
-      if Reactor.rails4_0? || Reactor.rails4_1?
-        if Reactor.rails4_0_ge6? || Reactor.rails4_1?
+      if Reactor.rails4_x?
+        if Reactor.rails4_0_ge6? || Reactor.rails4_1? || Reactor.rails4_2?
           alias_method :_create_record, :create
         else
           alias_method :create_record, :create
@@ -435,8 +435,8 @@ module Reactor
          end
       end
 
-      if Reactor.rails4_0? || Reactor.rails4_1?
-        if Reactor.rails4_0_ge6? || Reactor.rails4_1?
+      if Reactor.rails4_x?
+        if Reactor.rails4_0_ge6? || Reactor.rails4_1? || Reactor.rails4_2?
           alias_method :_update_record, :update
         else
           alias_method :update_record, :update
@@ -489,7 +489,7 @@ module Reactor
         new_name
       end
 
-      if Reactor.rails4_0? || Reactor.rails4_1?
+      if Reactor.rails4_x?
         # Detect the subclass from the inheritance column of attrs. If the inheritance column value
         # is not self or a valid subclass, raises ActiveRecord::SubclassNotFound
         # If this is a StrongParameters hash, and access to inheritance_column is not permitted,
@@ -510,7 +510,7 @@ module Reactor
           end
         end
 
-        if Reactor.rails4_0_ge6? || Reactor.rails4_1?
+        if Reactor.rails4_0_ge6? || Reactor.rails4_1? || Reactor.rails4_2?
           alias_method :subclass_from_attributes, :subclass_from_attrs
           remove_method :subclass_from_attrs
         end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.13.0"
+  VERSION = "1.14.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0.beta1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -224,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14