kwalify 0.1.0 → 0.2.0

data/examples/address-book/Makefile

@@ -1,4 +1,5 @@
 
 all:
+	kwalify -m address-book.schema.yaml
 	kwalify -f address-book.schema.yaml address-book.yaml
 

data/examples/address-book/address-book.schema.yaml

@@ -1,11 +1,11 @@
 ##
 ## Kwalify schema example for address book
 ##
-## $Release: 0.1.0 $
+## $Release: 0.2.0 $
 ## copyright(c) 2005 kuwata-lab all rights reserved.
 ##
 ##
-## NOTE: 'type:  string' is omitted in this example because 'string' is default type.
+## NOTE: 'type:  str' is omitted in this example because 'str' is default type.
 ##
 
 type:      seq
@@ -15,29 +15,29 @@ sequence:
     required:  yes
     mapping:
      "name":
-        #type:      string
+        type:      str
         required:  yes
      "email":
-        #type:      string
+        type:      str
         pattern:   /@/
      "tel":
-        #type:      string
+        type:      str
         pattern:   /^\d+-\d+-\d+$/
      "birth":
         type:      date
      "age":
-        type:      integer
+        type:      int
      "zip":
-        #type:      string
+        type:      str
         pattern:   /^\d+-\d+$/
      "addr":
-        #type:      string
+        type:      str
      "blood":
-        #type:      string
+        type:      str
         enum:
           - A
           - B
           - O
           - AB
      "memo":
-        type:      object
+        type:      any

data/examples/invoice/Makefile

@@ -1,3 +1,4 @@
 all:
+	kwalify -m invoice.schema.yaml
 	kwalify -f invoice.schema.yaml invoice.yaml
 

data/examples/invoice/invoice.schema.yaml

@@ -1,37 +1,30 @@
 ###
 ### Kwalify schema example for invoice
 ###
-### $Rev$
-### $Release: 0.1.0 $
+### $Rev: 18 $
+### $Release: 0.2.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
 type:      map
 required:  yes
 mapping:
- "invoice":
-    type:      integer
-    required:  yes
- "date":
-    type:      date
-    required:  yes
+ "invoice":  { type: int, required: yes }
+ "date":     { type: date, required: yes }
  "bill-to":  &customer
     type:      map
     required:  yes
     mapping:
-     "given":
-        required:  yes
-     "family":
-        required:  yes
+     "given":      { type: str, required: yes }
+     "family":     { type: str, required: yes }
      "address":
         type:      map
         required:  yes
         mapping:
-         "lines":
-         "city":
-         "state":
-         "postal":
-            type:      integer
+         "lines":  { type: str }
+         "city":   { type: str }
+         "state":  { type: str }
+         "postal": { type: int }
  "ship-to":   *customer
  "product":
     type:      seq
@@ -40,20 +33,10 @@ mapping:
       - type:      map
         required:  yes
         mapping:
-         "sku":
-            required:  yes
-            pattern:   /^[A-Z0-9]+$/
-         "quantity":
-            type:      integer
-            required:  yes
-         "description":
-         "price":
-            type:      float
- "tax":
-    type:      float
- "total":
-    type:      float
-    required:  yes
- "comments":
-    type:      text
-
+         "sku":         { type: str, required: yes, pattern: '/^[A-Z0-9]+$/' }
+         "quantity":    { type: int, required: yes }
+         "description": { type: str }
+         "price":       { type: float }
+ "tax":      { type: float }
+ "total":    { type: float, required: yes }
+ "comments": { type: str }

data/examples/tapkit/Makefile

@@ -0,0 +1,5 @@
+
+all:
+	kwalify -m tapkit.schema.yaml
+	kwalify -f tapkit.schema.yaml tapkit.yaml
+

data/examples/tapkit/tapkit.schema.yaml

@@ -0,0 +1,137 @@
+##
+## Kwalify schema example for TapKit
+##
+## $Release: 0.2.0 $
+## copyright(c) 2005 kuwata-lab all rights reserved.
+##
+
+type: map
+mapping:
+ "adapter_name":
+    type: str
+    enum:
+      - DBI
+      - CSV
+      #- MySQL
+      #- PostgreSQL
+      #- OpenBase
+ "connection":
+    type: map
+    mapping:
+     "url":
+        type: str
+        required: yes
+     "user":
+        type: str
+     "password":
+        type: str
+     "encoding":
+        type: str
+        enum:
+          - jis
+          - sjis
+          - euc
+     "path":
+        type: str
+ "entities":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+         "name":
+            type: str
+            required: yes
+         "external_name":
+            type: str
+            required: yes
+         "class_properties":
+            type: seq
+            required: yes
+            sequence:
+              - type: str
+         "primary_key_attributes":
+            type: seq
+            required: yes
+            sequence:
+              - type: str
+         "attributes":
+            type: seq
+            required: yes
+            sequence:
+              - type: map
+                mapping:
+                  "name":
+                     type: str
+                     required: yes
+                  "column_name":
+                     type: text
+                     required: yes
+                  "class_name":
+                     type: str
+                     enum:
+                       - String
+                       - Integer
+                       - Float
+                       - Date
+                       - Time
+                       - Timestamp
+                       - Boolean
+                  "external_type":
+                     type: str
+                     required: yes
+                     enum:   [
+                        char, character, varchar, char varying, character varying,
+                        nchar, national char, national character,
+                        national character varying, bit, bit varying, 
+                        int, integer, smallint, interval,
+                        numeric, decimal, dec, float, real, double presicion,
+                        date, time, timestamp
+                       ]
+                  "allow_null":
+                     type: bool
+                  "read_only":
+                     type: bool
+                  "width":
+                     type: int
+                  "factory_method":
+                     type: str
+                  "convertion_method":
+                     type: str
+         "relationships":
+            type: seq
+            sequence:
+              - type: map
+                mapping:
+                 "name":
+                    type: str
+                    required: yes
+                 "destination":
+                    type: str
+                    required: yes
+                 "joins":
+                    type: seq
+                    required: yes
+                    sequence:
+                      - type: map
+                        mapping:
+                         "source":
+                            type: str
+                         "destination":
+                            type: str
+                 "join-semantic":
+                    type: str
+                    enum:
+                      - inner
+                      - left_outer
+                      - right_outer
+                      - full_outer
+                 "to_many":
+                    type: bool
+                 "mandatory":
+                    type: bool
+                 "delete_rule":
+                    type: str
+                    enum:
+                      - nullify
+                      - cascade
+                      - deny

data/examples/tapkit/tapkit.yaml

@@ -0,0 +1,85 @@
+##
+## original:
+##   http://www.spice-of-life.net/tapkit/ja/TapKitUserGuide_J_c5_s6.html#doc7_1532
+##
+
+adapter_name: DBI
+
+connection:
+  url:      dbi:Mysql:examples
+  user:     mysql
+  password: mysql
+
+entities:
+  -
+    name:          Employee
+    external_name: EMPLOYEE
+
+    attributes:
+      -
+        name:          employee_id
+        column_name:   EMPLOYEE_ID
+        external_type: int
+        class_name:    Integer
+      -
+        name:          name
+        column_name:   NAME
+        external_type: char
+        class_name:    String
+        width:         64
+      -
+        name:          company_id
+        column_name:   COMPANY_ID
+        external_type: int
+        class_name:    Integer
+
+    relationships:
+      -
+        name:          company
+        destination:   Company
+        to_many:       false
+        joins:
+          -
+             source:      company_id
+             destination: company_id
+
+    primary_key_attributes:
+      - employee_id
+
+    class_properties:
+      - name
+      - company
+
+  -
+    name:          Company
+    external_name: COMPANY
+
+    attributes:
+      -
+        name:          company_id
+        column_name:   COMPANY_ID
+        external_type: int
+        class_name:    Integer
+      -
+        name:          name
+        column_name:   NAME
+        external_type: char
+        class_name:    String
+        width:         64
+
+    relationships:
+      -
+        name:          employees
+        destination:   Employee
+        to_many:       true
+        joins:
+          -
+             source:      company_id
+             destination: company_id
+
+    primary_key_attributes:
+      - company_id
+
+    class_properties:
+      - name
+      - employees

data/lib/kwalify.rb

@@ -1,10 +1,19 @@
 ###
-### $Rev: 5 $
-### $Release: 0.1.0 $
+### $Rev: 18 $
+### $Release: 0.2.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
+
+module Kwalify
+
+   RELEASE = ("$Release: 0.2.0 $" =~ /[.\d]+/) && $&
+
+end
+
 require 'kwalify/types'
-require 'kwalify/error-msg'
+require 'kwalify/messages'
 require 'kwalify/errors'
+require 'kwalify/rule'
 require 'kwalify/validator'
+require 'kwalify/meta-validator'

data/lib/kwalify/errors.rb

@@ -1,9 +1,11 @@
 ###
-### $Rev: 8 $
-### $Release: 0.1.0 $
+### $Rev: 18 $
+### $Release: 0.2.0 $
 ### copyright(c) 2005 kuwata-lab all rights reserved.
 ###
 
+require 'kwalify/messages'
+
 module Kwalify
 
    class KwalifyError < StandardError
@@ -18,95 +20,69 @@ module Kwalify
 
 
    class BaseError < KwalifyError
-      def initialize(message="", path=nil, schema=nil, error_symbol=nil)
+      def initialize(message="", path=nil, value=nil, rule=nil, error_symbol=nil)
          super(message)
          @error_symbol = error_symbol
-         @schema       = schema
+         @rule         = rule
          @path         = path
+         @value        = value
+      end
+      attr_reader :error_symbol, :rule, :path, :value
+
+      def path
+         return @path == '' ? "/" : @path
+      end
+
+      alias :_to_s :to_s
+
+      def message
+         _to_s
       end
-      attr_reader :error_symbol, :schema, :path
 
       def to_s
-         return super() if @path == nil
-         return "[/] #{super()}" if @path.empty?
-         return "[#{@path}] #{super()}"
+         return "[#{path()}] #{message()}"
       end
    end
 
 
    class SchemaError < BaseError
-      def initialize(message="", path=nil, schema=nil, error_symbol=nil)
-         super(message, path, schema, error_symbol)
+      def initialize(message="", path=nil, rule=nil, value=nil, error_symbol=nil)
+         super(message, path, rule, value, error_symbol)
       end
    end
 
 
    class ValidationError < BaseError
-      def initialize(message="", path=nil, schema=nil, error_symbol=nil, data=nil)
-         super(message, path, schema, error_symbol)
-         @data  = data
+      def initialize(message="", path=nil, rule=nil, value=nil, error_symbol=nil)
+         super(message, path, rule, value, error_symbol)
       end
-      attr_reader :data
    end
 
 
-   module Errors
+   module ErrorHelper
 
       def assert_error(message="")
          raise AssertionError.new(message)
       end
 
-
-      def error_message(error_symbol, schema, data, arg)
-         msg = nil
-         case error_symbol
-
-         ## validation error
-         when :missing_value
-            msg = ERROR_MESSAGES[error_symbol]
-         when :invalid_type
-            msg = ERROR_MESSAGES[error_symbol] % [ schema.type, data.class.name ]
-         when :invalid_enum
-            msg = ERROR_MESSAGES[error_symbol] % [ data.to_s ]
-         when :invalid_pattern
-            msg = ERROR_MESSAGES[error_symbol] % [ data.to_s, schema.pattern.inspect ]
-         when :missing_key
-            msg = ERROR_MESSAGES[error_symbol] % [ arg ]     # arg is keyname
-         when :invalid_key
-            msg = ERROR_MESSAGES[error_symbol] % [ arg ]     # arg is keyname
-
-         ## schema error
-         when :unexpected_key
-            msg = ERROR_MESSAGES[error_symbol] % [ arg ]     # arg is keyname
-         when :duplicate_key
-            msg = ERROR_MESSAGES[error_symbol] % [ arg ]     # arg is keyname
-         when :type_not_found
-            msg = ERROR_MESSAGES[error_symbol] % [ arg ]     # arg is typename
-         when :regexp_error
-            msg = ERROR_MESSAGES[error_symbol] % [ data ]
-         else
-            msg = ERROR_MESSAGES[error_symbol]
-         end
-
-         ##
-         return msg
+      def validate_error(error_symbol, rule, path, val, args=nil)
+         return _create_error(ValidationError, error_symbol, rule, path, val, args)
       end
 
-
-      def validate_error(error_symbol, schema, path, data, arg=nil)
-         msg = error_message(error_symbol, schema, data, arg)
-         return ValidationError.new(msg, path, schema, error_symbol, data)
+      def schema_error(error_symbol, rule, path, val, args=nil)
+         return _create_error(SchemaError, error_symbol, rule, path, val, args)
       end
 
-
-      def schema_error(error_symbol, schema, path, arg=nil)
-         msg = error_message(error_symbol, schema, nil, arg)
-         return SchemaError.new(msg, path, schema, error_symbol)
+      def _create_error(error_klass, error_symbol, rule, path, val, args)
+         msg = Kwalify.msg(error_symbol)
+         assert_error("error_symbol=#{error_symbol.inspect}") unless msg
+         msg = msg % args if args
+         msg = "'#{val.to_s.gsub(/\n/, '\n')}': #{msg}" if val != nil && Kwalify.scalar_class?(val.class)
+         return error_klass.new(msg, path, val, rule, error_symbol)
       end
 
-
-      module_function :assert_error, :validate_error, :schema_error, :error_message
-
    end
 
+   extend ErrorHelper
+
 end