infopark_fiona_connector 6.8.1.26.236500544 → 6.8.2.7.128454143

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

@@ -8,7 +8,7 @@ module RailsConnector
   # [children] an Array of objects, Obj, of which this one is the parent
   # [parent] the Obj of which this one is a child - nil for the root object
   # @api public
-  class Obj < CmsBaseModel
+  class BasicObj < CmsBaseModel
     CRYPT_KEY = "\xd7\x28\x9c\x63\xd6\x29\xdf\x20\xcd\x32\xcf\x30\xcf\x30\xcf\x30\xdf\x20\xb6\x49"\
         "\x91\x6e\x99\x66\x90\x6f\x8f\x70\x9e\x61\x8d\x72\x94\x6b\xdf\x20\xbe\x41\xb8\x47\xc4\x3b"\
         "\xdf\x20\xbd\x42\x9a\x65\x8d\x72\x93\x6c\x96\x69\x91\x6e".freeze
@@ -23,7 +23,7 @@ module RailsConnector
       when :released then configure_column_information("objs", true)
       when :edited
         configure_column_information("preview_objs", false)
-        has_many(:permissions, :class_name => "::RailsConnector::Permission", :foreign_key => "object_id")
+        has_many(:arel_permissions, :class_name => "::RailsConnector::Permission", :foreign_key => "object_id")
       else
         raise "configure_for_content called with unknown parameter #{which}"
       end
@@ -44,7 +44,7 @@ module RailsConnector
 
     # Patch to avoid a type_condition being added by ActiveRecord::Base.add_conditions! for Obj.find(params):
     def self.descends_from_active_record?
-      superclass == CmsBaseModel
+      self == BasicObj || superclass == BasicObj
     end
 
     # A CMS administrator can specify the <tt>obj_class</tt> for a given CMS object.
@@ -59,8 +59,7 @@ module RailsConnector
     # for a model in the RailsConnector namespace (RailsConnector::Permission etc.)
 
     def self.compute_type(type_name)
-      try_type { type_name.constantize } ||
-      self
+      try_type { type_name.constantize } || ::Obj
     end
 
     def self.reset_type_cache
@@ -69,7 +68,7 @@ module RailsConnector
 
     # @api public
     def permissions
-      @@use_cached_permissions ? attr_dict.permissions : super
+      @@use_cached_permissions ? attr_dict.permissions : arel_permissions
     end
 
     # @api public
@@ -91,7 +90,7 @@ module RailsConnector
       Obj.find(2001)
     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.
     # @api public
     def self.homepage
@@ -142,7 +141,7 @@ module RailsConnector
     #
     # The default is +obj.name+.
     #
-    # 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
@@ -202,7 +201,7 @@ module RailsConnector
     # @api public
     def active?(time_when = nil)
       return false if !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
 

data/lib/rails_connector/named_link.rb

@@ -3,7 +3,7 @@ module RailsConnector
   # This class provides methods used to retrieve objects from CMS based an entry
   # in CMS of the obj_class <tt>NamedLink</tt>.
   # @api public
-  class NamedLink < Obj
+  class NamedLink
 
     # @api public
     class NotFound < StandardError
@@ -18,7 +18,7 @@ module RailsConnector
     def self.generate_named_links_cache
       return if @@named_links_cache
 
-      found_objects = self.all
+      found_objects = BasicObj.find_all_by_obj_class('NamedLink')
       Rails.logger.warn "Couldn't find NamedLink CMS Object!" if found_objects.empty?
       Rails.logger.warn "More than one NamedLink CMS Object found!" if found_objects.size > 1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona_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: mime-types
@@ -76,6 +76,7 @@ files:
 - lib/rails_connector/attr_value_provider.bundle
 - lib/rails_connector/attr_value_provider.so
 - lib/rails_connector/attr_value_provider64.so
+- lib/rails_connector/basic_obj.rb
 - lib/rails_connector/blob.rb
 - lib/rails_connector/blob_mysql.rb
 - lib/rails_connector/blob_oracle.rb
@@ -90,7 +91,6 @@ files:
 - lib/rails_connector/lucene_search_request.rb
 - lib/rails_connector/named_link.rb
 - lib/rails_connector/news.rb
-- lib/rails_connector/obj.rb
 - lib/rails_connector/permission.rb
 - lib/rails_connector/rack_middlewares.rb
 - lib/rails_connector/ses/verity_accessor.rb
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 865577871
+      hash: 1027616381
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: