schematic 0.6.1 → 0.6.2

data/lib/schematic/generator/column.rb

@@ -8,12 +8,13 @@ module Schematic
         end
       end
 
-      def initialize(klass, column, additional_methods = {}, ignored_methods = {}, required_methods = [])
+      def initialize(klass, column, additional_methods = {}, ignored_methods = {}, required_methods = [], non_required_methods = [])
         @klass = klass
         @column = column
         @additional_methods = additional_methods
         @ignored_methods = ignored_methods
         @required_methods = required_methods
+        @non_required_methods = non_required_methods
       end
 
       def generate(builder)
@@ -40,6 +41,7 @@ module Schematic
       end
 
       def minimum_occurrences_for_column
+        return 0 if @non_required_methods.include?(@column.name.to_sym)
         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|

data/lib/schematic/generator/sandbox.rb

@@ -1,13 +1,14 @@
 module Schematic
   module Generator
     class Sandbox
-      attr_accessor :ignored_elements, :added_elements, :required_elements
+      attr_accessor :ignored_elements, :added_elements, :required_elements, :non_required_elements
 
       def initialize(klass)
         @klass = klass
         @ignored_elements ||= Hash.new([])
         @added_elements ||= {}
         @required_elements ||= []
+        @non_required_elements ||= []
       end
 
       def run(&block)
@@ -55,6 +56,10 @@ module Schematic
         fields.each { |field| required_elements << field }
       end
 
+      def not_required(*fields)
+        fields.each { |field| non_required_elements << field }
+      end
+
       def root(name)
         xsd_generator.names.root = name
       end

data/lib/schematic/generator/xsd.rb

@@ -89,9 +89,10 @@ module Schematic
           end
 
           required_methods = @klass.schematic_sandbox.required_elements
+          non_required_methods = @klass.schematic_sandbox.non_required_elements
 
           complex_type.xs :all do |all|
-            generate_column_elements(all, additional_methods, ignored_methods, required_methods)
+            generate_column_elements(all, additional_methods, ignored_methods, required_methods, non_required_methods)
 
             nested_attributes.each do |nested_attribute|
               case nested_attribute.macro
@@ -121,10 +122,10 @@ module Schematic
         end
       end
 
-      def generate_column_elements(builder, additional_methods, ignored_methods, required_methods)
+      def generate_column_elements(builder, additional_methods, ignored_methods, required_methods, non_required_methods)
         return unless @klass.respond_to?(:columns)
         @klass.columns.each do |column|
-          Column.new(@klass, column, additional_methods, ignored_methods, required_methods).generate(builder)
+          Column.new(@klass, column, additional_methods, ignored_methods, required_methods, non_required_methods).generate(builder)
         end
       end
 

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/schematic/generator/sandbox_spec.rb

@@ -78,6 +78,23 @@ describe Schematic::Generator::Sandbox do
     end
   end
 
+  describe "not requiring elements" do
+    it "should add the method to the non-required list" do
+      subject.run do
+        not_required :foo
+      end
+      subject.non_required_elements.should include(:foo)
+    end
+
+    it "accepts multiple fields" do
+      subject.run do
+        not_required :foo, :bar
+      end
+      subject.non_required_elements.should include(:foo)
+      subject.non_required_elements.should include(:bar)
+    end
+  end
+
   describe "setting the root" do
     it "should change the root element name" do
       subject.run do

data/spec/schematic/serializers/xsd_validation_presence_spec.rb

@@ -135,5 +135,40 @@ describe Schematic::Serializers::Xsd do
         end
       end
     end
+
+    context "with a model with field explicitly not required" do
+      subject { sanitize_xml(ModelWithNotRequiredField.to_xsd) }
+
+      with_model :model_with_not_required_field do
+        table :id => false do |t|
+          t.string :some_field
+        end
+
+        model do
+          validates_presence_of :some_field
+
+          schematic do
+            not_required :some_field
+          end
+        end
+      end
+
+      it "should mark that the field minimum occurrences is 1" do
+        xsd = generate_xsd_for_model(ModelWithNotRequiredField) do
+          <<-XML
+            <xs:element name="some-field" minOccurs="0" maxOccurs="1">
+              <xs:complexType>
+                <xs:simpleContent>
+                  <xs:restriction base="String">
+                  </xs:restriction>
+                </xs:simpleContent>
+              </xs:complexType>
+            </xs:element>
+          XML
+        end
+
+        subject.should == xsd
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70212766160660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212766160660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70212766160240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70212766160240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70212766159700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70212766159700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &70212766159200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *70212766159200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70212766158820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212766158820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70212766158360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212766158360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70212766157940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212766157940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Automatic XSD generation from ActiveRecord models
 email:
 - casecommons-dev@googlegroups.com
@@ -153,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3449394722461241422
+      hash: -4530207830951825601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,10 +197,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3449394722461241422
+      hash: -4530207830951825601
 requirements: []
 rubyforge_project: schematic
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models