infopark_cloud_connector 6.9.1.3.22208381 → 6.9.2.1.125136549

data/lib/rails_connector/migrations/migrator.rb

@@ -44,7 +44,6 @@ module RailsConnector
           end
         else
           CmsRestApi.post('workspaces', :workspace => { :title => 'rtc', :id => 'rtc' })
-
           workspace = migration_workspace
           workspace_lock.write(workspace)
         end

data/lib/rails_connector/workspace.rb

@@ -13,7 +13,7 @@ class Workspace
     if @current.respond_to? :call
       @current = @current.call
     else
-      @current || default
+      @current ||= default
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_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: rest-client
@@ -73,6 +73,7 @@ files:
 - app/controllers/rails_connector/objs_controller.rb
 - app/controllers/rails_connector/tasks_controller.rb
 - app/controllers/rails_connector/webservice_controller.rb
+- app/controllers/rails_connector/widget_renderer.rb
 - app/controllers/rails_connector/workspaces_controller.rb
 - app/helpers/rails_connector/cms_asset_helper.rb
 - app/helpers/rails_connector/cms_tag_helper.rb
@@ -81,6 +82,7 @@ files:
 - app/helpers/rails_connector/widget_helper.rb
 - app/views/rails_connector/_editing_javascript.html.erb
 - app/views/rails_connector/objs/create_widget.html.erb
+- app/views/rails_connector/objs/show.html.erb
 - config/locales/de.rails_connector.models.yml
 - config/locales/en.rails_connector.models.yml
 - config/routes.rb
@@ -106,7 +108,6 @@ files:
 - lib/rails_connector/cache_middleware.rb
 - lib/rails_connector/client_error.rb
 - lib/rails_connector/cloud_engine.rb
-- lib/rails_connector/cms_api_search_request.rb
 - lib/rails_connector/cms_backend.rb
 - lib/rails_connector/cms_cache_storage.rb
 - lib/rails_connector/cms_rest_api.rb
@@ -117,8 +118,6 @@ files:
 - lib/rails_connector/content_state_visitor.rb
 - lib/rails_connector/controller_runtime.rb
 - lib/rails_connector/date_attribute.rb
-- lib/rails_connector/default_search_request.rb
-- lib/rails_connector/elasticsearch_request.rb
 - lib/rails_connector/errors.rb
 - lib/rails_connector/link.rb
 - lib/rails_connector/log_subscriber.rb
@@ -137,7 +136,6 @@ files:
 - lib/rails_connector/obj_data_from_service.rb
 - lib/rails_connector/obj_search_enumerator.rb
 - lib/rails_connector/rack_middlewares.rb
-- lib/rails_connector/widget_renderer.rb
 - lib/rails_connector/workspace.rb
 - lib/rails_connector/workspace_data_from_service.rb
 - lib/rails_connector/workspace_selection_middleware.rb
@@ -156,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 22411057
+      hash: 117017377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/rails_connector/cms_api_search_request.rb

@@ -1,50 +0,0 @@
-module RailsConnector
-
-  # This class provides a basic implementation for accessing the search using the cms api.
-  # It can be activated by making it the superclass of SearchRequest.
-  # It should be customized by subclassing.
-  class CmsApiSearchRequest
-
-    # Takes +query_string+ and +options+ for accessing Cms Api Search.
-    #
-    # +options+ is a hash and may include:
-    #
-    # <tt>:limit</tt>:: The maximum number of hits
-    # <tt>:offset</tt>:: The search offset
-    def initialize(query_string, options = {})
-      @query_string = query_string
-      @options = options
-    end
-
-    # Accesses Cms Api Search using #query and fetches search hits.
-    def fetch_hits
-      search_enum = search_results
-
-      result = SES::SearchResult.new(search_enum.size)
-      search_enum.take(@options[:limit] || 10).each do |obj|
-        hard_coded_score = 1
-        result << SES::Hit.new(obj.id, hard_coded_score, {}, obj)
-      end
-
-      result
-    end
-
-    private
-
-    def search_results
-      now = Time.now
-      search_enum = Obj.where(:_valid_from, :is_less_than, now.to_iso
-          ).and_not(:_valid_until, :is_less_than, now.to_iso
-          ).and_not(:_obj_class, :equals, 'Image'
-          ).offset(@options[:offset] || 0
-          ).batch_size(@options[:limit] || 10)
-
-      @query_string.strip.split(/[\s]+/).each do |word|
-        search_enum.and(:*, :contains_prefix, word)
-      end
-
-      search_enum
-    end
-  end
-
-end

data/lib/rails_connector/default_search_request.rb

@@ -1,6 +0,0 @@
-module RailsConnector
-  # This class provides a default implementation for accessing the search server.
-  # It is used by {DefaultSearchController}.
-  class DefaultSearchRequest < CmsApiSearchRequest
-  end
-end

data/lib/rails_connector/elasticsearch_request.rb

@@ -1,78 +0,0 @@
-require 'json'
-require 'restclient'
-
-module RailsConnector
-
-  # This class provides a basic implementation for accessing a elasticsearch server.
-  # It can be activated by making it the superclass of SearchRequest.
-  # It should be customized by subclassing.
-  class ElasticsearchRequest
-    # Takes +query_string+ and +options+ for accessing Elasticsearch.
-    #
-    # +options+ is a hash and may include:
-    #
-    # <tt>:limit</tt>:: The maximum number of hits
-    # <tt>:offset</tt>:: The search offset
-    # <tt>:url</tt>:: A non-default Elasticsearch index URL
-    def initialize(query_string, options = {})
-      @query_string = query_string
-      @options = Configuration.search_options.merge(options)
-    end
-
-    # Accesses Elasticsearch using #query and fetches search hits.
-    def fetch_hits
-      the_request = request_body
-      (the_request[:fields] ||= []) << :obj_id
-      the_request[:fields].uniq!
-      the_request[:from] = @options[:offset] if @options[:offset]
-      the_request[:size] = @options[:limit] if @options[:limit]
-
-      hits = JSON.parse(
-        RestClient::Request.execute(:method => :get, :url => url, :payload => the_request.to_json)
-      )['hits']
-
-      result = SES::SearchResult.new(hits['total'])
-      hits['hits'].each do |hit|
-        result << SES::Hit.new(hit['fields']['obj_id'], hit['_score'] / hits['max_score'], hit)
-      end
-      result
-    end
-
-    def request_body
-      {
-        :query => query,
-        :filter => filter
-      }
-    end
-
-    def query
-      {
-        :query_string => {
-          :query => @query_string.
-              gsub(/[^\w\*]/, ' ').
-              gsub(/\b(and|or|not)\b/i, '').
-              gsub(/\s+/, ' ').strip
-        }
-      }
-    end
-
-    def filter
-      now = Time.now
-      {
-        :and => [
-          {:not => {:term => {:obj_type => :image}}},
-          {:not => {:term => {:suppress_export => true}}},
-          {:not => {:range => {:valid_from => {:from => (now + 1.second).to_iso, :to => '*'}}}},
-          {:not => {:range => {:valid_until => {:from => '*', :to => now.to_iso}}}}
-        ]
-      }
-    end
-
-    private
-
-    def url
-      "#{@options[:url]}/_search"
-    end
-  end
-
-end

data/lib/rails_connector/widget_renderer.rb

@@ -1,41 +0,0 @@
-module RailsConnector
-
-class WidgetRenderer < AbstractController::Base
-  include AbstractController::Rendering
-  include AbstractController::Helpers
-
-  helper :cms, "rails_connector/widget"
-
-  self.view_paths = [File.join('app', 'widgets')]
-
-  def initialize(request)
-    @_request = request
-  end
-
-  def show(widget, obj, widget_field_name, container)
-    @widget = widget
-    @obj = obj
-    @widget_field_name = widget_field_name
-    @container = container
-
-    render_to_string "#{widget.obj_class.underscore}/views/show"
-  end
-
-  def thumbnail(widget_dir)
-    begin
-      render_to_string "#{widget_dir}/views/thumbnail"
-    rescue ActionView::MissingTemplate => e
-      view_context.widget_thumbnail(
-        widget_dir.titleize,
-        'thumbnail.html.erb does not existing. Please provide one.',
-        view_context.image_tag('180x120.gif')
-      )
-    end
-  end
-
-  def request
-    @_request
-  end
-end
-
-end # module RailsConnector