dbee 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab2bf5eb7197181b4683180b3a3c490621d8e9fb58ee6d0edc99f39be1709ec
-  data.tar.gz: e20fc2c2d02819aa2659847c795878ee7c23a1798d5a27b4e220320987016692
+  metadata.gz: bc7bf9701c14a96bfe5c83893637a1e10545e70f268c674851279d150b57bcc4
+  data.tar.gz: 1fbdb14e73fe98629a2cf41db0906b543eb33d16e044d5c8552916c76d4e9e8d
 SHA512:
-  metadata.gz: c55baaace5f9e37d4d71a2465780ef60b20d06956ab27b45d9d91bc841757f4d393b05cfc757aead9f6acd4225b3b06a55b5521b78f6686e42cc4391fc9f72db
-  data.tar.gz: 96bcb8c21d3974b4d46608e3e80658bd6608dc588d781da4676ea335bc8dc75ffc7f6dd202e691bbc905589f3f81e8a2b00e9f770a1d21a58de1729382f0b3e2
+  metadata.gz: 6ecaedc494e15776f1716de8891dd528fcbbbb76e44d6fe4d3056ab70674ede17f029f5316c171680c9265074624de8d78cf8856957fa5242371c26e41297089
+  data.tar.gz: e091625f6c6281673c48df689a1ec3ec692898799f9ef76d28991c90c519526bcd3c09d19d0cd1ce72a1df35bc98b5f81b46b01ec25934b4aa7ea86635549d1e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.0.1 (August 26th, 2019)
+
+Fixes:
+
+* Dbee::Base sub-classes can now declare self-referential associations.  Note that it will stop the hierarchy once the cycle is detected.
+
+Additions:
+
+* Static constraint is now the default type when type is omitted.
+
 # 1.0.0 (August 22nd, 2019)
 
 Initial release.

data/lib/dbee/base.rb

@@ -24,11 +24,11 @@ module Dbee
         self
       end
 
-      def to_model(name = nil, constraints = [])
+      def to_model(name = nil, constraints = [], from = nil)
         name  = derive_name(name)
-        key   = [name, constraints]
+        key   = [name, constraints, from]
 
-        to_models[key] ||= Model.make(model_config(name, constraints))
+        to_models[key] ||= Model.make(model_config(name, constraints, from))
       end
 
       def table_name
@@ -63,10 +63,10 @@ module Dbee
         subclasses.reverse
       end
 
-      def model_config(name, constraints)
+      def model_config(name, constraints, from)
         {
           constraints: constraints,
-          models: associations,
+          models: associations(from),
           name: name,
           table: derive_table
         }
@@ -82,13 +82,15 @@ module Dbee
         inherited_table.empty? ? inflected_name : inherited_table
       end
 
-      def associations
-        inherited_associations_by_name.values.each_with_object([]) do |config, memo|
+      def associations(from)
+        inherited_associations_by_name.values
+                                      .reject { |c| c[:name].to_s == from.to_s }
+                                      .each_with_object([]) do |config, memo|
           model_klass             = config[:model]
           associated_constraints  = config[:constraints]
           name                    = config[:name]
 
-          memo << model_klass.to_model(name, associated_constraints)
+          memo << model_klass.to_model(name, associated_constraints, name)
         end
       end
 

data/lib/dbee/model.rb

@@ -69,11 +69,15 @@ module Dbee
     def ==(other)
       other.name == name &&
         other.table == table &&
-        other.models == models &&
-        other.constraints == constraints
+        other.models.sort == models.sort &&
+        other.constraints.sort == constraints.sort
     end
     alias eql? ==
 
+    def <=>(other)
+      other.name <=> name
+    end
+
     private
 
     attr_reader :models_by_name

data/lib/dbee/model/constraints.rb

@@ -21,6 +21,7 @@ module Dbee
 
       register 'reference', Reference
       register 'static',    Static
+      register '',          Reference # When type is not present this will be the default
     end
   end
 end

data/lib/dbee/model/constraints/base.rb

@@ -22,6 +22,10 @@ module Dbee
           @name = name.to_s
         end
 
+        def <=>(other)
+          other.name <=> name
+        end
+
         def hash
           name.hash
         end

data/lib/dbee/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Dbee
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/fixtures/models.rb

@@ -17,7 +17,6 @@ module Models
   class Demographics < Dbee::Base
     association :phone_numbers, model: PhoneNumbers,
                                 constraints: {
-                                  type: :reference,
                                   name: :demographic_id,
                                   parent: :id
                                 }
@@ -28,7 +27,7 @@ module Models
                         constraints: { type: :reference, name: :member_id, parent: :id }
 
     association :movies, model: Movies,
-                         constraints: { type: :reference, name: :member_id, parent: :id }
+                         constraints: { name: :member_id, parent: :id }
   end
 
   class Members < MembersBase
@@ -49,15 +48,18 @@ module Models
   end
 
   class TheatersBase < Dbee::Base
-  end
-
-  class Theaters < TheatersBase
     association :members, model: Members, constraints: [
       { type: :reference, name: :tid, parent: :id },
       { type: :reference, name: :partition, parent: :partition }
     ]
   end
 
+  class Theaters < TheatersBase
+    association :parent_theater, model: self, constraints: [
+      { type: :reference, name: :parent_theater_id, parent: :id }
+    ]
+  end
+
   class A < Dbee::Base
     table 'table_set_to_a'
   end

data/spec/fixtures/models.yaml

@@ -5,11 +5,9 @@ Theaters, Members, and Movies:
     - name: members
       table: members
       constraints:
-        - type: reference
-          parent: id
+        - parent: id
           name: tid
-        - type: reference
-          parent: partition
+        - parent: partition
           name: partition
       models:
         - name: demos
@@ -58,6 +56,69 @@ Theaters, Members, and Movies:
             - type: static
               name: genre
               value: comedy
+    - name: parent_theater
+      table: theaters
+      constraints:
+        - type: reference
+          name: parent_theater_id
+          parent: id
+      models:
+        - name: members
+          table: members
+          constraints:
+            - type: reference
+              parent: id
+              name: tid
+            - type: reference
+              parent: partition
+              name: partition
+          models:
+            - name: demos
+              table: demographics
+              constraints:
+                - type: reference
+                  parent: id
+                  name: member_id
+              models:
+                - name: phone_numbers
+                  table: phone_numbers
+                  constraints:
+                    - type: reference
+                      parent: id
+                      name: demographic_id
+            - name: movies
+              table: movies
+              constraints:
+                - type: reference
+                  parent: id
+                  name: member_id
+            - name: favorite_comic_movies
+              table: movies
+              constraints:
+                - type: reference
+                  parent: id
+                  name: member_id
+                - type: static
+                  name: genre
+                  value: comic
+            - name: favorite_mystery_movies
+              table: movies
+              constraints:
+                - type: reference
+                  parent: id
+                  name: member_id
+                - type: static
+                  name: genre
+                  value: mystery
+            - name: favorite_comedy_movies
+              table: movies
+              constraints:
+                - type: reference
+                  parent: id
+                  name: member_id
+                - type: static
+                  name: genre
+                  value: comedy
 Readme:
   name: practices
   models:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbee
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_hashable