dbee 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae136319b1de6f828e34e6e0546b7c6663848efecbf8bfb42f8fe6204bebb20c
-  data.tar.gz: 1690b0f58befeade514c2949163d37ada74f673235ab64a49ec18f7ffde58e1d
+  metadata.gz: 4e099b2ff5d651a4bc97562314e0216e07afa778cc7b99cc775a2461f744ab3a
+  data.tar.gz: 3d9ea4d091416484bdd5186caf02f9fec23e6d15d91fb9528965c9eff07f9669
 SHA512:
-  metadata.gz: 82c42cf23dbaed18644da3b2e02bc406833a65ca6429c8d31d824de44cf08fe2b503c4af32c6199646fbe797abe7af9dc434d75acff91b1fb7b502d2f7eb6d35
-  data.tar.gz: '07482747b169ccfde19405381d5128bd07ee269374e75c0f577ee34c26b3a0d877654c70da3a0b1bdd8ce31a1e591a4d0d8c11050390b3a5be18e06f7b312b11'
+  metadata.gz: 7a31b7129beab7271692bc7ff3534ce53977d80a017d5fee250e13fa1f5c586d51cd867c39e72aa646265287b2ae152a5b8d824bdd849459fedfb67f6b240ae6
+  data.tar.gz: 5d0149dedb9a61efc00df03e37e454bfb53755a7ecdb8f8440751779e352b30e2f1f910a97f60df7bbbd3cd7f8111dbf2af1d2b93635a2dfc255e735cd3e2ebc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.2.1 (September 1st, 2019)
+
+Fixes:
+
+* Dbee::Base table name should default to the most-parent table name (if none are explicitly defined.)  Overriding still takes most child sub-class precedence.
+
 # 1.2.0 (August 29th, 2019)
 
 Additions:

data/lib/dbee/base.rb

@@ -7,25 +7,29 @@
 # LICENSE file in the root directory of this source tree.
 #
 
+require_relative 'dsl/inflectable'
+require_relative 'dsl/reflectable'
+
 module Dbee
   # Instead of using the configuration-first approach, you could use this super class for
   # Model declaration.
   class Base
+    extend Dsl::Inflectable
+    extend Dsl::Reflectable
+
+    BASE_CLASS_CONSTANT = Dbee::Base
+
     class << self
       def partitioner(name, value)
         partitioners << { name: name, value: value }
       end
 
       def table(name)
-        @table_name = name.to_s
-
-        self
+        tap { @table_name = name.to_s }
       end
 
       def association(name, opts = {})
-        associations_by_name[name.to_s] = opts.merge(name: name)
-
-        self
+        tap { associations_by_name[name.to_s] = opts.merge(name: name) }
       end
 
       # This method is cycle-resistant due to the fact that it is a requirement to send in a
@@ -34,7 +38,7 @@ module Dbee
       # of a Query.  This is not true for configuration-first Model definitions because, in that
       # case, cycles do not exist since the nature of the configuration is flat.
       def to_model(key_chain, name = nil, constraints = [], path_parts = [])
-        derived_name  = derive_name(name)
+        derived_name  = name.to_s.empty? ? tableize(self.name) : name.to_s
         key           = [key_chain, derived_name, constraints, path_parts]
 
         to_models[key] ||= Model.make(
@@ -64,79 +68,53 @@ module Dbee
       end
 
       def inherited_table_name
-        subclasses.find(&:table_name?)&.table_name || ''
+        subclasses(BASE_CLASS_CONSTANT).find(&:table_name?)&.table_name ||
+          tableize(reversed_subclasses(BASE_CLASS_CONSTANT).first.name)
       end
 
-      def inherited_associations_by_name
-        reversed_subclasses.each_with_object({}) do |subclass, memo|
+      def inherited_associations
+        reversed_subclasses(BASE_CLASS_CONSTANT).each_with_object({}) do |subclass, memo|
           memo.merge!(subclass.associations_by_name)
-        end
+        end.values
       end
 
       def inherited_partitioners
-        reversed_subclasses.inject([]) do |memo, subclass|
+        reversed_subclasses(BASE_CLASS_CONSTANT).inject([]) do |memo, subclass|
           memo + subclass.partitioners
         end
       end
 
       private
 
-      def subclasses
-        ancestors.select { |a| a < Dbee::Base }
-      end
-
-      def reversed_subclasses
-        subclasses.reverse
-      end
-
       def model_config(key_chain, name, constraints, path_parts)
         {
           constraints: constraints,
-          partitioners: inherited_partitioners,
           models: associations(key_chain, path_parts),
           name: name,
-          table: derive_table
+          partitioners: inherited_partitioners,
+          table: inherited_table_name
         }
       end
 
-      def derive_name(name)
-        name.to_s.empty? ? inflected_name : name.to_s
-      end
-
-      def derive_table
-        inherited_table = inherited_table_name
-
-        inherited_table.empty? ? inflected_name : inherited_table
-      end
-
       def associations(key_chain, path_parts)
-        inherited_associations_by_name.values
-                                      .select { |c| key_chain.ancestor_path?(path_parts, c[:name]) }
-                                      .each_with_object([]) do |config, memo|
+        inherited_associations.select { |c| key_chain.ancestor_path?(path_parts, c[:name]) }
+                              .each_with_object([]) do |config, memo|
           model_constant          = constantize(config[:model])
           associated_constraints  = config[:constraints]
           name                    = config[:name]
 
-          memo << model_constant.to_model(key_chain, name, associated_constraints, path_parts)
+          memo << model_constant.to_model(
+            key_chain,
+            name,
+            associated_constraints,
+            path_parts
+          )
         end
       end
 
       def to_models
         @to_models ||= {}
       end
-
-      def inflected_name
-        name.split('::')
-            .last
-            .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-            .tr('-', '_')
-            .downcase
-      end
-
-      def constantize(value)
-        value.is_a?(String) || value.is_a?(Symbol) ? Object.const_get(value) : value
-      end
     end
   end
 end

data/lib/dbee/dsl/inflectable.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019-present, Blue Marble Payroll, LLC
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+module Dbee
+  module Dsl
+    # Provides methods for dealing with naming grammar.
+    module Inflectable
+      def constantize(value)
+        value.is_a?(String) || value.is_a?(Symbol) ? Object.const_get(value) : value
+      end
+
+      def tableize(value)
+        value.split('::')
+             .last
+             .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+             .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+             .tr('-', '_')
+             .downcase
+      end
+    end
+  end
+end

data/lib/dbee/dsl/reflectable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+#
+# Copyright (c) 2019-present, Blue Marble Payroll, LLC
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+#
+
+module Dbee
+  module Dsl
+    # Provide methods for dealing with introspection of class hierarchies.
+    module Reflectable
+      # Start at child, end with parent
+      def subclasses(base_class_constant)
+        ancestors.select { |a| a < base_class_constant }
+      end
+
+      # Start at parent, end with child
+      def reversed_subclasses(base_class_constant)
+        subclasses(base_class_constant).reverse
+      end
+    end
+  end
+end

data/lib/dbee/version.rb

@@ -8,5 +8,5 @@
 #
 
 module Dbee
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/fixtures/models.rb

@@ -23,6 +23,8 @@ module Models
   end
 
   class MembersBase < Dbee::Base
+    table 'members'
+
     association :demos, model: Demographics,
                         constraints: { type: :reference, name: :member_id, parent: :id }
 
@@ -55,6 +57,8 @@ module Models
   end
 
   class Theaters < TheatersBase
+    table 'theaters'
+
     association :parent_theater, model: self, constraints: [
       { type: :reference, name: :id, parent: :parent_theater_id }
     ]
@@ -148,9 +152,10 @@ module PartitionerExamples
     }
   end
 
-  class Dogs < Dbee::Base
-    table 'animals'
+  class Animals < Dbee::Base
+  end
 
+  class Dogs < Animals
     partitioner :type, 'Dog'
 
     partitioner :deleted, false

data/spec/fixtures/models.yaml

@@ -162,6 +162,7 @@ Readme:
               value: fax
 Cycle Example:
   name: a
+  table: base_a
   models:
     - name: b1
       table: b
@@ -169,18 +170,22 @@ Cycle Example:
         - name: c
           models:
             - name: a
+              table: base_a
         - name: d
           models:
             - name: a
+              table: base_a
     - name: b2
       table: b
       models:
         - name: c
           models:
             - name: a
+              table: base_a
         - name: d
           models:
             - name: a
+              table: base_a
               models:
                 - name: b1
                   table: b

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbee
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_hashable
@@ -155,6 +155,8 @@ files:
 - dbee.gemspec
 - lib/dbee.rb
 - lib/dbee/base.rb
+- lib/dbee/dsl/inflectable.rb
+- lib/dbee/dsl/reflectable.rb
 - lib/dbee/key_chain.rb
 - lib/dbee/key_path.rb
 - lib/dbee/model.rb