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

data/spec/adaptor/base_spec.rb

@@ -109,6 +109,93 @@ describe Kvom::Base do
     end
   end
 
+  describe "adapter.query(<hash_value>, <range_spec>)" do
+
+    def random_id(id)
+      $base_spec_random_id ||= SecureRandom.hex(8)
+      "#{$base_spec_random_id}#{id}"
+    end
+
+    def set_of_keys(documents)
+      keys = documents.map{|doc| doc.key}.to_set
+      keys.size.should == documents.size
+      keys
+    end
+
+    def create_document(id)
+      document = adapter.new_document(random_id(id), {})
+      adapter.save(document)
+      document
+    end
+
+    let(:adapter) {TestModel.adapter}
+
+    let(:one_001) {create_document("one|001")}
+    let(:one_002) {create_document("one|002")}
+    let(:one_0021) {create_document("one|0021")}
+    let(:one_0022) {create_document("one|0022")}
+    let(:one_3) {create_document("one|3")}
+    let(:two_two) {create_document("two|two")}
+    let(:three_empty) {create_document("three|")}
+
+    before(:all) do
+      [one_001, one_002, one_0021, one_0022, one_3, two_two, three_empty, three_empty]
+    end
+
+    context "when range is a single value" do
+      context "when the doc exists" do
+        it "returns a one-element list with the doc's model instance" do
+          set_of_keys(adapter.query(random_id("one"), "001")).should == set_of_keys([one_001])
+          set_of_keys(adapter.query(random_id("three"), "")).should == set_of_keys([three_empty])
+        end
+      end
+
+      context "when the doc does not exists" do
+        it "returns an empty list" do
+          adapter.query(random_id("unknown_hash"), "001").should == []
+          adapter.query(random_id("one"), "unknown_range").should == []
+        end
+      end
+    end
+
+    context "when range is a Range" do
+
+      it "returns documents exactly matching the range border" do
+        set_of_keys(adapter.query(random_id("one"), Range.new("0021", "0022"))).
+              should == set_of_keys([one_0021, one_0022])
+        set_of_keys(adapter.query(random_id("three"), Range.new("", ""))).
+              should == set_of_keys([three_empty])
+      end
+
+      it "returns all documents with a range value within the range" do
+        set_of_keys(adapter.query(random_id("one"), Range.new("0021", "0022"))).
+              should == set_of_keys([one_0021, one_0022])
+      end
+
+      context "when there is no doc within the range" do
+        it "returns an empty list" do
+          adapter.query(random_id("one"), Range.new("5", "8")).
+                should == []
+        end
+      end
+
+      context 'when range is ["", "~"]' do
+        it "does not miss a document for the hash value" do
+          set_of_keys(adapter.query(random_id("one"), Range.new("", "~"))).
+                should == set_of_keys([one_001, one_002, one_0021, one_0022, one_3])
+          set_of_keys(adapter.query(random_id("three"), Range.new("", "~"))).
+                should == set_of_keys([three_empty])
+        end
+      end
+    end
+
+    context "when there is no doc with the hash value" do
+      it "returns an empty list" do
+        adapter.query(random_id("none_of_these"), Range.new("", "~")).should == []
+      end
+    end
+  end
+
   describe "destroying models" do
 
     context "when the model has been created without id" do

data/spec/lib/json_spec.rb

@@ -0,0 +1,30 @@
+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

data/spec/spec_helper.rb

@@ -24,6 +24,8 @@ class TestModel < Kvom::Base
         }
         options[:partition] = "korb" if type == "partitioned_dynamo"
         Kvom::Adapter::DynamodbAdapter.new(options)
+      when /filesystem/
+        Kvom::Adapter::FilesystemAdapter.new(:path => File.expand_path("../../tmp/fsa", __FILE__))
       end
   end
 end
@@ -36,15 +38,25 @@ RSpec.configure do |config|
   output = config.output_stream || $stdout
 
   adapter_specified_and_different = lambda {|adapter_name|
-    if adapter_name
+    if adapter_name # no adapter_name => do not exclude
       application_adapter = TestModel.adapter.class.to_s.demodulize
       name = application_adapter.sub("Adapter", "").sub("db", "").downcase
-      if name != adapter_name.to_s
+      if name != adapter_name.to_s # same adapter name => do not exclude
         output.print "a"
-        true
+        true # yes, exclude
       end
     end
   }
+
+  multi_json_version_and_insufficient = lambda {|multi_json_version_restriction|
+    if multi_json_version_restriction
+      multi_json_version = Gem.loaded_specs["multi_json"].version
+      requirement = Gem::Requirement.create(multi_json_version_restriction)
+      !requirement.satisfied_by?(multi_json_version)
+    end
+  }
+
   output.puts "Run filtered using adapter metadata (a - when skipped)"
   config.filter_run_excluding :adapter => adapter_specified_and_different
+  config.filter_run_excluding :multi_json_version => multi_json_version_and_insufficient
 end

data/tmp/.gitignore

@@ -0,0 +1,3 @@
+# Last rule wins? Anyway - this works.
+*
+!/.gitignore

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kvom
 version: !ruby/object:Gem::Version 
-  hash: 2958223301
+  hash: -134787116
   prerelease: 6
   segments: 
   - 6
@@ -9,12 +9,13 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 809
-  - bdfa
+  - 856
   - 8
   - c
-  - 3
-  version: 6.8.0.beta.200.809.bdfa8c3
+  - 0
+  - fec
+  - 5
+  version: 6.8.0.beta.200.856.8c0fec5
 platform: ruby
 authors: 
 - Kristian Hanekamp, Infopark AG
@@ -22,69 +23,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 +02:00
+date: 2012-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 1
         segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
-  prerelease: false
-  name: rspec
+        - 1
+        version: "1"
   version_requirements: *id001
+  name: multi_json
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  name: helpful_configuration
+        - 3
+        version: "3"
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  name: couchrest
+        - 3
+        version: "3"
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  name: activemodel
+        - 2
+        - 8
+        version: "2.8"
   version_requirements: *id004
+  name: rspec
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +93,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: aws-sdk
   version_requirements: *id005
+  name: helpful_configuration
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,23 +107,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: multi_json
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  name: yajl-ruby
   prerelease: false
-  name: rack
-  version_requirements: *id007
+  type: :development
 description: Use it to build object models in ruby on top of a key value store.
 email: 
 - kristian.hanekamp@infopark.de
@@ -146,8 +132,14 @@ files:
 - lib/kvom/adapter/couchdb_document.rb
 - lib/kvom/adapter/dynamodb_adapter.rb
 - lib/kvom/adapter/dynamodb_document.rb
+- lib/kvom/adapter/filesystem_adapter.rb
+- lib/kvom/adapter/filesystem_document.rb
+- lib/kvom/adapter/key_attributes_document.rb
 - lib/kvom/base.rb
 - lib/kvom/document.rb
+- lib/kvom/lib.rb
+- lib/kvom/lib/json.rb
+- lib/kvom/lib/json_value.rb
 - lib/kvom/model_identity.rb
 - lib/kvom/not_found.rb
 - lib/kvom/storage.rb
@@ -161,9 +153,11 @@ files:
 - spec/adaptor/dynamodb_adaptor_spec.rb
 - spec/adaptor/model_identity_spec.rb
 - spec/cache_with_prefix_spec.rb
+- spec/lib/json_spec.rb
 - spec/spec_helper.rb
 - spec/storage/file_system_spec.rb
 - spec/storage/s3_spec.rb
+- tmp/.gitignore
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -206,6 +200,7 @@ test_files:
 - spec/adaptor/dynamodb_adaptor_spec.rb
 - spec/adaptor/model_identity_spec.rb
 - spec/cache_with_prefix_spec.rb
+- spec/lib/json_spec.rb
 - spec/spec_helper.rb
 - spec/storage/file_system_spec.rb
 - spec/storage/s3_spec.rb