rndb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c745160e3fa8b2713e1661bc83157c29746e9ed7125b6ac332700d81a3db7a7f
-  data.tar.gz: 52b92a38e619572b13ec8e5b50dac552d1561832fe39f858b9ce269db6eaadb7
+  metadata.gz: 214e9ee89f6ee4b994baf74bea9a34f49fc89e09c99ce436960ceb2c92d3d670
+  data.tar.gz: 85840a5d5346fb2334d395fa820d5f6111e43df485cd0b3e6a636a80f1837c61
 SHA512:
-  metadata.gz: f6930929cdf9a3958de8ae0c730bc619c74b62fe145776fd53a6a61fc84e7b1dcf7af0752955f47bac3d9e601a1907aa2d36fca6774bd765c87ad7668f07d01a
-  data.tar.gz: d9cf1aee0b156bb6e0d02491b89a3cb4abb4ca9bca1e55d99751d0ec3375aef75a7490da48d3cd78a7860c3879d52ce4b170ea33fd7ecbadd7f5f9786380ebf6
+  metadata.gz: bf56a0511606581fff82c10d25573c826daab12823cd02bf2e003f8abfb9912d8a58a641dfca3d8e1f611e6a307762a6ee4adb5df26f2ab44011521904cdf3e7
+  data.tar.gz: 8f63e7aa951fdf2b304985686bfd8f6ccc8ed5bfd672cddf4634e75e3efbd6e4446ff6942d28e270289357efbc95ff5aee1244fdae8dba2d93fcbde4e3835455

data/README.md

@@ -1,5 +1,6 @@
 [![test](https://github.com/kranzky/rndb/actions/workflows/test.yml/badge.svg)](https://github.com/kranzky/rndb/actions/workflows/test.yml)
 [![Coverage Status](https://coveralls.io/repos/github/kranzky/rndb/badge.svg?branch=main)](https://coveralls.io/github/kranzky/rndb?branch=main)
+[![Gem Version](https://badge.fury.io/rb/rndb.svg)](https://badge.fury.io/rb/rndb)
 
 # RnDB
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/rndb/query.rb

@@ -19,6 +19,11 @@ module RnDB
       @table[@ids[index]]
     end
 
+    # Retrieve the index of the specified ID.
+    def index(id)
+      @ids.index(id)
+    end
+
     # Implemented to be consistent with #first, which we get by magic.
     def last
       self[-1] unless count.zero?

data/lib/rndb/table.rb

@@ -31,17 +31,35 @@ module RnDB
     private
 
     def _generate_all
-      _schema[:columns].each_key do |name|
+      _schema[:columns].each do |name, column|
+        _generate_column_key(name) if column[:generator] && column[:distribution]
         _generate_column(name)
       end
+      _schema[:associations].each_key do |name|
+        _generate_association_id(name)
+      end
       @_attributes
     end
 
+    def _generate_column_key(name)
+      @_attributes ||= { id: @id }
+      @_attributes["#{name}_key".to_sym] ||= self.class.key(@id, name)
+    end
+
     def _generate_column(name)
       @_attributes ||= { id: @id }
       @_attributes[name] ||= self.class.value(@id, name)
     end
 
+    def _generate_association_id(name)
+      @_attributes ||= { id: @id }
+      @_attributes["#{name}_id".to_sym] ||= _generate_association(name)&.id
+    end
+
+    def _generate_association(name)
+      self.class.join(@id, name)
+    end
+
     def _validate!
       self.class.send(:_validate!)
     end
@@ -67,15 +85,7 @@ module RnDB
       # Return a Query that matches the supplied constraints
       def where(constraints={})
         _validate!
-        ids = Thicket.new(0..._schema[:size])
-        constraints.each do |attribute, values|
-          column = _schema[:columns][attribute]
-          other = Array(values).reduce(Thicket.new) do |thicket, value|
-            thicket | column[:mapping][value]
-          end
-          ids &= other
-        end
-        Query.new(self, ids)
+        Query.new(self, _query(constraints, _schema[:size]))
       end
 
       # Return all records.
@@ -110,41 +120,67 @@ module RnDB
 
       # Add a new column to the Table model.
       def column(attribute, *args)
+        column = _schema[:columns][attribute]
         args.each do |arg|
           index =
             case arg
-            when Hash
+            when Hash, Array
               :distribution
             when Proc
               :generator
             else
               raise "unsupported column parameter"
             end
-          _schema[:columns][attribute][index] = arg
+          column[index] = arg
+        end
+        if column[:generator] && column[:distribution]
+          define_method("#{attribute}_key") do
+            _generate_column_key(attribute)
+          end
         end
         define_method(attribute) do
           _generate_column(attribute)
         end
       end
 
+      # Add an association between two Table models.
+      def association(attribute, *args)
+        args.each do |arg|
+          _schema[:associations][attribute] = arg
+        end
+        define_method("#{attribute}_id".to_sym) do
+          _generate_association_id(attribute)
+        end
+        define_method(attribute) do
+          _generate_association(attribute)
+        end
+      end
+
       # Generate a random number, intended to be used in lambdas. The number
       # will have been seeded appropriately to ensure determinism.
-      def rand(args)
+      def rand(*args)
         _validate!
-        _db.prng.rand(args)
+        _db.prng.rand(*args)
+      end
+
+      # Retrieve the key that can be queried on for generated attributes.
+      def key(id, attribute)
+        @current = id
+        _validate!
+        column = _schema[:columns][attribute]
+        return if column[:distribution].nil?
+        column[:mapping].find do |_, ids|
+          ids.include?(id)
+        end&.first
       end
 
       # Retrieve the value of the given attribute for the given ID.
       def value(id, attribute)
+        @current = id
         _validate!
         return id if attribute == :id
         column = _schema[:columns][attribute]
-        value =
-          unless column[:distribution].nil?
-            column[:mapping].find do |_, ids|
-              ids.include?(id)
-            end&.first
-          end
+        value = key(id, attribute)
         unless column[:generator].nil?
           _seed_prng(id, attribute)
           value =
@@ -157,6 +193,27 @@ module RnDB
         value
       end
 
+      # Return the instance joined to the current ID.
+      def join(id, name)
+        @current = id
+        _schema[:associations][name].each do |context|
+          next unless (index = where(context[:where]).index(id))
+          return where(context[:joins])[index]
+        end
+        nil
+      end
+
+      def get(attribute)
+        raise unless @current
+        if _schema[:columns].key?(attribute)
+          value(@current, attribute)
+        elsif _schema[:associations].key?(attribute)
+          join(@current, attribute)
+        else
+          raise "no such attribute"
+        end
+      end
+
       private
 
       def _db
@@ -174,24 +231,52 @@ module RnDB
                 mapping: {},
                 generator: nil
               }
+            end,
+            associations: Hash.new do |associations, key|
+              associations[key] = nil
             end
           }
         end
         Thread.current[:rndb_tables][table_name]
       end
 
+      def _query(constraints, size)
+        ids = Thicket.new(0...size)
+        constraints.each do |attribute, values|
+          column = _schema[:columns][attribute]
+          raise "no mapping for column" if column[:mapping].empty?
+          other = Array(values).reduce(Thicket.new) do |thicket, value|
+            thicket | column[:mapping][value]
+          end
+          ids &= other
+        end
+        ids
+      end
+
+      def _migrate_column(column, ids, distribution)
+        min = 0.0
+        distribution.each do |value, probability|
+          max = min + probability
+          column[:mapping][value] ||= Thicket.new
+          column[:mapping][value] |= ids * (min..max)
+          min = max
+        end
+      end
+
       def _migrate(size)
         raise "table already migrated" unless _schema[:class].nil?
         ids = Thicket.new(0...size)
         _schema[:columns].each_value do |column|
           distribution = column[:distribution]
           next if distribution.nil?
-          raise "distribution must sum to unity" unless distribution.values.sum == 1
-          min = 0.0
-          column[:distribution].each do |value, probability|
-            max = min + probability
-            column[:mapping][value] = ids * (min..max)
-            min = max
+          if distribution.is_a?(Array)
+            distribution.each do |context|
+              thicket = ids & _query(context[:where], size)
+              _migrate_column(column, thicket, context[:stats])
+            end
+          else
+            raise "distribution must sum to unity" unless distribution.values.sum == 1
+            _migrate_column(column, ids, distribution)
           end
           ids =
             column[:mapping].values.reduce(Thicket.new) do |thicket, other|

data/rndb.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rndb 0.1.1 ruby lib
+# stub: rndb 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rndb".freeze
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lloyd Kranzky".freeze]
-  s.date = "2021-02-25"
+  s.date = "2021-02-26"
   s.description = "".freeze
   s.email = "lloyd@kranzky.com".freeze
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rndb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Lloyd Kranzky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc