infopark_rails_connector 6.8.1.26.236500544 → 6.8.2.7.128454143

data/app/helpers/rails_connector/layout_helper.rb

@@ -11,8 +11,7 @@ module RailsConnector
     def rails_connector_header_tags
       html = "".html_safe
       html += tag('meta', :name => 'generator',
-          :content => "Rails Connector for Infopark CMS Fiona by Infopark AG (www.infopark.de); "\
-          "Version #{Gem.loaded_specs['infopark_rails_connector'].version}")
+          :content => "Rails Connector for Infopark CMS Fiona by Infopark AG (www.infopark.de)")
       if Configuration.enabled?(:rss)
         html += auto_discovery_link_tag(:rss, rss_url, :title => 'RSS Feed')
       end

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector_95/repos/rails_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Fri Jan 25 10:08:18 2013 UTC
+## Converted at: Wed Jan 30 10:16:42 2013 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/generators/rails_connector/install/install_generator.rb

@@ -12,7 +12,7 @@ module RailsConnector
       def install_configuration
         copy_file "initializers/rails_connector.rb", "config/initializers/rails_connector.rb"
         copy_file 'initializers/crm_connector.rb', 'config/initializers/crm_connector.rb'
-        copy_file "obj_extensions.rb", "lib/obj_extensions.rb"
+        template 'app/models/obj.rb.erb', 'app/models/obj.rb'
         copy_file "local/configuration.rb", "config/local/configuration.rb"
       end
 

data/lib/generators/rails_connector/install/templates/app/models/obj.rb.erb

@@ -0,0 +1,5 @@
+# This is the base class for accessing CMS objects.
+# See the documentation for details: http://rubydoc.info/gems/infopark_<%= RailsConnector.platform %>_connector/RailsConnector/BasicObj
+class Obj < RailsConnector::BasicObj
+  # Your custom code goes here...
+end

data/lib/obj.rb

@@ -0,0 +1,3 @@
+# empty implementation for Obj
+# only unsed in case the app does not define Obj itself
+::Obj = Class.new(RailsConnector::BasicObj)

data/lib/rails_connector/commentable.rb

@@ -9,13 +9,13 @@ module RailsConnector
     end
 
     # Returns +true+ by default.
-    # Implement your own conditions by overwriting this method in your {ObjExtensions}.
+    # Implement your own conditions by overwriting this method in your {Obj}.
     def allow_comments?
       true
     end
 
     # Returns +true+ by default.
-    # Implement your own conditions by overwriting this method in your {ObjExtensions}.
+    # Implement your own conditions by overwriting this method in your {Obj}.
     def allow_anonymous_comments?
       true
     end

data/lib/rails_connector/configuration.rb

@@ -62,6 +62,27 @@ module RailsConnector
       # @api public
       attr_reader :content_service
 
+      # Determine if current visitor is permitted to edit content.
+      attr_accessor :editing_auth_callback
+
+      # Configure a callback to be invoked when the rails connector determines,
+      # if current visitor is permitted to edit content.
+      # Default is <code>false</code>.
+      #
+      # Example Usage:
+      #     RailsConnector::Configuation.editing_auth do |env|
+      #       request = Rack::Request.new(env)
+      #       # return truey if current visitor is permitted to edit content, falsy otherwise
+      #     end
+      # @api public
+      def editing_auth(&block)
+        if block.respond_to?(:arity) && block.arity == 1
+          self.editing_auth_callback = block
+        else
+          raise ArgumentError, 'editing_auth is not callable with arity one!'
+        end
+      end
+
       # Gets path of a CA certification file in PEM format.
       # @api public
       attr_reader :ca_file
@@ -170,7 +191,7 @@ module RailsConnector
         enable_authentication
         # Hier muss explizit der Namespace verwendet werden, da diese Methode von Rails
         # während der Initialisierung aufgerufen wird.
-        ::RailsConnector::Obj.configure_for_content(
+        ::RailsConnector::BasicObj.configure_for_content(
           ::RailsConnector::Configuration.use_edited_content? ? :edited : :released
         )
       end
@@ -179,7 +200,7 @@ module RailsConnector
         unless Rails.configuration.cache_classes
           after_initialize
           NamedLink.reset_cache
-          Obj.reset_type_cache
+          BasicObj.reset_type_cache
           initialize_addon_mixins
         end
       end
@@ -239,9 +260,9 @@ module RailsConnector
           RailsConnector::SES.enable
         end
         RailsConnector::Crm.enable if enabled?(:crm)
-        ::Obj.__send__(:include, RailsConnector::Syndicateable) if enabled?(:rss)
-        ::Obj.__send__(:include, RailsConnector::Commentable) if enabled?(:comments)
-        ::Obj.__send__(:include, RailsConnector::Rateable) if enabled?(:ratings)
+        RailsConnector::BasicObj.__send__(:include, RailsConnector::Syndicateable) if enabled?(:rss)
+        RailsConnector::BasicObj.__send__(:include, RailsConnector::Commentable) if enabled?(:comments)
+        RailsConnector::BasicObj.__send__(:include, RailsConnector::Rateable) if enabled?(:ratings)
       end
 
       def local_config_file
@@ -309,6 +330,7 @@ module RailsConnector
     self.cache_editable_workspaces = false
     self.use_recaptcha_on_user_registration = true
     self.ca_file = DEFAULT_CA_FILE
+    self.editing_auth{ |env| false }
 
     register_features(
       :search, :time_machine, :rss, :comments, :ratings,

data/lib/rails_connector/crm.rb

@@ -71,6 +71,13 @@ module RailsConnector
       # @api public
       def current_user
         @current_user ||= if logged_in?
+          incorrect_encoding = session[:user].any? do |key, value|
+            value.is_a?(String) && value.encoding_aware? && value.encoding.name != 'UTF-8'
+          end
+          if incorrect_encoding
+            self.current_user = Infopark::Crm::Contact.find(session[:user][:id])
+          end
+
           user_session = session[:user].dup
           live_server_groups = user_session.delete(:live_server_groups)
           user = Infopark::Crm::Contact.new(user_session || {})

data/lib/rails_connector/engine.rb

@@ -59,13 +59,6 @@ module ::RailsConnector
       ActionView::Base.__send__(:include, CmsRoutingHelper)
     end
 
-    initializer "rails_connector.enable_obj_extensions", :after => "load_config_initializers" do
-      # ObjExtensions are enabled automatically when the top-level constant Obj is loaded.
-      # This initializer only ensures, that ObjExtensions are loaded at least once on bootup.
-      # They may have been loaded already (implicitely) at the load_config_initializers stage.
-      ::Obj
-    end
-
     initializer "rails_connector.config_local", :after => :load_config_initializers,
         :before => :engines_blank_point do
       Dir.glob(Rails.root.join('config', 'local', '*.rb')).each do |file|

data/lib/rails_connector/seo.rb

@@ -8,7 +8,7 @@ module RailsConnector
     module ClassMethods
       # Finds all objects that shall be included in the SEO <tt>sitemap.xml</tt>.
       # On each exportable none-image object, {InstanceMethods#included_in_seo_sitemap?} is called.
-      # Overwrite <tt>included_in_seo_sitemap?</tt> in your {ObjExtensions} to adjust the criteria.
+      # Overwrite <tt>included_in_seo_sitemap?</tt> in your {Obj} to adjust the criteria.
       # @api public
       def find_all_for_sitemap
         start = Obj.homepage
@@ -23,27 +23,27 @@ module RailsConnector
     # @api public
     module InstanceMethods
 
-      # Returns +true+ by default. Overwrite in your {ObjExtensions} as you like.
+      # Returns +true+ by default. Overwrite in your {Obj} as you like.
       # @api public
       def readable_for_googlebots?
         true
       end
 
       # Default implementation: objects have to be <tt>active?</tt> and at least of one of: permitted for anyone (<tt>permitted_groups = []</tt>), <tt>readable_for_googlebots?</tt>.
-      # Overwrite in your {ObjExtensions} as you like.
+      # Overwrite in your {Obj} as you like.
       # @api public
       def included_in_seo_sitemap?
         (permitted_groups.empty? || readable_for_googlebots?) && active?
       end
 
       # Returns an html-stripped <tt>Obj#body</tt>, truncated to 300 chars.
-      # Overwrite in your {ObjExtensions} as you like. For example, point to a CMS field.
+      # Overwrite in your {Obj} as you like. For example, point to a CMS field.
       # @api public
       def seo_description
         HTML::FullSanitizer.new.sanitize(body.strip.gsub(%r{[\n|\r]}, " ")).mb_chars[0,300] if body
       end
 
-      # Returns +nil+ by default. Overwrite in your {ObjExtensions} as you like.
+      # Returns +nil+ by default. Overwrite in your {Obj} as you like.
       # For example, point to a CMS field of your objects.
       # @api public
       def seo_keywords

data/lib/rails_connector/syndicateable.rb

@@ -4,7 +4,7 @@ module RailsConnector
   #     RailsConnector::Configuration.enable(:rss)
   # @api public
   module Syndicateable
-    # Overwrite this method in your {ObjExtensions} in order to display another field in your feed.
+    # Overwrite this method in your {Obj} in order to display another field in your feed.
     # @api public
     def rss_description
       body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_rails_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: rails
@@ -253,7 +253,6 @@ files:
 - app/mailers/confirmation_mailer.rb
 - app/models/crm_form.rb
 - app/models/named_link.rb
-- app/models/obj.rb
 - app/models/rails_connector/default_comment.rb
 - app/models/rails_connector/default_rating.rb
 - app/models/rails_connector/link_list.rb
@@ -309,14 +308,14 @@ files:
 - lib/generators/rails_connector/comments/comments_generator.rb
 - lib/generators/rails_connector/comments/templates/migration.rb
 - lib/generators/rails_connector/install/install_generator.rb
+- lib/generators/rails_connector/install/templates/app/models/obj.rb.erb
 - lib/generators/rails_connector/install/templates/initializers/crm_connector.rb
 - lib/generators/rails_connector/install/templates/initializers/rails_connector.rb
 - lib/generators/rails_connector/install/templates/local/configuration.rb
-- lib/generators/rails_connector/install/templates/obj_extensions.rb
 - lib/generators/rails_connector/ratings/ratings_generator.rb
 - lib/generators/rails_connector/ratings/templates/migration.rb
 - lib/infopark_rails_connector.rb
-- lib/obj_extensions.rb
+- lib/obj.rb
 - lib/rails_connector/authenticable.rb
 - lib/rails_connector/cms_accessible.rb
 - lib/rails_connector/cms_dispatch_controller.rb
@@ -364,7 +363,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1041378993
+      hash: 688003405
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/models/obj.rb

@@ -1,9 +0,0 @@
-# ::Obj is just a shortcut
-::Obj = ::RailsConnector::Obj
-
-# load ObjExtensions from the embedding Rails App.
-# Must be done after Obj has been defined.
-require "obj_extensions"
-if (ObjExtensions rescue nil)
-  ObjExtensions.enable
-end

data/lib/generators/rails_connector/install/templates/obj_extensions.rb

@@ -1,26 +0,0 @@
-# @api public
-module ObjExtensions
-
-  # Infopark Rails Connector enables the developer to define specific behavior for Fiona CMS
-  # classes by using Single Table Inheritance (http://www.martinfowler.com/eaaCatalog/singleTableInheritance.html).
-  #
-  # If you wish to decorate the Obj model with extra behavior, you will need to add it here.
-  #
-  # Be careful only to use methods and classes that are part of the documented api.
-  # Other methods and classes may change without warning.
-  # @api public
-  def self.enable
-    return if Obj.respond_to? :obj_extensions_enabled
-
-    Obj.class_eval do
-
-      def self.obj_extensions_enabled
-      end
-
-      # Add custom extensions to the Obj model below
-      #
-
-    end
-
-  end
-end

data/lib/obj_extensions.rb

@@ -1,6 +0,0 @@
-# empty implementation for ObjExtension
-# only unsed in case the app does not define ObjExtensions itself
-module ObjExtensions
-  def self.enable
-  end
-end