schematic 0.4.2 → 0.4.3

data/lib/schematic/generator/column.rb

@@ -8,11 +8,12 @@ module Schematic
         end
       end
 
-      def initialize(klass, column, additional_methods = {}, ignored_methods = {})
+      def initialize(klass, column, additional_methods = {}, ignored_methods = [], required_methods = [])
         @klass = klass
         @column = column
         @additional_methods = additional_methods
         @ignored_methods = ignored_methods
+        @required_methods = required_methods
       end
 
       def generate(builder)
@@ -32,6 +33,7 @@ module Schematic
       end
 
       def minimum_occurrences_for_column
+        return "1" if @required_methods.include?(@column.name.to_sym)
         @klass._validators[@column.name.to_sym].each do |column_validation|
           next unless column_validation.is_a?  ActiveModel::Validations::PresenceValidator
           return "1" if column_validation.options[:allow_blank] != true && column_validation.options[:if].nil?

data/lib/schematic/generator/sandbox.rb

@@ -1,12 +1,13 @@
 module Schematic
   module Generator
     class Sandbox
-      attr_accessor :ignored_elements, :added_elements
+      attr_accessor :ignored_elements, :added_elements, :required_elements
 
       def initialize(klass)
         @klass = klass
         @ignored_elements ||= []
         @added_elements ||= {}
+        @required_elements ||= []
       end
 
       def run(&block)
@@ -44,6 +45,10 @@ module Schematic
         end
       end
 
+      def required(*fields)
+        fields.each { |field| required_elements << field }
+      end
+
       def method_missing(method, *args, &block)
         @klass.send method, *args, &block
       end

data/lib/schematic/generator/xsd.rb

@@ -60,8 +60,9 @@ module Schematic
         builder.xs :complexType, "name" => @names.type do |complex_type|
           additional_methods = @klass.schematic_sandbox.added_elements.merge(@options[:methods] || {})
           ignored_methods = @klass.schematic_sandbox.ignored_elements | (@options[:exclude] || [])
+          required_methods = @klass.schematic_sandbox.required_elements
           complex_type.xs :all do |all|
-            generate_column_elements(all, additional_methods, ignored_methods)
+            generate_column_elements(all, additional_methods, ignored_methods, required_methods)
 
             nested_attributes.each do |nested_attribute|
               all.xs :element,
@@ -76,9 +77,9 @@ module Schematic
         end
       end
 
-      def generate_column_elements(builder, additional_methods, ignored_methods)
+      def generate_column_elements(builder, additional_methods, ignored_methods, required_methods)
         @klass.columns.each do |column|
-          Column.new(@klass, column, additional_methods, ignored_methods).generate(builder)
+          Column.new(@klass, column, additional_methods, ignored_methods, required_methods).generate(builder)
         end
       end
 

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/schematic/generator/sandbox_spec.rb

@@ -50,6 +50,23 @@ describe Schematic::Generator::Sandbox do
     end
   end
 
+  describe "requiring elements" do
+    it "should add the method to the required list" do
+      subject.run do
+        required :foo
+      end
+      subject.required_elements.should include(:foo)
+    end
+
+    it "accepts multiple fields" do
+      subject.run do
+        required :foo, :bar
+      end
+      subject.required_elements.should include(:foo)
+      subject.required_elements.should include(:bar)
+    end
+  end
+
   describe "methods on original object get called when not difined in sandbox module" do
     before do
       klass.stub(:foo)

data/spec/schematic/serializers/xsd_validation_presence_spec.rb

@@ -91,5 +91,39 @@ describe Schematic::Serializers::Xsd do
         end
       end
     end
+
+    context "with a model with field explicitly required" do
+      subject { sanitize_xml(SomeModel.to_xsd) }
+      context "when allow blank is true" do
+        with_model :some_model do
+          table :id => false do |t|
+            t.boolean "current"
+          end
+
+          model do
+            schematic do
+              required :current
+            end
+          end
+        end
+
+        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:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="Boolean">
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            XML
+          end
+
+          subject.should == xsd
+        end
+      end
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 Z
+date: 2011-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1048090237494519988
+      hash: 1643851491389570172
       segments: 
       - 0
       version: "0"
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1048090237494519988
+      hash: 1643851491389570172
       segments: 
       - 0
       version: "0"