kvom 6.8.0.beta.200.869.9609b39 → 6.8.0.beta.200.883.f5f063b

data/Gemfile

@@ -1,12 +1,9 @@
 source "http://rubygems.org"
 
 gem "activesupport" # adapter (core), storage (core), file_system_storage
-gem "couchrest"     # couchdb_adapter
+gem "rack"          # file_system_storage (active_support/cache/file_store requires rack/utils)
 gem "aws-sdk"       # dynamodb_adapter, s3_storage
-gem "rack"          # file_system_storage
-                    # active_support/cache/file_store requires rack/utils
 
-# not that if any kvom source depends on it ;-)
 gem "pry"           # the debugging shell
 
 gemspec

data/lib/kvom/adapter/dynamodb_document.rb

@@ -42,10 +42,13 @@ class DynamodbDocument < KeyAttributesDocument
       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 type #{value.class.to_s}"
+        raise unsupported_value(value)
       end
       memo
     end

data/lib/kvom/adapter/filesystem_document.rb

@@ -4,7 +4,17 @@ module Kvom; module Adapter
 
 class FilesystemDocument < KeyAttributesDocument
   def to_json
-    Lib::Json.dump(attributes || {})
+    # 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)
   end
 end
 

data/lib/kvom/adapter/key_attributes_document.rb

@@ -1,5 +1,6 @@
-require 'kvom'
+require 'kvom/adapter'
 
+# :enddoc:
 module Kvom; module Adapter;
 
 class KeyAttributesDocument < Document
@@ -12,15 +13,24 @@ class KeyAttributesDocument < Document
   end
 
   def [](name)
-    @attributes ||= load_attributes
     @attributes[name]
   end
 
   def []=(name, value)
-    @attributes ||= load_attributes
     @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/base.rb

@@ -12,6 +12,7 @@ class Base
   include ModelIdentity
   extend ActiveModel::Naming
 
+
   class_attribute :key_prefix
 
   class << self
@@ -63,17 +64,16 @@ class Base
   end
 
   def initialize(doc_or_attrs = {})
-    if doc_or_attrs.is_a?(Document)
-      @document = doc_or_attrs
-    else
-      attrs = doc_or_attrs.stringify_keys
-
-      attrs["id"] ||= SecureRandom.hex(8)
-
-      id = attrs["id"]
-      @document = self.class.adapter.new_document(self.class.key_for(id), attrs)
-      @new = true
-    end
+    @document =
+        case doc_or_attrs
+        when Document
+          doc_or_attrs
+        else
+          @new = true
+          attrs = doc_or_attrs.stringify_keys
+          key = self.class.key_for(attrs["id"] ||= SecureRandom.hex(8))
+          self.class.adapter.new_document(key, attrs)
+        end
   end
 
   def document
@@ -89,14 +89,6 @@ class Base
     @document["id"]
   end
 
-  def read_attribute(name)
-    @document[name]
-  end
-
-  def write_attribute(name, value)
-    @document[name] = value
-  end
-
   def new?
     @new
   end
@@ -105,6 +97,16 @@ class Base
     self.class.adapter.destroy(@document)
   end
 
+  private
+
+  def read_attribute(name)
+    @document[name]
+  end
+
+  def write_attribute(name, value)
+    @document[name] = value
+  end
+
 end
 
 end # module Kvom

data/spec/adaptor/base_spec.rb

@@ -16,12 +16,6 @@ describe Kvom::Base do
     expect { ModelWithoutAdapter.find("spam") }.to raise_error(/overwritten/)
   end
 
-  it "should provide access to the underlying document" do
-    example = ExampleModel.create(:spam => "foo")
-    example.document["spam"].should == "foo"
-    example.document.should be_a(Kvom::Document)
-  end
-
   describe "getters and setters" do
     it "work for freshly created models" do
       example = ExampleModel.create(:spam => "foo")
@@ -44,6 +38,68 @@ describe Kvom::Base do
       loaded = ExampleModel.find(example.id)
       loaded.spam.should == "foo"
     end
+
+    context "when setting an empty string as property value" do
+
+      context "when created" do
+        it "raises an error" do
+          expect {ExampleModel.create(:spam => "")}.to raise_error "Unsupported value: empty string"
+        end
+      end
+
+      context "when saved" do
+        let(:example) {ExampleModel.create(:property => "not empty")}
+
+        it "raises an error" do
+          expect {
+            example.spam = ""
+            example.save
+          }.to raise_error "Unsupported value: empty string"
+        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")}
+
+        it "raises an error" do
+          expect {
+            example.spam = %w[invalid type array]
+            example.save
+          }.to raise_error "Unsupported value type: Array"
+        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)}
+
+      context "when modified" do
+        before do
+          example_from_db.spam = "and eggs"
+        end
+
+        it "persists the new value to the database" do
+          expect {
+            example_from_db.save
+          }.to change {
+            ExampleModel.find(example_id).spam
+          }.to("and eggs")
+        end
+
+      end
+    end
   end
 
   it "should accept an id as string or symbol" do
@@ -53,13 +109,13 @@ describe Kvom::Base do
     ExampleModel.find(second_id)
   end
 
-  describe "model id's" do
+  describe "model's id" do
     it "should use a custom prefix when given" do
-      CustomKeyPrefixModel.new.document.key.should =~ /^spam_prefix\/id\/.+/
+      CustomKeyPrefixModel.new.__send__(:document).key.should =~ /^spam_prefix\/id\/.+/
     end
 
     it "should use a default prefix" do
-      ExampleModel.new.document.key.should =~ /^ExampleModel\/id\/.+/
+      ExampleModel.new.__send__(:document).key.should =~ /^ExampleModel\/id\/.+/
     end
   end
 

data/spec/spec_helper.rb

@@ -5,16 +5,7 @@ require File.expand_path("../../lib/kvom", __FILE__)
 class TestModel < Kvom::Base
   def self.adapter
     @adapter ||=
-      case (type = ENV['KVOM_ADAPTER_TYPE'] || "couch")
-      when "couch"
-        require 'multi_json'
-        MultiJson.engine = :yajl
-        database_name = "kvom-unit_tests"
-        adapter = Kvom::Adapter::CouchdbAdapter.new({
-          :url => database_name,
-        })
-        CouchRest.database!(database_name)
-        adapter
+      case (type = ENV['KVOM_ADAPTER_TYPE'] || "file")
       when /dynamo/
         require File.expand_path("../../../tasks/support/local_config", __FILE__)
         options = {
@@ -24,7 +15,7 @@ class TestModel < Kvom::Base
         }
         options[:partition] = "korb" if type == "partitioned_dynamo"
         Kvom::Adapter::DynamodbAdapter.new(options)
-      when /filesystem/
+      when /file/
         Kvom::Adapter::FilesystemAdapter.new(:path => File.expand_path("../../tmp/fsa", __FILE__))
       end
   end
@@ -35,28 +26,17 @@ class ExampleModel < TestModel
 end
 
 RSpec.configure do |config|
-  output = config.output_stream || $stdout
-
-  adapter_specified_and_different = lambda {|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 # same adapter name => do not exclude
-        output.print "a"
-        true # yes, exclude
-      end
-    end
+  adapter = TestModel.adapter.class.to_s.demodulize.sub("Adapter", "").sub("db", "").downcase
+  adapter_specified_and_different = lambda {|required_adapter|
+    required_adapter && required_adapter.to_s != adapter
   }
 
+  multi_json_version = Gem.loaded_specs["multi_json"].version
   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
+    multi_json_version_restriction && !Gem::Requirement.create(multi_json_version_restriction).
+        satisfied_by?(multi_json_version)
   }
 
-  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kvom
 version: !ruby/object:Gem::Version 
-  hash: 11187448661
+  hash: 988956767
   prerelease: 6
   segments: 
   - 6
@@ -9,11 +9,13 @@ version: !ruby/object:Gem::Version
   - 0
   - beta
   - 200
-  - 869
-  - 9609
+  - 883
+  - f
+  - 5
+  - f
+  - 63
   - b
-  - 39
-  version: 6.8.0.beta.200.869.9609b39
+  version: 6.8.0.beta.200.883.f5f063b
 platform: ruby
 authors: 
 - Kristian Hanekamp, Infopark AG
@@ -21,11 +23,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 +02:00
+date: 2012-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,11 +36,11 @@ dependencies:
         segments: 
         - 1
         version: "1"
-  prerelease: false
-  name: multi_json
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +50,11 @@ dependencies:
         segments: 
         - 3
         version: "3"
-  prerelease: false
-  name: activesupport
   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: 
@@ -63,11 +64,11 @@ dependencies:
         segments: 
         - 3
         version: "3"
-  prerelease: false
-  name: activemodel
   version_requirements: *id003
+  name: activemodel
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +79,11 @@ dependencies:
         - 2
         - 8
         version: "2.8"
-  prerelease: false
-  name: rspec
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,11 +93,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: helpful_configuration
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: helpful_configuration
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,9 +107,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  name: yajl-ruby
   version_requirements: *id006
+  name: yajl-ruby
+  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,8 +128,6 @@ files:
 - lib/kvom.rb
 - lib/kvom/adapter.rb
 - lib/kvom/adapter/base.rb
-- lib/kvom/adapter/couchdb_adapter.rb
-- lib/kvom/adapter/couchdb_document.rb
 - lib/kvom/adapter/dynamodb_adapter.rb
 - lib/kvom/adapter/dynamodb_document.rb
 - lib/kvom/adapter/filesystem_adapter.rb

data/lib/kvom/adapter/couchdb_adapter.rb

@@ -1,83 +0,0 @@
-require 'kvom/adapter'
-require 'couchrest'
-
-module Kvom; module Adapter
-
-class CouchdbAdapter < Base
-
-  def new_document(key, attributes)
-    new_document_from_attributes(attributes.merge("_id" => key))
-  end
-
-  def save(doc)
-    doc.couchrest_document.save
-  end
-
-  def get(key)
-    doc =
-        begin
-          count_request {database.get(key) }
-        rescue RestClient::ResourceNotFound
-          raise NotFound.for_key(key)
-        end
-    CouchdbDocument.new(doc)
-  end
-
-  def query(hash_value, range_value)
-    params =
-        case range_value
-        when Range
-          {
-            :startkey => "#{hash_value}|#{range_value.begin}",
-            :endkey => "#{hash_value}|#{range_value.end}",
-          }
-        else
-          {
-            :key => "#{hash_value}|#{range_value}",
-          }
-        end
-
-    params[:include_docs] = true
-    count_request {database.all_docs(params)["rows"]}.map do |entry|
-      new_document_from_attributes(entry["doc"])
-    end
-  end
-
-  def destroy(doc)
-    doc.couchrest_document.destroy
-  end
-
-  private
-
-  def database_url
-    connection_spec[:url]
-  end
-
-  def new_document_from_attributes(attributes)
-    couch_doc = CouchRest::Document.new(attributes)
-    couch_doc.database = database
-    CouchdbDocument.new(couch_doc)
-  end
-
-  def database
-    @database ||= CouchRest.database(database_url)
-  end
-
-  module BlobSupport
-
-    def blob_url(id)
-      "#{ database_url }/#{ id }/blob"
-    end
-
-    def blob_attachment(id)
-      document = count_request {database.get(id)}
-      document["_attachments"]["blob"]
-    end
-
-  end
-
-  include BlobSupport
-
-end
-
-end; end # module Kvom::Adapter

data/lib/kvom/adapter/couchdb_document.rb

@@ -1,27 +0,0 @@
-require 'kvom/adapter'
-
-module Kvom; module Adapter
-
-class CouchdbDocument < Document
-
-  attr_accessor :couchrest_document
-
-  def initialize(couchrest_document)
-    self.couchrest_document = couchrest_document
-  end
-
-  def [](name)
-    couchrest_document[name]
-  end
-
-  def []=(name, value)
-    couchrest_document[name] = value
-  end
-
-  def key
-    couchrest_document.id
-  end
-
-end
-
-end; end # module Kvom::Adapter