kvom 6.8.0.23.da7f96b → 6.8.0.72.d18d096

data/kvom.gemspec

@@ -20,10 +20,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+
   s.add_runtime_dependency "multi_json", "~> 1"
   s.add_runtime_dependency "activesupport", ">= 3" # does not support rational versioning, does it?
   s.add_runtime_dependency "activemodel", ">= 3"   # adapters
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.8"
   s.add_development_dependency "helpful_configuration"
   s.add_development_dependency "yajl-ruby" # a specific json provider

data/lib/kvom/adapter/base.rb

@@ -17,31 +17,82 @@ class Base
     raise "implement me in subclass!"
   end
 
+  def get(key)
+    count_document_request do
+      read_doc(key)
+    end
+  end
+
   def save(doc)
-    raise "implement me in subclass!"
+    count_request do
+      write_doc(doc)
+    end
   end
 
-  def get(key)
-    raise "implement me in subclass!"
+  def save_index(key)
+    count_request do
+      write_index_doc(key)
+    end
   end
 
   def destroy(doc)
-    raise "implement me in subclass!"
+    count_request do
+      destroy_doc(doc)
+    end
+  end
+
+  def destroy_index(key)
+    count_request do
+      destroy_index_doc(key)
+    end
   end
 
   def query(hash_value, range_value)
-    raise "implement me in subclass!"
+    count_document_request do
+      query_docs(hash_value, range_value)
+    end
+  end
+
+  def range_values_of_hash_value(hash_value)
+    count_request do
+      doc_range_values_of_hash_value(hash_value)
+    end
   end
 
-  protected
+  private
 
-  def count_request(num_requests = 1)
-    @request_counter += num_requests
-    result = yield
-    @documents_loaded_counter += Array === result ? result.size : 1
+  def count_document_request
+    result = count_request {yield}
+    @documents_loaded_counter +=
+        case result
+        when nil
+          0
+        when Array
+          result.size
+        else
+          1
+        end
     result
   end
 
+  def count_request
+    @request_counter += 1
+    yield
+  end
+
+  %w[
+    read_doc
+    write_doc
+    write_index_doc
+    destroy_doc
+    destroy_index_doc
+    query_docs
+    doc_range_values_of_hash_value
+  ].each do |name|
+    define_method(name) do |*args|
+      raise "Method #{name} not yet implemented for #{self.class.name}!"
+    end
+  end
 end
 
 end; end # module Kvom::Adapter

data/lib/kvom/{document.rb → adapter/document.rb}

@@ -1,6 +1,6 @@
-require 'kvom'
+require 'kvom/adapter'
 
-module Kvom
+module Kvom; module Adapter
 
 class Document
   def key
@@ -16,4 +16,4 @@ class Document
   end
 end
 
-end # module Kvom
+end; end # module Kvom::Adapter

data/lib/kvom/adapter/dynamodb_adapter.rb

@@ -6,52 +6,69 @@ module Kvom; module Adapter
 class DynamodbAdapter < Base
 
   def new_document(key, attributes = nil)
-    DynamodbDocument.new_document(attributes, key, item_for_key(key))
+    DynamodbDocument.new_document(attributes, key, item_for_hash_and_range(key.first, key[1]))
   end
 
-  def get(key)
-    item = item_for_key(key)
-    count_request {
-      (attributes = item.attributes.to_h).empty? and raise NotFound.for_key(key)
-      DynamodbDocument.document_from_query(attributes, key, item)
-    }
+  private
+
+  def read_doc(key)
+    item = item_for_hash_and_range(key.first, key[1])
+    attributes = item.attributes.to_h
+    attributes.empty? and raise NotFound.for_key(key)
+    DynamodbDocument.document_from_query(attributes, key, item)
   end
 
-  def save(doc)
+  def write_doc(doc)
+    # doc is only saved if modified - might be one request more than sent to Dynamo
     doc.save
   end
 
-  def destroy(doc)
+  def write_index_doc(key)
+    item = item_for_hash_and_range(key.first, key[1])
+    table.items.put(:hash_key => item.hash_value, :range_key => item.range_value)
+  end
+
+  def destroy_doc(doc)
     doc.destroy
   end
 
-  def query(hash_value, range_value)
-    count_request do
-      case range_value
-      when String
-        item = item_for_hash_and_range(hash_value, range_value)
-        attributes = item.attributes.to_h
-        if attributes.empty?
-          []
-        else
-          key = key_from_item(item)
-          [DynamodbDocument.document_from_query(attributes, key, item)]
-        end
-      when Range
-        dynamo_range_start = dynamo_range_value(range_value.begin)
-        dynamo_range_end = dynamo_range_value(range_value.end)
-
-        query_options = {
-          :hash_value => partitioned_hash_value(hash_value),
-          :range_value => Range.new(dynamo_range_start, dynamo_range_end),
-          :select => :all,
-        }
-        table.items.query(query_options).map do |item_data|
-          item = item_data.item
-          key = key_from_item(item)
-          DynamodbDocument.document_from_query(item_data.attributes, key, item)
-        end
+  def destroy_index_doc(key)
+    item = item_for_hash_and_range(key.first, key[1])
+    item.delete
+  end
+
+  def query_docs(hash_value, range_value)
+    raise "Unsupported range value <empty string>" if range_value == ""
+    case range_value
+    when nil, String
+      item = item_for_hash_and_range(hash_value, range_value)
+      attributes = item.attributes.to_h
+      if attributes.empty?
+        []
+      else
+        key = key_from_item(item)
+        [DynamodbDocument.document_from_query(attributes, key, item)]
       end
+    when Range
+      dynamo_range_start = dynamo_range_value(range_value.begin)
+      dynamo_range_end = dynamo_range_value(range_value.end)
+
+      query_options = {
+        :hash_value => partitioned_hash_value(hash_value),
+        :range_value => Range.new(dynamo_range_start, dynamo_range_end),
+        :select => :all,
+      }
+      table.items.query(query_options).map do |item_data|
+        item = item_data.item
+        key = key_from_item(item)
+        DynamodbDocument.document_from_query(item_data.attributes, key, item)
+      end
+    end
+  end
+
+  def doc_range_values_of_hash_value(hash_value)
+    table.items.query(:hash_value => partitioned_hash_value(hash_value)).map do |item|
+      key_from_item(item).last
     end
   end
 
@@ -75,13 +92,9 @@ class DynamodbAdapter < Base
 
   def key_from_item(item)
     hash_value, range_value = item.hash_value, item.range_value
-    range_value = "" if range_value == " " # range_from_dynamo_range
+    range_value = nil if range_value == " " # range_from_dynamo_range
     hash_value = hash_value[(partition.length + 1)..-1] if partition # unpartitioned_hash_value
-    [hash_value, range_value].join("|")
-  end
-
-  def item_for_key(key)
-    item_for_hash_and_range(*(key.split("|", 2)))
+    [hash_value, range_value]
   end
 
   def item_for_hash_and_range(hash, range)
@@ -95,8 +108,8 @@ class DynamodbAdapter < Base
   end
 
   def dynamo_range_value(range_value)
-    case range_value || ""
-    when ""
+    case range_value
+    when nil, ""
       # range_key is required and must not be empty
       " "
     else

data/lib/kvom/adapter/filesystem_adapter.rb

@@ -15,39 +15,56 @@ class FilesystemAdapter < Base
     FilesystemDocument.new(key, attributes)
   end
 
-  def get(key)
-    count_request { document_for_key(key) } or raise NotFound.for_key(key)
-  end
+  private
 
-  def destroy(doc)
-    FileUtils.rm_f(filepath_for_document(doc))
+  def read_doc(key)
+    document_for_key(key) or raise NotFound.for_key(key)
   end
 
-  def save(doc)
+  def write_doc(doc)
     path = filepath_for_document(doc)
     FileUtils.mkdir_p(path.dirname)
     # TODO: conditional put
     File.open(path, "w") {|f| f.write(doc.to_json)}
   end
 
-  def query(hash_value, range_value)
+  def write_index_doc(key)
+    path = filepath_for_hash_and_range(key.first, key[1])
+    FileUtils.mkdir_p(path.dirname)
+    File.open(path, "w") {} # "touch"
+  end
+
+  def destroy_doc(doc)
+    FileUtils.rm_f(filepath_for_document(doc))
+  end
+
+  def destroy_index_doc(key)
+    FileUtils.rm_f(filepath_for_hash_and_range(key.first, key[1]))
+  end
+
+  def query_docs(hash_value, range_value)
     pathes_and_range_values =
-        count_request do
-          case range_value
-          when Range
-            range_file_query(hash_value, range_value.first, range_value.last)
-          else
-            single_file_query(hash_value, range_value)
-          end
+        case range_value
+        when Range
+          range_file_query(hash_value, range_value.first, range_value.last)
+        else
+          single_file_query(hash_value, range_value)
         end
     pathes_and_range_values.inject([]) do |memo, (path, doc_range_value)|
-      key = [hash_value, doc_range_value].join("|")
+      doc_range_value = nil if doc_range_value == ""
+      key = [hash_value, doc_range_value]
       doc = document_for_key_and_path(key, path)
       memo << doc if doc
       memo
     end
   end
 
+  def doc_range_values_of_hash_value(hash_value)
+    all_files(dir_for_hash_value(hash_value)).map do |entry|
+      range_value_from_path_component(entry)
+    end
+  end
+
   private
 
   def base_dir
@@ -59,25 +76,20 @@ class FilesystemAdapter < Base
   end
 
   def document_for_key(key)
-    document_for_key_and_path(key, filepath_for_key(key))
+    document_for_key_and_path(key, filepath_for_hash_and_range(key.first, key[1]))
   end
 
   def document_for_key_and_path(key, path)
-    begin
-      serialized_doc = File.read(path)
-    rescue ::Errno::ENOENT
-      return nil
-    end
-    # there is no "was loaded from db" yet (e.g. for conditional put)
+    serialized_doc = File.read(path)
+  rescue ::Errno::ENOENT
+    nil
+  else
     FilesystemDocument.new(key, Lib::Json.load(serialized_doc))
   end
 
   def filepath_for_document(doc)
-    filepath_for_key(doc.key)
-  end
-
-  def filepath_for_key(key)
-    filepath_for_hash_and_range(*(key.split("|", 2)))
+    key = doc.key
+    filepath_for_hash_and_range(key.first, key[1])
   end
 
   def filepath_for_hash_and_range(hash_value, range_value)
@@ -89,8 +101,13 @@ class FilesystemAdapter < Base
   end
 
   def path_component_for_value(value)
-    # value should not have a pipe character
-    value.gsub("/", "|")
+    case value
+    when nil
+      ""
+    else
+      # value should not have a pipe character
+      value.gsub("/", "|")
+    end
   end
 
   def path_component_for_range_value(range_value)
@@ -98,7 +115,12 @@ class FilesystemAdapter < Base
   end
 
   def value_from_path_component(path_component)
-    path_component.to_s.gsub("|", "/")
+    case path_component
+    when ""
+      nil
+    else
+      path_component.gsub("|", "/")
+    end
   end
 
   def range_value_from_path_component(path_component)
@@ -111,20 +133,26 @@ class FilesystemAdapter < Base
   end
 
   def range_file_query(hash_value, start_range_value, end_range_value)
-    hash_dir = dir_for_hash_value(hash_value)
-    Dir.foreach(hash_dir).inject([]) do |memo, entry|
-      if entry[-EXT_SIZE..-1] == EXT
-        range_value = range_value_from_path_component(entry)
-        if start_range_value <= range_value && range_value <= end_range_value
-          memo << [hash_dir + entry, range_value]
-        end
-      end
-      memo
+    dir = dir_for_hash_value(hash_value)
+    all_files(dir).map do |entry|
+      [range_value_from_path_component(entry), entry]
+    end.select do |range_value, entry|
+      compare_value = range_value || ""
+      start_range_value <= compare_value && compare_value <= end_range_value
+    end.map do |range_value, entry|
+      [dir + entry, range_value]
     end
+  end
+
+  def all_files(dir)
+    entries = Dir.entries(dir)
   rescue Errno::ENOENT
     []
+  else
+    entries.select do |entry|
+      entry[-EXT_SIZE..-1] == EXT
+    end
   end
-
 end
 
 end; end # module Kvom::Adapter

data/lib/kvom/model.rb

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

data/lib/kvom/{base.rb → model/base.rb}

@@ -1,21 +1,27 @@
-require 'kvom'
+require 'kvom/model'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/class/attribute'
 require 'active_model/naming'
 require 'securerandom'
 
-module Kvom
+module Kvom; module Model
 
 class Base
 
-  include ModelIdentity
+  include Kvom::ModelIdentity
   extend ActiveModel::Naming
 
 
+
   class_attribute :key_prefix
 
   class << self
+
+    def has_all_ids
+      include Feature::AllIds
+    end
+
     def create(attributes = {})
       new(attributes).tap { |model| model.save }
     end
@@ -27,7 +33,7 @@ class Base
 
     def find_by_id(id)
       find(id)
-    rescue NotFound
+    rescue Kvom::NotFound
       nil
     end
 
@@ -51,14 +57,18 @@ class Base
       raise "must be overwritten in subclasses"
     end
 
-    def key_for(id)
-      "#{key_prefix}/id/#{id}|"
+    def id_key_for(id)
+      key_for("id/#{id}", nil)
     end
 
     private
 
     def find_document(id)
-      adapter.get(key_for(id))
+      adapter.get(id_key_for(id))
+    end
+
+    def key_for(hash, range)
+      ["#{key_prefix}/#{hash}", range]
     end
 
   end
@@ -66,12 +76,12 @@ class Base
   def initialize(doc_or_attrs = {})
     @document =
         case doc_or_attrs
-        when Document
+        when ::Kvom::Adapter::Document
           doc_or_attrs
         else
           @new = true
           attrs = doc_or_attrs.stringify_keys
-          key = self.class.key_for(attrs["id"] ||= SecureRandom.hex(8))
+          key = self.class.id_key_for(attrs["id"] ||= SecureRandom.hex(8))
           self.class.adapter.new_document(key, attrs)
         end
   end
@@ -82,6 +92,7 @@ class Base
 
   def save
     self.class.adapter.save(@document)
+    self.class.adapter.save_index(all_key) if @new && is_a?(Feature::AllIds)
     @new = false
   end
 
@@ -94,6 +105,7 @@ class Base
   end
 
   def destroy
+    self.class.adapter.destroy_index(all_key) if is_a?(Feature::AllIds)
     self.class.adapter.destroy(@document)
   end
 
@@ -109,4 +121,4 @@ class Base
 
 end
 
-end # module Kvom
+end; end # module Kvom::Model

data/lib/kvom/model/feature.rb

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

data/lib/kvom/model/feature/all_ids.rb

@@ -0,0 +1,30 @@
+require 'kvom/model/feature'
+
+module Kvom; module Model; module Feature
+
+module AllIds
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def all_ids
+      adapter.range_values_of_hash_value("#{key_prefix}/all")
+    end
+
+    def all_key_for(id)
+      key_for("all", id)
+    end
+
+  end
+
+  private
+
+  def all_key
+    self.class.all_key_for(id)
+  end
+
+end
+
+end; end; end

data/lib/kvom/not_found.rb

@@ -2,6 +2,6 @@ require 'kvom'
 
 class Kvom::NotFound < ::StandardError
   def self.for_key(key)
-    new(%(document with key "#{key}" not found))
+    new(%(document with key "#{key.first}|#{key[1]}" not found))
   end
 end

data/spec/{adaptor → adapter}/counter_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
-describe Kvom::Base do
+describe Kvom::Model::Base do
   let(:model) { ExampleModel.create }
 
+  before do
+    model
+  end
+
   it "should count the number of requests" do
     expect {
       ExampleModel.find(model.id)

data/spec/model/all_ids_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Kvom::Model::Base, "with all-index enabled" do
+  describe ".all_ids" do
+    before(:all) do
+      TestModelWithIndex.create(:id => volatile_id("0815-list"))
+      TestModelWithIndex.create(:id => volatile_id("007"))
+      OtherModelWithIndex.create(:id => volatile_id("other"))
+    end
+
+    it "returns the ids of all persisted models" do
+      all_ids = TestModelWithIndex.all_ids
+      expected_ids = [volatile_id("0815-list"), volatile_id("007")]
+      (expected_ids & all_ids).should eq(expected_ids)
+    end
+
+    it "returns only ids of the model" do
+      all_ids = TestModelWithIndex.all_ids
+      all_ids.should_not include(volatile_id("other"))
+    end
+
+    it "returns ids for which a model can be fetched" do
+      all_ids = TestModelWithIndex.all_ids
+      all_ids.each do |model_id|
+        expect {TestModelWithIndex.find(model_id)}.to_not raise_error
+      end
+    end
+  end
+
+  describe ".create" do
+    it "adds the instance's id to the ids returned by .all_ids" do
+      new_id = volatile_id("neu")
+      expect {
+        TestModelWithIndex.create(:id => new_id)
+      }.to change {
+        TestModelWithIndex.all_ids.include?(new_id)
+      }.to(true)
+    end
+  end
+
+  describe "#destroy" do
+    let(:model) {TestModelWithIndex.create(:id => volatile_id("weg"))}
+
+    before do
+      model
+    end
+
+    it "removes the instance's id from the ids returned by .all_ids" do
+      expect {
+        model.destroy
+      }.to change {
+        TestModelWithIndex.all_ids.include?(volatile_id("weg"))
+      }.to(false)
+    end
+  end
+
+  describe ".save" do
+    it "does not write the index doc for an existing model" do
+      new_model = TestModelWithIndex.new(:id => volatile_id("counting"))
+      counter_before = TestModelWithIndex.adapter.request_counter
+      new_model.save
+      counter_new_saved = TestModelWithIndex.adapter.request_counter
+      requests_for_new_model = counter_new_saved - counter_before
+      new_model.something = "changed"
+      new_model.save
+      counter_existing_saved = TestModelWithIndex.adapter.request_counter
+      requests_for_existing_model = counter_existing_saved - counter_new_saved
+
+      requests_for_existing_model.should < requests_for_new_model
+    end
+  end
+end

data/spec/{adaptor → model}/base_spec.rb

@@ -1,17 +1,6 @@
 require 'spec_helper'
 
-class CustomKeyPrefixModel < TestModel
-  self.key_prefix = "spam_prefix"
-end
-
-class ModelWithoutAdapter < Kvom::Base
-end
-
-def random_id
-  rand.to_s
-end
-
-describe Kvom::Base do
+describe Kvom::Model::Base do
   it "should complain when no adapter is specified" do
     expect { ModelWithoutAdapter.find("spam") }.to raise_error(/overwritten/)
   end
@@ -111,11 +100,11 @@ describe Kvom::Base do
 
   describe "model's id" do
     it "should use a custom prefix when given" do
-      CustomKeyPrefixModel.new.__send__(:document).key.should =~ /^spam_prefix\/id\/.+/
+      CustomKeyPrefixModel.new.__send__(:document).key.first.should =~ /^spam_prefix\/id\/.+/
     end
 
     it "should use a default prefix" do
-      ExampleModel.new.__send__(:document).key.should =~ /^ExampleModel\/id\/.+/
+      ExampleModel.new.__send__(:document).key.first.should =~ /^ExampleModel\/id\/.+/
     end
   end
 
@@ -134,7 +123,7 @@ describe Kvom::Base do
       model_id = random_id
       expect {
         ExampleModel.find(model_id)
-      }.to raise_error(Kvom::NotFound, %r(document.*"ExampleModel/id/#{model_id}|"/))
+      }.to raise_error(Kvom::NotFound, %r(document.* key "ExampleModel/id/#{model_id}\|"))
     end
   end
 
@@ -167,49 +156,44 @@ describe Kvom::Base do
 
   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), {})
+    def create_document(hash, range)
+      document = adapter.new_document([volatile_id(hash), range], {})
       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|")}
+    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", nil)}
 
     before(:all) do
-      [one_001, one_002, one_0021, one_0022, one_3, two_two, three_empty, three_empty]
+      [one_001, one_002, one_0021, one_0022, one_3, two_two, 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])
+          set_of_keys(adapter.query(volatile_id("one"), "001")).should == set_of_keys([one_001])
+          set_of_keys(adapter.query(volatile_id("three"), nil)).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 == []
+          adapter.query(volatile_id("unknown_hash"), "001").should == []
+          adapter.query(volatile_id("one"), "unknown_range").should == []
         end
       end
     end
@@ -217,37 +201,38 @@ describe Kvom::Base do
     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"))).
+        set_of_keys(adapter.query(volatile_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"))).
+        set_of_keys(adapter.query(volatile_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")).
+          adapter.query(volatile_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("", "~"))).
+          set_of_keys(adapter.query(volatile_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
+
+        it "returns a document that has the hash value even if it has no range value" do
+          set_of_keys(adapter.query(volatile_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 == []
+        adapter.query(volatile_id("none_of_these"), Range.new("", "~")).should == []
       end
     end
   end
@@ -271,7 +256,7 @@ describe Kvom::Base do
 
     context "when the model has been created with an id" do
 
-      let(:model_with_id) {ExampleModel.create(:id => rand.to_s)}
+      let(:model_with_id) {ExampleModel.create(:id => random_id)}
 
       it "destroys the model" do
         id = model_with_id.id
@@ -325,7 +310,7 @@ describe Kvom::Base do
 
       context "including id" do
 
-        let(:model_id) {"static" + rand.to_s}
+        let(:model_id) {"not_a_default_#{random_id}"}
         let(:model_from_attributes_including_id) {ExampleModel.new({"id" => model_id})}
 
         before do

data/spec/spec_helper.rb

@@ -1,29 +1,7 @@
 # require 'pry'
 require File.expand_path("../../lib/kvom", __FILE__)
 
-
-class TestModel < Kvom::Base
-  def self.adapter
-    @adapter ||=
-      case (type = ENV['KVOM_ADAPTER_TYPE'] || "file")
-      when /dynamo/
-        require File.expand_path("../../../tasks/support/local_config", __FILE__)
-        options = {
-          :table => "test-kvom",
-          :access_key_id => local_config["aws_access_key_id"],
-          :secret_access_key => local_config["aws_secret_access_key"],
-        }
-        options[:partition] = "korb" if type == "partitioned_dynamo"
-        Kvom::Adapter::DynamodbAdapter.new(options)
-      when /file/
-        Kvom::Adapter::FilesystemAdapter.new(:path => File.expand_path("../../tmp/fsa", __FILE__))
-      end
-  end
-end
-
-class ExampleModel < TestModel
-  property :spam
-end
+Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f[0..-4]}
 
 RSpec.configure do |config|
   adapter = TestModel.adapter.class.to_s.demodulize.sub("Adapter", "").sub("db", "").downcase
@@ -37,6 +15,8 @@ RSpec.configure do |config|
         satisfied_by?(multi_json_version)
   }
 
+  config.include(TestIds)
+
   config.filter_run_excluding :adapter => adapter_specified_and_different
   config.filter_run_excluding :multi_json_version => multi_json_version_and_insufficient
 end

data/spec/support/model.rb

@@ -0,0 +1,41 @@
+class TestModel < Kvom::Model::Base
+  def self.adapter
+    @adapter ||=
+      case (type = ENV['KVOM_ADAPTER_TYPE'] || "file")
+      when /dynamo/
+        require File.expand_path("../../../../tasks/support/local_config", __FILE__)
+        options = {
+          :table => "test-kvom",
+          :access_key_id => local_config["aws_access_key_id"],
+          :secret_access_key => local_config["aws_secret_access_key"],
+        }
+        options[:partition] = "korb" if type == "partitioned_dynamo"
+        Kvom::Adapter::DynamodbAdapter.new(options)
+      when /file/
+        Kvom::Adapter::FilesystemAdapter.new(:path => File.expand_path("../../../tmp/fsa", __FILE__))
+      end
+  end
+end
+
+class ExampleModel < TestModel
+  property :spam
+end
+
+class CustomKeyPrefixModel < TestModel
+  self.key_prefix = "spam_prefix"
+end
+
+class ModelWithoutAdapter < Kvom::Model::Base
+end
+
+class TestModelWithIndex < TestModel
+  has_all_ids
+
+  property :something
+end
+
+class OtherModelWithIndex < TestModel
+  has_all_ids
+
+  property :something
+end

data/spec/support/test_ids.rb

@@ -0,0 +1,17 @@
+module TestIds
+  # - returns the same id for the whole test run
+  # - returns a different id when running the specs again
+  #   => no id collision when running the tests on a reused and not emptied database
+  def self.volatile_id(id)
+    "#{@discriminator ||= SecureRandom.hex(8)}#{id}"
+  end
+
+  def volatile_id(id)
+    TestIds.volatile_id(id)
+  end
+
+  def random_id
+    rand.to_s
+  end
+
+end

metadata

@@ -1,19 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: kvom
 version: !ruby/object:Gem::Version 
-  hash: -746145115
+  hash: 730055358
   prerelease: 9
   segments: 
   - 6
   - 8
   - 0
-  - 23
-  - da
-  - 7
-  - f
+  - 72
+  - d
+  - 18
+  - d
   - 96
-  - b
-  version: 6.8.0.23.da7f96b
+  version: 6.8.0.72.d18d096
 platform: ruby
 authors: 
 - Kristian Hanekamp, Infopark AG
@@ -21,10 +20,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-18 00:00:00 +02:00
+date: 2012-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +34,11 @@ dependencies:
         segments: 
         - 1
         version: "1"
-  version_requirements: *id001
   name: multi_json
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +48,11 @@ dependencies:
         segments: 
         - 3
         version: "3"
-  version_requirements: *id002
   name: activesupport
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,12 +62,26 @@ dependencies:
         segments: 
         - 3
         version: "3"
-  version_requirements: *id003
   name: activemodel
+  version_requirements: *id003
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +91,12 @@ dependencies:
         - 2
         - 8
         version: "2.8"
-  version_requirements: *id004
   name: rspec
+  version_requirements: *id005
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +105,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
   name: helpful_configuration
+  version_requirements: *id006
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,10 +119,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
   name: yajl-ruby
+  version_requirements: *id007
   prerelease: false
-  type: :development
 description: Use it to build object models in ruby on top of a key value store.
 email: 
 - kristian.hanekamp@infopark.de
@@ -126,16 +139,19 @@ files:
 - lib/kvom.rb
 - lib/kvom/adapter.rb
 - lib/kvom/adapter/base.rb
+- lib/kvom/adapter/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.rb
+- lib/kvom/model/base.rb
+- lib/kvom/model/feature.rb
+- lib/kvom/model/feature/all_ids.rb
 - lib/kvom/model_identity.rb
 - lib/kvom/not_found.rb
 - lib/kvom/storage.rb
@@ -144,15 +160,18 @@ files:
 - lib/kvom/storage/file_system_storage.rb
 - lib/kvom/storage/not_found.rb
 - lib/kvom/storage/s3_storage.rb
-- spec/adaptor/base_spec.rb
-- spec/adaptor/counter_spec.rb
-- spec/adaptor/dynamodb_adaptor_spec.rb
-- spec/adaptor/model_identity_spec.rb
+- 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/spec_helper.rb
 - spec/storage/file_system_spec.rb
 - spec/storage/s3_spec.rb
+- spec/support/model.rb
+- spec/support/test_ids.rb
 - tmp/.gitignore
 has_rdoc: true
 homepage: ""
@@ -191,12 +210,15 @@ signing_key:
 specification_version: 3
 summary: Key Value Object Mapper
 test_files: 
-- spec/adaptor/base_spec.rb
-- spec/adaptor/counter_spec.rb
-- spec/adaptor/dynamodb_adaptor_spec.rb
-- spec/adaptor/model_identity_spec.rb
+- 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/spec_helper.rb
 - spec/storage/file_system_spec.rb
 - spec/storage/s3_spec.rb
+- spec/support/model.rb
+- spec/support/test_ids.rb