infopark_cloud_connector 6.8.0.16.def5e85 → 6.8.0.23.da7f96b

data/lib/rails_connector/cms_api_search_request.rb

@@ -24,21 +24,23 @@ module RailsConnector
 
     # Accesses Cms Api Search using #query and fetches search hits.
     def fetch_hits
+      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(
         RestClient::Request.execute({
           :method => :get,
           :url => url,
           :user => @options[:login],
           :password => @options[:api_key],
-          :headers => {
-            :content_type => :json,
-            :accept => :json,
-            :params => {
-              :query => @query_string,
-              :offset => @options[:offset],
-              :limit => @options[:limit],
-            },
-          },
+          :headers => headers,
         })
       )
 

data/lib/rails_connector/obj.rb

@@ -510,7 +510,7 @@ module RailsConnector
     end
 
     def has_attribute?(name)
-      data_from_cms.has_attribute?(name.to_s)
+      data_from_cms.has_custom_attribute?(name.to_s)
     end
 
     private
@@ -532,13 +532,13 @@ module RailsConnector
 
     def prepare_attribute_value(attribute_value, attribute_type)
       case attribute_type
-      when :markdown
+      when "markdown"
         StringTagging.tag_as_markdown(attribute_value, self)
-      when :html
+      when "html"
         StringTagging.tag_as_html(attribute_value, self)
-      when :date
+      when "date"
         DateAttribute.parse(attribute_value) if attribute_value
-      when :linklist
+      when "linklist"
         LinkList.new(attribute_value)
       else
         attribute_value

data/lib/rails_connector/obj_data.rb

@@ -10,10 +10,38 @@ module RailsConnector
       raise "implement in subclass"
     end
 
-    def has_attribute?(name)
+    def has_custom_attribute?(name)
       raise "implement in subclass"
     end
 
+    private
+
+    def type_of_internal(key)
+      case key
+      when "_text_links"
+        "linklist"
+      when "_valid_from"
+        "date"
+      when "_valid_until"
+        "date"
+      when "_last_changed"
+        "date"
+      when "title"
+        "html"
+      end
+    end
+
+    def default_attribute_value(attribute_type)
+      case attribute_type
+      when "linklist"
+        []
+      when "multienum"
+        []
+      else
+        nil
+      end
+    end
+
   end
 
 end

data/lib/rails_connector/obj_data_from_database.rb

@@ -30,38 +30,43 @@ module RailsConnector
       [attribute_value, attribute_type]
     end
 
-    def has_attribute?(name)
+    def has_custom_attribute?(name)
       obj_class_attributes.include?(name)
     end
 
     private
 
-    attr_reader :values, :ext_ref, :rtc_ref, :revision
+    attr_reader :values, :rtc_ref, :revision
 
     def current_attribute_type(name)
-      revision.attributes[name]["type"].to_sym
+      revision.attributes[name]["type"]
     end
 
     def obj_class_attributes
-      name = values["_obj_class"]
-      if data = revision.obj_classes[name]
-        data["attributes"] || []
-      else
-        raise "Could not find ObjClass with name #{name} in Revision #{revision.id}!"
-      end
+      @obj_class_attributes ||=
+        begin
+          name = values["_obj_class"]
+          if data = revision.obj_classes[name]
+            Set.new(data["attributes"]) || Set.new
+          else
+            raise "Could not find ObjClass with name #{name} in Revision #{revision.id}!"
+          end
+        end
     end
 
     def read_value(attribute_name)
       return values[attribute_name] if values.key?(attribute_name)
-      if ext_ref && (attribute_name == "_text_links" || ?_ != attribute_name[0])
+      if @ext_ref && (attribute_name == "_text_links" || attribute_name[0] != ?_)
         extend_values_with_dict_storage_values
       end
       values[attribute_name]
     end
 
     def extend_values_with_dict_storage_values
+      return unless @ext_ref
+
       # may raise Kvom::Storage::NotFound
-      ext_values = DictStorage.get(ext_ref)
+      ext_values = DictStorage.get(@ext_ref)
       values.reverse_merge!(ext_values)
       @ext_ref = nil
     end
@@ -72,36 +77,9 @@ module RailsConnector
       ?_ == attribute_name[0] || SPECIAL_INTERNAL_ATTRIBUTES.include?(attribute_name)
     end
 
-    def type_of_internal(key)
-      case key
-      when "_text_links"
-        :linklist
-      when "_valid_from"
-        :date
-      when "_valid_until"
-        :date
-      when "_last_changed"
-        :date
-      when "title"
-        :html
-      end
-    end
-
     def legacy_attribute_type(name)
       if attr_def = legacy_attributes[name]
-        type = attr_def["type"]
-        type.to_sym if type
-      end
-    end
-
-    def default_attribute_value(attribute_type)
-      case attribute_type
-      when :linklist
-        []
-      when :multienum
-        []
-      else
-        nil
+        attr_def["type"]
       end
     end
 

data/lib/rails_connector/obj_data_from_hash.rb

@@ -10,7 +10,7 @@ module RailsConnector
       [@hash[attribute_name], nil]
     end
 
-    def has_attribute?(name)
+    def has_custom_attribute?(name)
       @hash.has_key?(name)
     end
 

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -308667469
+  hash: 363582215
   prerelease: 9
   segments: 
   - 6
   - 8
   - 0
-  - 16
-  - def
-  - 5
-  - e
-  - 85
-  version: 6.8.0.16.def5e85
+  - 23
+  - da
+  - 7
+  - f
+  - 96
+  - b
+  version: 6.8.0.23.da7f96b
 platform: ruby
 authors: 
 - Infopark AG
@@ -20,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-13 00:00:00 +02:00
+date: 2012-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,17 +61,18 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -308667469
+        hash: 363582215
         segments: 
         - 6
         - 8
         - 0
-        - 16
-        - def
-        - 5
-        - e
-        - 85
-        version: 6.8.0.16.def5e85
+        - 23
+        - da
+        - 7
+        - f
+        - 96
+        - b
+        version: 6.8.0.23.da7f96b
   version_requirements: *id003
   name: kvom
   prerelease: false