infopark_rails_connector 6.8.0.539.93842523 → 6.8.1

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
-## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Alex_P___208/repos/rails_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
+## /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 11 14:29:33 2013 UTC
+## Converted at: Thu Jan 24 15:11:49 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/rails_connector/authenticable.rb

@@ -22,9 +22,9 @@ module RailsConnector
     private
 
     def self.instance_method_defined?(mod, method_name)
-      mod.instance_methods.include?(method_name) or
-        mod.protected_instance_methods.include?(method_name) or
-        mod.private_instance_methods.include?(method_name)
+      (
+        mod.instance_methods + mod.protected_instance_methods + mod.private_instance_methods
+      ).map(&:to_s).include?(method_name)
     end
   end
 end

data/lib/rails_connector/cms_env.rb

@@ -31,7 +31,7 @@ module RailsConnector
         if params[:id]
           Obj.find(params[:id])
         elsif params[:permalink].present?
-          permalink =  params[:permalink].to_a.join("/")
+          permalink =  Array(params[:permalink]).join("/")
           Obj.find_by_permalink!(permalink)
         else
           if callback = RailsConnector::Configuration.choose_homepage_callback

data/lib/rails_connector/configuration.rb

@@ -220,18 +220,6 @@ module RailsConnector
         self.choose_homepage_callback = block
       end
 
-      def license
-        license_file.read
-      end
-
-      def license_file
-        @license_file.presence || Rails.root + "config" + "license.xml"
-      end
-
-      def license_file=(license_file)
-        @license_file = license_file.presence && Pathname(license_file)
-      end
-
       def cms_routes(*args)
         raise <<-EOS.gsub(/\s+/, ' ')
         Calling RailsConnector::Configuration.cms_routes is not needed anymore.

data/lib/rails_connector/engine.rb

@@ -36,7 +36,7 @@ module ::RailsConnector
       end
     end
 
-    initializer "rails_connector.configure_database" do |app|
+    initializer "rails_connector.configure_database", :before => :load_config_initializers do |app|
       RailsConnector::Configuration.configure_cms_database
     end
 
@@ -59,8 +59,10 @@ module ::RailsConnector
       ActionView::Base.__send__(:include, CmsRoutingHelper)
     end
 
-    initializer "rails_connector.enable_obj_extensions" do
+    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
 

data/lib/rails_connector/liquid_support/liquid_template_handler.rb

@@ -97,7 +97,7 @@ module RailsConnector::LiquidSupport
 
     def self.load_custom_filters
       return @loaded_custom_filters if @loaded_custom_filters
-      extract = /^#{Regexp.quote(filters_dir)}\/?(.*_filters).rb$/
+      extract = /^#{Regexp.quote(filters_dir.to_s)}\/?(.*_filters).rb$/
       @loaded_custom_filters = Dir["#{filters_dir}/**/*_filters.rb"].map do |file|
         filename = file.sub extract, '\1'
         require File.join(filters_dir, filename)

metadata

@@ -1,195 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: infopark_rails_connector
-version: !ruby/object:Gem::Version 
-  hash: 187682853
+version: !ruby/object:Gem::Version
+  version: 6.8.1
   prerelease: 
-  segments: 
-  - 6
-  - 8
-  - 0
-  - 539
-  - 93842523
-  version: 6.8.0.539.93842523
 platform: ruby
-authors: 
+authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-11 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 3
-        - 2
-        - 11
+      - !ruby/object:Gem::Version
         version: 3.2.11
-  version_requirements: *id001
-  name: rails
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
-        version: 0.9.2.2
-  version_requirements: *id002
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.11
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  version_requirements: *id004
-  name: maruku
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: liquid
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 0
-        - 2
-        version: 3.0.2
-  version_requirements: *id006
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 0
-        - 5
-        version: 1.0.5
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
   name: ruby-recaptcha
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
   name: infopark_crm_connector
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 0
-        - 19
-        version: 1.0.19
-  version_requirements: *id009
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: jquery-rails
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.19
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  version_requirements: *id010
+      - !ruby/object:Gem::Version
+        version: 1.0.19
+- !ruby/object:Gem::Dependency
   name: helpful_configuration
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
-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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .yardopts
 - README
 - app/assets/images/admin/minus.gif
@@ -361,42 +350,32 @@ files:
 - lib/rails_connector/syndicateable.rb
 - lib/search_request.rb
 - lib/tasks/check.rake
-- lib/tasks/cms_license_check.rake
-has_rdoc: yard
 homepage: http://www.infopark.de
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -315940941
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Infopark Rails Connector
 test_files: []
-
+has_rdoc: yard

data/lib/tasks/cms_license_check.rake

@@ -1,17 +0,0 @@
-namespace :cms do
-  namespace :license do
-    desc "Check if a license file is valid (options: FILE=/path/to/license.xml, default: currently installed license)"
-    task :check => :environment do
-      RailsConnector::Configuration.license_file = ENV['FILE']
-      puts "Checking license #{RailsConnector::Configuration.license_file}"
-      begin
-        Obj.root.fetch_attr_values
-        puts "OK, license is valid."
-        exit 0
-      rescue RailsConnector::InvalidLicenseError => e
-        puts e
-        exit 1
-      end
-    end
-  end
-end