infopark_rails_connector 6.9.1.3.22208381 → 6.9.2.1.125136549

data/README

@@ -2,22 +2,14 @@
 
 Infopark Rails Connector integrates Infopark’s CMS into your Rails application.
 
-It connects either to Infopark Cloud Express CMS via {https://rubygems.org/gems/infopark_cloud_connector infopark_cloud_connector} or to Infopark CMS Fiona via {https://rubygems.org/gems/infopark_fiona_connector infopark_fiona_connector}. It also enables you to integrate various ready-to-run features.
+It connects either to Infopark Cloud Express CMS via {https://rubygems.org/gems/infopark_cloud_connector infopark_cloud_connector} or to Infopark CMS Fiona via {https://rubygems.org/gems/infopark_fiona_connector infopark_fiona_connector}.
 
 For more information about Infopark Rails Connector, please visit {http://kb.infopark.de/ Infopark’s Knowledge Base}.
 
-== Configuration
-Here is how the available addons can be enabled in the <tt>rails_connector.rb</tt> initializer file of your application:
-
-  RailsConnector::Configuration.enable(
-    :time_machine
-  )
-
 == Layout Helpers
 Some of these functions require HTML or Javascript code to be included in the application layout.
-For example, Google Analytics only tracks pageviews if their JavaScript snippet is included at the bottom of the HTML body.
 
-The Rails Connector provides two helpers for managing this kind of layout code, switching on or off parts depending on whether features are enabled or not:
+The Rails Connector provides two helpers for managing this kind of layout code:
 
   rails_connector_header_tags
 
@@ -33,7 +25,3 @@ Infopark Rails Connector comes with three generators to help you get up and runn
   > rails generate rails_connector:install
 
 Adds to your application the Time Machine assets, a +rails_connector.rb+ initializer and rake tasks specific to the gem.
-
-== Seo Sitemap
-
-The default implementation of the SEO sitemap will reference all the files from your CMS in the generated <tt>sitemap.xml</tt>. For a large number of files, this can slow down your server. Please refer to {RailsConnector::SEO::ClassMethods#find_all_for_sitemap} for advice on optimization.

data/app/assets/javascripts/infopark_rails_connector.js.erb

@@ -1,3 +0,0 @@
-<% require_asset "comments" if comments = RailsConnector::Configuration.enabled?(:comments) %>
-<% require_asset "ratings" if ratings = RailsConnector::Configuration.enabled?(:ratings) %>
-<% require_asset "initializer" if comments || ratings %>

data/app/assets/stylesheets/infopark_rails_connector.css.erb

@@ -1,4 +0,0 @@
-/*
- *= require_self
-*/
-<% require_asset "ratings" if RailsConnector::Configuration.enabled?(:ratings) %>

data/app/controllers/rails_connector/default_cms_controller.rb

@@ -7,7 +7,6 @@ module RailsConnector
   # @api public
   class DefaultCmsController < ApplicationController
     include CmsAccessible
-    before_filter :set_preview_time
     before_filter :load_object
     before_filter :ensure_object_is_active
     before_filter :ensure_object_is_permitted

data/app/helpers/rails_connector/default_cms_helper.rb

@@ -13,14 +13,8 @@ module RailsConnector
     include DisplayHelper
     include MarkerHelper
     include CmsAssetHelper
-    include SeoHelper
-    include RailsConnector::MenuHelper
-    include RailsConnector::MicronavHelper
-    include RailsConnector::TimeMachineHelper
-    include RailsConnector::LinkHelper
     include RailsConnector::CmsAssetHelper
     include RailsConnector::TableOfContentsHelper
-    include RatingsHelper
     include RailsConnector::EditingHelper
     include RailsConnector::LayoutHelper
     include RailsConnector::CmsTagHelper

data/app/helpers/rails_connector/layout_helper.rb

@@ -4,29 +4,24 @@ module RailsConnector
   # and the end of the html body.
   # @api public
   module LayoutHelper
-    include TrackingHelper
 
-    # Renders all tags needed in the html head for the enabled features.
+    # Renders all tags needed in the html head.
     # @api public
     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)")
-      if Configuration.enabled?(:rss)
-        html += auto_discovery_link_tag(:rss, rss_url, :title => 'RSS Feed')
-      end
       html += include_edit_marker_support
       html += include_editing_stylesheet
       html
     end
 
-    # Renders all tags needed at the end of the body tag for the enabled features.
+    # Renders all tags needed at the end of the body tag.
     # @api public
     def rails_connector_after_content_tags
       html = "".html_safe
       html += render_marker_code
       html += include_editing_javascript
-      html += google_analytics if Configuration.enabled?(:google_analytics)
       html
     end
   end

data/app/views/cms/index.html.erb

@@ -1,3 +1 @@
 <%= render :partial => 'index' %>
-<%= render :partial => 'rating' %>
-<%= render :partial => 'comments' %>

data/app/views/errors/410_gone.html.erb

@@ -1,7 +1,7 @@
 <h1><%= t(:'rails_connector.lib.cms_accessible.not_released') %></h1>
 
-<% if @valid_until and @valid_until < Obj.preview_time %>
+<% if @valid_until && @valid_until < Time.now %>
   <%= raw t(:"rails_connector.views.errors.gone.not_released_anymore", :valid_until => "<strong>#{l @valid_until}</strong>") %>
-<% elsif @valid_from and Obj.preview_time < @valid_from %>
+<% elsif @valid_from && Time.now < @valid_from %>
   <%= raw t(:"rails_connector.views.errors.gone.not_yet_released", :valid_from => "<strong>#{l @valid_from}</strong>") %>
 <% 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 Apr 26 15:26:29 2013 UTC
+## Converted at: Mon Jul 22 15:48:13 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/config/cms_routes.rb

@@ -9,5 +9,6 @@ Rails.application.routes.draw do
     :as => "toggle_markers"
   match '/*permalink',
     :to => 'rails_connector/cms_dispatch#index',
-    :as => "cms_permalink"
+    :as => 'cms_permalink',
+    :format => false
 end

data/config/locales/de.rails_connector.views.yml

@@ -1,6 +1,4 @@
 de:
-  will_paginate:
-    page_gap: …
   rails_connector:
     views:
       errors:
@@ -9,79 +7,3 @@ de:
         gone:
           not_released_anymore: "Die Datei war nur bis zum %{valid_until} veröffentlicht."
           not_yet_released: "Die Datei wird erst am %{valid_from} veröffentlicht."
-      search:
-        search_failed: "Ihre Suchanfrage konnte leider nicht ausgeführt werden"
-        hits: "Treffer"
-      cms:
-        comments:
-          title: Leserkommentare
-          add_comment: Kommentar hinzufügen
-          name: "Name:"
-          email: "E-Mail:"
-          subject: "Betreff:"
-          body: "Kommentar:"
-          submit: senden
-          no_comments: Keine Kommentare vorhanden
-          wrote_on: schrieb am
-          are_you_sure: "Diesen Kommentar wirklich löschen?"
-          login_required: "Bitte melden Sie sich an, um einen Kommentar zu hinterlassen."
-        rating:
-          rate_here: "Bewerten Sie hier!"
-          thanks: "Danke für Ihre Bewertung."
-          title: "Bewertung"
-          login_required: "Bitte melden Sie sich an, um eine Bewertung abzugeben."
-          reset: "Bewertung zurücksetzen"
-          are_you_sure: "Bewertung dieser Seite wirklich zurücksetzen?"
-      user:
-        contact:
-          email: E-Mail
-          fax: Fax
-          first_name: Vorname
-          gender: Geschlecht
-          job_title: Tätigkeit
-          language: Sprache
-          last_name: Nachname
-          letter_address: Anschrift
-          login: Benutzername
-          mobile_phone: Mobiltelefon
-          phone: Telefonnummer
-          want_email: Kontakt via E-Mail
-          want_phonecall: Kontakt via Telefon
-          want_snailmail: Kontakt via Post
-          street_address: Straße und Hausnummer
-          postalcode: Postleitzahl
-          locality: Ort
-        languages:
-          de: deutsch
-          en: englisch
-        gender_male: männlich
-        gender_female: weiblich
-        login: Benutzername
-        password: Passwort
-        old_password: altes Passwort
-        new_password: neues Passwort
-        new_password_confirm: neues Passwort bestätigen
-        captcha: Bitte geben Sie die 2 Wörter ein
-        register_button: Registrieren
-        login_button: Einloggen
-        edit_button: Speichern
-        change_password_button: Passwort ändern
-        set_password_button: Passwort setzen
-        forgot_password_button: Passwort zurücksetzen
-        forgot_password_subject: Ihre Anfrage zur Änderung Ihres Passwortes
-        forgot_password_heading: Sie haben ein neues Password angefordert.
-        register_password_confirmation_mail_subject: Bitte bestätigen Sie Ihre Registrierung
-        register_heading: Vielen Dank für Ihre Anmeldung.
-        confirm_request: 'Bitte bestätigen Sie Ihre Anfrage unter %{url} und setzen dort ein Passwort.'
-        no_request: 'Falls Sie keine Anfrage gestellt haben, können Sie diese Nachricht ignorieren.'
-        new_link: Registrieren
-        edit_link: Profil bearbeiten
-        edit_password_link: Passwort bearbeiten
-        forgot_password_link: Passwort vergessen?
-      crm_form:
-        submit: Absenden
-        confirmation: 'Vielen Dank für Ihre Nachricht, wir werden uns in Kürze bei Ihnen melden!'
-        reference_further_questions: 'Ihre Anfrage wird bei uns unter der Kennung %{case_id} geführt. Bitte geben Sie diese bei Rückfragen mit an.'
-        title: Betreff
-        must_be_logged_in: 'Sie müssen angemeldet sein, um Zugriff auf diese Seite zu erhalten.'
-        logged_in_as: 'Sie sind angemeldet als %{user}'

data/config/locales/en.rails_connector.views.yml

@@ -1,6 +1,4 @@
 en:
-  will_paginate:
-    page_gap: …
   rails_connector:
     views:
       errors:
@@ -9,79 +7,3 @@ en:
         gone:
           not_released_anymore: "The file was released only until %{valid_until}"
           not_yet_released: "The file will be released on %{valid_from}"
-      search:
-        search_failed: Unfortunately your search request could not be completed
-        hits: hits
-      cms:
-        comments:
-          title: Comments
-          add_comment: Add a comment
-          name: "Name:"
-          email: "E-mail:"
-          subject: "Subject:"
-          body: "Comment:"
-          submit: send
-          no_comments: There are no comments yet
-          wrote_on: wrote on
-          are_you_sure: "Are you sure you want to delete this comment?"
-          login_required: Please login to leave a comment.
-        rating:
-          rate_here: "Please rate here."
-          thanks: "Thank you for rating."
-          title: "Rating"
-          login_required: Please login to rate this content.
-          reset: "Reset rating"
-          are_you_sure: "Are you sure you want to reset this rating?"
-      user:
-        contact:
-          email: Email
-          fax: Fax
-          first_name: First name
-          gender: Gender
-          job_title: Job title
-          language: Language
-          last_name: Last name
-          letter_address: Letter address
-          login: User name
-          mobile_phone: Mobile phone
-          phone: Phone number
-          want_email: Contact via email
-          want_phonecall: Contact via phone
-          want_snailmail: Contact via mail
-          street_address: Street
-          postalcode: Postal code
-          locality: City
-        languages:
-          de: German
-          en: English
-        gender_male: Male
-        gender_female: Female
-        login: User name
-        password: Password
-        old_password: Old password
-        new_password: New password
-        new_password_confirm: Confirm new password
-        captcha: Please type the two words
-        register_button: register
-        login_button: Login
-        edit_button: Save
-        change_password_button: Change password
-        set_password_button: Set password
-        forgot_password_button: Reset password
-        forgot_password_subject: Your request for changing your password
-        forgot_password_heading: You requested a new password.
-        register_password_confirmation_mail_subject: Please confirm your registration
-        register_heading: Thank you for signing up.
-        confirm_request: 'Please confirm your request by visiting %{url} and setting a password.'
-        no_request: 'If you did not request a new password, you can ignore this message.'
-        new_link: register
-        edit_link: edit personal data
-        edit_password_link: edit password
-        forgot_password_link: forgot password?
-      crm_form:
-        submit: Submit
-        confirmation: 'Thank you for contacting us, we will get back to you shortly'
-        reference_further_questions: 'If you have questions regarding this case, please refer to case %{case_id}.'
-        title: Subject
-        must_be_logged_in: 'You must be logged in to access this page.'
-        logged_in_as: 'You are logged in as %{user}'

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

@@ -11,7 +11,6 @@ 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'
         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/initializers/rails_connector.rb

@@ -1,29 +1,2 @@
 # Name of the CMS Fiona Instance to access
 RailsConnector::Configuration.instance_name = 'default'
-
-# Enable Rails Connector Addons.
-# Please refer to the Infopark Knowledge Base for more information on addons.
-RailsConnector::Configuration.enable(
-  # :comments,
-  # :google_analytics,
-  # :crm,
-  # :ratings,
-  # :rss,
-  :search,
-  # :seo_sitemap,
-  :time_machine
-)
-
-# Search should be configured in config/rails_connector.yml
-
-# RSS-Feed:
-#
-# Specify which Object should be used for the RSS feed's parent folder
-# RailsConnector::Configuration::Rss.root = lambda { NamedLink.get_object('news') }
-
-# Google Analytics:
-#
-# RailsConnector::Configuration::GoogleAnalytics.domains(
-#   '<your.domain.com>' => '<your-ga-code-1>',
-#   '<your.domain.de>' => '<your-ga-code-2>'
-# )

data/lib/rails_connector/cms_accessible.rb

@@ -5,10 +5,6 @@ module RailsConnector
 
   protected
 
-    def set_preview_time
-      Obj.preview_time = session[:preview_time]
-    end
-
     # Filter method to load a CMS object.
     #
     # To require the loading for all actions, use this in your controllers:

data/lib/rails_connector/configuration.rb

@@ -4,7 +4,6 @@ require "rails_connector/blob"
 
 module RailsConnector
 
-  # {RailsConnector::Configuration} is used to en/disable and initialize addons.
   # @api public
   class Configuration
     # @api public
@@ -19,12 +18,7 @@ module RailsConnector
     # @api public
     DEFAULT_CA_FILE = File.expand_path('../../../config/ca-bundle.crt', __FILE__)
 
-    @features = {}
-
     class << self
-      # Automatically generate editmarkers when rendering liquid templates in editor mode.
-      # @api public
-      attr_accessor :auto_liquid_editmarkers
 
       # there are three available modes for the rails connector:
       # <tt>live</tt> (show released contents only),
@@ -37,11 +31,6 @@ module RailsConnector
       # default options for {SearchRequest}
       attr_writer :search_options
 
-      # Include ReCaptcha tags in user registration form and validate the captcha
-      # when creating a new user registration (default: true).
-      # @api public
-      attr_accessor :use_recaptcha_on_user_registration
-
       # define a non-default blob cache dir.
       # +fiona connector+ only. has no effect when used with the +cloud connector+.
       # @api public
@@ -130,38 +119,6 @@ module RailsConnector
         mode == :preview || mode == :editor
       end
 
-      def register_features(*features)
-        features.each do |f|
-          @features.merge!(f.to_sym => false)
-        end
-      end
-      alias :register_feature :register_features
-
-      def registered_features
-        @features.keys
-      end
-
-      # Rails Connector Addons can be enabled as follows (in <tt>config/rails_connector.rb</tt>):
-      #
-      #   RailsConnector::Configuration.enable(
-      #     :time_machine
-      #   )
-      #
-      # @api public
-      def enable(*features)
-        features.each do |f|
-          assert_feature_is_known(f)
-          @features[f.to_sym] = true
-        end
-        initialize_addon_mixins
-      end
-
-      # Returns true if +feature+ is enabled, else false.
-      def enabled?(feature)
-        assert_feature_is_known(feature)
-        @features[feature.to_sym] == true
-      end
-
       # Configures your CMS instance name.
       #
       # Example call as to be used in <tt>rails_connector.rb</tt>:
@@ -172,9 +129,8 @@ module RailsConnector
       end
 
       def after_initialize
+        enable_ses
         enable_authentication
-        # Hier muss explizit der Namespace verwendet werden, da diese Methode von Rails
-        # während der Initialisierung aufgerufen wird.
         ::RailsConnector::BasicObj.configure_for_content(
           ::RailsConnector::Configuration.use_edited_content? ? :edited : :released
         )
@@ -185,7 +141,7 @@ module RailsConnector
           after_initialize
           NamedLink.reset_cache
           BasicObj.reset_type_cache
-          initialize_addon_mixins
+          ::ApplicationController.__send__(:helper, :cms)
         end
       end
 
@@ -221,18 +177,6 @@ module RailsConnector
               ' config.action_dispatch.x_sendfile_header = "X-Sendfile"'
       end
 
-      def initialize_addon_mixins
-        ::ApplicationController.__send__(:helper, :cms)
-        if enabled?(:search)
-          require "rails_connector/ses"
-          RailsConnector::SES.enable
-        end
-        RailsConnector::Crm.enable if enabled?(:crm)
-        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
         @local_config_file ||= read_local_config_file
       end
@@ -280,29 +224,22 @@ module RailsConnector
         config
       end
 
-      def assert_feature_is_known(f)
-        raise ArgumentError, "unknown feature: #{f.inspect}" unless @features.keys.include?(f.to_sym)
+      def enable_authentication
+        ::ApplicationController.__send__(:include, RailsConnector::Authenticable)
       end
 
-      def enable_authentication
-        # Wenn das OMC-Features an ist, dann braucht man keine Standardimplementierung
-        # für die Authentifizierung.
-        unless enabled?(:crm)
-          ::ApplicationController.__send__(:include, RailsConnector::Authenticable)
+      def enable_ses
+        if RailsConnector.platform_fiona?
+          require 'rails_connector/ses'
+
+          RailsConnector::SES.enable
         end
       end
     end
 
     # defaults
-    self.auto_liquid_editmarkers = true
-    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,
-      :crm, :seo_sitemap, :google_analytics
-    )
   end
 
   class ConfigurationError < StandardError