infopark_fiona_connector 6.9.1.3.22208381 → 6.9.2.1.125136549

data/lib/infopark_fiona_connector.rb

@@ -18,7 +18,4 @@ module RailsConnector
   autoload_all_sources
 end
 
-autoload :Comment, "comment"
-autoload :Rating, "rating"
-
 require "rails_connector/fiona_engine" if defined?(Rails)

data/lib/rails_connector/basic_obj.rb

@@ -14,7 +14,6 @@ module RailsConnector
         "\xdf\x20\xbd\x42\x9a\x65\x8d\x72\x93\x6c\x96\x69\x91\x6e".freeze
 
     include DateAttribute
-    include SEO
 
     self.store_full_sti_class = false
 
@@ -197,12 +196,11 @@ module RailsConnector
       object_type == :document
     end
 
-    # Returns true if this object is active (time_when is in objects time interval)
+    # Returns true if this object is active.
     # @api public
-    def active?(time_when = nil)
+    def active?
       return false if !valid_from
-      time_then = time_when || BasicObj.preview_time
-      valid_from <= time_then && (!valid_until || time_then <= valid_until)
+      valid_from <= Time.now && (!valid_until || Time.now <= valid_until)
     end
 
     # Returns true if this object has edited content.
@@ -230,8 +228,8 @@ module RailsConnector
 
     # Returns true if the export of the object is not suppressed and the content is active?
     # @api public
-    def exportable?(current_time = nil)
-      !suppressed? && active?(current_time)
+    def exportable?
+      !suppressed? && active?
     end
 
     # Returns the file name to which the Content.file_extension has been appended.
@@ -264,8 +262,7 @@ module RailsConnector
     # @api public
     def toclist(*args)
       return [] unless publication?
-      time = args.detect {|value| value.kind_of? Time}
-      toclist = children.find(:all).select{ |toc| toc.exportable?(time) }
+      toclist = children.find(:all).select{ |toc| toc.exportable? }
       toclist = toclist.reject { |toc| toc.binary? } unless args.include?(:all)
       toclist
     end
@@ -492,10 +489,6 @@ module RailsConnector
       @mime_type ||= compute_mime_type
     end
 
-    def to_liquid
-      LiquidSupport::ObjDrop.new(self)
-    end
-
     def respond_to?(method_id, include_private=false)
       if super
         true
@@ -508,14 +501,6 @@ module RailsConnector
       end
     end
 
-    def self.preview_time=(t)
-      Thread.current[:preview_time] = t
-    end
-
-    def self.preview_time
-      Thread.current[:preview_time] || Time.now
-    end
-
     private
 
     def as_date(value)

data/lib/rails_connector/date_attribute.rb

@@ -19,7 +19,7 @@ module RailsConnector
     end
 
     def self.parse(iso_date_time)
-      Time.from_iso(iso_date_time).localtime
+      Time.from_iso(iso_date_time).in_time_zone
     rescue ArgumentError
       raise "The value is not a valid ISO date time: #{iso_date_time.inspect}"
     end

data/lib/rails_connector/fiona_engine.rb

@@ -1,5 +1,9 @@
 module ::RailsConnector
   class FionaEngine < Rails::Engine
+    initializer 'rails_connector.config_local', :after => :load_config_initializers,
+        :before => :engines_blank_point do
+      Dir[Rails.root + 'config/local/*.rb'].map &method(:require)
+    end
   end
 end
 

data/lib/rails_connector/link.rb

@@ -132,10 +132,6 @@ module RailsConnector
       @destination_object ||= Obj.find(destination) if resolved_internal?
     end
 
-    def to_liquid
-      LiquidSupport::LinkDrop.new(self)
-    end
-
     private
 
     def resolved_internal?

data/lib/rails_connector/ses.rb

@@ -0,0 +1,83 @@
+require 'search_request'
+
+module RailsConnector
+
+  # This module accesses the Infopark Search Engine Server.
+  # @api public
+  module SES
+
+    autoload :VerityAccessor, "rails_connector/ses/verity_accessor"
+
+    # This method enables Obj to perform searches using the SES Search Engine Server.
+    def self.enable
+      ::Obj.extend Obj::ClassMethods
+    end
+
+    module Obj
+      # Extends the model class Obj with the class method find_with_ses.
+      module ClassMethods
+        # Queries the search engine and returns a SearchResult. The parameters
+        # are passed on to a SearchRequest (a kind of DefaultSearchRequest by default).
+        #
+        # Exceptions:
+        # * SearchError - The search engine reported an error.
+        #
+        def find_with_ses(query_string, options = {})
+          SearchRequest.new(query_string, options).fetch_hits
+        end
+      end
+    end
+
+    class SearchError < StandardError
+    end
+
+    # SearchResult is the list of hits in response to a search query. Since the
+    # maximum number of hits to return has been specified, there might be more
+    # hits available in the search engine.
+    # @api public
+    class SearchResult < Array
+      # The total number of hits.
+      # @api public
+      attr_reader :total_hits
+
+      def initialize(total_hits)
+        super()
+        @total_hits = total_hits
+      end
+    end
+
+    # A hit represents a found document for a particular search query.
+    # @api public
+    class Hit
+      # The ID of the found Obj.
+      # @api public
+      attr_reader :id
+
+      # The score of the hit.
+      # @api public
+      attr_reader :score
+
+      # The raw result hash returned by the search engine, for a low-level access.
+      # Don't use this unless you know what you're doing.
+      # Be aware that this is not migration safe.
+      # @api public
+      attr_reader :doc
+
+      def initialize(id, score, doc={}, obj=nil)
+        @id = id
+        @score = score
+        @doc = doc
+        @obj = obj
+      end
+
+      # Returns the hit's corresponding Obj (or nil if none found in the database).
+      # @api public
+      def obj
+        @obj ||= ::Obj.find(@id)
+      rescue RailsConnector::ResourceNotFound
+        nil
+      end
+    end
+  end
+
+end

data/lib/search_request.rb

@@ -0,0 +1,2 @@
+class SearchRequest < RailsConnector::DefaultSearchRequest
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona_connector
 version: !ruby/object:Gem::Version
-  version: 6.9.1.3.22208381
+  version: 6.9.2.1.125136549
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -73,7 +73,6 @@ files:
 - app/helpers/rails_connector/cms_tag_helper.rb
 - app/helpers/rails_connector/editing_helper.rb
 - app/helpers/rails_connector/marker_helper.rb
-- lib/comment.rb
 - lib/infopark_fiona_connector.rb
 - lib/rails_connector/attr_dict.rb
 - lib/rails_connector/attr_value_provider.bundle
@@ -90,15 +89,15 @@ files:
 - lib/rails_connector/errors.rb
 - lib/rails_connector/fiona_engine.rb
 - lib/rails_connector/link.rb
-- lib/rails_connector/liquid_support/action_marker.rb
 - lib/rails_connector/lucene_search_request.rb
 - lib/rails_connector/named_link.rb
 - lib/rails_connector/news.rb
 - lib/rails_connector/permission.rb
 - lib/rails_connector/rack_middlewares.rb
+- lib/rails_connector/ses.rb
 - lib/rails_connector/ses/verity_accessor.rb
 - lib/rails_connector/verity_search_request.rb
-- lib/rating.rb
+- lib/search_request.rb
 homepage: http://www.infopark.de
 licenses: []
 post_install_message: 
@@ -113,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813754529
+      hash: -343485329
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/comment.rb

@@ -1,4 +0,0 @@
-# The Comment model inherits all of its behavior from
-# {RailsConnector::DefaultComment}.
-class Comment < RailsConnector::DefaultComment
-end

data/lib/rails_connector/liquid_support/action_marker.rb

@@ -1,75 +0,0 @@
-module RailsConnector
-
-# @api public
-module LiquidSupport
-
-  # Usage example for actionmarkers in Liquid templates:
-  #   {% actionmarker obj.images[0] editImageWizard param_a:value_a param_b:value_b %}
-  #     [Edit image]
-  #   {% endactionmarker %}
-  #
-  # The first parameter may be an instance of {ObjDrop} (usually +obj+ in Liquid templates),
-  # +Array+ (such as a +LinkList+ field), or {LinkDrop} (as in the example above).
-  #
-  # The second parameter is the action to be run on the target objects.
-  # Additional parameters to be forwarded to the action can be added as <tt>key:value</tt> pairs.
-  # All parameters are evaluated in the current Liquid context and thus may contain,
-  # for example, method calls on objects.
-  #
-  # Internally, the parameter <tt>:context</tt> is always set to the currently viewed object (+obj+)
-  # and can not be overwritten.
-  #
-  # The Liquid actionmarker uses {RailsConnector::MarkerHelper#action_marker}.
-  # @api public
-  class ActionMarker < Liquid::Block
-    def initialize(tag_name, markup, tokens)
-      @obj_name, @method_name = markup.to_s.split(/\s+/)
-      unless @obj_name && @method_name
-        raise Liquid::SyntaxError.new("Syntax Error in 'actionmarker' - Valid syntax: actionmarker obj [action] [foo:bar]")
-      end
-      @params = {}
-      markup.scan(/#{Liquid::TagAttributes}(#{Liquid::SpacelessFilter})?/) do |key, value, spaceless_filter|
-        @params[key] = spaceless_filter.blank? ? value : "#{value}|#{spaceless_filter}"
-      end
-      super
-    end
-
-    def render(context)
-      context.registers[:action_view].action_marker(
-        (context[@method_name] || @method_name).to_s,
-        target_objs(context),
-        :params => params(context),
-        :context => context['obj'].__drop_content
-      ) do
-        context.stack { render_all(@nodelist, context) }
-      end
-    end
-
-  protected
-
-    def target_objs(context)
-      [ context[@obj_name] ].flatten.map do |item|
-        case item
-        when RailsConnector::Link
-          item.destination_object
-        when LinkDrop
-          item.destination.__drop_content
-        else
-          item.__drop_content
-        end
-      end
-    end
-
-    def params(context)
-      result = {}
-      @params.each do |key, value|
-        result[(context[key] || key).to_s] = (context[value] || value).to_s
-      end
-      result
-    end
-  end
-
-  Liquid::Template.register_tag('actionmarker', ActionMarker)
-end
-
-end

data/lib/rating.rb

@@ -1,4 +0,0 @@
-# The Rating model inherits all of its behavior from
-# {RailsConnector::DefaultRating}.
-class Rating < RailsConnector::DefaultRating
-end