hypostasis 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6caf9a586e59a87fa6af2c7403f8f6a111367f45
-  data.tar.gz: acb363691d0bede7084ae87720b35ed7eee871d9
+  metadata.gz: c5d1ed53d8953d86bdbf7c430f94f7b0cb175d8a
+  data.tar.gz: 15cc8dcd3abb23678df603443e6f5f12e8797cd3
 SHA512:
-  metadata.gz: 461374040933e42113e95cfb5c3f31746df9a9c99732cf5cb72f4781ad0bcc40f8f909d5c5ddc9007f8937f66652d6e63388498212c366771e849284af3da417
-  data.tar.gz: 1811b054f4ffd51b3aa17d01615bc49aeec934adf50b19ef9d6bdbdf009cad40eb334f381cfdc6782a69dd10c2b2d41ae008326ba8b56c21bcdf3f76e92903a7
+  metadata.gz: fb5c00de6a634eb076e224f8d863db4f0008252fa0b828c4806090598e4a4258ef5a443adcd83e74fa69d8acd0fe52b98bca843d8dcfea1038f017b940889ad7
+  data.tar.gz: a983faf3f5085fa01702658daaeb57486877a34f585fff043c5a4172d247ce880c88ed1a70abd3394a6ac6e1ce480d8900b8294e7e051ce904bb00082e40e3a3

data/README.md

@@ -19,8 +19,10 @@ variety of data models while using the same underlying storage system, provided
 by FoundationDB. The data models Hypostasis currently aims to support are the
 following:
 
-* Document
 * Key-Value
+* Column Group
+* Document
+
 
 ## Installation
 
@@ -68,14 +70,14 @@ basic language types currently suported include the following:
 * Time
 * Boolean
 
-### Document Data Model
+### ColumnGroup Data Model
 
     require 'hypostasis'
 
-    ns = Hypostasis::Connection.create_namespace('keystore', {data_model: :document})
+    ns = Hypostasis::Connection.create_namespace('keystore', {data_model: :column_group})
 
-    class SampleDocument
-      include Hypostasis::Document
+    class SampleColumnGroup
+      include Hypostasis::ColumnGroup
 
       field :name
       field :age
@@ -85,17 +87,19 @@ basic language types currently suported include the following:
       index :age
     end
 
-    SampleDocument.create(name: 'John', age: 21, dob: Date.today.prev_year(21))
+    SampleColumnGroup.create(name: 'John', age: 21, dob: Date.today.prev_year(21))
 
-    SampleDocument.find(<<id>>)
+    SampleColumnGroup.find(<<id>>)
 
-    SampleDocument.find_where(name: 'John')
-    SampleDocument.find_where(age: 21)
+    SampleColumnGroup.find_where(name: 'John')
+    SampleColumnGroup.find_where(age: 21)
 
-The Document data model provides a simple document-oriented data model on top
-of FoundationDB, including simple indexing. Like the Key-Value data model the
-document-oriented model is able to automatically encode and reconstitute
-certain basic Ruby data types, including the following:
+The Column Group data model provides a data model very similar to what would be
+provided by a traditional RDBMS or Column-Family data store with data organized
+along the idea of tables and rows, but mapped directly to the underlying
+key-value store of FoundationDB. Like the other data models, the Column Group
+model is able to automatically encode and reconstitute certain basic Ruby data
+types, including the following:
 
 * String
 * Fixnum

data/lib/hypostasis.rb

@@ -4,8 +4,9 @@ require 'hypostasis/errors'
 
 require 'hypostasis/tuple'
 require 'hypostasis/key_path'
+require 'hypostasis/key'
 require 'hypostasis/connection'
 require 'hypostasis/data_models'
 require 'hypostasis/namespace'
 
-require 'hypostasis/document'
+require 'hypostasis/column_group'

data/lib/hypostasis/column_group.rb

@@ -0,0 +1,48 @@
+require 'active_support/concern'
+require 'active_support/inflector'
+
+require 'hypostasis/column_group/namespaced'
+require 'hypostasis/column_group/fields'
+require 'hypostasis/column_group/indexes'
+require 'hypostasis/column_group/persistence'
+require 'hypostasis/column_group/findable'
+require 'hypostasis/column_group/belongs_to'
+require 'hypostasis/column_group/has_one'
+require 'hypostasis/column_group/has_many'
+
+module Hypostasis::ColumnGroup
+  extend ActiveSupport::Concern
+
+  include Hypostasis::ColumnGroup::Namespaced
+  include Hypostasis::ColumnGroup::Fields
+  include Hypostasis::ColumnGroup::Indexes
+  include Hypostasis::ColumnGroup::Persistence
+  include Hypostasis::ColumnGroup::Findable
+
+  include Hypostasis::ColumnGroup::BelongsTo
+  include Hypostasis::ColumnGroup::HasOne
+  include Hypostasis::ColumnGroup::HasMany
+
+  attr_reader :id
+
+  def initialize(*attributes)
+    self.class.namespace.open
+
+    @fields = {}
+    self.class.fields.each {|name| @fields[name] = nil}
+    attributes.each {|hsh| hsh.each {|name, value| @fields[name.to_sym] = value}}
+    self
+  end
+
+  def generate_id
+    @id ||= SecureRandom.uuid
+  end
+
+  def set_id(id)
+    @id ||= id.to_s
+  end
+
+  module ClassMethods
+    include Hypostasis::DataModels::Utilities
+  end
+end

data/lib/hypostasis/{document → column_group}/belongs_to.rb

@@ -1,4 +1,4 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module BelongsTo
     extend ActiveSupport::Concern
 

data/lib/hypostasis/{document → column_group}/fields.rb

@@ -1,4 +1,4 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module Fields
     extend ActiveSupport::Concern
 
@@ -12,6 +12,8 @@ module Hypostasis::Document
         self.class_eval { class_variable_get(:@@fields) }
       end
 
+      private
+
       def register_field(name)
         self.class_eval do
           class_variable_set(:@@fields, []) unless class_variable_defined?(:@@fields)

data/lib/hypostasis/{document → column_group}/findable.rb

@@ -1,26 +1,14 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module Findable
     extend ActiveSupport::Concern
 
     module ClassMethods
       def find(id)
-        document_keys = []
-        namespace.transact do |tr|
-          document_keys = tr.get_range_start_with(namespace.for_document(self, id)).to_a
+        document_keys = namespace.transact do |tr|
+          tr.get_range_start_with(namespace.for_column_group(self, id)).to_a
         end
-        raise Hypostasis::Errors::DocumentNotFound if document_keys.empty?
-        attributes = {}
-        id = Hypostasis::Tuple.unpack(document_keys.first.key.split('\\')[1]).to_a[1]
-        document_keys.each do |key|
-          attribute_tuple = key.key.split('\\')[2]
-          next if attribute_tuple.nil?
-          unpacked_key = Hypostasis::Tuple.unpack(attribute_tuple)
-          raw_value = key.value
-          attributes[unpacked_key.to_a[0].to_sym] = reconstitute_value(unpacked_key, raw_value)
-        end
-        document = self.new(attributes)
-        document.set_id(id)
-        document
+        raise Hypostasis::Errors::ColumnGroupNotFound if document_keys.empty?
+        reconstitute_column_group(document_keys)
       end
 
       def find_where(field_value_pairs)
@@ -36,6 +24,22 @@ module Hypostasis::Document
         results.uniq!
         results.collect! {|result| find(result) }
       end
+
+      private
+
+      def reconstitute_column_group(keys)
+        attributes = {}
+        keys.each do |key|
+          attribute_tuple = key.key.split('\\')[2]
+          next if attribute_tuple.nil?
+          unpacked_key = Hypostasis::Tuple.unpack(attribute_tuple)
+          raw_value = key.value
+          attributes[unpacked_key.to_a[0].to_sym] = reconstitute_value(unpacked_key, raw_value)
+        end
+        document = self.new(attributes)
+        document.set_id(Hypostasis::Tuple.unpack(keys.first.key.split('\\')[1]).to_a[1])
+        document
+      end
     end
   end
 end

data/lib/hypostasis/{document → column_group}/has_many.rb

@@ -1,4 +1,4 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module HasMany
     extend ActiveSupport::Concern
 

data/lib/hypostasis/{document → column_group}/has_one.rb

@@ -1,4 +1,4 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module HasOne
     extend ActiveSupport::Concern
 

data/lib/hypostasis/{document → column_group}/indexes.rb

@@ -1,7 +1,9 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module Indexes
     extend ActiveSupport::Concern
 
+    private
+
     def indexed_fields_to_commit
       self.class.class_eval { class_variable_set(:@@indexed_fields, []) unless class_variable_defined?(:@@indexed_fields) }
       self.class.indexed_fields.collect do |field_name|

data/lib/hypostasis/{document → column_group}/namespaced.rb

@@ -1,11 +1,11 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module Namespaced
     extend ActiveSupport::Concern
 
     module ClassMethods
       def use_namespace(namespace)
         data_model = :key_value
-        data_model = :document if self.included_modules.include?(Hypostasis::Document)
+        data_model = :column_group if self.included_modules.include?(Hypostasis::ColumnGroup)
         self.class_eval do
           class_variable_set(:@@namespace, Hypostasis::Namespace.new(namespace.to_s, data_model))
         end

data/lib/hypostasis/{document → column_group}/persistence.rb

@@ -1,11 +1,11 @@
-module Hypostasis::Document
+module Hypostasis::ColumnGroup
   module Persistence
     extend ActiveSupport::Concern
 
     def save
       generate_id
       self.class.namespace.transact do |tr|
-        tr.set(self.class.namespace.for_document(self), true.to_s)
+        tr.set(self.class.namespace.for_column_group(self), true.to_s)
 
         @fields.each do |field_name, value|
           tr.set(self.class.namespace.for_field(self, field_name, value.class.to_s), value.to_s)
@@ -20,7 +20,7 @@ module Hypostasis::Document
 
     def destroy
       self.class.namespace.transact do |tr|
-        tr.clear_range_start_with(self.class.namespace.for_document(self))
+        tr.clear_range_start_with(self.class.namespace.for_column_group(self))
       end
     end
 

data/lib/hypostasis/data_models.rb

@@ -2,4 +2,4 @@ module Hypostasis::DataModels; end
 
 require 'hypostasis/data_models/utilities'
 require 'hypostasis/data_models/key_value'
-require 'hypostasis/data_models/document'
+require 'hypostasis/data_models/column_group'

data/lib/hypostasis/data_models/{document.rb → column_group.rb}

@@ -1,18 +1,18 @@
-module Hypostasis::DataModels::Document
+module Hypostasis::DataModels::ColumnGroup
   def transact
     database.transact do |tr|
       yield tr
     end
   end
 
-  def for_document(document, id = nil)
-    class_name = document.is_a?(Class) ? document.to_s : document.class.to_s
-    document_id = id.nil? ? document.id.to_s : id.to_s
+  def for_column_group(column_group, id = nil)
+    class_name = column_group.is_a?(Class) ? column_group.to_s : column_group.class.to_s
+    document_id = id.nil? ? column_group.id.to_s : id.to_s
     name.to_s + '\\' + Hypostasis::Tuple.new(class_name, document_id).to_s
   end
 
   def for_field(document, field, type)
-    for_document(document) + '\\' + Hypostasis::Tuple.new(field.to_s, type.to_s).to_s
+    for_column_group(document) + '\\' + Hypostasis::Tuple.new(field.to_s, type.to_s).to_s
   end
 
   def for_index(document, field_name, value)

data/lib/hypostasis/data_models/utilities.rb

@@ -1,4 +1,6 @@
 module Hypostasis::DataModels::Utilities
+  private
+
   def reconstitute_value(tuple, raw_value)
     data_type = tuple.to_a.last
     case data_type

data/lib/hypostasis/errors.rb

@@ -10,5 +10,5 @@ module Hypostasis::Errors
   class TupleExhausted < StandardError; end
   class UnknownValueType < StandardError; end
   class MustDefineFieldType < StandardError; end
-  class DocumentNotFound < StandardError; end
+  class ColumnGroupNotFound < StandardError; end
 end

data/lib/hypostasis/key.rb

@@ -0,0 +1,36 @@
+class Hypostasis::Key
+  def initialize(key_path, value = nil)
+    @key_path = key_path
+  end
+
+  def first
+    unpack_tuple(decomposed_key.first)
+  end
+
+  def last
+    unpack_tuple(decomposed_key.last)
+  end
+
+  def [](index)
+    unpack_tuple(decomposed_key[index.to_i])
+  end
+
+private
+
+  def decomposed_key
+    @decomposed_key ||= @key_path.split('\\')
+  end
+
+  def unpack_tuple(key)
+    begin
+      Hypostasis::Tuple.unpack(key)
+    rescue RuntimeError => e
+      if e.message.match(/^Unknown data type in DB:/)
+        key
+      else
+        raise e
+      end
+    end
+  end
+
+end

data/lib/hypostasis/namespace.rb

@@ -56,8 +56,8 @@ private
     case @data_model
       when :key_value
         self.extend Hypostasis::DataModels::KeyValue
-      when :document
-        self.extend Hypostasis::DataModels::Document
+      when :column_group
+        self.extend Hypostasis::DataModels::ColumnGroup
       else
         raise Hypostasis::Errors::UnknownNamespaceDataModel, "#{@data_model} unknown"
     end

data/lib/hypostasis/version.rb

@@ -1,3 +1,3 @@
 module Hypostasis
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/test/{document → column}/has_many_spec.rb

@@ -1,7 +1,7 @@
 require 'minitest_helper'
 
 class HasManyOwnerDocument
-  include Hypostasis::Document
+  include Hypostasis::ColumnGroup
 
   use_namespace 'hasmany_docs'
 
@@ -12,7 +12,7 @@ class HasManyOwnerDocument
 end
 
 class HasManyChildDocument
-  include Hypostasis::Document
+  include Hypostasis::ColumnGroup
 
   use_namespace 'hasmany_docs'
 
@@ -22,9 +22,9 @@ class HasManyChildDocument
   belongs_to :has_many_owner_document
 end
 
-describe 'Document has_many Relationship' do
+describe 'ColumnGroup has_many Relationship' do
   before do
-    Hypostasis::Connection.create_namespace 'hasmany_docs', data_model: :document
+    Hypostasis::Connection.create_namespace 'hasmany_docs', data_model: :column_group
     @owner = HasManyOwnerDocument.create(name: 'John', age: '25')
     @children = []
     @children << HasManyChildDocument.create(name: 'James', age: '6', has_many_owner_document_id: @owner.id)

data/test/{document → column}/has_one_spec.rb

@@ -1,7 +1,7 @@
 require 'minitest_helper'
 
 class HasOneOwnerDocument
-  include Hypostasis::Document
+  include Hypostasis::ColumnGroup
 
   use_namespace 'hasone_docs'
 
@@ -12,7 +12,7 @@ class HasOneOwnerDocument
 end
 
 class HasOneChildDocument
-  include Hypostasis::Document
+  include Hypostasis::ColumnGroup
 
   use_namespace 'hasone_docs'
 
@@ -22,9 +22,9 @@ class HasOneChildDocument
   belongs_to :has_one_owner_document
 end
 
-describe 'Document has_one Relationship' do
+describe 'ColumnGroup has_one Relationship' do
   before do
-    Hypostasis::Connection.create_namespace 'hasone_docs', data_model: :document
+    Hypostasis::Connection.create_namespace 'hasone_docs', data_model: :column_group
     @owner = HasOneOwnerDocument.create(name: 'John', age: '25')
     @child = HasOneChildDocument.create(name: 'James', age: '6', has_one_owner_document_id: @owner.id)
   end

data/test/column_spec.rb

@@ -0,0 +1,106 @@
+require 'minitest_helper'
+
+describe Hypostasis::ColumnGroup do
+  let(:subject) { SampleColumn.new(name: 'John', age: 21, dob: Date.today.prev_year(21)) }
+
+  before do
+    Hypostasis::Connection.create_namespace 'sample_columns', data_model: :column_group
+    Hypostasis::Connection.create_namespace 'indexed_columns', data_model: :column_group
+  end
+
+  after do
+    Hypostasis::Connection.destroy_namespace 'sample_columns'
+    Hypostasis::Connection.destroy_namespace 'indexed_columns'
+  end
+
+  it { subject.must_respond_to :name }
+  it { subject.must_respond_to :age }
+  it { subject.must_respond_to :dob }
+
+  it { subject.must_respond_to :name= }
+  it { subject.must_respond_to :age= }
+  it { subject.must_respond_to :dob= }
+
+  it { subject.name.must_equal 'John' }
+  it { subject.age.must_equal 21 }
+  it { subject.dob.must_equal Date.today.prev_year(21) }
+
+  it { subject.must_respond_to :save }
+
+  describe '#create' do
+    let(:subject) { SampleColumn.create(name: 'John', age: 21, dob: Date.today.prev_year(21)) }
+
+    after do
+      subject.destroy
+    end
+
+    it { subject.id.wont_be_nil }
+    it { database.get(column_path(subject)).must_equal 'true' }
+    it { database.get(field_path(subject, :name, String)).must_equal 'John' }
+    it { database.get(field_path(subject, :age, Fixnum)).must_equal '21' }
+    it { database.get(field_path(subject, :dob, Date)).must_equal Date.today.prev_year(21).to_s }
+  end
+
+  describe '#save' do
+    let(:subject) { SampleColumn.new(name: 'John', age: 21, dob: Date.today.prev_year(21)) }
+
+    before do
+      subject.save
+    end
+
+    after do
+      subject.destroy
+    end
+
+    it { subject.id.wont_be_nil }
+    it { database.get(column_path(subject)).must_equal 'true' }
+    it { database.get(field_path(subject, :name, String)).must_equal 'John' }
+    it { database.get(field_path(subject, :age, Fixnum)).must_equal '21' }
+    it { database.get(field_path(subject, :dob, Date)).must_equal Date.today.prev_year(21).to_s }
+  end
+
+  describe '.find' do
+    let(:column_id) { subject.save.id }
+
+    after do
+      subject.destroy
+    end
+
+    it { SampleColumn.find(column_id).is_a?(SampleColumn).must_equal true }
+    it { SampleColumn.find(column_id).id.must_equal column_id }
+  end
+
+  describe 'indexing' do
+    before do
+      IndexedColumn.create(name: 'John', age: 21, dob: Date.today.prev_year(21))
+      IndexedColumn.create(name: 'Jane', age: 21, dob: Date.today.prev_year(21))
+      IndexedColumn.create(name: 'John', age: 23, dob: Date.today.prev_year(23))
+      IndexedColumn.create(name: 'Tom', age: 20, dob: Date.today.prev_year(20))
+    end
+
+    it { database.get_range_start_with(index_path(IndexedColumn, :name)).size.must_equal 4 }
+    it { database.get_range_start_with(index_path(IndexedColumn, :age)).size.must_equal 4 }
+
+    it { database.get_range_start_with(index_path(IndexedColumn, :name, 'John')).size.must_equal 2 }
+    it { database.get_range_start_with(index_path(IndexedColumn, :name, 'Jane')).size.must_equal 1 }
+
+    it { database.get_range_start_with(index_path(IndexedColumn, :age, 21)).size.must_equal 2 }
+  end
+
+  describe '.find_where' do
+    before do
+      IndexedColumn.create(name: 'John', age: 21, dob: Date.today.prev_year(21))
+      IndexedColumn.create(name: 'Jane', age: 21, dob: Date.today.prev_year(21))
+      IndexedColumn.create(name: 'John', age: 23, dob: Date.today.prev_year(23))
+      IndexedColumn.create(name: 'Tom', age: 20, dob: Date.today.prev_year(20))
+    end
+
+    it { IndexedColumn.find_where(name: 'John').size.must_equal 2 }
+    it { IndexedColumn.find_where(age: 21).size.must_equal 2 }
+    it { IndexedColumn.find_where(name: 'Tom').size.must_equal 1 }
+    it { IndexedColumn.find_where(name: 'Tom').first.is_a?(IndexedColumn).must_equal true }
+
+    it { IndexedColumn.find_where(name: 'John', age: 23).size.must_equal 1 }
+    it { IndexedColumn.find_where(name: 'John', age: 23).first.is_a?(IndexedColumn).must_equal true }
+  end
+end

data/test/key_spec.rb

@@ -0,0 +1,25 @@
+require 'minitest_helper'
+
+describe Hypostasis::Key do
+  let(:subject) { Hypostasis::Key.new('simple\\path\\example') }
+
+  it { subject.must_respond_to :[] }
+  it { subject.must_respond_to :first }
+  it { subject.must_respond_to :last }
+
+  it { subject[0].must_equal 'simple' }
+  it { subject[1].must_equal 'path' }
+  it { subject[2].must_equal 'example' }
+
+  it { subject.first.must_equal 'simple' }
+  it { subject.last.must_equal 'example'}
+
+  describe 'with Tuples' do
+    let(:tuple) { Hypostasis::Tuple.new('sample','tuple',15) }
+    let(:subject) { Hypostasis::Key.new("simple\\tuple\\#{tuple.to_s}") }
+
+    it { subject[0].must_equal 'simple' }
+    it { subject[1].must_equal 'tuple' }
+    it { subject[2].must_be_instance_of Hypostasis::Tuple }
+  end
+end

data/test/minitest_helper.rb

@@ -13,8 +13,8 @@ require 'hypostasis'
 
 require 'minitest/autorun'
 
-require 'support/sample_document'
-require 'support/indexed_document'
+require 'support/sample_column'
+require 'support/indexed_column'
 
 class Minitest::Spec
 
@@ -22,7 +22,7 @@ class Minitest::Spec
     @database ||= FDB.open
   end
 
-  def document_path(document)
+  def column_path(document)
     document_namespace = document.class.namespace.to_s
     document_tuple = Hypostasis::Tuple.new(document.class.to_s, document.id.to_s).to_s
     document_namespace + '\\' + document_tuple

data/test/namespace_spec.rb

@@ -137,7 +137,7 @@ describe Hypostasis::Namespace do
     end
   end
 
-  describe 'for a Document namespace' do
+  describe 'for a ColumnGroup namespace' do
     before do
       subject
     end
@@ -146,9 +146,9 @@ describe Hypostasis::Namespace do
       subject.destroy
     end
 
-    let(:subject) { Hypostasis::Namespace.create('document_space', { data_model: :document }) }
+    let(:subject) { Hypostasis::Namespace.create('column_space', { data_model: :column_group }) }
 
-    it { database.get('document_space\\' + Hypostasis::Tuple.new(['config','data_model']).to_s).must_equal 'document' }
+    it { database.get('column_space\\' + Hypostasis::Tuple.new(['config','data_model']).to_s).must_equal 'column_group' }
   end
 
   describe 'for an unknown namespace type' do

data/test/support/indexed_column.rb

@@ -0,0 +1,12 @@
+class IndexedColumn
+  include Hypostasis::ColumnGroup
+
+  use_namespace 'indexed_columns'
+
+  field :name
+  field :age
+  field :dob
+
+  index :name
+  index :age
+end

data/test/support/sample_column.rb

@@ -0,0 +1,9 @@
+class SampleColumn
+  include Hypostasis::ColumnGroup
+
+  use_namespace 'sample_columns'
+
+  field :name
+  field :age
+  field :dob
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hypostasis
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fdb
@@ -97,35 +97,37 @@ files:
 - Vagrantfile
 - hypostasis.gemspec
 - lib/hypostasis.rb
+- lib/hypostasis/column_group.rb
+- lib/hypostasis/column_group/belongs_to.rb
+- lib/hypostasis/column_group/fields.rb
+- lib/hypostasis/column_group/findable.rb
+- lib/hypostasis/column_group/has_many.rb
+- lib/hypostasis/column_group/has_one.rb
+- lib/hypostasis/column_group/indexes.rb
+- lib/hypostasis/column_group/namespaced.rb
+- lib/hypostasis/column_group/persistence.rb
 - lib/hypostasis/connection.rb
 - lib/hypostasis/data_models.rb
-- lib/hypostasis/data_models/document.rb
+- lib/hypostasis/data_models/column_group.rb
 - lib/hypostasis/data_models/key_value.rb
 - lib/hypostasis/data_models/utilities.rb
-- lib/hypostasis/document.rb
-- lib/hypostasis/document/belongs_to.rb
-- lib/hypostasis/document/fields.rb
-- lib/hypostasis/document/findable.rb
-- lib/hypostasis/document/has_many.rb
-- lib/hypostasis/document/has_one.rb
-- lib/hypostasis/document/indexes.rb
-- lib/hypostasis/document/namespaced.rb
-- lib/hypostasis/document/persistence.rb
 - lib/hypostasis/errors.rb
+- lib/hypostasis/key.rb
 - lib/hypostasis/key_path.rb
 - lib/hypostasis/namespace.rb
 - lib/hypostasis/tuple.rb
 - lib/hypostasis/version.rb
 - provision.sh
+- test/column/has_many_spec.rb
+- test/column/has_one_spec.rb
+- test/column_spec.rb
 - test/connection_spec.rb
-- test/document/has_many_spec.rb
-- test/document/has_one_spec.rb
-- test/document_spec.rb
 - test/key_path_spec.rb
+- test/key_spec.rb
 - test/minitest_helper.rb
 - test/namespace_spec.rb
-- test/support/indexed_document.rb
-- test/support/sample_document.rb
+- test/support/indexed_column.rb
+- test/support/sample_column.rb
 - test/tuple_spec.rb
 homepage: ''
 licenses:
@@ -152,13 +154,14 @@ signing_key:
 specification_version: 4
 summary: A layer for FoundationDB providing multiple data models for Ruby.
 test_files:
+- test/column/has_many_spec.rb
+- test/column/has_one_spec.rb
+- test/column_spec.rb
 - test/connection_spec.rb
-- test/document/has_many_spec.rb
-- test/document/has_one_spec.rb
-- test/document_spec.rb
 - test/key_path_spec.rb
+- test/key_spec.rb
 - test/minitest_helper.rb
 - test/namespace_spec.rb
-- test/support/indexed_document.rb
-- test/support/sample_document.rb
+- test/support/indexed_column.rb
+- test/support/sample_column.rb
 - test/tuple_spec.rb

data/lib/hypostasis/document.rb

@@ -1,48 +0,0 @@
-require 'active_support/concern'
-require 'active_support/inflector'
-
-require 'hypostasis/document/namespaced'
-require 'hypostasis/document/fields'
-require 'hypostasis/document/indexes'
-require 'hypostasis/document/persistence'
-require 'hypostasis/document/findable'
-require 'hypostasis/document/belongs_to'
-require 'hypostasis/document/has_one'
-require 'hypostasis/document/has_many'
-
-module Hypostasis::Document
-  extend ActiveSupport::Concern
-
-  include Hypostasis::Document::Namespaced
-  include Hypostasis::Document::Fields
-  include Hypostasis::Document::Indexes
-  include Hypostasis::Document::Persistence
-  include Hypostasis::Document::Findable
-
-  include Hypostasis::Document::BelongsTo
-  include Hypostasis::Document::HasOne
-  include Hypostasis::Document::HasMany
-
-  attr_reader :id
-
-  def initialize(*attributes)
-    self.class.namespace.open
-
-    @fields = {}
-    self.class.fields.each {|name| @fields[name] = nil}
-    attributes.each {|hsh| hsh.each {|name, value| @fields[name.to_sym] = value}}
-    self
-  end
-
-  def generate_id
-    @id ||= SecureRandom.uuid
-  end
-
-  def set_id(id)
-    @id ||= id.to_s
-  end
-
-  module ClassMethods
-    include Hypostasis::DataModels::Utilities
-  end
-end

data/test/document_spec.rb

@@ -1,106 +0,0 @@
-require 'minitest_helper'
-
-describe Hypostasis::Document do
-  let(:subject) { SampleDocument.new(name: 'John', age: 21, dob: Date.today.prev_year(21)) }
-
-  before do
-    Hypostasis::Connection.create_namespace 'sample_docs', data_model: :document
-    Hypostasis::Connection.create_namespace 'indexed_docs', data_model: :document
-  end
-
-  after do
-    Hypostasis::Connection.destroy_namespace 'sample_docs'
-    Hypostasis::Connection.destroy_namespace 'indexed_docs'
-  end
-
-  it { subject.must_respond_to :name }
-  it { subject.must_respond_to :age }
-  it { subject.must_respond_to :dob }
-
-  it { subject.must_respond_to :name= }
-  it { subject.must_respond_to :age= }
-  it { subject.must_respond_to :dob= }
-
-  it { subject.name.must_equal 'John' }
-  it { subject.age.must_equal 21 }
-  it { subject.dob.must_equal Date.today.prev_year(21) }
-
-  it { subject.must_respond_to :save }
-
-  describe '#create' do
-    let(:subject) { SampleDocument.create(name: 'John', age: 21, dob: Date.today.prev_year(21)) }
-
-    after do
-      subject.destroy
-    end
-
-    it { subject.id.wont_be_nil }
-    it { database.get(document_path(subject)).must_equal 'true' }
-    it { database.get(field_path(subject, :name, String)).must_equal 'John' }
-    it { database.get(field_path(subject, :age, Fixnum)).must_equal '21' }
-    it { database.get(field_path(subject, :dob, Date)).must_equal Date.today.prev_year(21).to_s }
-  end
-
-  describe '#save' do
-    let(:subject) { SampleDocument.new(name: 'John', age: 21, dob: Date.today.prev_year(21)) }
-
-    before do
-      subject.save
-    end
-
-    after do
-      subject.destroy
-    end
-
-    it { subject.id.wont_be_nil }
-    it { database.get(document_path(subject)).must_equal 'true' }
-    it { database.get(field_path(subject, :name, String)).must_equal 'John' }
-    it { database.get(field_path(subject, :age, Fixnum)).must_equal '21' }
-    it { database.get(field_path(subject, :dob, Date)).must_equal Date.today.prev_year(21).to_s }
-  end
-
-  describe '.find' do
-    let(:document_id) { subject.save.id }
-
-    after do
-      subject.destroy
-    end
-
-    it { SampleDocument.find(document_id).is_a?(SampleDocument).must_equal true }
-    it { SampleDocument.find(document_id).id.must_equal document_id }
-  end
-
-  describe 'indexing' do
-    before do
-      IndexedDocument.create(name: 'John', age: 21, dob: Date.today.prev_year(21))
-      IndexedDocument.create(name: 'Jane', age: 21, dob: Date.today.prev_year(21))
-      IndexedDocument.create(name: 'John', age: 23, dob: Date.today.prev_year(23))
-      IndexedDocument.create(name: 'Tom', age: 20, dob: Date.today.prev_year(20))
-    end
-
-    it { database.get_range_start_with(index_path(IndexedDocument, :name)).size.must_equal 4 }
-    it { database.get_range_start_with(index_path(IndexedDocument, :age)).size.must_equal 4 }
-
-    it { database.get_range_start_with(index_path(IndexedDocument, :name, 'John')).size.must_equal 2 }
-    it { database.get_range_start_with(index_path(IndexedDocument, :name, 'Jane')).size.must_equal 1 }
-
-    it { database.get_range_start_with(index_path(IndexedDocument, :age, 21)).size.must_equal 2 }
-  end
-
-  describe '.find_where' do
-    before do
-      IndexedDocument.create(name: 'John', age: 21, dob: Date.today.prev_year(21))
-      IndexedDocument.create(name: 'Jane', age: 21, dob: Date.today.prev_year(21))
-      IndexedDocument.create(name: 'John', age: 23, dob: Date.today.prev_year(23))
-      IndexedDocument.create(name: 'Tom', age: 20, dob: Date.today.prev_year(20))
-    end
-
-    it { IndexedDocument.find_where(name: 'John').size.must_equal 2 }
-    it { IndexedDocument.find_where(age: 21).size.must_equal 2 }
-    it { IndexedDocument.find_where(name: 'Tom').size.must_equal 1 }
-    it { IndexedDocument.find_where(name: 'Tom').first.is_a?(IndexedDocument).must_equal true }
-
-    it { IndexedDocument.find_where(name: 'John', age: 23).size.must_equal 1 }
-    it { IndexedDocument.find_where(name: 'John', age: 23).first.is_a?(IndexedDocument).must_equal true }
-  end
-end

data/test/support/indexed_document.rb

@@ -1,12 +0,0 @@
-class IndexedDocument
-  include Hypostasis::Document
-
-  use_namespace 'indexed_docs'
-
-  field :name
-  field :age
-  field :dob
-
-  index :name
-  index :age
-end

data/test/support/sample_document.rb

@@ -1,9 +0,0 @@
-class SampleDocument
-  include Hypostasis::Document
-
-  use_namespace 'sample_docs'
-
-  field :name
-  field :age
-  field :dob
-end