infopark_cloud_connector 7.0.1 → 7.0.2

data/lib/infopark_cloud_connector.rb

@@ -1,23 +1,3 @@
-# @api public
-module ::RailsConnector
-  PLATFORM_CLOUD = :cloud.freeze
-  PLATFORM_FIONA = :fiona.freeze
-
-  # return either <tt>:fiona</tt> or <tt>:cloud</tt> depending on the app's configuration.
-  # @return [Symbol]
-  def self.platform
-    PLATFORM_CLOUD
-  end
-
-  def self.platform_cloud?
-    true
-  end
-
-  def self.platform_fiona?
-    false
-  end
-end
-
 require 'rails_connector/core_extensions'
 require 'rails_connector/rack_middlewares'
 require "rails_connector/errors"

data/lib/rails_connector/basic_obj.rb

@@ -215,29 +215,6 @@ module RailsConnector
       end
     end
 
-    def permissions
-      # FIXME permissions
-      @permissions ||= OpenStruct.new({
-        :live => permitted_groups,
-        :read => [],
-        :write => [],
-        :root => [],
-        :create_children => [],
-      })
-    end
-
-    def permitted_for_user?(user)
-      if permitted_groups.blank?
-        true
-      else
-        if user
-          (permitted_groups & user.live_server_groups).any?
-        else
-          false
-        end
-      end
-    end
-
     # Returns the root {BasicObj Obj}, i.e. the Obj with the path "/"
     # @return [Obj]
     # @api public
@@ -382,13 +359,6 @@ module RailsConnector
       name
     end
 
-    # Returns an array with the names of groups that are permitted to access this Obj.
-    # This corresponds to the cms permission "permissionLiveServerRead".
-    def permitted_groups
-      # FIXME permissions not yet implemented in fiona 7
-      []
-    end
-
     # Returns true if this object is the root object.
     # @api public
     def root?
@@ -612,11 +582,6 @@ module RailsConnector
       end
     end
 
-    def body_data_path
-      # not needed/supported when using cloud connector.
-      nil
-    end
-
     # returns the content type of the Obj's body for binary Objs.
     # returns +nil+ for non-binary Objs.
     # @return [String]
@@ -652,6 +617,11 @@ module RailsConnector
       instantiate_widget(widget_id, widget_data) if widget_data
     end
 
+    # for internal testing purposes only
+    def blob_id
+      find_blob.try(:id)
+    end
+
     private
 
     def widget_data_from_pool(widget_id)

data/lib/rails_connector/cms_accessible.rb

@@ -16,81 +16,14 @@ module RailsConnector
       @obj = loaded_obj
     end
 
-    # Filter method to check if access to the loaded object is permitted. If it is
-    # not, a 403 Forbidden error message will be generated (by calling render_obj_error)
-    #
-    # To require the check for all actions, use this in your controllers:
-    #   before_filter :load_object
-    #   before_filter :ensure_object_is_permitted
-    def ensure_object_is_permitted
-      unless is_permitted(@obj)
-        @obj = nil
-        render_obj_error(403, "forbidden")
-        return false
-      end
-      return true
-    end
-
-    # This method is called when rendering an error caused by either {ensure_object_is_permitted}
-    # or {ensure_object_is_active} before filter. It renders an error template located in
-    # "errors/*.html.erb" with given HTTP status and content type "text/html" and with no layout.
-    # Overwrite this method to change the error page.
-    # @api public
-    def render_obj_error(status, name)
-      force_html_format
-      render(
-        :template => "errors/#{status}_#{name}",
-        :layout => false,
-        :status => status,
-        :content_type => Mime::HTML
-      )
-    end
-
-    # Enforce "html" as template format.
-    # @api public
-    def force_html_format
-      request.format = :html
-    end
-
-    # Inclusion hook to make is_permitted available as helper method.
-    def self.included(base)
-      base.__send__ :helper_method, :is_permitted
-    end
-
-    # Helper method to check live permissions
-    def is_permitted(obj)
-      obj.permitted_for_user?(current_user)
-    end
-
-    # Filter method which sets the header 'X-Robots-Tag: unavailable_after'
-    # to the valid_until date of the current object.
-    def set_google_expire_header
-      if @obj && (date = @obj.valid_until)
-        headers['X-Robots-Tag: unavailable_after'] = date.rfc822
-      end
-    end
-
-    # Deliver the obj's body as response by file or data.
-    # May respond with status 304 if a If-Modified-Since header is found.
+    # Deliver a binary @obj by redirecting to it's `body_data_url`.
+    # Will respond with 404 if the @obj has no blob.
     # @api public
     def deliver_file
       if @obj.body_data_url
         redirect_to enforce_protocol_from_request(@obj.body_data_url)
-      elsif stale?(:last_modified => @obj.last_changed.utc)
-        mime_type = @obj.mime_type
-        mime_type += '; charset=utf-8' if mime_type =~ /^text\//
-
-        if (filepath = @obj.body_data_path).present?
-          send_file(File.expand_path(filepath), {
-            :type => mime_type,
-            :filename => @obj.filename,
-            :disposition => 'inline',
-          })
-        else
-          # generics should send its body, empty files should be delivered as
-          # empty files - and not lead to an application error
-          send_data @obj.body || '', :type => mime_type, :filename => @obj.filename, :disposition => 'inline'
-        end
+      else
+        render text: "Empty Blob", status: 404
       end
     end
   end

data/lib/rails_connector/configuration.rb

@@ -135,13 +135,8 @@ module RailsConnector
         cms_api.api_key = value
       end
 
-      def after_initialize
-        enable_authentication
-      end
-
       def to_prepare
         unless Rails.configuration.cache_classes
-          after_initialize
           NamedLink.reset_cache
           BasicObj.reset_type_computer!
           BasicWidget.reset_type_computer!
@@ -184,10 +179,6 @@ module RailsConnector
       def cms_api
         RailsConnector::CmsRestApi.configuration
       end
-
-      def enable_authentication
-        ::ApplicationController.__send__(:include, RailsConnector::Authenticable)
-      end
     end
 
     # defaults

data/lib/rails_connector/engine.rb

@@ -8,7 +8,6 @@ require 'rails_connector/configuration'
 module ::RailsConnector
   class Engine < Rails::Engine
     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)

data/lib/rails_connector/obj_data_from_service.rb

@@ -11,7 +11,7 @@ module RailsConnector
       value_and_type = @data[attribute_name]
 
       if value_and_type.blank?
-        if INTERNAL_KEYS.include?(attribute_name)
+        if INTERNAL_KEYS.include?(attribute_name) || SPECIAL_KEYS.include?(attribute_name)
           type = type_of_internal(attribute_name)
           [default_attribute_value(type), type]
         else
@@ -47,7 +47,7 @@ module RailsConnector
     end
 
     def is_custom_attribute?(attribute_name)
-      !attribute_name.starts_with?('_')
+      !attribute_name.starts_with?('_') && !SPECIAL_KEYS.include?(attribute_name)
     end
 
     internal_key_list = %w[
@@ -68,6 +68,8 @@ module RailsConnector
 
     INTERNAL_KEYS = Set.new(internal_key_list.map { |name| "_#{name}" } )
 
+    SPECIAL_KEYS = Set.new(%w[ body title blob ])
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,13 +139,11 @@ files:
 - app/helpers/rails_connector/display_helper.rb
 - app/helpers/rails_connector/editing_helper.rb
 - app/helpers/rails_connector/layout_helper.rb
-- app/helpers/rails_connector/marker_helper.rb
 - app/helpers/rails_connector/table_of_contents_helper.rb
 - app/helpers/rails_connector/widget_helper.rb
 - app/models/named_link.rb
 - app/views/cms/_index.html.erb
 - app/views/cms/index.html.erb
-- app/views/errors/403_forbidden.html.erb
 - app/views/rails_connector/_editing_javascript.html.erb
 - app/views/rails_connector/objs/create_widget.html.erb
 - app/views/rails_connector/objs/show_widget.html.erb
@@ -154,11 +152,9 @@ files:
 - config/locales/de.rails_connector.errors.yml
 - config/locales/de.rails_connector.lib.yml
 - config/locales/de.rails_connector.models.yml
-- config/locales/de.rails_connector.views.yml
 - config/locales/en.rails_connector.errors.yml
 - config/locales/en.rails_connector.lib.yml
 - config/locales/en.rails_connector.models.yml
-- config/locales/en.rails_connector.views.yml
 - config/routes.rb
 - lib/assets/fonts/infopark_icons-webfont.eot
 - lib/assets/fonts/infopark_icons-webfont.ttf
@@ -177,7 +173,6 @@ files:
 - lib/obj.rb
 - lib/rails_connector/access_denied.rb
 - lib/rails_connector/attribute_content.rb
-- lib/rails_connector/authenticable.rb
 - lib/rails_connector/backend_not_available.rb
 - lib/rails_connector/basic_obj.rb
 - lib/rails_connector/basic_widget.rb

data/app/helpers/rails_connector/marker_helper.rb

@@ -1,46 +0,0 @@
-module RailsConnector
-
-  module MarkerHelper
-
-    def edit_marker(obj, attr, options = {}, &block)
-      if Configuration.editor_interface_enabled?
-        default_value = options.delete(:default_value)
-
-        if block_given?
-          content = block.call(obj, attr)
-          content = default_value || raw(" ") if content.blank?
-        end
-
-        tag_type = options.delete(:tag) || :span
-        content_tag(
-          tag_type,
-          content.to_s,
-          options
-        )
-      else
-        block_given? ? block.call(obj, attr) : nil
-      end
-    end
-
-    def marker_menu(left=0, top=0, &block)
-    end
-
-    def marker_menu_target(tag_name, options = {}, &block)
-      content_tag(
-        tag_name,
-        capture(&block),
-        options
-      )
-    end
-
-    def include_edit_marker_support
-    end
-
-    def render_marker_code
-    end
-
-  private
-
-  end
-
-end

data/app/views/errors/403_forbidden.html.erb

@@ -1,3 +0,0 @@
-<h1><%= t(:'rails_connector.lib.cms_accessible.protected') %></h1>
-
-<p><%= t(:"rails_connector.views.errors.forbidden.no_permissions") %></p>

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

@@ -1,6 +0,0 @@
-de:
-  rails_connector:
-    views:
-      errors:
-        forbidden:
-          no_permissions: "Sie haben nicht die notwendigen Zugriffsrechte"

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

@@ -1,6 +0,0 @@
-en:
-  rails_connector:
-    views:
-      errors:
-        forbidden:
-          no_permissions: "You don't have the required permissions"

data/lib/rails_connector/authenticable.rb

@@ -1,30 +0,0 @@
-module RailsConnector
-  module Authenticable
-    def self.included(mod)
-      %w(logged_in? admin? current_user).each do |method_name|
-        unless instance_method_defined?(mod, method_name)
-          mod.class_eval do
-            private
-            define_method(method_name, InstanceMethods.method(method_name).to_proc)
-          end
-        end
-
-        mod.send(:helper_method, method_name)
-      end
-    end
-
-    module InstanceMethods
-      def self.logged_in?; false; end
-      def self.admin?; false; end
-      def self.current_user; nil; end
-    end
-
-    private
-
-    def self.instance_method_defined?(mod, method_name)
-      (
-        mod.instance_methods + mod.protected_instance_methods + mod.private_instance_methods
-      ).map(&:to_s).include?(method_name)
-    end
-  end
-end