hypostasis 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2759108f29a8bfe2f537ee9893f7276de971bddf
-  data.tar.gz: f41debb7e9a74283d63700f803a1bd864ed4256f
+  metadata.gz: 56eb1dad44b0fb9b42de8fb725486b999ff653f8
+  data.tar.gz: fd2f53d2a2ef5e7179e035e077a39bab528497cb
 SHA512:
-  metadata.gz: 0b52739c1a6d68c39081b7993f8dd6150ee75d0054c79c852372d77458cd92541d87528b374866eced3a7b7539fa2e8c2b31ccfaef60606b5d12d3c3c11b0bde
-  data.tar.gz: 6d1db7ff4cd78d563bbefb59cd31fe94524a7e0c05b07413b2da452ec0e6f3ea4f48bcf079ce0be81b030821419445cfc94461ecfdf9096eb59fd6eebda3a451
+  metadata.gz: 308cceadb1be00576df9121377e48ce88e7e63f453875a60bca80a0f83ce53b349c00ca25e4cdd9902726605e8a2b5296dc6001693241f7079fdcdd60259852e
+  data.tar.gz: 155a90c17f1d50273bcf7b88eda970ac24a8f1a3f39f36df745c9c21f081fa50b8c12d4fb55620dc493e3b44bc05de67d2ac3156c41e820a4cb30fe9b83a1042

data/lib/hypostasis/column_group.rb

@@ -1,49 +1,21 @@
-require 'hypostasis/shared/utilities'
-require 'hypostasis/shared/namespaced'
-require 'hypostasis/shared/fields'
-require 'hypostasis/shared/indexes'
-
+require 'hypostasis/shared'
 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::Shared
   include Hypostasis::Shared::Utilities
   include Hypostasis::Shared::Namespaced
   include Hypostasis::Shared::Fields
   include Hypostasis::Shared::Indexes
+  include Hypostasis::Shared::BelongsTo
+  include Hypostasis::Shared::HasOne
+  include Hypostasis::Shared::HasMany
 
   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
+  module ClassMethods; end
 end

data/lib/hypostasis/column_group/findable.rb

@@ -29,17 +29,18 @@ module Hypostasis::ColumnGroup
 
       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
+        keys.each {|key| attributes.merge(parse_key(key))}
         document = self.new(attributes)
         document.set_id(Hypostasis::Tuple.unpack(keys.first.key.split('\\')[1]).to_a[1])
         document
       end
+
+      def parse_key(key)
+        attribute_tuple = key.key.split('\\')[2]
+        return {} if attribute_tuple.nil?
+        unpacked_key = Hypostasis::Tuple.unpack(attribute_tuple)
+        {unpacked_key.to_a[0].to_sym => reconstitute_value(unpacked_key, key.value)}
+      end
     end
   end
 end

data/lib/hypostasis/document.rb

@@ -1,52 +1,25 @@
-require 'hypostasis/shared/utilities'
-require 'hypostasis/shared/namespaced'
-require 'hypostasis/shared/fields'
-require 'hypostasis/shared/indexes'
-
+require 'hypostasis/shared'
 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::Shared
   include Hypostasis::Shared::Utilities
   include Hypostasis::Shared::Namespaced
   include Hypostasis::Shared::Fields
   include Hypostasis::Shared::Indexes
+  include Hypostasis::Shared::BelongsTo
+  include Hypostasis::Shared::HasOne
+  include Hypostasis::Shared::HasMany
 
   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
 
   def to_bson
     @fields.to_bson
   end
 
-  module ClassMethods
-    include Hypostasis::DataModels::Utilities
-  end
+  module ClassMethods; end
 end

data/lib/hypostasis/shared.rb

@@ -0,0 +1,33 @@
+require 'hypostasis/shared/utilities'
+require 'hypostasis/shared/namespaced'
+require 'hypostasis/shared/fields'
+require 'hypostasis/shared/indexes'
+require 'hypostasis/shared/belongs_to'
+require 'hypostasis/shared/has_one'
+require 'hypostasis/shared/has_many'
+
+module Hypostasis::Shared
+  extend ActiveSupport::Concern
+
+  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 → shared}/belongs_to.rb

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

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

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

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

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

data/lib/hypostasis/version.rb

@@ -1,3 +1,3 @@
 module Hypostasis
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hypostasis
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - James Thompson
@@ -126,10 +126,7 @@ files:
 - hypostasis.gemspec
 - lib/hypostasis.rb
 - lib/hypostasis/column_group.rb
-- lib/hypostasis/column_group/belongs_to.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/persistence.rb
 - lib/hypostasis/connection.rb
 - lib/hypostasis/data_models.rb
@@ -139,10 +136,7 @@ files:
 - 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/findable.rb
-- lib/hypostasis/document/has_many.rb
-- lib/hypostasis/document/has_one.rb
 - lib/hypostasis/document/persistence.rb
 - lib/hypostasis/errors.rb
 - lib/hypostasis/ext/bson/date.rb
@@ -150,7 +144,11 @@ files:
 - lib/hypostasis/key.rb
 - lib/hypostasis/key_path.rb
 - lib/hypostasis/namespace.rb
+- lib/hypostasis/shared.rb
+- lib/hypostasis/shared/belongs_to.rb
 - lib/hypostasis/shared/fields.rb
+- lib/hypostasis/shared/has_many.rb
+- lib/hypostasis/shared/has_one.rb
 - lib/hypostasis/shared/indexes.rb
 - lib/hypostasis/shared/namespaced.rb
 - lib/hypostasis/shared/utilities.rb

data/lib/hypostasis/column_group/belongs_to.rb

@@ -1,18 +0,0 @@
-module Hypostasis::ColumnGroup
-  module BelongsTo
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def belongs_to(klass)
-        field_name = "#{klass.to_s}_id"
-        accessor_name = klass.to_s
-        parent_klass = klass.to_s.classify
-        self.class_eval do
-          field field_name.to_sym
-          index field_name.to_sym
-          define_method(accessor_name) { parent_klass.constantize.find(self.send(field_name.to_sym)) }
-        end
-      end
-    end
-  end
-end

data/lib/hypostasis/column_group/has_many.rb

@@ -1,17 +0,0 @@
-module Hypostasis::ColumnGroup
-  module HasMany
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def has_many(klass)
-        singular_klass = klass.to_s.singularize
-        accessor_name = klass.to_s
-        child_klass = singular_klass.to_s.classify
-        self_klass = "#{self.to_s.underscore}_id".to_sym
-        self.class_eval do
-          define_method(accessor_name) { child_klass.constantize.find_where(self_klass => @id) }
-        end
-      end
-    end
-  end
-end

data/lib/hypostasis/column_group/has_one.rb

@@ -1,16 +0,0 @@
-module Hypostasis::ColumnGroup
-  module HasOne
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def has_one(klass)
-        accessor_name = klass.to_s
-        child_klass = klass.to_s.classify
-        self_klass = "#{self.to_s.underscore}_id".to_sym
-        self.class_eval do
-          define_method(accessor_name) { child_klass.constantize.find_where(self_klass => @id).first }
-        end
-      end
-    end
-  end
-end