kvom 6.8.0.539.93842523 → 6.8.1

data/kvom.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
 
-  s.add_runtime_dependency "multi_json", "~> 1"
+  s.add_runtime_dependency "multi_json", "~> 1.3"
   s.add_runtime_dependency "activesupport", ">= 3" # does not support rational versioning, does it?
   s.add_runtime_dependency "activemodel", ">= 3"   # adapters
 

data/lib/kvom/adapter/attributes.rb

@@ -1,4 +1,5 @@
 require 'kvom/adapter'
+require 'multi_json'
 
 module Kvom; module Adapter
 
@@ -6,7 +7,7 @@ class Attributes
   def initialize(attributes, from_db = false)
     if from_db
       meta = attributes && attributes.delete("@meta.json")
-      @coding = meta && Lib::Json.load(meta)["coding"] || {}
+      @coding = meta && MultiJson.load(meta)["coding"] || {}
       @coded_attributes = attributes
       @attributes = {}
     else
@@ -24,7 +25,7 @@ class Attributes
         when nil
           coded_value
         when "json"
-          ::Kvom::Lib::Json.load(coded_value)
+          MultiJson.load(coded_value)
         when "jsonvalue"
           ::Kvom::Lib::JsonValue.load(coded_value)
         else
@@ -52,7 +53,7 @@ class Attributes
               ::Kvom::Lib::JsonValue.dump(value)
             when Array, Hash
               @coding[name] = "json"
-              ::Kvom::Lib::Json.dump(value)
+              MultiJson.dump(value)
             when String, Numeric
               value
             else
@@ -64,7 +65,7 @@ class Attributes
     if @coding.empty?
       @coded_attributes.delete("@meta.json")
     else
-      @coded_attributes["@meta.json"] = Lib::Json.dump("coding" => @coding)
+      @coded_attributes["@meta.json"] = MultiJson.dump("coding" => @coding)
     end
     @coded_attributes
   end

data/lib/kvom/adapter/filesystem_adapter.rb

@@ -1,4 +1,5 @@
 require 'kvom/adapter'
+require 'multi_json'
 require 'fileutils'
 require 'pathname'
 
@@ -86,7 +87,7 @@ class FilesystemAdapter < Base
   rescue ::Errno::ENOENT
     nil
   else
-    FilesystemDocument.new(key, Lib::Json.load(serialized_doc), true)
+    FilesystemDocument.new(key, MultiJson.load(serialized_doc), true)
   end
 
   def filepath_for_document(doc)

data/lib/kvom/adapter/filesystem_document.rb

@@ -1,10 +1,11 @@
 require 'kvom/adapter'
+require 'multi_json'
 
 module Kvom; module Adapter
 
 class FilesystemDocument < Document
   def to_json
-    Lib::Json.dump(attributes.to_h)
+    MultiJson.dump(attributes.to_h)
   end
 end
 

data/lib/kvom/lib/json_value.rb

@@ -1,4 +1,5 @@
 require 'kvom/lib'
+require 'multi_json'
 
 module Kvom; module Lib
 
@@ -15,7 +16,7 @@ module JsonValue
       when ""
         '""'
       else
-        Json.dump([primitive])[1..-2]
+        MultiJson.dump([primitive])[1..-2]
       end
     end
 
@@ -30,7 +31,7 @@ module JsonValue
       when '""'
         ""
       else
-        Json.load("[#{jsonvalue_string}]").first
+        MultiJson.load("[#{jsonvalue_string}]").first
       end
     end
   end

data/lib/kvom/storage/base.rb

@@ -21,8 +21,8 @@ class Base
 
   def put(data)
     id = generate_id
-    json_string = Lib::Json.dump(data)
-    normalized = Lib::Json.load(json_string)
+    json_string = MultiJson.dump(data)
+    normalized = MultiJson.load(json_string)
     write(id, normalized, json_string)
     {"id" => id}
   end

data/lib/kvom/storage/s3_storage.rb

@@ -30,7 +30,7 @@ class S3Storage < Base
   attr_reader :bucket, :bucket_prefix, :cache
 
   def read(id)
-    Lib::Json.load(s3_read(id))
+    MultiJson.load(s3_read(id))
   end
 
   def write(id, object, json_string)

metadata

@@ -1,134 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: kvom
-version: !ruby/object:Gem::Version 
-  hash: 187682853
+version: !ruby/object:Gem::Version
+  version: 6.8.1
   prerelease: 
-  segments: 
-  - 6
-  - 8
-  - 0
-  - 539
-  - 93842523
-  version: 6.8.0.539.93842523
 platform: ruby
-authors: 
+authors:
 - Kristian Hanekamp, Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-11 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        version: "1"
-  version_requirements: *id001
-  name: multi_json
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
-  version_requirements: *id002
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
-  version_requirements: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 8
-        version: "2.8"
-  version_requirements: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
   name: helpful_configuration
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use it to build object models in ruby on top of a key value store.
-email: 
+email:
 - kristian.hanekamp@infopark.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -144,7 +145,6 @@ files:
 - lib/kvom/adapter/filesystem_document.rb
 - lib/kvom/conflict.rb
 - lib/kvom/lib.rb
-- lib/kvom/lib/json.rb
 - lib/kvom/lib/json_value.rb
 - lib/kvom/model.rb
 - lib/kvom/model/base.rb
@@ -163,7 +163,6 @@ files:
 - spec/adapter/dynamodb_adapter_spec.rb
 - spec/adapter/model_identity_spec.rb
 - spec/cache_with_prefix_spec.rb
-- spec/lib/json_spec.rb
 - spec/model/all_ids_spec.rb
 - spec/model/base_spec.rb
 - spec/model/conflict_spec.rb
@@ -174,46 +173,38 @@ files:
 - spec/support/model.rb
 - spec/support/test_ids.rb
 - tmp/.gitignore
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -89310097
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: kvom
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Key Value Object Mapper
-test_files: 
+test_files:
 - spec/adapter/counter_spec.rb
 - spec/adapter/dynamodb_adapter_spec.rb
 - spec/adapter/model_identity_spec.rb
 - spec/cache_with_prefix_spec.rb
-- spec/lib/json_spec.rb
 - spec/model/all_ids_spec.rb
 - spec/model/base_spec.rb
 - spec/model/conflict_spec.rb
@@ -223,3 +214,4 @@ test_files:
 - spec/support/adapter.rb
 - spec/support/model.rb
 - spec/support/test_ids.rb
+has_rdoc: 

data/lib/kvom/lib/json.rb

@@ -1,14 +0,0 @@
-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/spec/lib/json_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe ::Kvom::Lib::Json do
-
-  context "when MultiJson is new style (methods are dump and load)", :multi_json_version => ">= 1.3.0" do
-    it "is MultiJson" do
-      ::Kvom::Lib::Json.should == ::MultiJson
-    end
-  end
-
-  context "when MultiJson is old style (methods are encode and decode)", :multi_json_version => "< 1.3.0" do
-
-    let(:ruby_object) {[1, nil, true, false, [], {}]}
-    let(:json_string) {'[1,null,true,false,[],{}]'}
-
-    it "forwards .dump to MultiJson.encode" do
-      MultiJson.should_receive(:encode).with(ruby_object).and_return(json_string)
-
-      Kvom::Lib::Json.dump(ruby_object).should be_equal(json_string)
-    end
-
-    it "forwards .load to MultiJson.decode" do
-      MultiJson.should_receive(:decode).with(json_string).and_return(ruby_object)
-
-      Kvom::Lib::Json.load(json_string).should be_equal(ruby_object)
-    end
-
-  end
-
-end