infopark_cloud_connector 6.8.0.beta.200.681.7c84f4a → 6.8.0.beta.200.713.e5c3150

data/lib/rails_connector/dict_storage.rb

@@ -0,0 +1,51 @@
+module RailsConnector
+
+  class DictStorage #:nodoc: all
+
+    class << self
+
+      def configure(config)
+        @config = config.present? ? config.symbolize_keys : {}
+      end
+
+      def get(spec)
+        storage.get(spec)
+      end
+
+      private
+
+      attr_reader :config
+
+      def storage
+        @storage ||=
+            case config[:type]
+            when "s3"
+              s3_storage(config)
+            when "file"
+              file_storage(config)
+            else
+              raise "Unsupported dict storage type #{config[:type]}"
+            end
+      end
+
+      def s3_storage(config)
+        bucket = AWS::S3.new(config).buckets[config[:bucket_name]]
+        Kvom::Storage::S3Storage.new({
+          :bucket => bucket,
+          :bucket_prefix => "dict",
+          :cache => s3_storage_cache,
+          :cache_prefix => "dict.",
+        })
+      end
+
+      def s3_storage_cache
+        Rails.cache
+      end
+
+      def file_storage(config)
+        Kvom::Storage::FileSystemStorage.new(config)
+      end
+
+    end
+  end
+end

data/lib/rails_connector/obj.rb

@@ -520,29 +520,35 @@ module RailsConnector
     private
 
     def update_data(values = {}, meta = {})
-      @values = values
+      @values = values || {}
+      meta ||= {}
       @attributes = meta["attributes"] || {}
+      @ext_ref = meta["ext_ref"]
       @attr_cache = {}
     end
 
     def read_attribute(name)
       name = name.to_s
+      @attr_cache[name] ||= attribute_value_from_raw_attribute_value(name)
+    end
+
+    def attribute_value_from_raw_attribute_value(name)
       raw = read_raw_attribute_value(name)
-      @attr_cache[name] ||= case type_of(name)
-        when :markdown
-          StringTagging.tag_as_markdown(raw, self)
-        when :html
-          StringTagging.tag_as_html(raw, self)
-        when :date
-          DateAttribute.parse raw if raw
-        when :linklist
-          if name == "_text_links"
-            LinkList.new(raw.values)
-          else
-            LinkList.new(raw)
-          end
+      case type_of(name)
+      when :markdown
+        StringTagging.tag_as_markdown(raw, self)
+      when :html
+        StringTagging.tag_as_html(raw, self)
+      when :date
+        DateAttribute.parse raw if raw
+      when :linklist
+        if name == "_text_links"
+          LinkList.new(raw && raw.values)
         else
-          raw
+          LinkList.new(raw)
+        end
+      else
+        raw
       end
     end
 
@@ -618,9 +624,21 @@ module RailsConnector
     end
 
     def read_raw_attribute_value(attribute_name)
+      return @values[attribute_name] if @values.key?(attribute_name)
+      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
+      # may raise Kvom::Storage::NotFound
+      values = DictStorage.get(@ext_ref)
+      @values.reverse_merge!(values)
+      @ext_ref = nil
+      @values
+    end
+
     class << self
       private
 

data/lib/rails_connector/path_conversion.rb

@@ -3,7 +3,11 @@ module RailsConnector
   module PathConversion #:nodoc: all
 
     def self.path_from_list(components)
-      "/#{components.join("/")}"
+      if components
+        "/#{components.join("/")}"
+      else
+        "/"
+      end
     end
 
     private

data/lib/rails_connector/workspace.rb

@@ -137,7 +137,8 @@ module RailsConnector
           "_obj_type" => data["obj_type"],
           "_obj_class" => data["obj_class"]["name"]
         ),
-        "attributes" => data["attributes"]
+        "attributes" => data["attributes"],
+        "ext_ref" => data["ext_ref"],
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version 
-  hash: -177875434235
+  hash: 2363298151
   prerelease: 6
   segments: 
   - 6
@@ -9,14 +9,12 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 681
-  - 7
+  - 713
+  - e
+  - 5
   - c
-  - 84
-  - f
-  - 4
-  - a
-  version: 6.8.0.beta.200.681.7c84f4a
+  - 3150
+  version: 6.8.0.beta.200.713.e5c3150
 platform: ruby
 authors: 
 - Infopark AG
@@ -24,7 +22,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-26 00:00:00 +02:00
+date: 2012-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,21 +63,19 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -177875434235
+        hash: 2363298151
         segments: 
         - 6
         - 8
         - 0
         - beta
         - 200
-        - 681
-        - 7
+        - 713
+        - e
+        - 5
         - c
-        - 84
-        - f
-        - 4
-        - a
-        version: 6.8.0.beta.200.681.7c84f4a
+        - 3150
+        version: 6.8.0.beta.200.713.e5c3150
   version_requirements: *id003
   name: kvom
   prerelease: false
@@ -106,6 +102,7 @@ files:
 - lib/rails_connector/couchdb_views_source_path.rb
 - lib/rails_connector/date_attribute.rb
 - lib/rails_connector/default_search_request.rb
+- lib/rails_connector/dict_storage.rb
 - lib/rails_connector/elasticsearch_request.rb
 - lib/rails_connector/errors.rb
 - lib/rails_connector/link.rb