schematic 0.5.4 → 0.5.5

data/.gitignore

@@ -4,6 +4,7 @@
 .DS_Store
 .bundle
 .idea
+.vimlog
 Gemfile.lock
 doc
 pkg/*

data/README.rdoc

@@ -39,6 +39,7 @@ You can include or exclude additional elements:
       element :author => [:name, :email, :url]
       element :blog => { :post => { :category => nil } }
       ignore :comments
+      ignore :attachments => [:filetype]
     end
   end
 

data/lib/schematic/generator/column.rb

@@ -8,7 +8,7 @@ module Schematic
         end
       end
 
-      def initialize(klass, column, additional_methods = {}, ignored_methods = [], required_methods = [])
+      def initialize(klass, column, additional_methods = {}, ignored_methods = {}, required_methods = [])
         @klass = klass
         @column = column
         @additional_methods = additional_methods
@@ -55,8 +55,7 @@ module Schematic
       end
 
       def skip_generation?
-        @additional_methods.keys.map(&:to_s).include?(@column.name) ||
-          @ignored_methods.map(&:to_s).include?(@column.name)
+        (@additional_methods.keys + @ignored_methods.keys).map(&:to_s).include?(@column.name)
       end
     end
   end

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

@@ -5,8 +5,12 @@ 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|
+            if validator.options[:in].respond_to?(:call)
+              valid_values = validator.options[:in].call(nil) rescue []
+            else
+              valid_values = validator.options[:in]
+            end
+            valid_values.each do |value|
               builder.xs(:enumeration, "value" => value)
             end
           end
@@ -21,4 +25,3 @@ module Schematic
     end
   end
 end
-

data/lib/schematic/generator/sandbox.rb

@@ -5,7 +5,7 @@ module Schematic
 
       def initialize(klass)
         @klass = klass
-        @ignored_elements ||= []
+        @ignored_elements ||= Hash.new([])
         @added_elements ||= {}
         @required_elements ||= []
       end
@@ -33,7 +33,13 @@ module Schematic
       end
 
       def ignore(*fields)
-        fields.each { |field| ignored_elements << field }
+        if fields[0].is_a?(Hash)
+          fields[0].each do |key, value|
+            ignored_elements[key.to_sym] = value
+          end
+        else
+          fields.each { |field| ignored_elements[field] = nil }
+        end
       end
 
       def add(*args)

data/lib/schematic/generator/xsd.rb

@@ -40,6 +40,7 @@ module Schematic
           next if nested_attribute.klass == klass.superclass
           @options ||= {}
           @options[:generated_types] ||= []
+          @options[:exclude] = klass.schematic_sandbox.ignored_elements[nested_attribute.name]
           next if @options[:generated_types].include?(nested_attribute.klass)
           nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, nested_attribute.macro == :has_many, @options)
           @options[:generated_types] << nested_attribute.klass
@@ -61,8 +62,20 @@ module Schematic
       def generate_complex_type_for_model(builder)
         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] || [])
+          ignored_methods = @klass.schematic_sandbox.ignored_elements.dup
+          exclude = @options[:exclude]
+
+          case exclude
+          when Hash
+            ignored_methods.merge!(exclude)
+          when Array
+            exclude.each do |key|
+              ignored_methods[key] = nil
+            end
+          end
+
           required_methods = @klass.schematic_sandbox.required_elements
+
           complex_type.xs :all do |all|
             generate_column_elements(all, additional_methods, ignored_methods, required_methods)
 
@@ -156,7 +169,9 @@ module Schematic
       def nested_attributes
         return [] unless @klass.respond_to?(:reflect_on_all_associations)
         @klass.reflect_on_all_associations.select do |association|
-          @klass.instance_methods.include?("#{association.name}_attributes=".to_sym) && association.options[:polymorphic] != true && !@klass.schematic_sandbox.ignored_elements.include?(association.name.to_sym)
+          @klass.instance_methods.include?("#{association.name}_attributes=".to_sym) &&
+            association.options[:polymorphic] != true &&
+            !@klass.schematic_sandbox.ignored_elements[association.name.to_sym].nil?
         end
       end
 

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

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

@@ -13,6 +13,7 @@ describe Schematic::Generator::Restrictions::Enumeration do
           t.string "and_also_be_skipped"
           t.boolean "active"
           t.string "options"
+          t.string "more_options"
           t.integer "force_enumeration"
           t.integer "skip_enumeration"
           t.integer "skip_inclusion_set_lambda"
@@ -25,6 +26,7 @@ describe Schematic::Generator::Restrictions::Enumeration do
           validates :and_also_be_skipped, :inclusion => ["a", "b", "c"], :if => lambda { true}, :unless => lambda { false }
           validates :active, :inclusion => { :in => [true, false] }
           validates :options, :inclusion => { :in => lambda { |f| ["some valid attribute"] } }
+          validates :more_options, :inclusion => { :in => lambda { |f| f.title == "something" ? ["test"] : ["something else"] } }
           validates :force_enumeration, :inclusion => { :in => [1, 2], :xsd => { :include => true} }, :if => lambda { false }
           validates :skip_enumeration, :inclusion => { :in => [1, 2], :xsd => { :include => false} }, :if => lambda { true }
           validates :skip_inclusion_set_lambda, :inclusion => { :in => lambda { |x| [1, 2] } }, :if => :some_method
@@ -47,6 +49,7 @@ describe Schematic::Generator::Restrictions::Enumeration do
                                               :and_also_be_skipped => "a",
                                               :active => true,
                                               :options => "some valid attribute",
+                                              :more_options => "something else",
                                               :force_enumeration => 2,
                                               :skip_enumeration => 2,
                                               :skip_inclusion_set_lambda => 2)
@@ -103,6 +106,15 @@ describe Schematic::Generator::Restrictions::Enumeration do
                 </xs:complexType>
               </xs:element>
               <xs:element name="options" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:restriction base="String">
+                      <xs:enumeration value="some valid attribute"/>
+                    </xs:restriction>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="more-options" minOccurs="0" maxOccurs="1">
                 <xs:complexType>
                   <xs:simpleContent>
                     <xs:restriction base="String">
@@ -144,5 +156,3 @@ describe Schematic::Generator::Restrictions::Enumeration do
     end
   end
 end
-
-

data/spec/schematic/generator/sandbox_spec.rb

@@ -5,19 +5,30 @@ describe Schematic::Generator::Sandbox do
   let(:klass) { Object }
 
   describe "ignoring elements" do
-    it "should add the method to the ignored list" do
-      subject.run do
-        ignore :foo
+    context "on the base element" do
+      it "should add the method to the ignored list" do
+        subject.run do
+          ignore :foo
+        end
+        subject.ignored_elements.should include(:foo)
+      end
+
+      it "accepts multiple fields" do
+        subject.run do
+          ignore :foo, :bar
+        end
+        subject.ignored_elements.should include(:foo)
+        subject.ignored_elements.should include(:bar)
       end
-      subject.ignored_elements.should include(:foo)
     end
 
-    it "accepts multiple fields" do
-      subject.run do
-        ignore :foo, :bar
+    context "on nested elements" do
+      it "should remove the method to the element list" do
+        subject.run do
+          ignore :foo => [:bar]
+        end
+        subject.ignored_elements[:foo].should == [:bar]
       end
-      subject.ignored_elements.should include(:foo)
-      subject.ignored_elements.should include(:bar)
     end
   end
 

data/spec/schematic/serializers/xsd_xsd_methods_spec.rb

@@ -4,8 +4,6 @@ describe Schematic::Serializers::Xsd do
   describe "Adding additional methods" do
     context "given a method" do
       with_model :some_model do
-        table {}
-
         model do
           schematic do
             add :foo_bar
@@ -258,8 +256,6 @@ describe Schematic::Serializers::Xsd do
 
     context "given nested methods" do
       with_model :some_model do
-        table {}
-
         model do
           schematic do
             add :foo => { :bar => { :baz => nil } }

data/spec/schematic/serializers/xsd_xsd_minimum_occurrences_for_spec.rb

@@ -11,7 +11,6 @@ describe Schematic::Serializers::Xsd do
         table :id => false do |t|
           t.string "title"
         end
-        model {}
       end
 
       it { should == "0" }

data/spec/schematic_serializers_xsd_spec.rb

@@ -52,6 +52,7 @@ describe Schematic::Serializers::Xsd do
           validate_xml_against_xsd(xml, subject)
         end
       end
+
       context "when the model is not namespaced" do
         subject { SomeModel.to_xsd }
 
@@ -138,11 +139,8 @@ describe Schematic::Serializers::Xsd do
           table do |t|
             t.integer :parent_id
           end
-          model {}
         end
         with_model :parent do
-          table {}
-          model {}
         end
 
 
@@ -179,7 +177,6 @@ describe Schematic::Serializers::Xsd do
 
       context "when the model has a nested attribute on a subclass with a different class name than the has_many association" do
         with_model :parent2 do
-          table {}
           model do
             has_many :children, :class_name => "SpecialChild"
             accepts_nested_attributes_for :children
@@ -207,7 +204,6 @@ describe Schematic::Serializers::Xsd do
 
       context "when the model has a nested attribute for a has_one association" do
         with_model :car do
-          table {}
           model do
             has_one :engine
             accepts_nested_attributes_for :engine
@@ -236,7 +232,6 @@ describe Schematic::Serializers::Xsd do
 
       context "when the model has a nested attribute which is ignored" do
         with_model :car do
-          table {}
           model do
             has_one :engine
             accepts_nested_attributes_for :engine
@@ -264,9 +259,53 @@ describe Schematic::Serializers::Xsd do
         end
       end
 
+      context "when the model has a nested attribute and ignores one of the methods of the nested attribute" do
+        with_model :parent do
+          model do
+            has_one :child
+            accepts_nested_attributes_for :child
+            schematic do
+              ignore :child => [:last_name]
+            end
+          end
+        end
+
+        with_model :child do
+          table do |t|
+            t.integer :parent_id
+            t.string :first_name
+            t.string :last_name
+          end
+
+          model do
+            belongs_to :parent
+          end
+        end
+
+        describe "the parent XSD" do
+          subject { Parent.to_xsd }
+
+          it "should be valid" do
+            subject.should include "child-attributes"
+            subject.should include "first-name"
+            subject.should_not include "last-name"
+            validate_xsd(subject)
+          end
+        end
+
+        describe "the child XSD" do
+          subject { Child.to_xsd }
+
+          it "should be valid" do
+            subject.should include "first-name"
+            subject.should include "last-name"
+            validate_xsd(subject)
+          end
+        end
+      end
+
       context "when the model has a circular nested attribute reference" do
         with_model :plate do
-          table {}
           model do
             has_many :cheeses
             accepts_nested_attributes_for :cheeses
@@ -294,7 +333,6 @@ describe Schematic::Serializers::Xsd do
 
       context "when the model has a nested reference that references another nested reference" do
         with_model :blog do
-          table {}
           model do
             has_many :posts
             has_many :readers
@@ -446,7 +484,6 @@ describe Schematic::Serializers::Xsd do
 
       describe "additional methods" do
         with_model :some_model do
-          table {}
         end
 
         it "should include the additional method" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156382040 !ruby/object:Gem::Requirement
+  requirement: &2152311800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156382040
+  version_requirements: *2152311800
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2156381140 !ruby/object:Gem::Requirement
+  requirement: &2152311020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156381140
+  version_requirements: *2152311020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156379260 !ruby/object:Gem::Requirement
+  requirement: &2152310340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2156379260
+  version_requirements: *2152310340
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2156361020 !ruby/object:Gem::Requirement
+  requirement: &2152309480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156361020
+  version_requirements: *2152309480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156360300 !ruby/object:Gem::Requirement
+  requirement: &2152308540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156360300
+  version_requirements: *2152308540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156358880 !ruby/object:Gem::Requirement
+  requirement: &2152307820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156358880
+  version_requirements: *2152307820
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2156358200 !ruby/object:Gem::Requirement
+  requirement: &2152307120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156358200
+  version_requirements: *2152307120
 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: -4443311822607440419
+      hash: -2905881266573223577
 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: -4443311822607440419
+      hash: -2905881266573223577
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.10