kvom 6.8.2.36.82613853 → 6.8.3.1.23895778

data/kvom.gemspec

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

data/lib/kvom/adapter/base.rb

@@ -50,9 +50,10 @@ class Base
     end
   end
 
-  def query(hash_value, range_value)
+  def query(hash_value, range_value, query_options={})
+    query_options.assert_valid_keys(:limit)
     count_document_request do
-      query_docs(hash_value, range_value)
+      query_docs(hash_value, range_value, query_options)
     end
   end
 

data/lib/kvom/adapter/dynamodb_adapter.rb

@@ -36,7 +36,7 @@ class DynamodbAdapter < Base
     item.delete
   end
 
-  def query_docs(hash_value, range_value)
+  def query_docs(hash_value, range_value, query_options={})
     raise "Unsupported range value <empty string>" if range_value == ""
     case range_value
     when nil, String
@@ -52,11 +52,12 @@ class DynamodbAdapter < Base
       dynamo_range_start = dynamo_range_value(range_value.begin)
       dynamo_range_end = dynamo_range_value(range_value.end)
 
-      query_options = {
+      query_options = query_options.merge(
         :hash_value => partitioned_hash_value(hash_value),
         :range_value => Range.new(dynamo_range_start, dynamo_range_end),
-        :select => :all,
-      }
+        :select => :all
+      )
+
       table.items.query(query_options).map do |item_data|
         item = item_data.item
         key = key_from_item(item)

data/lib/kvom/adapter/filesystem_adapter.rb

@@ -45,7 +45,7 @@ class FilesystemAdapter < Base
     FileUtils.rm_f(filepath_for_hash_and_range(key.first, key[1]))
   end
 
-  def query_docs(hash_value, range_value)
+  def query_docs(hash_value, range_value, query_options={})
     pathes_and_range_values =
         case range_value
         when Range
@@ -53,6 +53,9 @@ class FilesystemAdapter < Base
         else
           single_file_query(hash_value, range_value)
         end
+    if limit = query_options[:limit]
+      pathes_and_range_values = pathes_and_range_values.first(limit)
+    end
     pathes_and_range_values.inject([]) do |memo, (path, doc_range_value)|
       doc_range_value = nil if doc_range_value == ""
       key = [hash_value, doc_range_value]

data/spec/model/base_spec.rb

@@ -291,7 +291,7 @@ describe Kvom::Model::Base do
     end
   end
 
-  describe "adapter.query(<hash_value>, <range_spec>)" do
+  describe "adapter.query(<hash_value>, <range_spec>, <query_options>)" do
 
     def set_of_keys(documents)
       keys = documents.map{|doc| doc.key}.to_set
@@ -319,6 +319,12 @@ describe Kvom::Model::Base do
       [one_001, one_002, one_0021, one_0022, one_3, two_two, three_empty]
     end
 
+    it 'should be able to limit results' do
+      adapter.query(volatile_id('one'), Range.new('0001', '0022'), :limit => 2).length.should eq(2)
+      adapter.query(volatile_id('one'), Range.new('0001', '0022'), :limit => 4).length.should eq(4)
+      adapter.query(volatile_id('one'), Range.new('0001', '0022'), :limit => 8).length.should eq(4)
+    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kvom
 version: !ruby/object:Gem::Version
-  version: 6.8.2.36.82613853
+  version: 6.8.3.1.23895778
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-31 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -176860239
+      hash: -10481197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: