reactive_record 0.0.2 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTE3ZTY1ODk3NDRjYTBmMTc3OGNmOWVmNWNhYzNmYjJiZGI1NzFiYw==
+    ZDg0ZjdmNjhkNmJmYTE2OWQ0ODFkMzkwYmNiNmEwMjdkODY4NWZjOA==
   data.tar.gz: !binary |-
-    ZWUzZjFmNzlkNzU1YmRiNWMwNDMxOTc0ODFiZGM3ZTg1N2RjNTI3NQ==
+    YmNkZjQ3OGVlZjJhNDM3MGQ0YmE0YmJmN2RkNGYzYmJiNjBlMDVkOA==
 SHA512:
   metadata.gz: !binary |-
-    MzY2ZWFkYTk5Y2VlNmYxMzhlYjQ2YTU1MjJiYTdiOGJhNzMzZmRmNGYwZTg2
-    Y2U3YmI2MTQ1YmZlYmYyNzk2OGZhNWQ0MTQ4ZjViZTg1OTk5ZTY4ZWJiNTI5
-    Y2I2OTc4YTE2MmE5YWM4YzFhNTZkY2ZjOTFjNGQzODIwZTQ4M2Y=
+    MDM2NDQxMDFiMTZlYjA2ZGM2ZDBlNjc1OTJhOWRhYTY4NTdjYzlhMDIxNTI5
+    N2NhYzJiZGIxMWFjMDJhOTJmNDZlOGZmOGFmYTNkNjQ0ODMyOTAxOTkwYmI1
+    ZGIzNTBiM2QxZjc0MWQ5OWJmOWVkYmI3NzkwNTE1MWE0NjkwNTA=
   data.tar.gz: !binary |-
-    MGUzZDM1NTdhN2FmYzE2ZGYxMjMxZGVlYWNjNmRlYWNmZjk0YzhhMGFmNmY5
-    NTBlZjRlYzkwNGU3ZTAwOTcxZWFmNDdhNjdmZTE3NDBmM2E0ZTFiNDNjMzMy
-    NmRkYWUzMWYyZWUzMzBiNzcyNTVhM2RhNGI0YzUwNDhiNzdiMmU=
+    MTgzZTk5ZDNjODliZDhiZjAxN2ZkYmI0NzAwMjdhYmFmYjNlOThhOTVmZDM5
+    ZGUyZDQzZGQwNWFjODJmNWY3ZGRkYWJkMWZjYzk0MjhkOTVlNTJmYzgyMzA5
+    YWYzMjliMGExM2I5YTBjNWNhMTBlN2RmMzlkYzc3ZDliYzZlMjk=

data/.gitignore

@@ -17,4 +17,3 @@ test/version_tmp
 tmp
 .ruby-version
 .ruby-gemset
-lib/parser.rb

data/README.md

@@ -3,6 +3,8 @@
       alt="Reactive record logo">
 </p>
 
+[![Gem Version](https://badge.fury.io/rb/reactive_record.png)](http://badge.fury.io/rb/reactive_record)
+
 Generates ActiveRecord models to fit a pre-existing Postgres database.
 Now you can use Rails with the db schema you always wanted. It's
 **your** convention over configuration.

data/lib/code_generator.rb

@@ -156,6 +156,8 @@ class OperatorNode < Node
       MathExpr.new @value, @expr1, @expr2
     when :match
       MatchExpr.new @expr1, @expr2
+    when :and
+      AndExpr.new @expr1, @expr2
     end
   end
 
@@ -203,6 +205,16 @@ class ComparisonExpr
   end
 end
 
+class AndExpr
+  def initialize  e1, e2
+    @e1, @e2 = e1, e2
+  end
+
+  def gen
+    "#{@e1.gen} && #{@e2.gen}"
+  end
+end
+
 class MathExpr
   def initialize op, e1, e2
     @e1, @e2 = e1, e2

data/lib/lexer.rb

@@ -2,6 +2,7 @@ require 'strscan'
 
 module ConstraintParser
   class Lexer
+    AND         = /AND/
     CASCADE     = /CASCADE/
     CHECK       = /CHECK/
     COMMA       = /,/
@@ -50,6 +51,7 @@ module ConstraintParser
           when text = @ss.scan(EQ)          then [:EQ, text]
           when text = @ss.scan(PLUS)        then [:PLUS, text]
           when text = @ss.scan(MATCH_OP)    then [:MATCH_OP, text]
+          when text = @ss.scan(AND)         then [:AND, text]
 
           # SQL Keywords
           when text = @ss.scan(CHECK)       then [:CHECK, text]

data/lib/parser.rb

@@ -0,0 +1,360 @@
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by Racc 1.4.9
+# from Racc grammer file "".
+#
+
+require 'racc/parser.rb'
+module ConstraintParser
+  class Parser < Racc::Parser
+
+
+  require 'lexer'
+  require 'code_generator'
+
+  def initialize tokenizer, handler = nil
+    @tokenizer = tokenizer
+    super()
+  end
+
+  def next_token
+    @tokenizer.next_token
+  end
+
+  def parse
+    do_parse
+  end
+##### State transition tables begin ###
+
+racc_action_table = [
+    27,    28,    21,    22,    23,    24,    25,    26,    29,    27,
+    28,    21,    22,    23,    24,    25,    26,    29,    46,    12,
+    14,    11,    12,    14,    11,    30,    36,    32,     6,    13,
+    45,     7,    13,    33,    30,    27,    28,    21,    22,    23,
+    24,    25,    26,    29,     5,    12,    14,    11,    16,    18,
+    17,     9,    39,    40,     8,    13,    42,    37,    16,    44,
+    30,    34 ]
+
+racc_action_check = [
+    10,    10,    10,    10,    10,    10,    10,    10,    10,    35,
+    35,    35,    35,    35,    35,    35,    35,    35,    44,    11,
+    11,    11,    20,    20,    20,    10,    30,    15,     0,    11,
+    44,     0,    20,    16,    35,    31,    31,    31,    31,    31,
+    31,    31,    31,    31,     0,     6,     6,     6,     7,     9,
+     8,     5,    32,    33,     1,     6,    38,    31,    39,    42,
+    31,    18 ]
+
+racc_action_pointer = [
+    16,    54,   nil,   nil,   nil,    33,    29,    30,    50,    33,
+    -2,     3,   nil,   nil,   nil,     5,    17,   nil,    37,   nil,
+     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    10,    33,    36,    29,   nil,     7,   nil,   nil,    36,    40,
+   nil,   nil,    45,   nil,     7,   nil,   nil ]
+
+racc_action_default = [
+   -29,   -29,    -1,    -2,    -3,   -29,    -6,   -29,   -29,   -29,
+    -5,    -6,   -10,   -11,   -12,   -29,   -29,    47,   -29,    -8,
+    -6,   -13,   -14,   -15,   -16,   -17,   -18,   -19,   -20,   -21,
+   -29,   -29,   -29,   -29,    -4,    -9,   -22,    -7,   -23,   -29,
+   -25,   -24,   -29,   -26,   -29,   -27,   -28 ]
+
+racc_goto_table = [
+    15,    10,     1,     4,     3,     2,    31,    38,    41,   nil,
+   nil,   nil,   nil,   nil,   nil,    35,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    43 ]
+
+racc_goto_check = [
+     8,     5,     1,     4,     3,     2,     5,     9,    10,   nil,
+   nil,   nil,   nil,   nil,   nil,     5,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     8 ]
+
+racc_goto_pointer = [
+   nil,     2,     5,     4,     3,    -5,   nil,   nil,    -7,   -25,
+   -30 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,   nil,   nil,   nil,    19,    20,   nil,   nil,
+   nil ]
+
+racc_reduce_table = [
+  0, 0, :racc_error,
+  1, 30, :_reduce_1,
+  1, 30, :_reduce_2,
+  1, 30, :_reduce_3,
+  4, 31, :_reduce_4,
+  2, 32, :_reduce_5,
+  0, 34, :_reduce_6,
+  3, 34, :_reduce_7,
+  2, 34, :_reduce_8,
+  3, 34, :_reduce_9,
+  1, 34, :_reduce_10,
+  1, 34, :_reduce_11,
+  1, 34, :_reduce_12,
+  1, 36, :_reduce_13,
+  1, 36, :_reduce_14,
+  1, 36, :_reduce_15,
+  1, 36, :_reduce_16,
+  1, 36, :_reduce_17,
+  1, 36, :_reduce_18,
+  1, 36, :_reduce_19,
+  1, 36, :_reduce_20,
+  1, 36, :_reduce_21,
+  2, 35, :_reduce_22,
+  4, 33, :_reduce_23,
+  5, 33, :_reduce_24,
+  3, 37, :_reduce_25,
+  2, 38, :_reduce_26,
+  3, 39, :_reduce_27,
+  3, 39, :_reduce_28 ]
+
+racc_reduce_n = 29
+
+racc_shift_n = 47
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :PLUS => 2,
+  :MATCH_OP => 3,
+  :GTEQ => 4,
+  :LTEQ => 5,
+  :NEQ => 6,
+  :EQ => 7,
+  :GT => 8,
+  :LT => 9,
+  :AND => 10,
+  :CASCADE => 11,
+  :CHECK => 12,
+  :COMMA => 13,
+  :DELETE => 14,
+  :FOREIGN_KEY => 15,
+  :IDENT => 16,
+  :INT => 17,
+  :LPAREN => 18,
+  :NEWLINE => 19,
+  :ON => 20,
+  :PRIMARY_KEY => 21,
+  :REFERENCES => 22,
+  :RESTRICT => 23,
+  :RPAREN => 24,
+  :SPACE => 25,
+  :STRLIT => 26,
+  :TYPE => 27,
+  :UNIQUE => 28 }
+
+racc_nt_base = 29
+
+racc_use_result_var = true
+
+Racc_arg = [
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
+
+Racc_token_to_s_table = [
+  "$end",
+  "error",
+  "PLUS",
+  "MATCH_OP",
+  "GTEQ",
+  "LTEQ",
+  "NEQ",
+  "EQ",
+  "GT",
+  "LT",
+  "AND",
+  "CASCADE",
+  "CHECK",
+  "COMMA",
+  "DELETE",
+  "FOREIGN_KEY",
+  "IDENT",
+  "INT",
+  "LPAREN",
+  "NEWLINE",
+  "ON",
+  "PRIMARY_KEY",
+  "REFERENCES",
+  "RESTRICT",
+  "RPAREN",
+  "SPACE",
+  "STRLIT",
+  "TYPE",
+  "UNIQUE",
+  "$start",
+  "constraint",
+  "unique_column",
+  "check_statement",
+  "foreign_key",
+  "expr",
+  "type_signature",
+  "operator",
+  "column_spec",
+  "table_spec",
+  "action_spec" ]
+
+Racc_debug_parser = false
+
+##### State transition tables end #####
+
+# reduce 0 omitted
+
+def _reduce_1(val, _values, result)
+ result = val[0] 
+    result
+end
+
+def _reduce_2(val, _values, result)
+ result = val[0] 
+    result
+end
+
+def _reduce_3(val, _values, result)
+ result = val[0] 
+    result
+end
+
+def _reduce_4(val, _values, result)
+ result = UniqueNode.new(IdentNode.new(val[2])) 
+    result
+end
+
+def _reduce_5(val, _values, result)
+ result = CheckNode.new(val[1]) 
+    result
+end
+
+def _reduce_6(val, _values, result)
+ result = EmptyExprNode.new :empty 
+    result
+end
+
+def _reduce_7(val, _values, result)
+ result = ExprNode.new(val[1]) 
+    result
+end
+
+def _reduce_8(val, _values, result)
+ result = TypedExprNode.new(val[0], val[1]) 
+    result
+end
+
+def _reduce_9(val, _values, result)
+ result = OperatorNode.new(val[1], val[0], val[2]) 
+    result
+end
+
+def _reduce_10(val, _values, result)
+ result = IdentNode.new(val[0]) 
+    result
+end
+
+def _reduce_11(val, _values, result)
+ result = StrLitNode.new(val[0]) 
+    result
+end
+
+def _reduce_12(val, _values, result)
+ result = IntNode.new(val[0]) 
+    result
+end
+
+def _reduce_13(val, _values, result)
+ result = :gteq  
+    result
+end
+
+def _reduce_14(val, _values, result)
+ result = :lteq  
+    result
+end
+
+def _reduce_15(val, _values, result)
+ result = :neq   
+    result
+end
+
+def _reduce_16(val, _values, result)
+ result = :eq    
+    result
+end
+
+def _reduce_17(val, _values, result)
+ result = :gt    
+    result
+end
+
+def _reduce_18(val, _values, result)
+ result = :lt    
+    result
+end
+
+def _reduce_19(val, _values, result)
+ result = :plus  
+    result
+end
+
+def _reduce_20(val, _values, result)
+ result = :match 
+    result
+end
+
+def _reduce_21(val, _values, result)
+ result = :and 
+    result
+end
+
+def _reduce_22(val, _values, result)
+ result = IdentNode.new(val[1]) 
+    result
+end
+
+def _reduce_23(val, _values, result)
+ result = ForeignKeyNode.new(val[1], val[3]) 
+    result
+end
+
+def _reduce_24(val, _values, result)
+ result = ForeignKeyNode.new(val[1], val[3], val[4]) 
+    result
+end
+
+def _reduce_25(val, _values, result)
+ result = IdentNode.new(val[1]) 
+    result
+end
+
+def _reduce_26(val, _values, result)
+ result = TableNode.new(IdentNode.new(val[0]), val[1]) 
+    result
+end
+
+def _reduce_27(val, _values, result)
+ result = ActionNode.new(:delete, :restrict) 
+    result
+end
+
+def _reduce_28(val, _values, result)
+ result = ActionNode.new(:delete, :cascade) 
+    result
+end
+
+def _reduce_none(val, _values, result)
+  val[0]
+end
+
+  end   # class Parser
+  end   # module ConstraintParser

data/lib/parser.y

@@ -4,7 +4,8 @@ prechigh
   left GTEQ LTEQ NEQ EQ GT LT
 preclow
 
-token CASCADE
+token AND
+      CASCADE
       CHECK
       COMMA
       DELETE
@@ -59,6 +60,7 @@ rule
                   | LT       { result = :lt    }
                   | PLUS     { result = :plus  }
                   | MATCH_OP { result = :match }
+                  | AND      { result = :and }
                   ;
 
   type_signature  : TYPE IDENT { result = IdentNode.new(val[1]) }

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/reactive_record.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/twopoint718/reactive_record"
   gem.licenses      = ['MIT']
 
-  gem.files         = [`git ls-files`.split($/), "lib/parser.rb"]
+  gem.files         = `git ls-files`.split("\n")
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]

data/spec/lexer_spec.rb

@@ -142,4 +142,26 @@ describe ConstraintParser::Lexer do
       [:RPAREN, ')'],
     ]
   end
+ it "CHECK (((port >= 1024) AND (port <= 65634)))" do
+    @lex = lex.new StringIO.new "CHECK (((port >= 1024) AND (port <= 65634)))"
+    @lex.tokenize.should == [
+      [:CHECK, 'CHECK'],
+      [:LPAREN, '('],
+      [:LPAREN, '('],
+      [:LPAREN, '('],
+      [:IDENT, 'port'],
+      [:GTEQ, '>='],
+      [:INT, "1024"],
+      [:RPAREN, ')'],
+      [:AND, 'AND'],
+      [:LPAREN, '('],
+      [:IDENT, 'port'],
+      [:LTEQ, '<='],
+      [:INT, "65634"],
+      [:RPAREN, ')'],
+      [:RPAREN, ')'],
+      [:RPAREN, ')'],
+    ]
+  end
+
 end

data/spec/parser_spec.rb

@@ -32,6 +32,11 @@ describe ConstraintParser::Parser do
     @parser.parse.gen.should == 'validate { errors.add(:start_date, "Expected TODO") unless start_date <= Time.now.to_date + 365 }'
   end
 
+  it "CHECK (((port >= 1024) AND (port <= 65634)))" do
+    @parser = par.new(lex.new StringIO.new "CHECK (((port >= 1024) AND (port <= 65634)))")
+    @parser.parse.gen.should == 'validate { errors.add(:port, "Expected TODO") unless port >= 1024 && port <= 65634 }'
+  end
+
   it "FOREIGN KEY (employee_id) REFERENCES employees(employee_id) ON DELETE RESTRICT" do
     @parser = par.new(lex.new StringIO.new "FOREIGN KEY (employee_id) REFERENCES employees(employee_id) ON DELETE RESTRICT")
     @parser.parse.gen.should == "belongs_to :employees, foreign_key: 'employee_id', class: 'Employees', primary_key: 'employee_id'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactive_record
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Joe Nelson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -85,6 +85,7 @@ files:
 - lib/code_generator.rb
 - lib/generators/reactive_record/install_generator.rb
 - lib/lexer.rb
+- lib/parser.rb
 - lib/parser.y
 - lib/reactive_record.rb
 - lib/reactive_record/version.rb
@@ -93,7 +94,6 @@ files:
 - spec/parser_spec.rb
 - spec/reactive_record_spec.rb
 - spec/seed/database.sql
-- lib/parser.rb
 homepage: https://github.com/twopoint718/reactive_record
 licenses:
 - MIT