infopark_cloud_connector 6.8.0.23.da7f96b → 6.8.0.72.d18d096

data/lib/infopark_cloud_connector.rb

@@ -1,5 +1,4 @@
 require 'rails_connector/rack_middlewares'
-require 'rails_connector/core_extensions'
 require "rails_connector/errors"
 
 module RailsConnector

data/lib/rails_connector/blob.rb

@@ -4,8 +4,8 @@ module RailsConnector
 
 class Blob
 
-  def self.find(id, options)
-    new(blob_class.find(id, options))
+  def self.find(id)
+    new(blob_class.find(id))
   end
 
   def self.config

data/lib/rails_connector/cms_api_search_request.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'restclient'
 
 module RailsConnector
@@ -27,27 +26,27 @@ module RailsConnector
       headers = {
         :content_type => :json,
         :accept => :json,
-        :params => {
-          :query => @query_string,
-          :offset => @options[:offset],
-          :limit => @options[:limit],
-        },
       }
       headers[:host] = @options[:http_host] if @options[:http_host].present?
-      hits = JSON.parse(
+      hits = MultiJson.decode(
         RestClient::Request.execute({
           :method => :get,
           :url => url,
           :user => @options[:login],
           :password => @options[:api_key],
           :headers => headers,
+          :payload => MultiJson.encode({
+            :query => query,
+            :offset => @options[:offset],
+            :size => @options[:limit],
+          }),
         })
       )
 
       result = SES::SearchResult.new(hits['total'])
       hits['results'].each do |hit|
         hard_coded_score = 1
-        result << SES::Hit.new(hit, hard_coded_score, nil)
+        result << SES::Hit.new(hit['id'], hard_coded_score, hit)
       end
       result
     end
@@ -57,6 +56,40 @@ module RailsConnector
     def url
       "#{@options[:url]}/revisions/#{Revision.current.id}/objs/search"
     end
+
+    def query
+      now = Time.now
+
+      q = [
+        {
+          "field" => "_obj_class",
+          "operator" => "equal",
+          "value" => "Image",
+          "negate" => true
+        },
+        {
+          "field" => "_valid_from",
+          "operator" => "less_than",
+          "value" => now.to_iso
+        },
+        {
+          "field" => "_valid_until",
+          "operator" => "less_than",
+          "value" => now.to_iso,
+          "negate" => true
+        }
+      ]
+
+      @query_string.split(/[\s]+/).each do |word|
+        q << {
+          "field" => "*",
+          "operator" => "prefix_search",
+          "value" => word,
+        }
+      end
+
+      q
+    end
   end
 
 end

data/lib/rails_connector/cms_base_model.rb

@@ -4,7 +4,7 @@ module RailsConnector
 
   # This is the abstract class from which all CMS models derive.
   #
-  class CmsBaseModel < Kvom::Base #:nodoc:
+  class CmsBaseModel < Kvom::Model::Base #:nodoc:
     class << self
       def instance_name=(ignore) # :nodoc:
         # this method is here only for compatibility with the fiona connector.

data/lib/rails_connector/obj.rb

@@ -12,9 +12,6 @@ module RailsConnector
     include SEO
     include ObjBody
 
-    extend PathConversion
-    include PathConversion
-
     # Create a new Obj instance with the given values and attributes.
     # Normally this method should not be used.
     # Instead Objs should be loaded from the cms database.
@@ -70,10 +67,6 @@ module RailsConnector
       find_objs_by(:path, [path]).first.first
     end
 
-    def self.find_by_path_list(path_list) # :nodoc:
-      find_by_path(path_from_list(path_list))
-    end
-
     def self.find_many_by_paths(pathes) # :nodoc:
       find_objs_by(:path, pathes).map(&:first)
     end
@@ -138,14 +131,14 @@ module RailsConnector
     # return the Obj that is the parent of this Obj.
     # returns nil for the root Obj.
     def parent
-      root? ? nil : Obj.find_by_path_list(path_list[0..-2])
+      root? ? nil : Obj.find_by_path(parent_path)
     end
 
     # Returns an Array of all the ancestor objects, starting at the root and ending at this object's parent.
     def ancestors
       return [] if root?
-      ancestor_paths = path_list[0..-2].inject([""]) do |list, component|
-        list << list.last + "/#{component}"
+      ancestor_paths = parent_path.scan(/\/[^\/]+/).inject([""]) do |list, component|
+        list << list.last + component
       end
       ancestor_paths[0] = "/"
       Obj.find_many_by_paths(ancestor_paths)
@@ -160,16 +153,16 @@ module RailsConnector
 
     # returns the Obj's path as a String.
     def path
-      path_from_list(path_list)
-    end
-
-    def path_list # :nodoc:
-      read_attribute('_path') || []
+      read_attribute('_path') or raise "Obj without path"
     end
 
     # returns the Obj's name, i.e. the last component of the path.
     def name
-      path_list.last || ""
+      if root?
+        ""
+      else
+        path.match(/[^\/]+$/)[0]
+      end
     end
 
     def permissions
@@ -315,7 +308,7 @@ module RailsConnector
 
     # Returns true if this object is the root object.
     def root?
-      path_list.empty?
+      path == "/"
     end
 
     # Returns a list of exportable? children excluding the binary? ones unless :all is specfied.
@@ -391,7 +384,7 @@ module RailsConnector
     # Returns the Object with the given name next in the hierarchy
     # returns nil if no object with the given name was found.
     def find_nearest(name)
-      obj = self.class.find_by_path_list(path_list + [name])
+      obj = self.class.find_by_path(root? ? "/#{name}" : "#{path}/#{name}")
       return obj if obj and obj.active?
       parent.find_nearest(name) unless self.root?
     end
@@ -545,6 +538,11 @@ module RailsConnector
       end
     end
 
+    def parent_path
+      raise "parent_path called for root" if root?
+      path.gsub(/\/[^\/]+$/, "").presence || "/"
+    end
+
     def as_date(value)
       DateAttribute.parse(value) unless value.nil?
     end

data/lib/rails_connector/obj_body.rb

@@ -53,7 +53,7 @@ module ObjBody
 
   def find_blob
     blob_spec = read_attribute('blob')
-    Blob.find(blob_spec["id"], :context => path) if blob_spec
+    Blob.find(blob_spec["id"]) if blob_spec
   end
 end
 

data/lib/rails_connector/obj_data_from_database.rb

@@ -17,6 +17,8 @@ module RailsConnector
         attribute_value = read_value(attribute_name)
         if attribute_name == '_text_links'
           attribute_value = attribute_value && attribute_value.values
+        elsif attribute_name == '_path'
+          attribute_value = PathConversion.path_from_list(attribute_value)
         end
       else
         attribute_type = current_attribute_type(attribute_name)
@@ -34,6 +36,10 @@ module RailsConnector
       obj_class_attributes.include?(name)
     end
 
+    def all_custom_attributes
+      obj_class_attributes
+    end
+
     private
 
     attr_reader :values, :rtc_ref, :revision

data/lib/rails_connector/obj_data_from_hash.rb

@@ -3,7 +3,7 @@ module RailsConnector
 
   class ObjDataFromHash < ObjData
     def initialize(hash)
-      @hash = hash
+      @hash = hash.stringify_keys
     end
 
     def value_and_type_of(attribute_name)

data/lib/rails_connector/s3_blob.rb

@@ -29,7 +29,7 @@ class S3Blob
       @cached_bucket_url = nil
     end
 
-    def find(id, options)
+    def find(id)
       new(id)
     end
 

metadata

@@ -1,19 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: 363582215
+  hash: 300142121
   prerelease: 9
   segments: 
   - 6
   - 8
   - 0
-  - 23
-  - da
-  - 7
-  - f
+  - 72
+  - d
+  - 18
+  - d
   - 96
-  - b
-  version: 6.8.0.23.da7f96b
+  version: 6.8.0.72.d18d096
 platform: ruby
 authors: 
 - Infopark AG
@@ -21,10 +20,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-18 00:00:00 +02:00
+date: 2012-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,11 +36,11 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
-  version_requirements: *id001
   name: aws-sdk
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,32 +51,30 @@ dependencies:
         - 1
         - 6
         version: "1.6"
-  version_requirements: *id002
   name: rest-client
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 363582215
+        hash: 300142121
         segments: 
         - 6
         - 8
         - 0
-        - 23
-        - da
-        - 7
-        - f
+        - 72
+        - d
+        - 18
+        - d
         - 96
-        - b
-        version: 6.8.0.23.da7f96b
-  version_requirements: *id003
+        version: 6.8.0.72.d18d096
   name: kvom
+  version_requirements: *id003
   prerelease: false
-  type: :runtime
 description: The Cloud 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: []