kvom 6.8.0.110.6570b45 → 6.8.0.210.ed204b0

data/lib/kvom.rb

@@ -11,4 +11,11 @@ module Kvom
   end
 
   setup_autoload(self, __FILE__)
+
+  class NotFound < ::StandardError
+    def self.for_key(key)
+      new(%(document with key "#{key.first}|#{key[1]}" not found))
+    end
+  end
+
 end

data/lib/kvom/adapter.rb

@@ -2,4 +2,7 @@ require 'kvom'
 
 module Kvom::Adapter
   Kvom.setup_autoload(self, __FILE__)
+
+  class UnsupportedValue < ArgumentError; end
+
 end

data/lib/kvom/adapter/attributes.rb

@@ -0,0 +1,73 @@
+require 'kvom/adapter'
+
+module Kvom; module Adapter
+
+class Attributes
+  def initialize(attributes, from_db = false)
+    if from_db
+      meta = attributes && attributes.delete("@meta.json")
+      @coding = meta && Lib::Json.load(meta)["coding"] || {}
+      @coded_attributes = attributes
+      @attributes = {}
+    else
+      @coding = {}
+      @coded_attributes = {}
+      @attributes = attributes ? attributes.dup : {}
+    end
+  end
+
+  def [](name)
+    return @attributes[name] if @attributes.key?(name)
+    coded_value = @coded_attributes[name]
+    @attributes[name] =
+        case @coding[name]
+        when nil
+          coded_value
+        when "json"
+          ::Kvom::Lib::Json.load(coded_value)
+        when "jsonvalue"
+          ::Kvom::Lib::JsonValue.load(coded_value)
+        else
+          raise "Unexpected coding #{@coding[name]} for attribute #{name}"
+        end
+  end
+
+  def []=(name, value)
+    @coding.delete(name)
+    @coded_attributes.delete(name)
+    @attributes[name] = value
+  end
+
+  def to_h
+    @attributes.each do |(name, value)|
+      next if @coded_attributes.key?(name)
+      if value == nil
+        # can happen for (the writer bypassing) new(:property => nil)
+        @coded_attributes.delete(name)
+      else
+        @coded_attributes[name] =
+            case value
+            when "", true, false
+              @coding[name] = "jsonvalue"
+              ::Kvom::Lib::JsonValue.dump(value)
+            when Array, Hash
+              @coding[name] = "json"
+              ::Kvom::Lib::Json.dump(value)
+            when String, Numeric
+              value
+            else
+              raise UnsupportedValue, "Unsupported value type #{value.class}"
+            end
+       end
+    end
+
+    if @coding.empty?
+      @coded_attributes.delete("@meta.json")
+    else
+      @coded_attributes["@meta.json"] = Lib::Json.dump("coding" => @coding)
+    end
+    @coded_attributes
+  end
+end
+
+end; end

data/lib/kvom/adapter/base.rb

@@ -24,8 +24,10 @@ class Base
   end
 
   def save(doc)
-    count_request do
-      write_doc(doc)
+    doc.update_revision do
+      count_request do
+        write_doc(doc)
+      end
     end
   end
 
@@ -37,6 +39,7 @@ class Base
 
   def destroy(doc)
     count_request do
+      key = doc.key
       destroy_doc(doc)
     end
   end
@@ -61,6 +64,22 @@ class Base
 
   private
 
+  %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
+
+  private
+
   def count_document_request
     result = count_request {yield}
     @documents_loaded_counter +=
@@ -80,19 +99,6 @@ class Base
     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/adapter/document.rb

@@ -1,19 +1,39 @@
+require 'securerandom'
 require 'kvom/adapter'
 
 module Kvom; module Adapter
 
 class Document
-  def key
-    raise "implement me in subclass!"
-  end
+
+  attr_reader :key, :persisted_revision
 
   def [](name)
-    raise "implement me in subclass!"
+    attributes[name]
   end
 
   def []=(name, value)
-    raise "implement me in subclass!"
+    attributes[name] = value
   end
+
+  def update_revision
+    revision_count = @persisted_revision ? @persisted_revision[17..-1].to_i : 0
+    attributes["@rev"] = "%s-%d" % [SecureRandom.hex(8), revision_count + 1]
+    yield
+    @persisted_revision = attributes["@rev"]
+  end
+
+  private
+
+  attr_reader :attributes
+
+  # TODO: from_db is obsolete as soon as all persisted models have got "@rev"
+  #       (then, from_db <=> attributes.key?(@"rev")
+  def initialize(key, attributes, from_db = false)
+    @key = key
+    @attributes = Attributes.new(attributes, from_db)
+    @persisted_revision = from_db ? attributes["@rev"] : nil
+  end
+
 end
 
 end; end # module Kvom::Adapter

data/lib/kvom/adapter/dynamodb_adapter.rb

@@ -6,7 +6,7 @@ module Kvom; module Adapter
 class DynamodbAdapter < Base
 
   def new_document(key, attributes = nil)
-    DynamodbDocument.new_document(attributes, key, item_for_hash_and_range(key.first, key[1]))
+    DynamodbDocument.new(key, attributes, item_for_hash_and_range(key.first, key[1]))
   end
 
   private
@@ -15,12 +15,11 @@ class DynamodbAdapter < Base
     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)
+    DynamodbDocument.document_from_query(key, attributes, item)
   end
 
   def write_doc(doc)
-    # doc is only saved if modified - might be one request more than sent to Dynamo
-    doc.save
+    doc.write
   end
 
   def write_index_doc(key)
@@ -47,7 +46,7 @@ class DynamodbAdapter < Base
         []
       else
         key = key_from_item(item)
-        [DynamodbDocument.document_from_query(attributes, key, item)]
+        [DynamodbDocument.document_from_query(key, attributes, item)]
       end
     when Range
       dynamo_range_start = dynamo_range_value(range_value.begin)
@@ -61,7 +60,7 @@ class DynamodbAdapter < Base
       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)
+        DynamodbDocument.document_from_query(key, item_data.attributes, item)
       end
     end
   end

data/lib/kvom/adapter/dynamodb_document.rb

@@ -2,77 +2,44 @@ require 'kvom/adapter'
 
 module Kvom; module Adapter
 
-class DynamodbDocument < KeyAttributesDocument
+class DynamodbDocument < Document
   class << self
-    def new_document(attributes, key, item)
-      new(key, item, attributes, nil)
-    end
-
-    def document_from_query(item_attributes, key, item)
-      attributes = AttributesFromItemAttributes.from(item_attributes)
-      new(key, item, attributes, attributes["@rev"])
+    def document_from_query(key, item_attributes, item)
+      item_attributes.delete("hash_key")
+      item_attributes.delete("range_key")
+      new(key, item_attributes, item, true)
     end
 
   end
 
-  def initialize(key, item, attributes, revision)
-    super(key, attributes)
+  def initialize(key, attributes, item, from_db = false)
     @dynamo_item = item
-    @revision = revision
-    @modified = @revision == nil
-  end
-
-  def []=(name, value)
-    case value
-    when String, Fixnum, nil
-      # okay ...
-    else
-      raise "Unsupported value type: #{value.class.name}"
-    end
-    unless self[name] == value
-      @modified = true
-      super
-    end
+    super(key, attributes, from_db)
   end
 
-  def save
-    return unless modified?
-    raise "Not yet implemented" if AttributesFromItemAttributes === attributes
-    dynamo_attributes = attributes.inject({}) do |memo, (name, value)|
-      case value
-      when nil
-        # skip
-      when ""
-        # will not raise an error when persisted, but will be returned as nil
-        raise unsupported_value(value)
-      when String, Fixnum, BigDecimal
-        memo[name] = value
-      else
-        raise unsupported_value(value)
-      end
-      memo
+  def write
+    dynamo_attributes = attributes.to_h.merge({
+      "hash_key" => @dynamo_item.hash_value,
+      "range_key" => @dynamo_item.range_value,
+    })
+    begin
+      # might be improved to saving only changed attributes
+      @dynamo_item.table.items.put(dynamo_attributes, revision_condition)
+    rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException => e
+      raise Kvom::WriteConflict.wrap(e)
     end
-    dynamo_attributes["hash_key"] = @dynamo_item.hash_value
-    dynamo_attributes["range_key"] = @dynamo_item.range_value
-    dynamo_attributes["@rev"] = new_revision = (@rev || 0) + 1
-    # might be improved to saving only changed attributes
-    @dynamo_item.table.items.put(dynamo_attributes, revision_condition)
-    @revision = new_revision
-    @modified = false
   end
 
   def destroy
     @dynamo_item.delete(revision_condition)
+  rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException => e
+    raise Kvom::WriteConflict.wrap(e)
   end
 
   private
 
-  def modified?
-    @modified
-  end
-
   def revision_condition
-    dynamo_condition("@rev" => @revision)
+    dynamo_condition("@rev" => persisted_revision)
   end
 
   def dynamo_condition(condition)
@@ -87,49 +54,10 @@ class DynamodbDocument < KeyAttributesDocument
     end
     options = {}
     options[:if] = present_condition unless present_condition.empty?
-    options[:unless] = missing_condition unless missing_condition.empty?
+    options[:unless_exists] = missing_condition unless missing_condition.empty?
     options
   end
 
-  class AttributesFromItemAttributes
-    def self.from(attributes)
-      attributes.delete("hash_key")
-      attributes.delete("range_key")
-      meta = attributes.delete("@meta.json")
-      return attributes unless meta
-      meta = Lib::Json.load(meta)
-      coding = meta["coding"]
-      return attributes if !coding || coding.empty?
-      new(attributes, coding)
-    end
-
-    def initialize(attributes, coding)
-      @attributes = attributes
-      @coding = coding
-    end
-
-    def [](name)
-      value = @attributes[name]
-      coding = @coding[name]
-      return value unless coding
-      self[name] =
-          case coding
-          when "json"
-            Lib::Json.load(value)
-          when "jsonvalue"
-            Lib::JsonValue.load(value)
-          else
-            raise "Unexpected coding #{coding} for attribute #{name}"
-          end
-    end
-
-    def []=(name, value)
-      @coding.delete(name)
-      @attributes[name] = value
-    end
-
-  end
-
 end
 
 end; end # module Kvom::Adapter

data/lib/kvom/adapter/filesystem_adapter.rb

@@ -11,7 +11,6 @@ class FilesystemAdapter < Base
   EXT_OFFSET = -(EXT_SIZE + 1)
 
   def new_document(key, attributes)
-    # there is no "was loaded from db" yet (e.g. for conditional put)
     FilesystemDocument.new(key, attributes)
   end
 
@@ -22,9 +21,9 @@ class FilesystemAdapter < Base
   end
 
   def write_doc(doc)
+    check_unmodified(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
 
@@ -35,7 +34,10 @@ class FilesystemAdapter < Base
   end
 
   def destroy_doc(doc)
-    FileUtils.rm_f(filepath_for_document(doc))
+    check_unmodified(doc)
+    FileUtils.rm(filepath_for_document(doc))
+  rescue ::Errno::ENOENT => e
+    raise Kvom::WriteConflict.wrap(e)
   end
 
   def destroy_index_doc(key)
@@ -84,7 +86,7 @@ class FilesystemAdapter < Base
   rescue ::Errno::ENOENT
     nil
   else
-    FilesystemDocument.new(key, Lib::Json.load(serialized_doc))
+    FilesystemDocument.new(key, Lib::Json.load(serialized_doc), true)
   end
 
   def filepath_for_document(doc)
@@ -153,6 +155,14 @@ class FilesystemAdapter < Base
       entry[-EXT_SIZE..-1] == EXT
     end
   end
+
+  def check_unmodified(doc)
+    current = document_for_key(doc.key)
+    current_revision = current && current.persisted_revision
+    unless current_revision == doc.persisted_revision
+      raise Kvom::WriteConflict
+    end
+  end
 end
 
 end; end # module Kvom::Adapter

data/lib/kvom/adapter/filesystem_document.rb

@@ -2,19 +2,9 @@ require 'kvom/adapter'
 
 module Kvom; module Adapter
 
-class FilesystemDocument < KeyAttributesDocument
+class FilesystemDocument < Document
   def to_json
-    # supported values restricted to the ones of dynamo_document
-    attributes.each do |key, value|
-      case value
-      when ""
-        raise unsupported_value(value)
-      when nil, String, Fixnum # BigDecimal is not standard ruby
-      else
-        raise unsupported_value(value)
-      end
-    end
-    Lib::Json.dump(attributes)
+    Lib::Json.dump(attributes.to_h)
   end
 end
 

data/lib/kvom/conflict.rb

@@ -0,0 +1,3 @@
+require 'kvom'
+
+class Kvom::Conflict < ::StandardError; end

data/lib/kvom/model/base.rb

@@ -13,7 +13,6 @@ class Base
   extend ActiveModel::Naming
 
 
-
   class_attribute :key_prefix
 
   class << self
@@ -73,6 +72,10 @@ class Base
 
   end
 
+  # Currently, the caller is responsible to not leak non-property
+  # attributes into the (persisted!) model by using the mass assignment
+  # available by new(). A filter would require to remember the properties
+  # (through a class inheritable attribute)
   def initialize(doc_or_attrs = {})
     @document =
         case doc_or_attrs

data/lib/kvom/write_conflict.rb

@@ -0,0 +1,17 @@
+require 'kvom'
+
+class Kvom::WriteConflict < Kvom::Conflict
+
+  attr_reader :cause
+
+  def self.wrap(cause)
+    new.tap do
+      new.cause = cause
+    end
+  end
+
+  def cause=(ex)
+    @cause and raise "Cannot set cause twice"
+    @cause = ex
+  end
+end

data/script/cleanup

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler'
+
+Bundler.setup
+
+$LOAD_PATH << File.expand_path("../../lib", __FILE__)
+require 'kvom'
+require File.expand_path("../../spec/support/adapter", __FILE__)
+
+module KvomGarbageCollector
+
+  def self.cleanup(type)
+    adapter = AdapterForSpec.adapter_for_type(type)
+    case adapter.class.name
+    when /FilesystemAdapter/
+      Filesystem
+    when /Dynamo/
+      Dynamo
+    else
+      raise "Cleanup aborted (unexpected adapter class #{adapter.class})"
+    end.cleanup(adapter)
+  end
+
+  module Filesystem
+
+    def self.cleanup(adapter)
+      require 'fileutils'
+      dir = adapter.__send__(:base_dir)
+      dir.to_s.include?("tmp") or raise "Unexpected filesystem adapter directory: #{dir}"
+      FileUtils.rm_rf(dir)
+    end
+
+  end
+
+  module Dynamo
+
+    def self.cleanup(adapter)
+      now = Time.now.strftime("%Y%m%d%H%M%S")
+      statistic = Hash.new(0)
+      item_collection = adapter.__send__(:table).items
+      items = item_collection.to_a
+      sleep 5
+      item_collection.select(:hash_key, :range_key, :tfc) do |item_data|
+        item = item_data.item
+        if items.include?(item)
+          type = "skipped"
+          time_for_cleanup = item_data.attributes["tfc"]
+          case time_for_cleanup
+          when nil
+            # legacy
+            item_collection.put({
+              :hash_key => item.hash_value,
+              :range_key => item.range_value,
+              :tfc => (Time.now + 2 * 60 * 60).strftime("%Y%m%d%H%M%S"),
+            })
+            type = "marked"
+          else
+            if time_for_cleanup < now
+              item.delete
+              type = "removed"
+            end
+          end
+          statistic[type] += 1
+        else
+          type = "vanished"
+        end
+      end
+      actions = statistic.keys.sort.reverse.map {|type| "#{type}: #{statistic[type]}"}.join(", ")
+      puts "Dynamo cleanup: #{statistic.values.inject(0) {|sum, i| sum + i}} items (#{actions})"
+    end
+
+  end
+
+end
+
+KvomGarbageCollector.cleanup(ARGV.first || ENV['KVOM_ADAPTER_TYPE'] || "file")

data/spec/model/all_ids_spec.rb

@@ -21,8 +21,12 @@ describe Kvom::Model::Base, "with all-index enabled" do
 
     it "returns ids for which a model can be fetched" do
       all_ids = TestModelWithIndex.all_ids
+      erroneous_ids = {}
       all_ids.each do |model_id|
-        expect {TestModelWithIndex.find(model_id)}.to_not raise_error
+        TestModelWithIndex.find(model_id).tap do |model|
+          model.should be
+          model.should be_kind_of(TestModelWithIndex)
+        end
       end
     end
   end

data/spec/model/base_spec.rb

@@ -1,89 +1,226 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Kvom::Model::Base do
+
   it "should complain when no adapter is specified" do
     expect { ModelWithoutAdapter.find("spam") }.to raise_error(/overwritten/)
   end
 
   describe "getters and setters" do
     it "work for freshly created models" do
-      example = ExampleModel.create(:spam => "foo")
-      example.spam.should == "foo"
-      example.spam = "bar"
-      example.spam.should == "bar"
+      model = ExampleModel.create(:spam => "foo")
+      model.spam.should == "foo"
+      model.spam = "bar"
+      model.spam.should == "bar"
     end
 
-    it "handle access via string as well as symbols" do
-      example = ExampleModel.create(:spam => "foo")
-      example.spam.should == "foo"
-      example = ExampleModel.create("spam" => "foo")
-      example.spam.should == "foo"
+    it "handles access via string as well as symbols" do
+      model = ExampleModel.create(:spam => "foo")
+      model.spam.should == "foo"
+      model = ExampleModel.create("spam" => "foo")
+      model.spam.should == "foo"
     end
 
     it "works for models loaded from database" do
-      example = ExampleModel.create(:spam => "foo")
-      example.save
+      model = ExampleModel.create(:spam => "foo")
+      model.save
 
-      loaded = ExampleModel.find(example.id)
+      loaded = ExampleModel.find(model.id)
       loaded.spam.should == "foo"
     end
 
-    context "when setting an empty string as property value" do
+    context "when setting" do
+      def raise_unsupported_value(*message)
+        raise_error(Kvom::Adapter::UnsupportedValue, *message)
+      end
 
-      context "when created" do
-        it "raises an error" do
-          expect {ExampleModel.create(:spam => "")}.to raise_error "Unsupported value: empty string"
+      context "an unsupported property value" do
+        context "when created" do
+          it "raises a Kvom::Adapter::UnsupportedValue error" do
+            expect {ExampleModel.create(:spam => Object.new)}.to raise_unsupported_value
+          end
+        end
+
+        context "when saved" do
+          let(:model) {ExampleModel.create(:spam => "not empty")}
+
+          it "raises a Kvom::Adapter::UnsupportedValue error" do
+            model.spam = Object.new
+            expect {
+              model.save
+            }.to raise_unsupported_value
+          end
         end
       end
 
-      context "when saved" do
-        let(:example) {ExampleModel.create(:property => "not empty")}
+      shared_examples_for "setting a supported property value" do |value|
+        it "can persist and return this value" do
+          model = ExampleModel.create(:spam => value)
+          model.spam.should == value
+          ExampleModel.find(model.id).spam.should == value
+        end
+      end
 
-        it "raises an error" do
-          expect {
-            example.spam = ""
-            example.save
-          }.to raise_error "Unsupported value: empty string"
+      # shared_examples_for "setting an unsupported property value" do |value, message|
+      #   it "raises a Kvom::Adapter::UnsupportedValue" do
+      #     expect {
+      #       ExampleModel.create(:spam => value)
+      #     }.to raise_unsupported_value(message + message)
+
+      #     model = ExampleModel.new
+      #     expect {
+      #       model.spam = value
+      #       model.save
+      #     }.to raise_unsupported_value(message)
+      #   end
+      # end
+
+      context "the supported value type Fixnum" do
+        it_should_behave_like "setting a supported property value", 2
+      end
+
+      context "the supported value type String" do
+        context 'and the value is ""' do
+          it_should_behave_like "setting a supported property value", ""
         end
 
+        context 'and the value is not ""' do
+          it_should_behave_like "setting a supported property value", " "
+          it_should_behave_like "setting a supported property value", "not empty"
+        end
       end
 
+      context "the supported value type Hash" do
+        context "containing jsonable values" do
+          it_should_behave_like "setting a supported property value", {
+            "hash" => "is",
+            "also" => "supported",
+            "true" => true,
+            "false" => false,
+            "nil" => nil,
+            "array" => %w[a r r a y],
+            "number" => 3,
+            "nested hash" => {
+              "deep" => "nested",
+            },
+          }
+        end
+
+        # No spec: explicitely undefined behaviour
+        # context "containing a non jsonable value" do
+        #   it_should_behave_like "setting an unsupported property value", {"object" => Object.new},
+        #       "Unsupported value type: Object"
+        # end
+      end
+
+      context "the supported value type Array" do
+        context "containing jsonable values" do
+          it_should_behave_like "setting a supported property value", [
+            "hash" => "is",
+            "also" => "supported",
+            "true" => true,
+            "false" => false,
+            "nil" => nil,
+            "array" => %w[a r r a y],
+            "number" => 3,
+            "nested hash" => {
+              "deep" => "nested",
+            },
+          ]
+        end
+
+        # No spec: explicitely undefined behaviour
+        # context "containing a non jsonable value" do
+        #   it_should_behave_like "setting an unsupported property value", [Object.new],
+        #       "Unsupported value type: Object"
+        # end
+      end
     end
 
-    context "when setting a value of an unsupported value class" do
-      context "when saved" do
-        let(:example) {ExampleModel.create(:property => "valid type")}
+    context "one property with changing types of value" do
+
+      KVOM_PROPERTY_VALUES = [
+        "string",
+        {"ha" => "sh"},
+        [],
+        true,
+        %w[a r r a y],
+        "",
+        {"ha" => "sh"},
+        nil,
+        false,
+      ]
+
+      KVOM_PROPERTY_VALUE_TRANSITIONS = (
+        current = nil
+        transitions = []
+        KVOM_PROPERTY_VALUES.each do |v|
+          transitions << [current, v]
+          current = v
+        end
+        transitions
+      )
+
+      context "for a new model (never persisted)" do
 
-        it "raises an error" do
-          expect {
-            example.spam = %w[invalid type array]
-            example.save
-          }.to raise_error "Unsupported value type: Array"
+        let(:new_model) {ExampleModel.new}
+
+        it "always returns the current value" do
+          KVOM_PROPERTY_VALUES.each do |value|
+            expect {
+              expect {
+                new_model.spam = value
+              }.to change(new_model, :spam).to(value)
+            }.to_not change(new_model, :new?)
+          end
         end
 
       end
 
+      KVOM_PROPERTY_VALUE_TRANSITIONS.each do |(before, after)|
+        context "for a persisted model with value #{before.inspect}" do
+          context "for the persisted model itself" do
+            let(:model_just_persisted) {ExampleModel.create(:spam => before)}
+
+            it "it returns the current value" do
+              expect {
+                model_just_persisted.spam = after
+              }.to change(model_just_persisted, :spam).to(after)
+            end
+          end
+
+          context "when the model is fresh loaded" do
+            let(:loaded_model) {ExampleModel.find(ExampleModel.create(:spam => before).id)}
+
+            it "it returns the current value" do
+              expect {
+                loaded_model.spam = after
+              }.to change(loaded_model, :spam).to(after)
+            end
+          end
+        end
+      end
     end
-
   end
 
   describe "#save" do
 
     context "when loaded from database" do
 
-      let(:example_id) {ExampleModel.create(:spam => "ham").id}
-      let(:example_from_db) {ExampleModel.find(example_id)}
+      let(:model_id) {ExampleModel.create(:spam => "ham").id}
+      let(:model_from_db) {ExampleModel.find(model_id)}
 
       context "when modified" do
         before do
-          example_from_db.spam = "and eggs"
+          model_from_db.spam = "and eggs"
         end
 
         it "persists the new value to the database" do
           expect {
-            example_from_db.save
+            model_from_db.save
           }.to change {
-            ExampleModel.find(example_id).spam
+            ExampleModel.find(model_id).spam
           }.to("and eggs")
         end
 
@@ -114,9 +251,9 @@ describe Kvom::Model::Base do
     end
 
     it "should find model instances" do
-      example = ExampleModel.create(:spam => "foo")
-      ExampleModel.find(example.id).id.should == example.id
-      ExampleModel.find(example.id).spam.should == "foo"
+      model = ExampleModel.create(:spam => "foo")
+      ExampleModel.find(model.id).id.should == model.id
+      ExampleModel.find(model.id).spam.should == "foo"
     end
 
     it "should raise exception when instances cannot be found" do

data/spec/model/conflict_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe Kvom::Model::Base do
+
+  describe "#save" do
+
+    let(:model) {ExampleModel.create(:spam => "foo")}
+
+    before do
+      model
+    end
+
+    context "when the model has been changed concurrently" do
+      before do
+        Process.waitpid(fork {
+          model.spam = "changed"
+          model.save
+        })
+      end
+
+      it "raises a Kvom::WriteConflict error" do
+        expect {
+          model.save
+        }.to raise_error(Kvom::WriteConflict)
+      end
+
+    end
+
+    context "when the model has been deleted concurrently" do
+      before do
+        Process.waitpid(fork {
+          model.destroy
+        })
+      end
+
+      it "raises a Kvom::WriteConflict error" do
+        expect {
+          model.save
+        }.to raise_error(Kvom::WriteConflict)
+      end
+
+    end
+
+  end
+
+  describe "#destroy" do
+
+    let(:model) {ExampleModel.create(:spam => "foo")}
+
+    before do
+      model
+    end
+
+    context "when the model has been changed concurrently" do
+      before do
+        Process.waitpid(fork {
+          model.spam = "changed"
+          model.save
+        })
+      end
+
+      it "raises a Kvom::WriteConflict error" do
+        expect {
+          model.destroy
+        }.to raise_error(Kvom::WriteConflict)
+      end
+
+    end
+
+    context "when the model has been deleted concurrently" do
+      before do
+        Process.waitpid(fork {
+          model.destroy
+        })
+      end
+
+      it "raises a Kvom::WriteConflict error" do
+        expect {
+          model.destroy
+        }.to raise_error(Kvom::WriteConflict)
+      end
+
+    end
+
+  end
+
+  describe ".create" do
+
+    before do
+      @model_id = "published-" + SecureRandom.hex(8)
+    end
+
+    context "when the model has been created concurrently" do
+      before do
+        Process.waitpid(fork {
+          ExampleModel.create(:id => @model_id)
+        })
+      end
+
+      it "raises a Kvom::WriteConflict error" do
+        expect {
+          ExampleModel.create(:id => @model_id)
+        }.to raise_error(Kvom::WriteConflict)
+      end
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# require 'pry'
+require 'pry'
 require File.expand_path("../../lib/kvom", __FILE__)
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f[0..-4]}

data/spec/support/adapter.rb

@@ -0,0 +1,23 @@
+module AdapterForSpec
+  def self.adapter
+    @adapter ||= adapter_for_type(ENV['KVOM_ADAPTER_TYPE'] || "file")
+  end
+
+  def self.adapter_for_type(type)
+    case type
+    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__))
+    else
+      raise "Unexpected kvom adapter type specification #{type}"
+    end
+  end
+end

data/spec/support/model.rb

@@ -1,19 +1,6 @@
 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
+    @adapter ||= AdapterForSpec.adapter
   end
 end
 
@@ -28,10 +15,15 @@ end
 class ModelWithoutAdapter < Kvom::Model::Base
 end
 
+require 'securerandom'
 class TestModelWithIndex < TestModel
   has_all_ids
 
   property :something
+
+  # not required to be set, but keeps cleanup and test separated
+  $test_model_with_index_key_prefix ||= "#{key_prefix}-#{SecureRandom.hex(8)}"
+  self.key_prefix = $test_model_with_index_key_prefix
 end
 
 class OtherModelWithIndex < TestModel

data/spec/support/test_ids.rb

@@ -3,7 +3,7 @@ module TestIds
   # - 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}"
+    "#{@discriminator ||= Time.now.strftime("%Y%m%d%H%M%S-") + SecureRandom.hex(8)}#{id}"
   end
 
   def volatile_id(id)

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: kvom
 version: !ruby/object:Gem::Version 
-  hash: -497236305
-  prerelease: 14
+  hash: -268426508
+  prerelease: 10
   segments: 
   - 6
   - 8
   - 0
-  - 110
-  - 6570
+  - 210
+  - ed
+  - 204
   - b
-  - 45
-  version: 6.8.0.110.6570b45
+  - 0
+  version: 6.8.0.210.ed204b0
 platform: ruby
 authors: 
 - Kristian Hanekamp, Infopark AG
@@ -19,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-26 00:00:00 +02:00
+date: 2012-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,13 +138,14 @@ files:
 - kvom.gemspec
 - lib/kvom.rb
 - lib/kvom/adapter.rb
+- lib/kvom/adapter/attributes.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/conflict.rb
 - lib/kvom/lib.rb
 - lib/kvom/lib/json.rb
 - lib/kvom/lib/json_value.rb
@@ -152,13 +154,14 @@ files:
 - 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
 - lib/kvom/storage/base.rb
 - lib/kvom/storage/cache_with_prefix.rb
 - lib/kvom/storage/file_system_storage.rb
 - lib/kvom/storage/not_found.rb
 - lib/kvom/storage/s3_storage.rb
+- lib/kvom/write_conflict.rb
+- script/cleanup
 - spec/adapter/counter_spec.rb
 - spec/adapter/dynamodb_adapter_spec.rb
 - spec/adapter/model_identity_spec.rb
@@ -166,9 +169,11 @@ files:
 - spec/lib/json_spec.rb
 - spec/model/all_ids_spec.rb
 - spec/model/base_spec.rb
+- spec/model/conflict_spec.rb
 - spec/spec_helper.rb
 - spec/storage/file_system_spec.rb
 - spec/storage/s3_spec.rb
+- spec/support/adapter.rb
 - spec/support/model.rb
 - spec/support/test_ids.rb
 - tmp/.gitignore
@@ -216,8 +221,10 @@ test_files:
 - spec/lib/json_spec.rb
 - spec/model/all_ids_spec.rb
 - spec/model/base_spec.rb
+- spec/model/conflict_spec.rb
 - spec/spec_helper.rb
 - spec/storage/file_system_spec.rb
 - spec/storage/s3_spec.rb
+- spec/support/adapter.rb
 - spec/support/model.rb
 - spec/support/test_ids.rb

data/lib/kvom/adapter/key_attributes_document.rb

@@ -1,36 +0,0 @@
-require 'kvom/adapter'
-
-# :enddoc:
-module Kvom; module Adapter;
-
-class KeyAttributesDocument < Document
-
-  attr_reader :key, :attributes
-
-  def initialize(key, attributes)
-    @key = key
-    @attributes = attributes || {}
-  end
-
-  def [](name)
-    @attributes[name]
-  end
-
-  def []=(name, value)
-    @attributes[name] = value
-  end
-
-  private
-
-  def unsupported_value(value)
-    case value
-    when ""
-      "Unsupported value: empty string"
-    else
-      "Unsupported value type: #{value.class.to_s}"
-    end
-  end
-
-end
-
-end; end # module Kvom::Adapter

data/lib/kvom/not_found.rb

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