infopark_reactor 1.11.0.beta2 → 1.11.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2649a34240ebf7ba0254b206e929f8d80be1f4ad
-  data.tar.gz: 31b0f374168394beb5f1de509a0e201ce8b64f33
+  metadata.gz: dcc04099064780ed9c6480ed010c5911fc7c6ab8
+  data.tar.gz: 04b8654ad0ae1c2d61d65fcb67a8a76309e21a02
 SHA512:
-  metadata.gz: 1c119f9285fa51ff038cb37d40628bdc606d57022d0d4d91c6b0e4d3195ca1342b31ea6f89014b8f9710a7fc25cb03ccf04fd7fa9581ba1e80b24be448120801
-  data.tar.gz: 13d83fbc668a9b4d211b5f339a7bafe9ef658e7fcb06a892c0f17a3f96c5e0443cc00b7d15bfd1ec23959f45dd40560df9c39c06a8cb2cd430835a7e2b5deb30
+  metadata.gz: 5a49301c71daa7a5f265623c259d3a6c1dd4127819771e345cb929e084c9b27b3204c1ed3ba25b4d29e8ff4d5f863c8909cb305b435308d06526c531961a6177
+  data.tar.gz: e57cf0ab9b1d21e8b8ea06152c2a94541b4ff43aab5f8f48a7a30fcea3fc5e51be17d7a45328433bb234c6589ab1355a5007c0fc1a0f004e7a06bae5c1d7d70e

data/lib/infopark_reactor.rb

@@ -61,16 +61,9 @@ require 'reactor/no_working_version'
 require 'reactor/not_permitted'
 
 # require components
-require 'reactor/attributes'
-require 'reactor/persistence'
-require 'reactor/validations'
-require 'reactor/permission'
-require 'reactor/legacy'
+require 'reactor/main'
 require 'reactor/rc_independent'
 require 'reactor/sudo'
-require 'reactor/workflow'
-require 'reactor/streaming_upload'
-require 'reactor/rails_connector_meta'
 
 # require rails integration
 require 'reactor/session'

data/lib/reactor/main.rb

@@ -0,0 +1,21 @@
+require 'reactor/rails_connector_meta'
+require 'reactor/legacy'
+require 'reactor/attributes'
+require 'reactor/persistence'
+require 'reactor/validations'
+require 'reactor/permission'
+require 'reactor/workflow'
+require 'reactor/streaming_upload'
+
+module Reactor
+  module Main
+    def self.included(base)
+      [RailsConnector::Meta, Reactor::Legacy::Base,
+       Reactor::Attributes::Base, Reactor::Persistence::Base,
+       Reactor::Validations::Base, Reactor::Permission::Base,
+       Reactor::Workflow::Base, Reactor::StreamingUpload::Base].each do |mod|
+         base.send(:include, mod)
+       end
+    end
+  end
+end

data/lib/reactor/support/link_matcher.rb

@@ -10,8 +10,8 @@ module Reactor
         match = match_url
         (match[:action] == "index") &&
           (match[:controller] == "rails_connector/cms_dispatch") &&
-          ((match[:id].present? && Obj.exists?(match[:id].to_i)) ||
-          (match[:permalink].present? && Obj.exists?(:permalink => match[:permalink])))
+          ((match[:id].present? && RailsConnector::AbstractObj.exists?(match[:id].to_i)) ||
+          (match[:permalink].present? && RailsConnector::AbstractObj.exists?(:permalink => match[:permalink])))
       rescue ActionController::RoutingError
         return false
       end
@@ -20,9 +20,9 @@ module Reactor
         match = match_url
 
         if match[:permalink].present?
-          append_fragment_and_query Obj.find_by_permalink(match[:permalink]).path 
+          append_fragment_and_query RailsConnector::AbstractObj.find_by_permalink(match[:permalink]).path 
         elsif match[:id].present?
-          append_fragment_and_query Obj.find(match[:id].to_i).path
+          append_fragment_and_query RailsConnector::AbstractObj.find(match[:id].to_i).path
         end
       end
 

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.11.0.beta2"
+  VERSION = "1.11.0.beta3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.11.0.beta2
+  version: 1.11.0.beta3
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,6 +152,7 @@ files:
 - lib/reactor/link/external.rb
 - lib/reactor/link/internal.rb
 - lib/reactor/link/temporary_link.rb
+- lib/reactor/main.rb
 - lib/reactor/migration.rb
 - lib/reactor/no_working_version.rb
 - lib/reactor/not_permitted.rb