infopark_cloud_connector 6.8.1.26.236500544 → 6.8.2.7.128454143

data/app/controllers/rails_connector/objs_controller.rb

@@ -29,12 +29,11 @@ module RailsConnector
       end
     end
 
-    # Overwrite this method in your project.
     # If +true+, allow access to ObjsController, else deny access.
-    # Default: +false+
+    # See {RailsConnector::Configuration.editing_auth} for details.
     # @return [Bool]
     def allow_access?
-      false
+      Configuration.editing_auth_callback.call(request.env)
     end
 
   end

data/lib/rails_connector/{obj.rb → basic_obj.rb}

@@ -5,7 +5,7 @@ require 'kvom'
 module RailsConnector
   # The CMS file class
   # @api public
-  class Obj
+  class BasicObj
     extend ActiveModel::Naming
     include Kvom::ModelIdentity
 
@@ -27,7 +27,7 @@ module RailsConnector
     # May result in an instance of a subclass of Obj according to STI rules.
     def self.instantiate(obj_data)
       obj_class = obj_data.value_of("_obj_class")
-      Obj.compute_type(obj_class).new(obj_data)
+      BasicObj.compute_type(obj_class).new(obj_data)
     end
 
     # @api public
@@ -48,7 +48,7 @@ module RailsConnector
         find_objs_by(:id, id_or_list).map(&:first)
       else
         obj = find_objs_by(:id, [id_or_list.to_s]).first.first
-        obj or raise ResourceNotFound, "Could not find #{self} with id #{id_or_list}"
+        obj or raise ResourceNotFound, "Could not find Obj with id #{id_or_list}"
       end
     end
 
@@ -75,7 +75,7 @@ module RailsConnector
     # @return [ObjSearchEnumerator]
     # @api public
     def self.all
-      if self.name == 'RailsConnector::Obj'
+      if superclass == RailsConnector::BasicObj
         ObjSearchEnumerator.new(nil)
       else
         find_all_by_obj_class(self.name)
@@ -135,14 +135,14 @@ module RailsConnector
     # @api public
     def self.find_by_permalink!(permalink)
       find_by_permalink(permalink) or
-        raise ResourceNotFound, "Could not find #{self} with permalink '#{permalink}'"
+        raise ResourceNotFound, "Could not find Obj with permalink '#{permalink}'"
     end
 
     # accepts the name of an "obj_by" - view and a list of keys.
     # returns a list of lists of Objs: a list of Objs for each given keys.
     def self.find_objs_by(view, keys)
       CmsBackend.find_obj_data_by(Workspace.current.data, view, keys).map do |list|
-        list.map { |obj_data| Obj.instantiate(obj_data) }
+        list.map { |obj_data| BasicObj.instantiate(obj_data) }
       end
     end
 
@@ -167,7 +167,7 @@ module RailsConnector
 
     def self.compute_type(type_name)
       @compute_type_cache ||= {}
-      @compute_type_cache[type_name] ||= try_type { type_name.constantize } || self
+      @compute_type_cache[type_name] ||= try_type { type_name.constantize } || Obj
     end
 
     def self.reset_type_cache
@@ -178,7 +178,7 @@ module RailsConnector
     # returns +nil+ for the root Obj.
     # @api public
     def parent
-      root? ? nil : Obj.find_by_path(parent_path)
+      root? ? nil : BasicObj.find_by_path(parent_path)
     end
 
     # Returns an Array of all the ancestor objects, starting at the root and ending at this object's parent.
@@ -190,14 +190,14 @@ module RailsConnector
         list << list.last + component
       end
       ancestor_paths[0] = "/"
-      Obj.find_many_by_paths(ancestor_paths)
+      BasicObj.find_many_by_paths(ancestor_paths)
     end
 
     # return a list of all child Objs.
     # @return [Array<Obj>]
     # @api public
     def children
-      Obj.find_objs_by(:ppath, [path]).first
+      self.class.find_objs_by(:ppath, [path]).first
     end
 
     ### ATTRIBUTES #################
@@ -205,7 +205,7 @@ module RailsConnector
     # returns the Obj's path as a String.
     # @api public
     def path
-      read_attribute('_path') or raise "Obj without path"
+      read_attribute('_path') or raise 'Obj without path'
     end
 
     # returns the Obj's name, i.e. the last component of the path.
@@ -245,10 +245,11 @@ module RailsConnector
     # @return [Obj]
     # @api public
     def self.root
-      Obj.find_by_path("/") or raise ResourceNotFound, "Obj.root not found: There is no Obj with path '/'."
+      BasicObj.find_by_path("/") or raise ResourceNotFound,
+          "Obj.root not found: There is no Obj with path '/'."
     end
 
-    # Returns the homepage object. This can be overwritten in your application's +ObjExtensions+.
+    # Returns the homepage object. This can be overwritten in your application's +Obj+.
     # Use <tt>Obj#homepage?</tt> to check if an object is the homepage.
     # @return [Obj]
     # @api public
@@ -294,7 +295,7 @@ module RailsConnector
     # The default is {http://apidock.com/rails/ActiveSupport/Inflector/parameterize parameterize}
     # on +obj.title+.
     #
-    # You can customize this part by overwriting +obj.slug+ in {ObjExtentions}.
+    # You can customize this part by overwriting +obj.slug+ in {Obj}.
     # @return [String]
     # @api public
     def slug
@@ -347,7 +348,7 @@ module RailsConnector
     # @api public
     def active?(time_when = nil)
       return false unless valid_from
-      time_then = time_when || Obj.preview_time
+      time_then = time_when || BasicObj.preview_time
       valid_from <= time_then && (!valid_until || time_then <= valid_until)
     end
 
@@ -748,20 +749,14 @@ module RailsConnector
       private
 
       def try_type
-        result = yield
-        result if subclass_of_obj(result)
+        klass = yield
+        klass if klass.try(:descends_from_basic_obj?) # Descendants of BasicObj have this method
       rescue NameError
-        nil
       end
 
-      def subclass_of_obj(klass)
-        if klass == Obj
-          true
-        else
-          klass.superclass && subclass_of_obj(klass.superclass)
-        end
+      def descends_from_basic_obj?
+        self != BasicObj
       end
-
     end
   end
 

data/lib/rails_connector/named_link.rb

@@ -36,7 +36,7 @@ module RailsConnector
     # Overwrite this method only if you know what you are doing.
     # @api public
     def self.find_named_link_obj
-      Obj.find_by_path("/_named_links")
+      BasicObj.find_by_path("/_named_links")
     end
 
     def self.cache_expiry_time=(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.8.1.26.236500544
+  version: 6.8.2.7.128454143
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.1.26.236500544
+        version: 6.8.2.7.128454143
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.1.26.236500544
+        version: 6.8.2.7.128454143
 description: The Cloud Connector for Infopark CMS Fiona enables you to develop modern,
   dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS
   managed content.
@@ -79,6 +79,7 @@ files:
 - lib/infopark_cloud_connector.rb
 - lib/rails_connector/access_denied.rb
 - lib/rails_connector/backend_not_available.rb
+- lib/rails_connector/basic_obj.rb
 - lib/rails_connector/blob.rb
 - lib/rails_connector/cache.rb
 - lib/rails_connector/cache_middleware.rb
@@ -109,7 +110,6 @@ files:
 - lib/rails_connector/migrations/migrator.rb
 - lib/rails_connector/migrations/workspace_lock.rb
 - lib/rails_connector/named_link.rb
-- lib/rails_connector/obj.rb
 - lib/rails_connector/obj_data.rb
 - lib/rails_connector/obj_data_from_database.rb
 - lib/rails_connector/obj_data_from_hash.rb
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 620009807
+      hash: 903498323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: