schematic 0.5.0 → 0.5.1

data/lib/schematic/generator/column.rb

@@ -19,7 +19,10 @@ module Schematic
       def generate(builder)
         return if skip_generation?
 
-        builder.xs :element, "name" => @column.name.dasherize, "minOccurs" => minimum_occurrences_for_column, "maxOccurs" => "1" do |field|
+        builder.xs :element,
+          "name" => @column.name.dasherize,
+          "minOccurs" => minimum_occurrences_for_column,
+          "maxOccurs" => "1" do |field|
           field.xs :complexType do |complex_type|
             complex_type.xs :simpleContent do |simple_content|
               simple_content.xs :restriction, "base" => map_type(@column) do |restriction|

data/lib/schematic/generator/types.rb

@@ -19,6 +19,7 @@ module Schematic
             complex_type.xs :simpleContent do |simple_content|
               simple_content.xs :extension, "base" => xsd_type do |extension|
                 extension.xs :attribute, "name" => "type", "type" => "xs:string", "use" => "optional"
+                extension.xs :attribute, "name" => "nil", "type" => "xs:boolean", "use" => "optional"
               end
             end
           end

data/lib/schematic/generator/xsd.rb

@@ -38,7 +38,9 @@ module Schematic
         nested_attributes.each do |nested_attribute|
           next if nested_attribute.klass == klass
           next if nested_attribute.klass == klass.superclass
-          next if @options && @options[:generated_types] && @options[:generated_types].include?(nested_attribute.klass)
+          @options ||= {}
+          @options[:generated_types] ||= []
+          next if @options[:generated_types].include?(nested_attribute.klass)
           nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, @options)
           @options[:generated_types] << nested_attribute.klass
         end

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/schematic/serializers/xsd_xsd_methods_spec.rb

@@ -41,7 +41,9 @@ describe Schematic::Serializers::Xsd do
 
     context "given a method with validations" do
       with_model :some_model do
-        table {}
+        table :id => false do |t|
+          t.string :foo
+        end
 
         model do
           validates :foo_bar, :inclusion => { :in => [1,2,3] }
@@ -68,10 +70,10 @@ describe Schematic::Serializers::Xsd do
       it "should generate validation restrictions for the method if there are any" do
         xsd = generate_xsd_for_model(SomeModel) do
           <<-XML
-        <xs:element name="id" minOccurs="0" maxOccurs="1">
+        <xs:element name="foo" minOccurs="0" maxOccurs="1">
           <xs:complexType>
             <xs:simpleContent>
-              <xs:restriction base="Integer">
+              <xs:restriction base="String">
               </xs:restriction>
             </xs:simpleContent>
           </xs:complexType>
@@ -111,7 +113,9 @@ describe Schematic::Serializers::Xsd do
 
     context "given a singular enumeration restriction" do
       with_model :some_model do
-        table {}
+        table :id => false do |t|
+          t.string :foo
+        end
 
         model do
 
@@ -134,10 +138,10 @@ describe Schematic::Serializers::Xsd do
       it "should include the additional methods" do
         xsd = generate_xsd_for_model(SomeModel) do
           <<-XML
-            <xs:element name="id" minOccurs="0" maxOccurs="1">
+            <xs:element name="foo" minOccurs="0" maxOccurs="1">
               <xs:complexType>
                 <xs:simpleContent>
-                  <xs:restriction base="Integer">
+                  <xs:restriction base="String">
                   </xs:restriction>
                 </xs:simpleContent>
               </xs:complexType>
@@ -176,7 +180,9 @@ describe Schematic::Serializers::Xsd do
 
     context "given a an array of methods" do
       with_model :some_model do
-        table {}
+        table :id => false do |t|
+          t.string :bar
+        end
 
         model do
           def foo=(value)
@@ -204,10 +210,10 @@ describe Schematic::Serializers::Xsd do
       it "should include the additional methods" do
         xsd = generate_xsd_for_model(SomeModel) do
           <<-XML
-            <xs:element name="id" minOccurs="0" maxOccurs="1">
+            <xs:element name="bar" minOccurs="0" maxOccurs="1">
               <xs:complexType>
                 <xs:simpleContent>
-                  <xs:restriction base="Integer">
+                  <xs:restriction base="String">
                   </xs:restriction>
                 </xs:simpleContent>
               </xs:complexType>

data/spec/schematic_serializers_xsd_spec.rb

@@ -56,7 +56,7 @@ describe Schematic::Serializers::Xsd do
         subject { SomeModel.to_xsd }
 
         with_model :some_model do
-          table do |t|
+          table :id => false do |t|
             t.string "some_string"
             t.text "some_text"
             t.float "some_float"
@@ -134,39 +134,42 @@ describe Schematic::Serializers::Xsd do
       end
 
       context "when the model has a nested attribute on a subclass with a reference to the superclass" do
-        with_model :parent do
-          table {}
-          model do
-            has_many :children, :class_name => "Namespace::Child"
-            accepts_nested_attributes_for :children
-          end
-        end
-
         with_model :child do
           table do |t|
             t.integer :parent_id
           end
-
-          model do
-            belongs_to :parent
-          end
+          model {}
         end
+        with_model :parent do
+          table {}
+          model {}
+        end
+
 
         before do
-          module Namespace; end
-          class Namespace::Child < Child
+          ::Child.class_eval do
+            belongs_to :parent
+          end
+          module Namespace
+            if defined?(SubChild)
+             remove_const(:SubChild)
+            end
+          end
+          class Namespace::SubChild < ::Child
             accepts_nested_attributes_for :parent
           end
+          ::Parent.class_eval do
+            has_many :children, :class_name => "Namespace::SubChild"
+            accepts_nested_attributes_for :children
+          end
         end
 
-        subject { Namespace::Child.to_xsd }
+        subject { Namespace::SubChild.to_xsd }
 
-        it "should generate a valid XSD" do
+        it "should generate a valid xsd and validate against its own XSD" do
           validate_xsd(subject)
-        end
-
-        it "should validate against its own XSD" do
-          child_instance = Namespace::Child.new(:parent_id => 123)
+          child_instance = Namespace::SubChild.new(:parent_id => 123)
+          child_instance.save!
           xml = [child_instance].to_xml
           lambda {
             validate_xml_against_xsd(xml, subject)
@@ -175,7 +178,7 @@ describe Schematic::Serializers::Xsd do
       end
 
       context "when the model has a nested attribute on a subclass with a different class name than the association" do
-        with_model :parent do
+        with_model :parent2 do
           table {}
           model do
             has_many :children, :class_name => "SpecialChild"
@@ -189,11 +192,11 @@ describe Schematic::Serializers::Xsd do
           end
 
           model do
-            belongs_to :parent
+            belongs_to :parent2
           end
         end
 
-        subject { Parent.to_xsd }
+        subject { Parent2.to_xsd }
 
         it "should generate a valid XSD" do
           subject.should include "children-attributes"
@@ -281,6 +284,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:integer">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>
@@ -288,6 +292,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:float">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>
@@ -295,6 +300,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:string">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>
@@ -302,6 +308,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:string">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>
@@ -309,6 +316,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:dateTime">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>
@@ -316,6 +324,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:date">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>
@@ -323,6 +332,7 @@ describe Schematic::Serializers::Xsd do
             <xs:simpleContent>
             <xs:extension base="xs:boolean">
             <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="nil" type="xs:boolean" use="optional"/>
             </xs:extension>
             </xs:simpleContent>
             </xs:complexType>

data/spec/spec_helper.rb

@@ -48,6 +48,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:integer">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>
@@ -55,6 +56,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:float">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>
@@ -62,6 +64,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:string">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>
@@ -69,6 +72,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:string">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>
@@ -76,6 +80,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:dateTime">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>
@@ -83,6 +88,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:date">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>
@@ -90,6 +96,7 @@ def generate_xsd_for_model(model, header_element = nil)
   <xs:simpleContent>
   <xs:extension base="xs:boolean">
   <xs:attribute name="type" type="xs:string" use="optional"/>
+  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
   </xs:extension>
   </xs:simpleContent>
   </xs:complexType>

data/spec/support/extensions/active_model/validations/inclusion.rb

@@ -6,12 +6,11 @@ module ActiveModel
   # == Active Model Inclusion Validator
   module Validations
     class InclusionValidator < EachValidator
-      ERROR_MESSAGE = "An object with the method #include? or a proc or lambda is required, " <<
-                      "and must be supplied as the :in option of the configuration hash"
-
       def check_validity!
         unless [:include?, :call].any?{ |method| options[:in].respond_to?(method) }
-          raise ArgumentError, ERROR_MESSAGE
+          error_message = "An object with the method #include? or a proc or lambda is required, " <<
+                          "and must be supplied as the :in option of the configuration hash"
+          raise ArgumentError, error_message
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160710780 !ruby/object:Gem::Requirement
+  requirement: &2164310000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160710780
+  version_requirements: *2164310000
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2160710120 !ruby/object:Gem::Requirement
+  requirement: &2164309120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160710120
+  version_requirements: *2164309120
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2160709240 !ruby/object:Gem::Requirement
+  requirement: &2164308120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2160709240
+  version_requirements: *2164308120
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2160708640 !ruby/object:Gem::Requirement
+  requirement: &2164307420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160708640
+  version_requirements: *2164307420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2160707900 !ruby/object:Gem::Requirement
+  requirement: &2164304880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160707900
+  version_requirements: *2164304880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160707220 !ruby/object:Gem::Requirement
+  requirement: &2164303960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160707220
+  version_requirements: *2164303960
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2160700000 !ruby/object:Gem::Requirement
+  requirement: &2164288000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160700000
+  version_requirements: *2164288000
 description: Automatic XSD generation from ActiveRecord models
 email:
 - casecommons-dev@googlegroups.com
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2951425198536234180
+      hash: -1652545114662954696
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,10 +162,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2951425198536234180
+      hash: -1652545114662954696
 requirements: []
 rubyforge_project: schematic
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models