lowdata 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00edcbe16f363ff5571130711b163c2b7a30f269b063237d9513f0d0d65b1ac9
-  data.tar.gz: b76da81116417a88cb6d440acfcd676aee2f9f53726c8b079551e4ab6df5279f
+  metadata.gz: 5b4ee6fd29a6d15edeb3d85e8517c7b7a3a8d2256e8839479bf5596087879da9
+  data.tar.gz: a383a5cd9e4153e59ebe872af635bd7b96880a0fb38e347f8e6a6094d0163e73
 SHA512:
-  metadata.gz: 76724feffd8a520b11e60bd387ebf1a3aa7543fc7bb962af8b4b5db4411f9099fa42cef7207c98592cf6687a393076b51f3ffad45b198e32b885f8636accac93
-  data.tar.gz: f555c5e21c68df568a8e02e511f9fd6ee8ced5ca9a97edc799eb95415e96fb56c38b2711eb161546fe7c00b775905c1418127b146caddb474a96c9ede039062b
+  metadata.gz: '009095ae108f1118421d6ca8945b66e93664ed1b1b45f8fb120c9204d3a359f4b16d789a60f0001a07cd058b788c25484929f020fc6dba19e36e432cbee7eb4d'
+  data.tar.gz: 6431685585fe4c8cbd8703ebe7c17c50dd22292f4055912c65ba0673e7af424b8be54f4a41c444190f432aa90b248b939ea83f53827961367b354b81932037eb

data/lib/lowdata.rb

@@ -44,6 +44,23 @@ class LowData
       @table ||= name && table_name(name.split('::').last.delete_suffix('Data'))
     end
 
+    # The Method Factory pattern, as in LowNode: each public instance method gets a class method of the same name, so
+    # `UsersData.update(1, attributes)` calls `UsersData.new.update(1, attributes)`. Defined when the instance method
+    # is, so it's a real method rather than a method_missing lookup. Existing class methods, like `table`, are kept.
+    def method_added(name)
+      super
+      return if self == LowData || !public_method_defined?(name)
+      return unless name.match?(/\A[a-z_]\w*[?!]?\z/) # Setters like `title=` stay instance methods.
+      return if factory_method?(name) # A parent's class method already calls `new` on this class.
+      return warn(class_method_exists_message(name:)) if respond_to?(name, true)
+
+      (@factory_methods ||= []) << name
+      # public_send because `private def secret` makes the method private only after it's added.
+      singleton_class.class_eval <<~RUBY, __FILE__, __LINE__ + 1
+        def #{name}(...) = new.public_send(:#{name}, ...) # def update(...) = new.public_send(:update, ...)
+      RUBY
+    end
+
     # Resolve undefined constants in a repository to tables, so `Users` and `BlogPosts` become :users and :blog_posts.
     # `Table` is the repository's own table, joined to whichever related tables own the columns asked for.
     def const_missing(name)
@@ -64,6 +81,14 @@ class LowData
 
     private
 
+    def factory_method?(name)
+      self < LowData && (@factory_methods&.include?(name) || superclass.send(:factory_method?, name))
+    end
+
+    def class_method_exists_message(name:)
+      "#{self}##{name} has no class method, because #{self}.#{name} exists. Call #{self}.new.#{name}"
+    end
+
     def inverted_table
       raise ConfigError, "Set the table for #{self}, e.g. self.table = :posts" if table.nil?
 

data/lib/nesting_path.rb

@@ -10,6 +10,8 @@ class LowData
   class NestingPath
     ARRAY_END_MESSAGE = 'An array ends a + chain, because it nests several tables. Put the rest of the chain in the ' \
                         'array, e.g. Users + [Posts + Comments, Orders]'
+    AFTER_ARRAY_MESSAGE = '%<child>s comes after an array, so it has no single table to nest in. Put it in the array: ' \
+                          '%<beside>s nests %<child>s in %<parent>s, and %<in_last>s nests it in %<last>s'
 
     # A node waiting for its children to be linked, and the entries from it down to the end of its chain.
     Entry = Struct.new(:node, :children, :tail, :closed) do
@@ -43,16 +45,19 @@ class LowData
 
     # Nests a segment and returns the path to the end of the chain.
     def attach(path:, segment:)
-      raise JoinError, ARRAY_END_MESSAGE if path.last.closed
       return siblings(path:, nodes: segment.nodes) if segment.is_a?(DataExpression::Siblings)
 
       child = @tree.entry(node: segment)
+      raise JoinError, after_array_message(array: path.last, child:) if path.last.closed
+
       parent = parent(path:, child:)
       parent.children << child
       path[0..path.index { |entry| entry.equal?(parent) }] + child.path
     end
 
     def siblings(path:, nodes:)
+      raise JoinError, ARRAY_END_MESSAGE if path.last.closed
+
       nodes.each { |node| path.last.children << @tree.entry(node:) }
       path.last.closed = true
       path
@@ -94,6 +99,26 @@ class LowData
       entry.tables.product(other.tables).any? { |table, other_table| @schema.linked?(table, other_table) }
     end
 
+    # Suggests the two places in the array a table after it can go: beside its elements, or in its last one.
+    def after_array_message(array:, child:)
+      *elements, last = array.children
+      beside = [*elements, last, child].map { |entry| chained(entry:) }
+      in_last = [*elements.map { |entry| chained(entry:) }, "#{chained(entry: last)} + #{chained(entry: child)}"]
+      format(AFTER_ARRAY_MESSAGE, child: child.tables.first, parent: array.tables.last, last: last.path.last.tables.last,
+                                  beside: in_array(array:, elements: beside), in_last: in_array(array:, elements: in_last))
+    end
+
+    def in_array(array:, elements:) = "#{written(entry: array)} + [#{elements.join(', ')}]"
+
+    # An array element as written, with its whole chain: `Posts + Comments`.
+    def chained(entry:) = entry.path.map { |link| written(entry: link) }.join(' + ')
+
+    # A table as written in an expression, without its brackets: `Posts`, or `(Posts & Likes)` for a join.
+    def written(entry:)
+      names = entry.tables.map { |table| LowData.constant_name(table) }
+      names.one? ? names.first : "(#{names.join(' & ')})"
+    end
+
     # Suggests an array, or naming the foreign key that reaches back to the earlier table.
     def unlinked_message(child:, parent:, earlier:)
       message = "No foreign key links #{child} to #{parent}"

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class LowData
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lowdata
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - maedi