dbml 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c1cc0879db898fd838bccb388775692c2fd9510cc889dfb06aea5bc6532856
-  data.tar.gz: a6aa38aa4625fad6f0dafc7a49e1866f6376d222cf92dede1ea0994583312388
+  metadata.gz: 0d397713801bd11420626394ef9e93a83cea36401027ebc27c0d024060c3df47
+  data.tar.gz: e0c31278a397d67841cdf77dcb944bd19847a8e0975af6c9bf6bc7e7c120b562
 SHA512:
-  metadata.gz: 4ec98ffd66c2c197329a74a44bbecf8766124a12fe1e809b121d6a9428e7378e6a65a4c7e93c62f8a94b9662f69da5a1985010e6452d1cf945fb49befcde6ac5
-  data.tar.gz: 2c1c230ed637641c8fc798cf04dbc21eb282bfbb428ae6fdeeb752602dc22fcab549712e208f2b52d0e7f119068fb49ab7d2b26d8a1b66e50cb18ed491fa2517
+  metadata.gz: a2ce41f83c7a3f37c15b49bdfd5af8cbb485fa822ede5bfb18d9b70ca2c052148dcec45a76810ed716a5126558fa7e5a0f8232c148d66751788528c172c1912b
+  data.tar.gz: 6145c6e8e58d6d7d6259f8cf80fc79b5c3f7e4b32c88a8c8f0048bbd4ae11f7ba2334d55adfec7a67deaf0a2f0424ef788917f8d74419849c57696eb971f8c07

data/lib/dbml.rb

@@ -50,20 +50,25 @@ module DBML
     BOOLEAN            = 'true'.r.map {|_| true } | 'false'.r.map {|_| false }
     NULL               = 'null'.r.map {|_| nil }
     NUMBER             = prim(:double)
-    EXPRESSION         = seq('`'.r, /[^`]+/.r, '`'.r)[1].map {|str| Expression.new str}
+    EXPRESSION         = seq('`'.r, /[^`]*/.r, '`'.r)[1].map {|str| Expression.new str}
     # KEYWORD parses phrases:   'no action' => :"no action"
     KEYWORD             = /[^#{RESERVED_PUNCTUATION}\s][^#{RESERVED_PUNCTUATION}]*/.r.map {|str| str.to_sym}
-    SINGLE_LING_STRING = seq("'".r, /[^']+/.r, "'".r)[1]
+    SINGLE_LING_STRING = seq("'".r, /[^']*/.r, "'".r)[1] | seq('"'.r, /[^"]*/.r, '"'.r)[1]
     # MULTI_LINE_STRING ignores indentation on the first line: "'''  long\n    string'''" => "long\n  string"
     # MULTI_LINE_STRING allows apostrophes: "'''it's a string with '' bunny ears'''" => "it's a string with '' bunny ears"
-    MULTI_LINE_STRING  = seq("'''".r, /([^']|'[^']|''[^'])+/m.r, "'''".r)[1].map do |string|
+    # MULTI_LINE_STRING allows blanks: "''''''" => ""
+    # MULTI_LINE_STRING allows blank lines to have no indent: "'''  my string\n\n  it's really great'''" => "my string\nit's really great"
+    # MULTI_LINE_STRING allows blank first lines: "'''\n    start of\n    my writing'''" => "start of\nmy writing"
+    MULTI_LINE_STRING  = seq(/'''\n?/.r, /([^']|'[^']|''[^'])*/m.r, /\n?'''/.r)[1].map do |string|
       indent = string.match(/^\s*/m)[0].size
       string.lines.map do |line|
-        raise "Indentation does not match" unless line =~ /\s{#{indent}}/
+        raise "Indentation does not match in #{line.inspect}" unless line =~ /\s{#{indent}}/ or line =~ /^\n$/
         line[indent..]
       end.join
     end
-    STRING = SINGLE_LING_STRING | MULTI_LINE_STRING
+    # STRING parses blank strings: "''" => ""
+    # STRING parses double quotes: '""' => ""
+    STRING = MULTI_LINE_STRING | SINGLE_LING_STRING
     ATOM = BOOLEAN | NULL | NUMBER | EXPRESSION | STRING
 
     # Each setting item can take in 2 forms: Key: Value or keyword, similar to that of Python function parameters.
@@ -282,12 +287,13 @@ module DBML
     # RELATIONSHIP parses long form: "Ref name {\nleft.lcol < right.rcol\n}" => DBML::Relationship.new('name', 'left', ['lcol'], '<', 'right', ['rcol'], {})
     # RELATIONSHIP parses short form: "Ref name: left.lcol > right.rcol" => DBML::Relationship.new('name', 'left', ['lcol'], '>', 'right', ['rcol'], {})
     # RELATIONSHIP parses composite form: 'Ref: left.(a, b) - right.(c, d)' => DBML::Relationship.new(nil, 'left', ['a', 'b'], '-', 'right', ['c', 'd'], {})
+    # RELATIONSHIP parses lowercase r: "ref name: left.lcol > right.rcol" => DBML::Relationship.new('name', 'left', ['lcol'], '>', 'right', ['rcol'], {})
     # RELATIONSHIP parses settings: "Ref: L.a > R.b [delete: cascade, update: no action]" => DBML::Relationship.new(nil, 'L', ['a'], '>', 'R', ['b'], {delete: :cascade, update: :'no action'})
     COMPOSITE_COLUMNS = '('.r >> comma_separated(COLUMN_NAME) << ')'
     RELATIONSHIP_TYPE = '>'.r | '<'.r | '-'.r
     RELATIONSHIP_PART = seq(seq(IDENTIFIER, '.'.r)[0], (COLUMN_NAME.map {|c| [c]}) | COMPOSITE_COLUMNS)
     RELATIONSHIP_BODY = seq_(RELATIONSHIP_PART, RELATIONSHIP_TYPE, RELATIONSHIP_PART, SETTINGS.maybe)
-    RELATIONSHIP = seq_('Ref'.r >> NAKED_IDENTIFIER.maybe, long_or_short(RELATIONSHIP_BODY)).map do |(name, (left, type, right, settings))|
+    RELATIONSHIP = seq_(/[Rr]ef/.r >> NAKED_IDENTIFIER.maybe, long_or_short(RELATIONSHIP_BODY)).map do |(name, (left, type, right, settings))|
       Relationship.new unwrap(name), *left, type, *right, unwrap(settings) || {}
     end
 

data/lib/dbml/version.rb

@@ -1,3 +1,3 @@
 module DBML
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Simon Worthington
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec