kvom 6.8.0.beta.200.809.bdfa8c3 → 6.8.0.beta.200.856.8c0fec5

data/lib/kvom/adapter/filesystem_document.rb

@@ -0,0 +1,11 @@
+require 'kvom/adapter'
+
+module Kvom; module Adapter
+
+class FilesystemDocument < KeyAttributesDocument
+  def to_json
+    Lib::Json.dump(attributes || {})
+  end
+end
+
+end; end # module Kvom::Adapter

data/lib/kvom/adapter/key_attributes_document.rb

@@ -0,0 +1,26 @@
+require 'kvom'
+
+module Kvom; module Adapter;
+
+class KeyAttributesDocument < Document
+
+  attr_reader :key, :attributes
+
+  def initialize(key, attributes)
+    @key = key
+    @attributes = attributes || {}
+  end
+
+  def [](name)
+    @attributes ||= load_attributes
+    @attributes[name]
+  end
+
+  def []=(name, value)
+    @attributes ||= load_attributes
+    @attributes[name] = value
+  end
+
+end
+
+end; end # module Kvom::Adapter

data/lib/kvom/base.rb

@@ -1,3 +1,4 @@
+require 'kvom'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
@@ -7,6 +8,7 @@ require 'securerandom'
 module Kvom
 
 class Base
+
   include ModelIdentity
   extend ActiveModel::Naming
 
@@ -102,6 +104,7 @@ class Base
   def destroy
     self.class.adapter.destroy(@document)
   end
+
 end
 
 end # module Kvom

data/lib/kvom/document.rb

@@ -1,4 +1,8 @@
-class Kvom::Document
+require 'kvom'
+
+module Kvom
+
+class Document
   def key
     raise "implement me in subclass!"
   end
@@ -11,3 +15,5 @@ class Kvom::Document
     raise "implement me in subclass!"
   end
 end
+
+end # module Kvom

data/lib/kvom/lib.rb

@@ -0,0 +1,5 @@
+require 'kvom'
+
+module Kvom::Lib
+  Kvom.setup_autoload(self, __FILE__)
+end

data/lib/kvom/lib/json.rb

@@ -0,0 +1,14 @@
+require 'kvom/lib'
+require 'multi_json'
+
+::Kvom::Lib::Json = ::MultiJson if (%w[dump load] - ::MultiJson.singleton_methods).empty?
+
+module Kvom::Lib::Json
+  def self.dump(*args)
+    ::MultiJson.encode(*args)
+  end
+
+  def self.load(*args)
+    ::MultiJson.decode(*args)
+  end
+end unless defined?(Kvom::Lib::Json)

data/lib/kvom/lib/json_value.rb

@@ -0,0 +1,39 @@
+require 'kvom/lib'
+
+module Kvom; module Lib
+
+module JsonValue
+
+  class << self
+    # all special cases are just a shortcut
+    def dump(primitive)
+      case primitive
+      when nil
+        "null"
+      when true, false
+        primitive.to_s
+      when ""
+        '""'
+      else
+        Json.dump([primitive])[1..-2]
+      end
+    end
+
+    def load(jsonvalue_string)
+      case jsonvalue_string
+      when "null"
+        nil
+      when "true"
+        true
+      when "false"
+        false
+      when '""'
+        ""
+      else
+        Json.load("[#{jsonvalue_string}]").first
+      end
+    end
+  end
+end
+
+end; end # module Kvom::Lib

data/lib/kvom/model_identity.rb

@@ -1,3 +1,5 @@
+require 'kvom'
+
 module Kvom
 
 module ModelIdentity # :nodoc:

data/lib/kvom/not_found.rb

@@ -1,3 +1,5 @@
+require 'kvom'
+
 class Kvom::NotFound < ::StandardError
   def self.for_key(key)
     new(%(document with key "#{key}" not found))

data/lib/kvom/storage.rb

@@ -1,5 +1,5 @@
-module Kvom
-  module Storage
-    Kvom.setup_autoload(self, __FILE__)
-  end
+require 'kvom'
+
+module Kvom::Storage
+  Kvom.setup_autoload(self, __FILE__)
 end

data/lib/kvom/storage/base.rb

@@ -1,88 +1,66 @@
+require 'kvom/storage'
+
 require 'securerandom'
 require 'multi_json'
 require 'active_support/core_ext/hash/keys'
 
-module Kvom
-  module Storage
-    if MultiJson.respond_to?(:dump)
-      module MultiJsonCoder
-        def encode(value)
-          MultiJson.dump(value)
-        end
+module Kvom; module Storage
 
-        def decode(value)
-          MultiJson.load(value)
-        end
-      end
-    else
-      module MultiJsonCoder
-        def encode(value)
-          MultiJson.encode(value)
-        end
+class Base
 
-        def decode(value)
-          MultiJson.decode(value)
-        end
-      end
-    end
+  attr_reader :config
 
-    class Base
-
-      include MultiJsonCoder
-
-      attr_reader :config
-
-      def initialize(config = nil)
-        @config =
-            if config
-              config.symbolize_keys
-            else
-              {}
-            end
-      end
-
-      def put(data)
-        id = generate_id
-        json_string = encode(data)
-        normalized = decode(json_string)
-        write(id, normalized, json_string)
-        {"id" => id}
-      end
+  def initialize(config = nil)
+    @config =
+        if config
+          config.symbolize_keys
+        else
+          {}
+        end
+  end
 
-      def get(spec)
-        raise "Invalid key spec (not a hash): #{spec.inspect}" unless Hash === spec
-        id =
-            case
-            when spec.key?("id")
-              spec["id"]
-            when spec.key?(:id)
-              spec[:id]
-            else
-              raise "Invalid key spec (no id): #{spec.inspect}"
-            end
-        read(id)
-      end
+  def put(data)
+    id = generate_id
+    json_string = Lib::Json.dump(data)
+    normalized = Lib::Json.load(json_string)
+    write(id, normalized, json_string)
+    {"id" => id}
+  end
 
-      private
+  def get(spec)
+    raise "Invalid key spec (not a hash): #{spec.inspect}" unless Hash === spec
+    id =
+        case
+        when spec.key?("id")
+          spec["id"]
+        when spec.key?(:id)
+          spec[:id]
+        else
+          raise "Invalid key spec (no id): #{spec.inspect}"
+        end
+    read(id)
+  end
 
-      def write(id, data, json_data)
-        raise "implement me in subclass!"
-      end
+  private
 
-      def read(id)
-        raise "implement me in subclass!"
-      end
+  def write(id, data, json_data)
+    raise "implement me in subclass!"
+  end
 
-      if RUBY_VERSION < "1.9.2"
-        def generate_id
-          SecureRandom.base64(15).tr("+/", "-_")
-        end
-      else
-        def generate_id
-          SecureRandom.urlsafe_base64(15)
-        end
-      end
+  def read(id)
+    raise "implement me in subclass!"
+  end
 
+  if RUBY_VERSION < "1.9.2"
+    def generate_id
+      SecureRandom.base64(15).tr("+/", "-_")
+    end
+  else
+    def generate_id
+      SecureRandom.urlsafe_base64(15)
     end
   end
+
 end
+
+end; end # module Kvom::Storage

data/lib/kvom/storage/cache_with_prefix.rb

@@ -1,4 +1,8 @@
-class Kvom::Storage::CacheWithPrefix
+require 'kvom/storage'
+
+module Kvom; module Storage
+
+class CacheWithPrefix
 
   def initialize(cache, prefix)
     @prefix = prefix
@@ -22,3 +26,5 @@ class Kvom::Storage::CacheWithPrefix
   end
 
 end
+
+end; end # module Kvom::Storage

data/lib/kvom/storage/file_system_storage.rb

@@ -1,27 +1,28 @@
+require 'kvom/storage'
 # require 'active_support/cache/file_store' # fails to autoload Cache::Store (no separate file)
 require 'active_support/cache'
 
-module Kvom
-  module Storage
-    class FileSystemStorage < Base
-      def initialize(options)
-        super
-        path = config[:path] or raise "No path specified"
-        @storage = ActiveSupport::Cache::FileStore.new(path, options)
-      end
+module Kvom; module Storage
 
-      private
+class FileSystemStorage < Base
+  def initialize(options)
+    super
+    path = config[:path] or raise "No path specified"
+    @storage = ActiveSupport::Cache::FileStore.new(path, options)
+  end
 
-      attr_reader :storage
+  private
 
-      def read(id)
-        storage.read(id)
-      end
+  attr_reader :storage
 
-      def write(id, value, ignored_json_string)
-        storage.write(id, value)
-      end
+  def read(id)
+    storage.read(id)
+  end
 
-    end
+  def write(id, value, ignored_json_string)
+    storage.write(id, value)
   end
+
 end
+
+end; end # module Kvom::Storage

data/lib/kvom/storage/not_found.rb

@@ -1,6 +1,3 @@
-module Kvom
-  module Storage
-    module NotFound
-    end
-  end
-end
+require 'kvom/storage'
+
+module Kvom::Storage::NotFound; end

data/lib/kvom/storage/s3_storage.rb

@@ -1,73 +1,75 @@
+require 'kvom/storage'
 require 'multi_json'
 require 'aws-sdk'
 
-module ::Kvom::Storage
-  class S3Storage < Base
-
-    def initialize(options)
-      super
-      @bucket = config[:bucket] or raise "No bucket specified"
-      if "" != (bucket_prefix = config[:bucket_prefix].to_s)
-        @bucket_prefix = bucket_prefix
-      end
-
-      if (cache = config[:cache])
-        cache_prefix = config[:cache_prefix].to_s
-        @cache =
-            if "" != cache_prefix
-              CacheWithPrefix.new(cache, cache_prefix)
-            else
-              cache
-            end
-        extend CacheAware
-      end
-    end
-
-    private
+module Kvom; module Storage
 
-    attr_reader :bucket, :bucket_prefix, :cache
+class S3Storage < Base
 
-    def read(id)
-      decode(s3_read(id))
+  def initialize(options)
+    super
+    @bucket = config[:bucket] or raise "No bucket specified"
+    if "" != (bucket_prefix = config[:bucket_prefix].to_s)
+      @bucket_prefix = bucket_prefix
     end
 
-    def write(id, object, json_string)
-      s3_object(id).write(json_string)
+    if (cache = config[:cache])
+      cache_prefix = config[:cache_prefix].to_s
+      @cache =
+          if "" != cache_prefix
+            CacheWithPrefix.new(cache, cache_prefix)
+          else
+            cache
+          end
+      extend S3Storage::CacheAware
     end
+  end
 
-    def s3_read(id)
-      s3_object(id).read
-    rescue AWS::S3::Errors::NoSuchKey => e
-      e.extend NotFound
-      raise e
-    end
+  private
 
-    def s3_object(id)
-      @s3_objects ||= bucket.objects
-      s3_id = bucket_prefix ? "#{bucket_prefix}/#{id}" : id
-      @s3_objects[s3_id]
-    end
+  attr_reader :bucket, :bucket_prefix, :cache
 
-    module CacheAware
+  def read(id)
+    Lib::Json.load(s3_read(id))
+  end
 
-      private
+  def write(id, object, json_string)
+    s3_object(id).write(json_string)
+  end
 
-      def read(id)
-        object = cache.read(id)
-        if nil == object
-          object = super
-          cache.write(id, object)
-        end
-        object
-      end
+  def s3_read(id)
+    s3_object(id).read
+  rescue AWS::S3::Errors::NoSuchKey => e
+    e.extend NotFound
+    raise e
+  end
 
-      def write(id, object, json_string)
-        super
-        cache.write(id, object)
-      end
+  def s3_object(id)
+    @s3_objects ||= bucket.objects
+    s3_id = bucket_prefix ? "#{bucket_prefix}/#{id}" : id
+    @s3_objects[s3_id]
+  end
+
+end
+
+module S3Storage::CacheAware
 
+  private
+
+  def read(id)
+    object = cache.read(id)
+    if nil == object
+      object = super
+      cache.write(id, object)
     end
+    object
+  end
 
+  def write(id, object, json_string)
+    super
+    cache.write(id, object)
   end
 
 end
+
+end; end # module Kvom::Storage