schematic 0.1.3 → 0.1.4

data/lib/schematic/generator/column.rb

@@ -19,6 +19,7 @@ module Schematic
                 Restrictions::Length.new(@klass, @column).generate(restriction)
                 Restrictions::Enumeration.new(@klass, @column).generate(restriction)
                 Restrictions::Pattern.new(@klass, @column).generate(restriction)
+                Restrictions::Custom.new(@klass, @column).generate(restriction)
               end
             end
           end

data/lib/schematic/generator/restrictions/base.rb

@@ -8,7 +8,7 @@ module Schematic
         end
 
         def for_validator(validator_klass)
-          @klass._validators[@column.name.to_sym].each do |column_validation|
+          validators_for_column.each do |column_validation|
             next unless column_validation.is_a? validator_klass
             next unless column_validation.options[:if].nil?
             yield(column_validation)
@@ -16,6 +16,10 @@ module Schematic
           end
         end
 
+        def validators_for_column
+          @klass._validators[@column.name.to_sym]
+        end
+
       end
     end
   end

data/lib/schematic/generator/restrictions/custom.rb

@@ -0,0 +1,18 @@
+module Schematic
+  module Generator
+    module Restrictions
+      class Custom < Base
+        def generate(builder)
+          validators_for_column.each do |validator|
+            if validator.respond_to?(:xsd_restriction)
+              restriction = validator.xsd_restriction
+              builder.xs(:pattern, "value" => restriction.is_a?(Regexp) ? restriction.source : restriction)
+              return
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/schematic/generator/restrictions/enumeration.rb

@@ -2,11 +2,6 @@ module Schematic
   module Generator
     module Restrictions
       class Enumeration < Base
-        def initialize(klass, column)
-          @klass = klass
-          @column = column
-        end
-
         def generate(builder)
           for_validator ActiveModel::Validations::InclusionValidator do |validator|
             validator.options[:in].each do |value|

data/lib/schematic/generator/restrictions/length.rb

@@ -2,11 +2,6 @@ module Schematic
   module Generator
     module Restrictions
       class Length < Base
-        def initialize(klass, column)
-          @klass = klass
-          @column = column
-        end
-
         def generate(builder)
           for_validator ActiveModel::Validations::LengthValidator do |validator|
             builder.xs(:maxLength, "value" => validator.options[:maximum]) if validator.options[:maximum]

data/lib/schematic/generator/restrictions/pattern.rb

@@ -2,11 +2,6 @@ module Schematic
   module Generator
     module Restrictions
       class Pattern < Base
-        def initialize(klass, column)
-          @klass = klass
-          @column = column
-        end
-
         def generate(builder)
           for_validator ActiveModel::Validations::FormatValidator do |validator|
             if pattern = validator.options[:with]

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/schematic/generator/restrictions/custom_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe Schematic::Generator::Restrictions::Enumeration do
+  describe ".to_xsd" do
+    context "with a model with custom validations" do
+      before do
+        class CrazyTownValidator < ActiveModel::EachValidator
+          def validate_each(record, attribute, value)
+            record.errors.add(attribute, "must be crazy") unless value.match /.*crazy.*/
+          end
+
+          def xsd_restriction
+            /.*crazy.*/
+          end
+        end
+      end
+
+      subject { sanitize_xml(CustomModel.to_xsd) }
+      with_model :custom_model do
+        table :id => false do |t|
+          t.string "title"
+        end
+
+        model do
+          validates :title, :crazy_town => true
+        end
+      end
+
+      it "should validate against it's own XSD" do
+        invalid_instance = CustomModel.new(:title => "happy")
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, subject)
+        }.should raise_error
+        valid_instance = CustomModel.new(:title => "iamcrazytoday")
+        xml = [valid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, subject)
+        }.should_not raise_error
+      end
+
+      it "should mark that the field with the allowed values" do
+        xsd = generate_xsd_for_model(CustomModel) do
+          <<-XML
+              <xs:element name="title" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                      <xs:pattern value=".*crazy.*"/>
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+          XML
+        end
+
+        subject.should == xsd
+      end
+    end
+  end
+end
+
+
+
+

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -112,6 +112,7 @@ files:
 - lib/schematic/generator/names.rb
 - lib/schematic/generator/namespaces.rb
 - lib/schematic/generator/restrictions/base.rb
+- lib/schematic/generator/restrictions/custom.rb
 - lib/schematic/generator/restrictions/enumeration.rb
 - lib/schematic/generator/restrictions/length.rb
 - lib/schematic/generator/restrictions/pattern.rb
@@ -120,6 +121,7 @@ files:
 - lib/schematic/serializers/xsd.rb
 - lib/schematic/version.rb
 - schematic.gemspec
+- spec/schematic/generator/restrictions/custom_spec.rb
 - spec/schematic/generator/restrictions/enumeration_spec.rb
 - spec/schematic/generator/restrictions/length_spec.rb
 - spec/schematic/generator/restrictions/pattern_spec.rb
@@ -160,6 +162,7 @@ signing_key:
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models
 test_files: 
+- spec/schematic/generator/restrictions/custom_spec.rb
 - spec/schematic/generator/restrictions/enumeration_spec.rb
 - spec/schematic/generator/restrictions/length_spec.rb
 - spec/schematic/generator/restrictions/pattern_spec.rb