schematic 0.2.1 → 0.2.3

data/lib/schematic.rb

@@ -9,7 +9,9 @@ module Schematic
     autoload :Names, 'schematic/generator/names'
     autoload :Namespaces, 'schematic/generator/namespaces'
     autoload :Column, 'schematic/generator/column'
+    autoload :ColumnValidator, 'schematic/generator/column_validator'
     autoload :Types, 'schematic/generator/types'
+    autoload :Uniqueness, 'schematic/generator/uniqueness'
 
     module Restrictions
       autoload :Base, 'schematic/generator/restrictions/base'
@@ -18,7 +20,6 @@ module Schematic
       autoload :Length, 'schematic/generator/restrictions/length'
       autoload :Pattern, 'schematic/generator/restrictions/pattern'
       autoload :Numericality, 'schematic/generator/restrictions/numericality'
-      autoload :Uniqueness, 'schematic/generator/restrictions/uniqueness'
     end
   end
   module Serializers

data/lib/schematic/generator/column.rb

@@ -1,6 +1,12 @@
 module Schematic
   module Generator
     class Column
+      attr_accessor :restriction_classes
+      class << self
+        def restriction_classes
+          @restriction_classes ||= [Restrictions::Length, Restrictions::Enumeration, Restrictions::Numericality, Restrictions::Pattern, Restrictions::Custom]
+        end
+      end
 
       def initialize(klass, column, additional_methods = {}, ignored_methods = {})
         @klass = klass
@@ -16,11 +22,9 @@ module Schematic
           field.xs :complexType do |complex_type|
             complex_type.xs :simpleContent do |simple_content|
               simple_content.xs :restriction, "base" => map_type(@column) do |restriction|
-                Restrictions::Length.new(@klass, @column).generate(restriction)
-                Restrictions::Enumeration.new(@klass, @column).generate(restriction)
-                Restrictions::Pattern.new(@klass, @column).generate(restriction)
-                Restrictions::Numericality.new(@klass, @column).generate(restriction)
-                Restrictions::Custom.new(@klass, @column).generate(restriction)
+                self.class.restriction_classes.each do |restriction_class|
+                  restriction_class.new(@klass, @column).generate(restriction)
+                end
               end
             end
           end

data/lib/schematic/generator/column_validator.rb

@@ -0,0 +1,25 @@
+module Schematic
+  module Generator
+    class ColumnValidator
+      attr_reader :klass, :column
+
+      def initialize(klass, column)
+        @klass = klass
+        @column = column
+      end
+
+      def for_validator(validator_klass)
+        validators_for_column.each do |column_validation|
+          next unless column_validation.is_a? validator_klass
+          next unless column_validation.options[:if].nil? || column_validation.options[:unless].nil?
+          yield(column_validation)
+          return
+        end
+      end
+
+      def validators_for_column
+        klass._validators[column.name.to_sym]
+      end
+    end
+  end
+end

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

@@ -1,25 +1,10 @@
 module Schematic
   module Generator
     module Restrictions
-      class Base
-        def initialize(klass, column)
-          @klass = klass
-          @column = column
+      class Base < Schematic::Generator::ColumnValidator
+        def self.inherited(klass)
+          Schematic::Generator::Column.restriction_classes << klass unless Schematic::Generator::Column.restriction_classes.include?(klass)
         end
-
-        def for_validator(validator_klass)
-          validators_for_column.each do |column_validation|
-            next unless column_validation.is_a? validator_klass
-            next unless column_validation.options[:if].nil? || column_validation.options[:unless].nil?
-            yield(column_validation)
-            return
-          end
-        end
-
-        def validators_for_column
-          @klass._validators[@column.name.to_sym]
-        end
-
       end
     end
   end

data/lib/schematic/generator/uniqueness.rb

@@ -0,0 +1,25 @@
+module Schematic
+  module Generator
+    class Uniqueness < ColumnValidator
+
+      def generate(builder)
+        for_validator ActiveRecord::Validations::UniquenessValidator do |validator|
+          unique_name = validator.attributes.first.to_s.dasherize
+          additional_fields = (validator.options[:scope] || []).map(&:to_s).map(&:dasherize)
+
+          names = Schematic::Generator::Names.new(@klass)
+          builder.xs :unique, "name" => "#{unique_name}-must-be-unique" do |unique|
+            unique.xs :selector, "xpath" => "./#{names.element}"
+            unique.xs :field, "xpath" => unique_name
+            additional_fields.each do |additional_field|
+              unique.xs :field, "xpath" => additional_field
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+
+

data/lib/schematic/generator/xsd.rb

@@ -7,7 +7,13 @@ module Schematic
       def initialize(klass, options = {})
         @klass = klass
         @names = Names.new(klass)
-        @options = options
+        self.options = options
+      end
+
+      def options=(hash = {})
+        @options = {:generated_types => []}.merge(hash)
+        @options[:generated_types] << @klass unless @options[:generated_types].include?(@klass)
+        @options
       end
 
       def header(builder)
@@ -30,9 +36,11 @@ module Schematic
 
       def generate(builder, klass)
         nested_attributes.each do |nested_attribute|
-          next if nested_attribute.klass == klass || nested_attribute.klass == klass.superclass
-
+          next if nested_attribute.klass == klass
+          next if nested_attribute.klass == klass.superclass
+          next if @options && @options[:generated_types] && @options[:generated_types].include?(klass)
           nested_attribute.klass.generate_xsd(builder, klass, @options)
+          @options[:generated_types] << klass
         end
 
         generate_complex_type_for_collection(builder)
@@ -72,7 +80,7 @@ module Schematic
 
       def generate_uniqueness_constraints(builder)
         @klass.columns.each do |column|
-           Restrictions::Uniqueness.new(@klass, column).generate(builder)
+           Uniqueness.new(@klass, column).generate(builder)
         end
       end
 

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

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

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe "Schematic::Generator::Restrictions::Mixin" do
+  describe ".to_xsd" do
+    context "with a model with a mixed in restriction" do
+      before do
+        class MixedInRestriction < Schematic::Generator::Restrictions::Base
+          def generate(builder)
+            for_validator ActiveModel::BlockValidator do |validator|
+              builder.xs(:enumeration, "value" => "cheese")
+            end
+          end
+        end
+      end
+
+      subject { sanitize_xml(TestModel.to_xsd) }
+      with_model :test_model do
+        table :id => false do |t|
+          t.string "title"
+        end
+
+        model do
+          validates_each :title do |object, attr, value|
+          end
+        end
+      end
+
+      it "should validate against it's own XSD" do
+        invalid_instance = TestModel.new(:title => "cake")
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, subject)
+        }.should raise_error
+        valid_instance = TestModel.new(:title => "cheese")
+        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(TestModel) do
+          <<-XML
+              <xs:element name="title" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                      <xs:enumeration value="cheese"/>
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+          XML
+        end
+
+        subject.should == xsd
+      end
+    end
+  end
+end
+
+
+
+
+

data/spec/schematic/generator/{restrictions/uniqueness_spec.rb → uniqueness_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Schematic::Generator::Restrictions::Uniqueness do
+describe Schematic::Generator::Uniqueness do
   describe ".to_xsd" do
     context "with a model with a uniqueness validation" do
       subject { sanitize_xml(TestModel.to_xsd) }

data/spec/schematic_serializers_xsd_spec.rb

@@ -154,6 +154,45 @@ describe Schematic::Serializers::Xsd do
         end
 
       end
+
+      context "when the model has a nested reference that references another nested reference" do
+        with_model :blog do
+          table {}
+          model do
+            has_many :posts
+            has_many :readers
+            accepts_nested_attributes_for :posts
+            accepts_nested_attributes_for :readers
+          end
+        end
+
+        with_model :post do
+          table do |t|
+            t.integer :blog_id
+          end
+
+          model do
+            belongs_to :blog
+            has_many :readers
+            accepts_nested_attributes_for :blog
+            accepts_nested_attributes_for :readers
+          end
+        end
+
+        with_model :reader do
+          table do |t|
+            t.integer :blog_id
+            t.integer :post_id
+          end
+        end
+
+        subject { Post.to_xsd }
+
+        it "should generate a valid XSD" do
+          validate_xsd(subject)
+        end
+
+      end
     end
 
     context "for an empty model with no attributes or validations" do

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 Z
+date: 2011-06-01 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -109,6 +110,7 @@ files:
 - TODO
 - lib/schematic.rb
 - lib/schematic/generator/column.rb
+- lib/schematic/generator/column_validator.rb
 - lib/schematic/generator/names.rb
 - lib/schematic/generator/namespaces.rb
 - lib/schematic/generator/restrictions/base.rb
@@ -117,8 +119,8 @@ files:
 - lib/schematic/generator/restrictions/length.rb
 - lib/schematic/generator/restrictions/numericality.rb
 - lib/schematic/generator/restrictions/pattern.rb
-- lib/schematic/generator/restrictions/uniqueness.rb
 - lib/schematic/generator/types.rb
+- lib/schematic/generator/uniqueness.rb
 - lib/schematic/generator/xsd.rb
 - lib/schematic/serializers/xsd.rb
 - lib/schematic/version.rb
@@ -126,9 +128,10 @@ 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/mixin_spec.rb
 - spec/schematic/generator/restrictions/numericality_spec.rb
 - spec/schematic/generator/restrictions/pattern_spec.rb
-- spec/schematic/generator/restrictions/uniqueness_spec.rb
+- spec/schematic/generator/uniqueness_spec.rb
 - spec/schematic/serializers/xsd_extend_spec.rb
 - spec/schematic/serializers/xsd_validation_presence_spec.rb
 - spec/schematic/serializers/xsd_xsd_ignore_methods_spec.rb
@@ -138,6 +141,7 @@ files:
 - spec/spec_helper.rb
 - spec/xsd/XMLSchema.xsd
 - spec/xsd/xml.xsd
+has_rdoc: true
 homepage: https://github.com/Casecommons/schematic
 licenses: []
 
@@ -161,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: schematic
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models
@@ -169,9 +173,10 @@ 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/mixin_spec.rb
 - spec/schematic/generator/restrictions/numericality_spec.rb
 - spec/schematic/generator/restrictions/pattern_spec.rb
-- spec/schematic/generator/restrictions/uniqueness_spec.rb
+- spec/schematic/generator/uniqueness_spec.rb
 - spec/schematic/serializers/xsd_extend_spec.rb
 - spec/schematic/serializers/xsd_validation_presence_spec.rb
 - spec/schematic/serializers/xsd_xsd_ignore_methods_spec.rb

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

@@ -1,26 +0,0 @@
-module Schematic
-  module Generator
-    module Restrictions
-      class Uniqueness < Base
-        def generate(builder)
-          for_validator ActiveRecord::Validations::UniquenessValidator do |validator|
-            unique_name = validator.attributes.first.to_s.dasherize
-            additional_fields = (validator.options[:scope] || []).map(&:to_s).map(&:dasherize)
-
-            names = Schematic::Generator::Names.new(@klass)
-            builder.xs :unique, "name" => "#{unique_name}-must-be-unique" do |unique|
-              unique.xs :selector, "xpath" => "./#{names.element}"
-              unique.xs :field, "xpath" => unique_name
-              additional_fields.each do |additional_field|
-                unique.xs :field, "xpath" => additional_field
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
-
-
-