schematic 0.5.9 → 0.6.0

data/lib/schematic/generator/column.rb

@@ -19,10 +19,14 @@ module Schematic
       def generate(builder)
         return if skip_generation?
 
-        builder.xs :element,
+        options = {
           "name" => @column.name.dasherize,
-          "minOccurs" => minimum_occurrences_for_column,
-          "maxOccurs" => "1" do |field|
+          "minOccurs" => minimum_occurrences_for_column.to_s,
+          "maxOccurs" => "1"
+        }
+        options.merge!({"nillable" => "false"}) if minimum_occurrences_for_column > 0
+
+        builder.xs :element, options 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|
@@ -36,18 +40,18 @@ module Schematic
       end
 
       def minimum_occurrences_for_column
-        return "1" if @required_methods.include?(@column.name.to_sym)
-        return "0" unless @klass.respond_to?(:_validators)
+        return 1 if @required_methods.include?(@column.name.to_sym)
+        return 0 unless @klass.respond_to?(:_validators)
         @klass._validators[@column.name.to_sym].each do |column_validation|
           next unless column_validation.is_a?  ActiveModel::Validations::PresenceValidator
           if column_validation.options[:allow_blank] != true &&
             column_validation.options[:if].nil? &&
             column_validation.options[:unless].nil?
 
-            return "1"
+            return 1
           end
         end
-        "0"
+        0
       end
 
       def map_type(column)

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/schematic.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('builder')
-  s.add_development_dependency('rspec-rails', '>= 2.1')
+  s.add_development_dependency('rspec-rails', '= 2.7')
   s.add_development_dependency('with_model', '>= 0.2.4')
   s.add_development_dependency('nokogiri')
   s.add_development_dependency('sqlite3')

data/spec/schematic/serializers/xsd_validation_presence_spec.rb

@@ -47,7 +47,7 @@ describe Schematic::Serializers::Xsd do
         it "should mark that the field minimum occurrences is 1" do
           xsd = generate_xsd_for_model(SomeModel) do
             <<-XML
-              <xs:element name="title" minOccurs="1" maxOccurs="1">
+              <xs:element name="title" minOccurs="1" maxOccurs="1" nillable="false">
                 <xs:complexType>
                   <xs:simpleContent>
                     <xs:restriction base="String">
@@ -120,7 +120,7 @@ describe Schematic::Serializers::Xsd do
         it "should mark that the field minimum occurrences is 1" do
           xsd = generate_xsd_for_model(SomeModel) do
             <<-XML
-              <xs:element name="current" minOccurs="1" maxOccurs="1">
+              <xs:element name="current" minOccurs="1" maxOccurs="1" nillable="false">
                 <xs:complexType>
                   <xs:simpleContent>
                     <xs:restriction base="Boolean">

data/spec/schematic/serializers/xsd_xsd_minimum_occurrences_for_spec.rb

@@ -13,7 +13,7 @@ describe Schematic::Serializers::Xsd do
         end
       end
 
-      it { should == "0" }
+      it { should == 0 }
     end
 
     context "given a column with presence of but allow blank" do
@@ -26,7 +26,7 @@ describe Schematic::Serializers::Xsd do
         end
       end
 
-      it { should == "0" }
+      it { should == 0 }
     end
 
     context "given a column with presence of and no allow blank" do
@@ -39,7 +39,7 @@ describe Schematic::Serializers::Xsd do
         end
       end
 
-      it { should == "1" }
+      it { should == 1 }
     end
   end
 

data/spec/schematic_serializers_xsd_spec.rb

@@ -19,6 +19,7 @@ describe Schematic::Serializers::Xsd do
         before do
           class SomeClass
             include ActiveModel::Serializers::Xml
+            attr_accessor :foo, :bar
             def attributes=(hash)
               @hash = hash
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152959400 !ruby/object:Gem::Requirement
+  requirement: &70329222280980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152959400
+  version_requirements: *70329222280980
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152958280 !ruby/object:Gem::Requirement
+  requirement: &70329222247240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152958280
+  version_requirements: *70329222247240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152957200 !ruby/object:Gem::Requirement
+  requirement: &70329222245680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2152957200
+  version_requirements: *70329222245680
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2152955660 !ruby/object:Gem::Requirement
+  requirement: &70329222244100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *2152955660
+  version_requirements: *70329222244100
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152954800 !ruby/object:Gem::Requirement
+  requirement: &70329222243200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152954800
+  version_requirements: *70329222243200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152953920 !ruby/object:Gem::Requirement
+  requirement: &70329222242300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152953920
+  version_requirements: *70329222242300
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2152952540 !ruby/object:Gem::Requirement
+  requirement: &70329222240840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152952540
+  version_requirements: *70329222240840
 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: -3956753853577588500
+      hash: -3320943580698096283
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3956753853577588500
+      hash: -3320943580698096283
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.10