schematic 0.3.5 → 0.3.6

data/lib/schematic/generator/restrictions/enumeration.rb

@@ -5,10 +5,17 @@ module Schematic
         def generate(builder)
           for_validator ActiveModel::Validations::InclusionValidator do |validator|
             next if column.type == :boolean
+            next if validator.options[:in].respond_to?(:call)
             validator.options[:in].each do |value|
               builder.xs(:enumeration, "value" => value)
             end
           end
+          enumeration_method = "xsd_#{column.name}_enumeration_restrictions".to_sym
+          if klass.respond_to? enumeration_method
+            klass.send(enumeration_method).each do |enumeration|
+              builder.xs(:enumeration, "value" => enumeration)
+            end
+          end
         end
       end
     end

data/lib/schematic/generator/xsd.rb

@@ -88,7 +88,7 @@ module Schematic
         end
       end
 
-      def generate_sequence_value_restrictions(builder, value)
+      def generate_inclusion_value_restrictions(builder, value)
         enumeration_method = "xsd_#{value}_enumeration_restrictions".to_sym
         builder.xs :complexType do |complex_type|
           complex_type.xs :simpleContent do |simple_content|
@@ -114,7 +114,7 @@ module Schematic
                     if values.present?
                       values.each do |value|
                         nested_sequence.xs :element, "name" => value.to_s.dasherize, "minOccurs" => "0", "maxOccurs" => "unbounded" do |sequence_element|
-                          generate_sequence_value_restrictions(sequence_element, value)
+                          generate_inclusion_value_restrictions(sequence_element, value)
                         end
                       end
                     else

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/schematic/generator/restrictions/enumeration_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "support/extensions/active_model/validations/inclusion"
 
 describe Schematic::Generator::Restrictions::Enumeration do
   describe ".to_xsd" do
@@ -8,11 +9,13 @@ describe Schematic::Generator::Restrictions::Enumeration do
         table :id => false do |t|
           t.string "title"
           t.boolean "active"
+          t.string "options"
         end
 
         model do
           validates :title, :inclusion => { :in => ["a", "b", "c"] }
           validates :active, :inclusion => { :in => [true, false] }
+          validates :options, :inclusion => { :in => lambda { |f| ["some valid attribute"] } }
         end
       end
 
@@ -22,7 +25,7 @@ describe Schematic::Generator::Restrictions::Enumeration do
         lambda {
           validate_xml_against_xsd(xml, subject)
         }.should raise_error
-        valid_instance = EnumerationModel.new(:title => "a", :active => true)
+        valid_instance = EnumerationModel.new(:title => "a", :active => true, :options => "some valid attribute")
         xml = [valid_instance].to_xml
         lambda {
           validate_xml_against_xsd(xml, subject)
@@ -51,6 +54,14 @@ describe Schematic::Generator::Restrictions::Enumeration do
                   </xs:simpleContent>
                 </xs:complexType>
               </xs:element>
+              <xs:element name="options" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
           XML
         end
 

data/spec/schematic/serializers/xsd_xsd_methods_spec.rb

@@ -109,6 +109,71 @@ describe Schematic::Serializers::Xsd do
       end
     end
 
+    context "given a singular enumeration restriction" do
+      with_model :some_model do
+        table {}
+
+        model do
+
+          attr_accessor :bar
+
+          def self.xsd_bar_enumeration_restrictions
+            ["a", "b", "c"]
+          end
+
+          def self.xsd_methods
+            {:bar => nil}
+          end
+
+          def to_xml(options = {})
+            super({:methods => [:bar]}.merge(options))
+          end
+        end
+      end
+
+      it "should include the additional methods" do
+        xsd = generate_xsd_for_model(SomeModel) do
+          <<-XML
+            <xs:element name="id" minOccurs="0" maxOccurs="1">
+              <xs:complexType>
+                <xs:simpleContent>
+                  <xs:restriction base="Integer">
+                  </xs:restriction>
+                </xs:simpleContent>
+              </xs:complexType>
+            </xs:element>
+            <xs:element name="bar" minOccurs="0" maxOccurs="1">
+              <xs:complexType>
+                <xs:simpleContent>
+                  <xs:restriction base="String">
+                    <xs:enumeration value="a"/>
+                    <xs:enumeration value="b"/>
+                    <xs:enumeration value="c"/>
+                  </xs:restriction>
+                </xs:simpleContent>
+              </xs:complexType>
+            </xs:element>
+          XML
+        end
+        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+      end
+
+      it "should validate against the xsd" do
+        xsd = SomeModel.to_xsd
+
+        invalid_instance = SomeModel.new(:bar => "invalid option")
+        xml = [invalid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, xsd)
+        }.should raise_error
+        valid_instance = SomeModel.new(:bar => "b")
+        xml = [valid_instance].to_xml
+        lambda {
+          validate_xml_against_xsd(xml, xsd)
+        }.should_not raise_error
+      end
+    end
+
     context "given a an array of methods" do
       with_model :some_model do
         table {}

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

@@ -0,0 +1,70 @@
+#This backports Rails 3.1 lambda inclusion behavior for Rails 3.
+require 'active_support/core_ext/range'
+
+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
+        end
+      end
+
+      def validate_each(record, attribute, value)
+        delimiter = options[:in]
+        exclusions = delimiter.respond_to?(:call) ? delimiter.call(record) : delimiter
+        unless exclusions.send(inclusion_method(exclusions), value)
+          record.errors.add(attribute, :inclusion, options.except(:in).merge!(:value => value))
+        end
+      end
+
+    private
+
+      # In Ruby 1.9 <tt>Range#include?</tt> on non-numeric ranges checks all possible values in the
+      # range for equality, so it may be slow for large ranges. The new <tt>Range#cover?</tt>
+      # uses the previous logic of comparing a value with the range endpoints.
+      def inclusion_method(enumerable)
+        enumerable.is_a?(Range) ? :cover? : :include?
+      end
+    end
+
+    module HelperMethods
+      # Validates whether the value of the specified attribute is available in a particular enumerable object.
+      #
+      #   class Person < ActiveRecord::Base
+      #     validates_inclusion_of :gender, :in => %w( m f )
+      #     validates_inclusion_of :age, :in => 0..99
+      #     validates_inclusion_of :format, :in => %w( jpg gif png ), :message => "extension %{value} is not included in the list"
+      #     validates_inclusion_of :states, :in => lambda{ |person| STATES[person.country] }
+      #   end
+      #
+      # Configuration options:
+      # * <tt>:in</tt> - An enumerable object of available items. This can be
+      #   supplied as a proc or lambda which returns an enumerable. If the enumerable
+      #   is a range the test is performed with <tt>Range#cover?</tt>
+      #   (backported in Active Support for 1.8), otherwise with <tt>include?</tt>.
+      # * <tt>:message</tt> - Specifies a custom error message (default is: "is not included in the list").
+      # * <tt>:allow_nil</tt> - If set to true, skips this validation if the attribute is +nil+ (default is +false+).
+      # * <tt>:allow_blank</tt> - If set to true, skips this validation if the attribute is blank (default is +false+).
+      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+      #   and <tt>:update</tt>.
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a true or false value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a true or false value.
+      def validates_inclusion_of(*attr_names)
+        validates_with InclusionValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end
+
+

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,12 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -04:00
+date: 2011-07-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: builder
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +33,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,10 +44,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.1"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: with_model
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,10 +55,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,10 +66,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +77,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: autotest
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,6 +88,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 description: Automatic XSD generation from ActiveRecord models
 email: 
@@ -139,6 +139,7 @@ files:
 - spec/schematic/serializers/xsd_xsd_minimum_occurrences_for_spec.rb
 - spec/schematic_serializers_xsd_spec.rb
 - spec/spec_helper.rb
+- spec/support/extensions/active_model/validations/inclusion.rb
 - spec/xsd/XMLSchema.xsd
 - spec/xsd/xml.xsd
 has_rdoc: true
@@ -155,12 +156,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -515081018085257419
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -515081018085257419
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -184,5 +191,6 @@ test_files:
 - spec/schematic/serializers/xsd_xsd_minimum_occurrences_for_spec.rb
 - spec/schematic_serializers_xsd_spec.rb
 - spec/spec_helper.rb
+- spec/support/extensions/active_model/validations/inclusion.rb
 - spec/xsd/XMLSchema.xsd
 - spec/xsd/xml.xsd