schematic 0.4.3 → 0.4.4

data/lib/schematic/generator/column.rb

@@ -36,12 +36,16 @@ module Schematic
         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?
+          if column_validation.options[:allow_blank] != true &&
+            column_validation.options[:if].nil? &&
+            column_validation.options[:unless].nil?
+
+            return "1"
+          end
         end
         "0"
       end
 
-
       def map_type(column)
         Types::COMPLEX[column.type][:complex_type]
       end

data/lib/schematic/version.rb

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

data/spec/schematic/serializers/xsd_validation_presence_spec.rb

@@ -66,10 +66,12 @@ describe Schematic::Serializers::Xsd do
         with_model :some_model do
           table :id => false do |t|
             t.string "title"
+            t.string "description"
           end
 
           model do
             validates :title, :presence => true, :if => lambda { |model| false }
+            validates :description, :presence => true, :unless => lambda { |model| true }
           end
         end
 
@@ -84,6 +86,14 @@ describe Schematic::Serializers::Xsd do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="description" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
             XML
           end
 

metadata

@@ -1,104 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: schematic
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.4
   prerelease: 
-  version: 0.4.3
 platform: ruby
-authors: 
+authors:
 - Case Commons, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153071180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153071180
+- !ruby/object:Gem::Dependency
   name: builder
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2153070760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153070760
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2153070160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153070160
+- !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2153069700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153069700
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2153069200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153069200
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2153068740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153068740
+- !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2153068220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *2153068220
 description: Automatic XSD generation from ActiveRecord models
-email: 
+email:
 - casecommons-dev@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -145,38 +141,35 @@ files:
 - spec/xsd/xml.xsd
 homepage: https://github.com/Casecommons/schematic
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1643851491389570172
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2874258645481789242
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1643851491389570172
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2874258645481789242
 requirements: []
-
 rubyforge_project: schematic
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Automatic XSD generation from ActiveRecord models
-test_files: 
+test_files:
 - spec/schematic/generator/restrictions/custom_spec.rb
 - spec/schematic/generator/restrictions/enumeration_spec.rb
 - spec/schematic/generator/restrictions/length_spec.rb