fixture_fox 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 559cb3c1dc15071bcb9ddb4dd8dbb7f31e212cfa131093aa29db1a8d8be5137e
-  data.tar.gz: 919e1f0458dc7d632dfd37c5cc62851adaedd05cb9a927477d021f637a1b9480
+  metadata.gz: d169cf91f6468fcd829b7edd7af5309c4a15ff17e7087d2a75609fa7ea97b606
+  data.tar.gz: 2d99e4c1329f4cde08ac5f808c593f5cc92d086db7f8fb8bb909932aa6a96f67
 SHA512:
-  metadata.gz: 5c8e37e8ced79cf730949f3bf7c05e53cca8d63c617071fb27c69693f2e025387a29941672fa59ec5a4f001c8d4e258660be64ea6e29a1992103f06492783a02
-  data.tar.gz: db3e0a16ee29fa1f31b33b27c05da0d702e70ce90617200a91b474ce29ae36eca40f9238c14e4ff7507a583de5c1ceeb481f7fd3b3784a14de283f2e0ce85953
+  metadata.gz: 0b4bee30d8d492878f68a511730e7dda92b9db40c9a4c3be68f4e5db0a14464a9879cb7d7c3d570dab3c849352decb45df6e8f6441ae5dea8eb238ee1c7450ac
+  data.tar.gz: b33f654ff11fd0935c49f83492829d010dd035dfaf2034229c16272d5610a2127fd097c0fe2cd60cf9234755ac1edb6b2992e455a3fa34b9fb8bdd6c2869f15f

data/lib/fixture_fox/analyzer.rb

@@ -108,7 +108,7 @@ module FixtureFox
       ast.tables.each { |ast_table|
         @type.key?(ast_table.schema.value.downcase) or
             ast_table.schema.error("Can't find schema '#{ast_table.schema}'")
-        type = ast_table.type = @type[ast_table.schema.value.downcase][ast_table.name.downcase] or 
+        type = ast_table.type = @type[ast_table.schema.value.downcase][ast_table.name.downcase] or
             ast_table.ident.error(
                 "Can't find ast_table '#{ast_table.ident}' (maybe you forgot to declare a schema?)")
         @tables[type.uid] = type
@@ -136,7 +136,7 @@ module FixtureFox
 
     def assign_field_types(ast_record)
       ast_record.members.each { |field|
-        field.column = ast_record.type[field.ident.litt.downcase] or 
+        field.column = ast_record.type[field.ident.litt.downcase] or
             field.ident.error("Can't find field '#{ast_record.type.table.name}.#{field.ident}'")
         field.type = field.column.type
         case field
@@ -174,9 +174,9 @@ module FixtureFox
             end
 
             values.each { |value|
-              if value.is_a?(klass) || !f.type.array? && 
-                  klass == Time && 
-                  value.is_a?(String) && 
+              if value.is_a?(klass) || !f.type.array? &&
+                  (klass == Time || klass == Date) &&
+                  value.is_a?(String) &&
                   value =~ /^\d\d\d\d-\d\d-\d\d(?: \d\d:\d\d(?::\d\d)?)?$/
                 ;
               else
@@ -192,9 +192,9 @@ module FixtureFox
     end
 
     def check_ref(ast_ref)
-      anchor = ast_ref.referenced_anchor = @anchors[ast_ref.reference.value.to_sym] or 
+      anchor = ast_ref.referenced_anchor = @anchors[ast_ref.reference.value.to_sym] or
           ast_ref.reference.error("Can't find anchor for reference '#{ast_ref.reference.litt}'")
-      anchor_types = 
+      anchor_types =
           [anchor.type] +
           (anchor.type.table.sub_table? ? [anchor.type.table.super_table.record_type] : [])
       anchor_types.any? { |anchor_type| ast_ref.type == anchor_type } or
@@ -211,8 +211,6 @@ module FixtureFox
     end
 
     def generate_record_ids
-#     puts "generate_record_ids"
-#     puts "  ids: #{@ids}"
       @super_table_records = [] # Array of pairs of super_table/id
       records.each { |ast_record|
         table = ast_record.type.table
@@ -270,19 +268,17 @@ module FixtureFox
       records.each { |record|
         record.members.each { |field|
           table = nil # To bring table into scope. FIXME: Yt?
+#         puts "#{field.class}"
           case field
             when AstFieldMember
-#             puts "AstFieldMember: #{field}"
               table = record.type.table
               column = field.column.postgres_column
               idr.put(table.schema.name, table.name, record.id, column, field.value.value)
             when AstReferenceMember
-#             puts "AstReferenceMember: #{field}"
               table = record.type.table
               column = field.column.postgres_column
               idr.put(table.schema.name, table.name, record.id, column, field.referenced_anchor.id)
             when AstRecordMember
-#             puts "AstRecordMember: #{record.type}"
               column = field.column
 
               this_record_id = field.record.id
@@ -300,7 +296,6 @@ module FixtureFox
                 idr.put(schema.name, table.name, that_record_id, link_column, this_record_id)
               end
             when AstTableMember
-#             puts "AstTableMember: #{field}"
               if field.column.is_a?(PgGraph::Type::MmTableColumn)
                 table = mm_table = field.column.mm_table
                 this_mm_column = field.column.this_mm_column
@@ -316,11 +311,22 @@ module FixtureFox
               else
                 table = record_table = field.column.type.table
                 record_column = field.column
+
                 field.elements.each { |r|
                   record_id = r.is_a?(AstReferenceElement) ? r.referenced_anchor.id : r.id
+                  if record_table[record_column.that_link_column].kind?
+                    key_schema_name = record_column.table.schema.name
+                    key_table_name = record_column.table.name
+                    key_record_id = record.id
+                    key_field = record_column.this_link_column.to_sym
+                    key = idr.data[key_schema_name][key_table_name][key_record_id][key_field]
+                  else
+                    key = record.id
+                  end
+
                   idr.put(
-                      record_table.schema.name, record_table.name, 
-                      record_id, record_column.that_link_column, record.id)
+                      record_table.schema.name, record_table.name,
+                      record_id, record_column.that_link_column, key)
                 }
               end
             else

data/lib/fixture_fox/anchor.rb

@@ -45,7 +45,7 @@ module FixtureFox
       constrain arg, PgGraph::Type::RecordType, String
       constrain id, NilClass, Integer # id is initially nil for anchors declared in the source
       !@anchors.key?(name) or raise Error, "Duplicate anchor: #{name.inspect}"
-      type = 
+      type =
           case arg
             when PgGraph::Type::RecordType; arg
             when String; @type.dot(arg) or raise Error, "Illegal path: #{path.inspect}"

data/lib/fixture_fox/hash_parser.rb

@@ -38,7 +38,7 @@ private
     value = extract_value
     [key.to_sym, value]
   end
-  
+
   def extract_key
     key = ""
     while @i < @s.size && @s[@i] =~ /\w/
@@ -104,7 +104,7 @@ private
         else
           litt.strip
         end
-    value 
+    value
   end
 end
 

data/lib/fixture_fox/idr.rb

@@ -9,7 +9,7 @@ module FixtureFox
     # List of materialized views that depends on the tables. Assigned by the analyzer
     # FIXME: Is this in use?
     attr_accessor :materialized_views
-    
+
     # Data as a hash from schema to table to id to record to field to value.
     # Ie. { "schema" => { "table" => { 1 => { id: 1, name: "Alice" } } } }
     attr_reader :data
@@ -49,7 +49,7 @@ module FixtureFox
     def dump
       data.sort_by(&:first).each { |schema, tables|
         puts schema
-        tables.each { |table, records| 
+        tables.each { |table, records|
           puts "  #{table}"
           records.each { |id, fields|
             puts "    #{fields.inspect}"

data/lib/fixture_fox/line.rb

@@ -88,11 +88,11 @@ module FixtureFox
   end
 
   class Line < TokenizedLine
-    attr_reader :dash 
+    attr_reader :dash
     attr_reader :ident
     attr_reader :empty # Empty token
-    attr_reader :value 
-    attr_reader :reference 
+    attr_reader :value
+    attr_reader :reference
     attr_reader :anchor
 
     attr_reader :directive # SchemaDirective token
@@ -143,7 +143,7 @@ module FixtureFox
           error "Illegal character after '-'"
       end
 
-      # Expect key/value pair 
+      # Expect key/value pair
       case line
         when /^(\w+)(\s*):\s*$/ # Record
           @ident = make_ident($1)
@@ -197,15 +197,15 @@ module FixtureFox
     def to_s(long: false)
       super +
           if long
-            [ dash && "dash:#{dash.pos}", 
-              ident && "ident:#{ident.pos} #{ident.value}", 
+            [ dash && "dash:#{dash.pos}",
+              ident && "ident:#{ident.pos} #{ident.value}",
               value && "value:#{value.pos} #{value.value}",
               reference && "reference:#{reference.pos} #{reference.value}",
               anchor && "anchor:##{anchor.pos} #{anchor.value}"
             ]
           else
-            [ dash && "dash", 
-              ident && "ident: #{ident.to_s}", 
+            [ dash && "dash",
+              ident && "ident: #{ident.to_s}",
               value && "value: #{value.to_s}",
               reference && "reference: #{reference.to_s}",
               anchor && "anchor: #{anchor.to_s}"

data/lib/fixture_fox/parser.rb

@@ -8,7 +8,7 @@ module FixtureFox
     attr_reader :anchor_files # Name of external anchor files from @anchors directive
 
     def initialize(file, lines, schema: nil)
-      @file = file 
+      @file = file
       @lines = lines
       @schema = schema || "public"
       @anchor_files = []
@@ -18,7 +18,7 @@ module FixtureFox
       @ast = ast || Ast.new(file)
 
       # Current schema. The schema is initialized with a synthetic Ident token
-      # because the #analyzer needs a token to emit an error message if the 
+      # because the #analyzer needs a token to emit an error message if the
       # public schema doesn't exist
       schema = Ident.new(file, 1, peek.initial_indent, 1, @schema)
 
@@ -86,14 +86,14 @@ module FixtureFox
         include_file = include_path.to_s
       else
         including_dir = Pathname.new(file).expand_path.dirname
-        include_file = 
+        include_file =
             Pathname.new(including_dir.to_s + "/" + include_path.to_s)
             .cleanpath
             .relative_path_from(Pathname.getwd).to_s
       end
       tokenizer = Tokenizer.new(include_file)
       Parser.new(tokenizer.file, tokenizer.call).call(@ast)
-    end            
+    end
 
     # Parse table elements. Current line should be the first element
     def parse_elements(table)

data/lib/fixture_fox/tokenizer.rb

@@ -42,7 +42,7 @@ module FixtureFox
       !source.empty? or return []
       @initial_indent = source.first[/\A */].size
 
-      while !source.empty? 
+      while !source.empty?
         line = source.shift
         @lineno += 1
 

data/lib/fixture_fox/version.rb

@@ -1,3 +1,3 @@
 module FixtureFox
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

data/lib/fixture_fox.rb

@@ -22,7 +22,7 @@ module FixtureFox
     attr_reader :type
 
     # Name of first source file
-    attr_reader :file 
+    attr_reader :file
 
     # Names of all source files except included files. FIXME: Not maintained - always []
     attr_reader :files
@@ -43,8 +43,8 @@ module FixtureFox
     def idr() @idr || generate end
 
     # List of tables with records (PgGraph::Type::Table)
-    def tables() 
-      @analyzer.data_tables 
+    def tables()
+      @analyzer.data_tables
     end
 
     # Default schema. Defaults to "public"
@@ -60,12 +60,12 @@ module FixtureFox
 
     # List of anchors defined by the sources
     def defined_anchors()
-      @analyzer.defined_anchors.values 
+      @analyzer.defined_anchors.values
     end
 
     # List of external anchors referenced by the sources. FIXME: Unused
-    def referenced_anchors() 
-      @analyzer.referenced_anchors.values 
+    def referenced_anchors()
+      @analyzer.referenced_anchors.values
     end
 
     def parsed?() !@ast.nil? end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixture_fox
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg