infopark_rails_connector 6.8.0.beta.200.621.4c8e1b0 → 6.8.0.beta.200.650.7c93155

data/app/helpers/rails_connector/marker_helper.rb

@@ -227,7 +227,7 @@ module RailsConnector
     #   <%= marker_menu do %>
     #     <%= iconlist do %>
     #       <%= edit_item("edit title", "css_class", @obj, :image) %>
-    #       <%= action_item("edit image", "css_class", @obj, :editImage) %>
+    #       <%= action_item("edit image", "css_class", [@obj], :editImage) %>
     #     <% end %>
     #   <% end %>
     def iconlist(&block)
@@ -250,7 +250,7 @@ module RailsConnector
     #
     # [title] the title which will be displayed.
     # [css_class] the css-class can be used to display a different icon.
-    # [objs] the objects for which the action dialog will be generated.
+    # [objs] the array of objects for which the action dialog will be generated.
     # [action] the action for which the action dialog will be generated.
     # [options] options that will be delegated to the +action_marker+ helper.
     def action_item(title, css_class, objs, action, options = {})

data/app/views/rss/index.rss.builder

@@ -6,6 +6,6 @@ xml.rss :version => '2.0' do
     xml.link cms_url(@obj)
     xml.description strip_tags(display_value(@obj.rss_description))
 
-    xml << (render :partial => 'item.rss', :collection => table_of_contents(@obj)).to_s
+    xml << (render(:partial => "item", :collection => table_of_contents(@obj))).to_s
   end
 end

data/lib/rails_connector/cms_accessible.rb

@@ -15,7 +15,7 @@ module RailsConnector
     def load_object # :nodoc:
       CmsEnv.new(request.env).load
       loaded_obj = request.env[CmsEnv::OBJ_ENV_KEY]
-      raise loaded_obj if loaded_obj.is_a?(RailsConnector::ResourceNotFound)
+      raise loaded_obj if loaded_obj.is_a?(StandardError)
       @obj = loaded_obj
     end
 

data/lib/rails_connector/cms_dispatch_controller.rb

@@ -36,7 +36,7 @@ module RailsConnector
     end
 
     def obj_not_found?
-      loaded_obj.is_a?(RailsConnector::ResourceNotFound)
+      loaded_obj.is_a?(StandardError)
     end
 
     def default_controller

data/lib/rails_connector/cms_env.rb

@@ -22,7 +22,7 @@ module RailsConnector
       env[OBJ_ENV_KEY] =
         begin
           find_obj
-        rescue RailsConnector::ResourceNotFound => e
+        rescue StandardError => e
           e
         end
     end
@@ -35,7 +35,17 @@ module RailsConnector
           permalink =  params[:permalink].to_a.join("/")
           Obj.find_by_permalink!(permalink)
         else
-          Obj.homepage
+          if callback = RailsConnector::Configuration.choose_homepage_callback
+            callback_result = callback.call(env)
+            if callback_result.is_a?(Obj)
+              callback_result
+            else
+              raise "choose_homepage callback did not return an Obj. "\
+                "Instead saw #{callback_result.class}."
+            end
+          else
+            Obj.homepage
+          end
         end
 
       if found_obj.suppressed?

data/lib/rails_connector/cms_test_request.rb

@@ -3,21 +3,6 @@ module RailsConnector
     def for_cms_object(test_obj=nil)
       # prepare the env as if the given obj was loaded by CmsEnv
       env[RailsConnector::CmsEnv::OBJ_ENV_KEY] = test_obj if test_obj
-      class << self
-        # This special behaviour is necessary for testing controllers that descend from DefaultCmsController.
-        # These controllers do not have explicit routes by default.
-        # Instead, they are reached via the CmsDispatchController.
-        # The TestRequest must therefore use CmsDispatchController as a fallback route.
-        def assign_parameters(routes, controller_path, action, parameters = {})
-          super(routes, controller_path, action, parameters)
-        rescue ActionController::RoutingError=> e
-          begin
-            super(routes, "rails_connector/cms_dispatch", action, parameters)
-          rescue ActionController::RoutingError
-            raise e
-          end
-        end
-      end
     end
   end
 end

data/lib/rails_connector/configuration.rb

@@ -133,6 +133,16 @@ module RailsConnector
         end
       end
 
+      attr_accessor :choose_homepage_callback #:nodoc:
+
+      # Configure a callback to be invoked when the rails connector delivers the homepage.
+      # The given callback will receive the rack env
+      # and must return an Obj to be used as the homepage.
+      # If no callback is configured, Obj.homepage will be used as the default.
+      def choose_homepage(&block)
+        self.choose_homepage_callback = block
+      end
+
       def license #:nodoc:
         license_file.read
       end

data/lib/rails_connector/engine.rb

@@ -11,6 +11,9 @@ module ::RailsConnector
     config.to_prepare { RailsConnector::Configuration.to_prepare }
     config.after_initialize { RailsConnector::Configuration.after_initialize }
 
+    # make sure our exceptions cause an adequate error page and http status code
+    config.action_dispatch.rescue_responses.merge!("RailsConnector::ResourceNotFound" => :not_found)
+
     initializer "rails_connector.add_cms_routing_paths", :after => :add_routing_paths do |app|
       cms_route = File.expand_path("cms_routes.rb", paths['config'].to_a.first)
       app.routes_reloader.paths.push(cms_route)
@@ -33,12 +36,6 @@ module ::RailsConnector
       end
     end
 
-    # make sure our exceptions cause an adequate error page and http status code
-    initializer "rails_connector.register_exceptions" do |app|
-      responses = ActionDispatch::ShowExceptions.rescue_responses
-      responses["RailsConnector::ResourceNotFound"] = :not_found
-    end
-
     initializer "rails_connector.configure_database" do |app|
       RailsConnector::Configuration.configure_cms_database
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_rails_connector
 version: !ruby/object:Gem::Version 
-  hash: 15922107031
+  hash: -1017909884
   prerelease: 6
   segments: 
   - 6
@@ -9,15 +9,11 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 621
-  - 4
+  - 650
+  - 7
   - c
-  - 8
-  - e
-  - 1
-  - b
-  - 0
-  version: 6.8.0.beta.200.621.4c8e1b0
+  - 93155
+  version: 6.8.0.beta.200.650.7c93155
 platform: ruby
 authors: 
 - Infopark AG
@@ -25,43 +21,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 +02:00
+date: 2012-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rails
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 13
         segments: 
         - 3
+        - 2
         - 1
-        - 3
-        version: 3.1.3
-  prerelease: false
+        version: 3.2.1
+  requirement: *id001
   type: :runtime
-  name: rails
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 11
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
-  prerelease: false
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
+  requirement: *id002
   type: :runtime
-  name: rake
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +71,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  prerelease: false
+  requirement: *id003
   type: :runtime
-  name: json
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: maruku
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,12 +87,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  prerelease: false
+  requirement: *id004
   type: :runtime
-  name: maruku
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: liquid
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -104,12 +103,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  prerelease: false
+  requirement: *id005
   type: :runtime
-  name: liquid
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: will_paginate
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,12 +119,12 @@ dependencies:
         - 0
         - 2
         version: 3.0.2
-  prerelease: false
+  requirement: *id006
   type: :runtime
-  name: will_paginate
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: ruby-recaptcha
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -136,12 +135,12 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  prerelease: false
+  requirement: *id007
   type: :runtime
-  name: ruby-recaptcha
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: infopark_crm_connector
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -152,12 +151,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  prerelease: false
+  requirement: *id008
   type: :runtime
-  name: infopark_crm_connector
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: tidy
+  prerelease: false
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -168,12 +167,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  prerelease: false
+  requirement: *id009
   type: :runtime
-  name: tidy
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: jquery-rails
+  prerelease: false
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -184,12 +183,12 @@ dependencies:
         - 0
         - 19
         version: 1.0.19
-  prerelease: false
+  requirement: *id010
   type: :runtime
-  name: jquery-rails
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: helpful_configuration
+  prerelease: false
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -200,10 +199,8 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  prerelease: false
+  requirement: *id011
   type: :runtime
-  name: helpful_configuration
-  version_requirements: *id011
 description: The Rails 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.
 email: info@infopark.de
 executables: []
@@ -211,55 +208,55 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- app/controllers/cms_controller.rb
+- app/mailers/confirmation_mailer.rb
+- app/models/rails_connector/default_comment.rb
+- app/models/rails_connector/default_rating.rb
+- app/models/rails_connector/link_list.rb
+- app/models/crm_form.rb
+- app/models/named_link.rb
+- app/models/obj.rb
 - app/controllers/comments_controller.rb
-- app/controllers/crm_form_controller.rb
-- app/controllers/pdf_controller.rb
-- app/controllers/rails_connector/default_cms_controller.rb
+- app/controllers/cms_controller.rb
+- app/controllers/user_controller.rb
+- app/controllers/rails_connector/time_machine_controller.rb
+- app/controllers/rails_connector/pdf_external_controller.rb
 - app/controllers/rails_connector/default_comments_controller.rb
 - app/controllers/rails_connector/default_crm_form_controller.rb
-- app/controllers/rails_connector/default_pdf_controller.rb
-- app/controllers/rails_connector/default_ratings_controller.rb
+- app/controllers/rails_connector/default_user_controller.rb
 - app/controllers/rails_connector/default_rss_controller.rb
+- app/controllers/rails_connector/default_pdf_controller.rb
 - app/controllers/rails_connector/default_search_controller.rb
-- app/controllers/rails_connector/default_user_controller.rb
-- app/controllers/rails_connector/pdf_external_controller.rb
-- app/controllers/rails_connector/time_machine_controller.rb
-- app/controllers/ratings_controller.rb
+- app/controllers/rails_connector/default_cms_controller.rb
+- app/controllers/rails_connector/default_ratings_controller.rb
 - app/controllers/rss_controller.rb
 - app/controllers/search_controller.rb
+- app/controllers/pdf_controller.rb
+- app/controllers/crm_form_controller.rb
 - app/controllers/seo_sitemap_controller.rb
-- app/controllers/user_controller.rb
-- app/helpers/cms_helper.rb
-- app/helpers/cms_routing_helper.rb
+- app/controllers/ratings_controller.rb
+- app/helpers/user_helper.rb
 - app/helpers/crm_form_helper.rb
-- app/helpers/rails_connector/cms_asset_helper.rb
+- app/helpers/rails_connector/layout_helper.rb
+- app/helpers/rails_connector/display_helper.rb
 - app/helpers/rails_connector/default_cms_helper.rb
-- app/helpers/rails_connector/default_cms_routing_helper.rb
-- app/helpers/rails_connector/default_crm_form_helper.rb
+- app/helpers/rails_connector/time_machine_helper.rb
+- app/helpers/rails_connector/mandatory_label_helper.rb
 - app/helpers/rails_connector/default_ratings_helper.rb
-- app/helpers/rails_connector/default_user_helper.rb
-- app/helpers/rails_connector/display_helper.rb
-- app/helpers/rails_connector/error_messages_helper.rb
-- app/helpers/rails_connector/layout_helper.rb
+- app/helpers/rails_connector/table_of_contents_helper.rb
 - app/helpers/rails_connector/link_helper.rb
-- app/helpers/rails_connector/mandatory_label_helper.rb
+- app/helpers/rails_connector/default_cms_routing_helper.rb
+- app/helpers/rails_connector/default_user_helper.rb
+- app/helpers/rails_connector/micronav_helper.rb
 - app/helpers/rails_connector/marker_helper.rb
 - app/helpers/rails_connector/menu_helper.rb
-- app/helpers/rails_connector/micronav_helper.rb
+- app/helpers/rails_connector/error_messages_helper.rb
+- app/helpers/rails_connector/cms_asset_helper.rb
 - app/helpers/rails_connector/seo_helper.rb
-- app/helpers/rails_connector/table_of_contents_helper.rb
-- app/helpers/rails_connector/time_machine_helper.rb
+- app/helpers/rails_connector/default_crm_form_helper.rb
 - app/helpers/rails_connector/tracking_helper.rb
+- app/helpers/cms_routing_helper.rb
+- app/helpers/cms_helper.rb
 - app/helpers/ratings_helper.rb
-- app/helpers/user_helper.rb
-- 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
 - README
 files: 
 - app/assets/images/admin/minus.gif
@@ -481,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Infopark Rails Connector