hypostasis 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d1ed53d8953d86bdbf7c430f94f7b0cb175d8a
-  data.tar.gz: 15cc8dcd3abb23678df603443e6f5f12e8797cd3
+  metadata.gz: 10fcbef73dc4571adad2aff13a7c29c9fd934b09
+  data.tar.gz: ff7b955b340befb4abcbde39414873a60af7db22
 SHA512:
-  metadata.gz: fb5c00de6a634eb076e224f8d863db4f0008252fa0b828c4806090598e4a4258ef5a443adcd83e74fa69d8acd0fe52b98bca843d8dcfea1038f017b940889ad7
-  data.tar.gz: a983faf3f5085fa01702658daaeb57486877a34f585fff043c5a4172d247ce880c88ed1a70abd3394a6ac6e1ce480d8900b8294e7e051ce904bb00082e40e3a3
+  metadata.gz: 5b8deb5378de71e559c5999e9b4775b8c440b1e6723d3b4f437806971ca47dac622cc04842c723785e1617f13bc274a4c13b125b3169ed26922fb125fd2fa40c
+  data.tar.gz: 781f1f1a55419d90c6731d151a62a2fa7f9fb05f7d30420385aba3bb45f4f0d8ecb9ddf659f24f4d5af890304b532b8006442945b585561f5e0086342ddedef4

data/.travis.yml

@@ -3,49 +3,34 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-#  - ruby-head
   - jruby-19mode
-#  - jruby-head
 jdk:
   - openjdk6
   - openjdk7
   - oraclejdk7
-#  - oraclejdk8
+branches:
+  only:
+    - master
+    - /^feature\/.*/
+    - /-stable$/
 matrix:
   exclude:
     - rvm: 1.9.3
       jdk: openjdk6
     - rvm: 1.9.3
       jdk: oraclejdk7
-#    - rvm: 1.9.3
-#      jdk: oraclejdk8
     - rvm: 2.0.0
       jdk: openjdk6
     - rvm: 2.0.0
       jdk: oraclejdk7
-#    - rvm: 2.0.0
-#      jdk: oraclejdk8
     - rvm: 2.1.0
       jdk: openjdk6
     - rvm: 2.1.0
       jdk: oraclejdk7
-#    - rvm: 2.1.0
-#      jdk: oraclejdk8
-#    - rvm: ruby-head
-#      jdk: openjdk6
-#    - rvm: ruby-head
-#      jdk: oraclejdk7
-#    - rvm: ruby-head
-#      jdk: oraclejdk8
-#  allow_failures:
-#    - rvm: ruby-head
-#    - rvm: jruby-head
-#    - jdk: oraclejdk8
+  allow_failures:
+    - rvm: jruby-19mode
 before_install:
   - wget https://foundationdb.com/downloads/I_accept_the_FoundationDB_Community_License_Agreement/1.0.1/foundationdb-clients_1.0.1-1_amd64.deb
   - wget https://foundationdb.com/downloads/I_accept_the_FoundationDB_Community_License_Agreement/1.0.1/foundationdb-server_1.0.1-1_amd64.deb
   - sudo dpkg -i foundationdb-clients_1.0.1-1_amd64.deb
   - sudo dpkg -i foundationdb-server_1.0.1-1_amd64.deb
-addons:
-  code_climate:
-    repo_token: 8bd71907fa5f14a405d4adade4ddd62dc4c7d5a2470e025f5c6899fc32ac2898

data/hypostasis.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'fdb', '~> 1.0.1'
   spec.add_dependency 'activesupport', '>= 3.2.0'
+  spec.add_dependency 'bson', '~> 2.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', '~> 5.2.0'
+  spec.add_development_dependency 'tzinfo'
 end

data/lib/hypostasis.rb

@@ -1,3 +1,10 @@
+require 'active_support/concern'
+require 'active_support/inflector'
+require 'bson'
+
+require 'hypostasis/ext/bson/date'
+require 'hypostasis/ext/bson/date_time'
+
 require 'hypostasis/version'
 
 require 'hypostasis/errors'
@@ -10,3 +17,4 @@ require 'hypostasis/data_models'
 require 'hypostasis/namespace'
 
 require 'hypostasis/column_group'
+require 'hypostasis/document'

data/lib/hypostasis/column_group.rb

@@ -1,9 +1,8 @@
-require 'active_support/concern'
-require 'active_support/inflector'
+require 'hypostasis/shared/utilities'
+require 'hypostasis/shared/namespaced'
+require 'hypostasis/shared/fields'
+require 'hypostasis/shared/indexes'
 
-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'
@@ -13,9 +12,11 @@ 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::Shared::Utilities
+  include Hypostasis::Shared::Namespaced
+  include Hypostasis::Shared::Fields
+  include Hypostasis::Shared::Indexes
+
   include Hypostasis::ColumnGroup::Persistence
   include Hypostasis::ColumnGroup::Findable
 

data/lib/hypostasis/data_models.rb

@@ -1,5 +1,7 @@
 module Hypostasis::DataModels; end
 
 require 'hypostasis/data_models/utilities'
+require 'hypostasis/data_models/for_indexes'
 require 'hypostasis/data_models/key_value'
 require 'hypostasis/data_models/column_group'
+require 'hypostasis/data_models/document'

data/lib/hypostasis/data_models/column_group.rb

@@ -1,4 +1,7 @@
 module Hypostasis::DataModels::ColumnGroup
+  include Hypostasis::DataModels::Utilities
+  include Hypostasis::DataModels::ForIndexes
+
   def transact
     database.transact do |tr|
       yield tr
@@ -6,24 +9,10 @@ module Hypostasis::DataModels::ColumnGroup
   end
 
   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
+    name.to_s + '\\' + Hypostasis::Tuple.new(get_class_name(column_group), get_object_id(column_group, id)).to_s
   end
 
   def for_field(document, field, type)
     for_column_group(document) + '\\' + Hypostasis::Tuple.new(field.to_s, type.to_s).to_s
   end
-
-  def for_index(document, field_name, value)
-    class_name = document.is_a?(Class) ? document.to_s : document.class.to_s
-    index_path = Hypostasis::Tuple.new('indexes', class_name).to_s
-    value = value.to_s unless value.is_a?(Fixnum) || value.is_a?(Bignum)
-    if document.is_a?(Class)
-      field_path = Hypostasis::Tuple.new(field_name.to_s, value).to_s
-    else
-      field_path = Hypostasis::Tuple.new(field_name.to_s, value, document.id.to_s).to_s
-    end
-    name.to_s + '\\' + index_path + '\\' + field_path
-  end
 end

data/lib/hypostasis/data_models/document.rb

@@ -0,0 +1,14 @@
+module Hypostasis::DataModels::Document
+  include Hypostasis::DataModels::Utilities
+  include Hypostasis::DataModels::ForIndexes
+
+  def transact
+    database.transact do |tr|
+      yield tr
+    end
+  end
+
+  def for_document(document, id = nil)
+    name.to_s + '\\' + Hypostasis::Tuple.new(get_class_name(document), get_object_id(document, id)).to_s
+  end
+end

data/lib/hypostasis/data_models/for_indexes.rb

@@ -0,0 +1,12 @@
+module Hypostasis::DataModels::ForIndexes
+  def for_index(object, field_name, value)
+    index_path = Hypostasis::Tuple.new('indexes', get_class_name(object)).to_s
+    value = value.to_s unless value.is_a?(Fixnum) || value.is_a?(Bignum)
+    if object.is_a?(Class)
+      field_path = Hypostasis::Tuple.new(field_name.to_s, value).to_s
+    else
+      field_path = Hypostasis::Tuple.new(field_name.to_s, value, object.id.to_s).to_s
+    end
+    name.to_s + '\\' + index_path + '\\' + field_path
+  end
+end

data/lib/hypostasis/data_models/utilities.rb

@@ -1,6 +1,14 @@
 module Hypostasis::DataModels::Utilities
   private
 
+  def get_class_name(object)
+    object.is_a?(Class) ? object.to_s : object.class.to_s
+  end
+
+  def get_object_id(object, id = nil)
+    id.nil? ? object.id.to_s : id.to_s
+  end
+
   def reconstitute_value(tuple, raw_value)
     data_type = tuple.to_a.last
     case data_type

data/lib/hypostasis/document.rb

@@ -0,0 +1,46 @@
+require 'hypostasis/shared/utilities'
+require 'hypostasis/shared/namespaced'
+require 'hypostasis/shared/fields'
+require 'hypostasis/shared/indexes'
+
+require 'hypostasis/document/persistence'
+require 'hypostasis/document/findable'
+
+module Hypostasis::Document
+  extend ActiveSupport::Concern
+
+  include Hypostasis::Shared::Utilities
+  include Hypostasis::Shared::Namespaced
+  include Hypostasis::Shared::Fields
+  include Hypostasis::Shared::Indexes
+
+  include Hypostasis::Document::Persistence
+  include Hypostasis::Document::Findable
+
+  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
+
+  def to_bson
+    @fields.to_bson
+  end
+
+  module ClassMethods
+    include Hypostasis::DataModels::Utilities
+  end
+end

data/lib/hypostasis/document/findable.rb

@@ -0,0 +1,48 @@
+module Hypostasis::Document
+  module Findable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def find(id)
+        fdb_key = nil
+        namespace.transact do |tr|
+          fdb_key = tr.get(namespace.for_document(self, id))
+        end
+        raise Hypostasis::Errors::DocumentNotFound if fdb_key.nil?
+        reconstitute_document(fdb_key.value, id)
+      end
+
+      def find_where(field_value_pairs)
+        results = []
+        namespace.transact do |tr|
+          field_value_pairs.each do |field, value|
+            results << tr.get_range_start_with(namespace.for_index(self, field, value)).to_a
+          end
+        end
+        results.flatten!
+        results.collect! {|result| Hypostasis::Tuple.unpack(result.key.split('\\').last).to_a.last }.compact!
+        results.select! {|e| results.count(e) == field_value_pairs.size}
+        results.uniq!
+        find_many(results)
+      end
+
+      def find_many(ids)
+        results = []
+        namespace.transact do |tr|
+          ids.each {|id| results << [tr.get(namespace.for_document(self, id)), id]}
+        end
+        results.collect! do |result|
+          reconstitute_document(result[0], result[1])
+        end
+      end
+
+      private
+
+      def reconstitute_document(bson_value, id)
+        document = self.new(Hash.from_bson(StringIO.new(bson_value)))
+        document.set_id(id)
+        document
+      end
+    end
+  end
+end

data/lib/hypostasis/document/persistence.rb

@@ -0,0 +1,26 @@
+module Hypostasis::Document
+  module Persistence
+    extend ActiveSupport::Concern
+
+    def save
+      generate_id
+      self.class.namespace.transact do |tr|
+        tr.set(self.class.namespace.for_document(self), @fields.to_bson)
+        indexed_fields_to_commit.each {|key| tr.set(key, 'true') }
+      end
+      self
+    end
+
+    def destroy
+      self.class.namespace.transact do |tr|
+        tr.clear_range_start_with(self.class.namespace.for_document(self))
+      end
+    end
+
+    module ClassMethods
+      def create(*attributes)
+        self.new(*attributes).save
+      end
+    end
+  end
+end

data/lib/hypostasis/errors.rb

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

data/lib/hypostasis/ext/bson/date.rb

@@ -0,0 +1,5 @@
+class Date
+  def bson_type
+    9.chr.force_encoding(BSON::BINARY).freeze
+  end
+end

data/lib/hypostasis/ext/bson/date_time.rb

@@ -0,0 +1,5 @@
+class DateTime
+  def bson_type
+    9.chr.force_encoding(BSON::BINARY).freeze
+  end
+end

data/lib/hypostasis/namespace.rb

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

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

@@ -1,26 +1,23 @@
-module Hypostasis::ColumnGroup
+module Hypostasis::Shared
   module Fields
     extend ActiveSupport::Concern
 
+    included do
+      cattr_accessor_with_default :fields, []
+    end
+
     module ClassMethods
       def field(name, options = {})
         register_field(name.to_sym)
         create_accessors(name.to_s, options)
       end
 
-      def fields
-        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)
-          registered_fields = class_variable_get(:@@fields)
-          registered_fields << name.to_sym
-          class_variable_set(:@@fields, registered_fields)
-        end
+        registered_fields = fields
+        registered_fields << name.to_sym
+        fields = registered_fields
       end
 
       def create_accessors(name, options)

data/lib/hypostasis/shared/indexes.rb

@@ -0,0 +1,25 @@
+module Hypostasis::Shared
+  module Indexes
+    extend ActiveSupport::Concern
+
+    included do
+      cattr_accessor_with_default :indexed_fields, []
+    end
+
+    private
+
+    def indexed_fields_to_commit
+      indexed_fields.collect do |field_name|
+        self.class.namespace.for_index(self, field_name, @fields[field_name])
+      end
+    end
+
+    module ClassMethods
+      def index(field_name, options = {})
+        registered_indexed_fields = indexed_fields
+        registered_indexed_fields << field_name.to_sym
+        indexed_fields = registered_indexed_fields
+      end
+    end
+  end
+end

data/lib/hypostasis/shared/namespaced.rb

@@ -0,0 +1,29 @@
+module Hypostasis::Shared
+  module Namespaced
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def use_namespace(namespace)
+        self.class_eval do
+          class_variable_set(:@@namespace, Hypostasis::Namespace.new(namespace.to_s, detect_data_model))
+        end
+      end
+
+      def namespace
+        self.class_eval { class_variable_get(:@@namespace) }
+      end
+
+      private
+
+      def detect_data_model
+        if self.included_modules.include?(Hypostasis::ColumnGroup)
+          :column_group
+        elsif self.included_modules.include?(Hypostasis::Document)
+          :document
+        else
+          :key_value
+        end
+      end
+    end
+  end
+end

data/lib/hypostasis/shared/utilities.rb

@@ -0,0 +1,12 @@
+module Hypostasis::Shared
+  module Utilities
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def cattr_accessor_with_default(name, default = nil)
+        cattr_accessor name
+        class_variable_set("@@#{name.to_s}".to_sym, default)
+      end
+    end
+  end
+end

data/lib/hypostasis/version.rb

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

data/test/document/indexing_spec.rb

@@ -0,0 +1,24 @@
+require 'minitest_helper'
+
+describe 'Hypostasis::Document indexing' do
+  before do
+    Hypostasis::Connection.create_namespace 'indexed_documents', data_model: :document
+
+    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
+
+  after do
+    Hypostasis::Connection.destroy_namespace 'indexed_documents'
+  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

data/test/document_spec.rb

@@ -0,0 +1,86 @@
+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_documents', data_model: :document
+    Hypostasis::Connection.create_namespace 'indexed_documents', data_model: :document
+  end
+
+  after do
+    Hypostasis::Connection.destroy_namespace 'sample_documents'
+    Hypostasis::Connection.destroy_namespace 'indexed_documents'
+  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 subject.to_bson }
+  end
+
+  describe '.save' do
+    before do
+      subject.save
+    end
+
+    after do
+      subject.destroy
+    end
+
+    it { subject.id.wont_be_nil }
+    it { database.get(document_path(subject)).must_equal subject.to_bson }
+  end
+
+  describe '.find' do
+    let(:document_id) { subject.save.id }
+    let(:found) { SampleDocument.find(document_id) }
+
+    after do
+      subject.destroy
+    end
+
+    it { found.is_a?(SampleDocument).must_equal true }
+    it { found.id.must_equal document_id }
+
+    it { found.name.must_equal 'John' }
+    it { found.age.must_equal 21 }
+    it { found.dob.must_equal Date.today.prev_year(21).at_midnight.to_time }
+  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/minitest_helper.rb

@@ -1,7 +1,4 @@
-if ENV['CI']
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
-else
+unless ENV['CI']
   require 'simplecov'
   SimpleCov.start do
     add_filter '/test/'
@@ -11,10 +8,17 @@ end
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'hypostasis'
 
+require 'active_support/core_ext'
+require 'active_support/time_with_zone'
+
 require 'minitest/autorun'
 
 require 'support/sample_column'
 require 'support/indexed_column'
+require 'support/sample_document'
+require 'support/indexed_document'
+
+Time.zone = 'UTC'
 
 class Minitest::Spec
 
@@ -22,17 +26,23 @@ class Minitest::Spec
     @database ||= FDB.open
   end
 
-  def column_path(document)
+  def document_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
   end
 
-  def field_path(document, name, type)
-    document_namespace = document.class.namespace.to_s
-    document_tuple = Hypostasis::Tuple.new(document.class.to_s, document.id.to_s).to_s
+  def column_path(column_group)
+    column_namespace = column_group.class.namespace.to_s
+    column_tuple = Hypostasis::Tuple.new(column_group.class.to_s, column_group.id.to_s).to_s
+    column_namespace + '\\' + column_tuple
+  end
+
+  def field_path(column_group, name, type)
+    column_namespace = column_group.class.namespace.to_s
+    column_tuple = Hypostasis::Tuple.new(column_group.class.to_s, column_group.id.to_s).to_s
     field_tuple = Hypostasis::Tuple.new(name.to_s, type.to_s).to_s
-    document_namespace + '\\' + document_tuple + '\\' + field_tuple
+    column_namespace + '\\' + column_tuple + '\\' + field_tuple
   end
 
   def index_path(klass, field_name, value = nil)

data/test/support/indexed_document.rb

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

data/test/support/sample_document.rb

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

metadata

@@ -1,85 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: hypostasis
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A layer for FoundationDB providing multiple data models for Ruby.
 email:
 - james@plainprograms.com
@@ -87,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -99,35 +127,47 @@ files:
 - 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/column_group.rb
+- lib/hypostasis/data_models/document.rb
+- lib/hypostasis/data_models/for_indexes.rb
 - lib/hypostasis/data_models/key_value.rb
 - lib/hypostasis/data_models/utilities.rb
+- lib/hypostasis/document.rb
+- lib/hypostasis/document/findable.rb
+- lib/hypostasis/document/persistence.rb
 - lib/hypostasis/errors.rb
+- lib/hypostasis/ext/bson/date.rb
+- lib/hypostasis/ext/bson/date_time.rb
 - lib/hypostasis/key.rb
 - lib/hypostasis/key_path.rb
 - lib/hypostasis/namespace.rb
+- lib/hypostasis/shared/fields.rb
+- lib/hypostasis/shared/indexes.rb
+- lib/hypostasis/shared/namespaced.rb
+- lib/hypostasis/shared/utilities.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/column_group_spec.rb
 - test/connection_spec.rb
+- test/document/indexing_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_column.rb
+- test/support/indexed_document.rb
 - test/support/sample_column.rb
+- test/support/sample_document.rb
 - test/tuple_spec.rb
 homepage: ''
 licenses:
@@ -139,29 +179,33 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 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/column_group_spec.rb
 - test/connection_spec.rb
+- test/document/indexing_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_column.rb
+- test/support/indexed_document.rb
 - test/support/sample_column.rb
+- test/support/sample_document.rb
 - test/tuple_spec.rb

data/lib/hypostasis/column_group/indexes.rb

@@ -1,29 +0,0 @@
-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|
-        self.class.namespace.for_index(self, field_name, @fields[field_name])
-      end
-    end
-
-    module ClassMethods
-      def index(field_name, options = {})
-        self.class_eval do
-          class_variable_set(:@@indexed_fields, []) unless class_variable_defined?(:@@indexed_fields)
-          registered_indexed_fields = class_variable_get(:@@indexed_fields)
-          registered_indexed_fields << field_name.to_sym
-          class_variable_set(:@@indexed_fields, registered_indexed_fields)
-        end
-      end
-
-      def indexed_fields
-        self.class_eval { class_variable_get(:@@indexed_fields) }
-      end
-    end
-  end
-end

data/lib/hypostasis/column_group/namespaced.rb

@@ -1,19 +0,0 @@
-module Hypostasis::ColumnGroup
-  module Namespaced
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def use_namespace(namespace)
-        data_model = :key_value
-        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
-      end
-
-      def namespace
-        self.class_eval { class_variable_get(:@@namespace) }
-      end
-    end
-  end
-end