schematic 0.5.5 → 0.5.6

data/lib/schematic/generator/sandbox.rb

@@ -27,9 +27,9 @@ module Schematic
         output
       end
 
-      def generate_xsd(builder, klass, include_collection, options)
+      def generate_xsd(builder, klass, include_collection, options, exclude)
         xsd_generator.options = options
-        xsd_generator.generate(builder, klass, include_collection)
+        xsd_generator.generate(builder, klass, include_collection, exclude)
       end
 
       def ignore(*fields)
@@ -54,10 +54,6 @@ module Schematic
       def required(*fields)
         fields.each { |field| required_elements << field }
       end
-
-      def method_missing(method, *args, &block)
-        @klass.send method, *args, &block
-      end
     end
   end
 end

data/lib/schematic/generator/xsd.rb

@@ -4,14 +4,14 @@ module Schematic
       attr_reader :output, :names
       attr_accessor :options
 
-      def initialize(klass, options = {})
+      def initialize(klass)
         @klass = klass
         @names = Names.new(klass)
-        self.options = options
       end
 
       def options=(hash = {})
-        @options = {:generated_types => []}.merge(hash)
+        @options = hash
+        @options[:generated_types] ||= []
         @options[:generated_types] << @klass
         @options
       end
@@ -34,15 +34,18 @@ module Schematic
         end
       end
 
-      def generate(builder, klass, include_collection=true)
+      def generate(builder, klass, include_collection=true, exclude_from_parent = [])
+        @exclude = exclude_from_parent
+
         nested_attributes.each do |nested_attribute|
           next if nested_attribute.klass == klass
           next if nested_attribute.klass == klass.superclass
           @options ||= {}
           @options[:generated_types] ||= []
-          @options[:exclude] = klass.schematic_sandbox.ignored_elements[nested_attribute.name]
+          exclude = klass.schematic_sandbox.ignored_elements[nested_attribute.name].dup
           next if @options[:generated_types].include?(nested_attribute.klass)
-          nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, nested_attribute.macro == :has_many, @options)
+
+          nested_attribute.klass.schematic_sandbox.generate_xsd(builder, klass, nested_attribute.macro == :has_many, @options, exclude)
           @options[:generated_types] << nested_attribute.klass
         end
 
@@ -63,7 +66,7 @@ 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.dup
-          exclude = @options[:exclude]
+          exclude = @exclude
 
           case exclude
           when Hash
@@ -169,7 +172,7 @@ 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) &&
+          @klass.instance_methods.include?(:"#{association.name}_attributes=") &&
             association.options[:polymorphic] != true &&
             !@klass.schematic_sandbox.ignored_elements[association.name.to_sym].nil?
         end

data/lib/schematic/version.rb

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

data/spec/schematic/generator/sandbox_spec.rb

@@ -77,19 +77,4 @@ describe Schematic::Generator::Sandbox do
       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)
-    end
-
-    it "should delegate missing methods to klass" do
-      klass.should_receive(:foo)
-
-      subject.run do
-        self.foo
-      end
-    end
-  end
 end
-

data/spec/schematic_serializers_xsd_spec.rb

@@ -304,6 +304,142 @@ 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
+          table do |t|
+            t.string :first_name
+            t.string :last_name
+          end
+
+          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 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 nested attribute and ignores a required method of the nested attribute" do
+        with_model :person do
+          model do
+            has_one :house
+            accepts_nested_attributes_for :house
+            schematic do
+              ignore :house => [:address]
+            end
+          end
+        end
+
+        with_model :house do
+          table do |t|
+            t.string :address
+            t.integer :price
+            t.belongs_to :person
+          end
+          model do
+            belongs_to :person
+            validates :address, presence: true
+          end
+        end
+
+        describe "the parent XSD" do
+          subject { Person.to_xsd }
+          it "should be valid" do
+            subject.should include %{"house-attributes"}
+            subject.should include %{"price"}
+            subject.should_not include %{"address"}
+            validate_xsd(subject)
+          end
+        end
+
+        describe "the child XSD" do
+          subject { House.to_xsd }
+          it "should be valid" do
+            subject.should include %{"price"}
+            subject.should include %{"address"}
+            validate_xsd(subject)
+          end
+        end
+      end
+
+      context "when the model has a polymorphic nested attribute and ignores a required method of the nested attribute" do
+        with_model :person do
+          model do
+            has_one :house, as: :homeowner
+            accepts_nested_attributes_for :house
+            schematic do
+              ignore :house => [:address]
+            end
+          end
+        end
+
+        with_model :house do
+          table do |t|
+            t.string :address
+            t.integer :price
+            t.belongs_to :homeowner, polymorphic: true
+          end
+          model do
+            belongs_to :homeowner, polymorphic: true
+            validates :address, presence: true
+          end
+        end
+
+        describe "the parent XSD" do
+          subject { Person.to_xsd }
+          it "should be valid" do
+            subject.should include %{"house-attributes"}
+            subject.should include %{"price"}
+            subject.should_not include %{"address"}
+            validate_xsd(subject)
+          end
+        end
+
+        describe "the child XSD" do
+          subject { House.to_xsd }
+          it "should be valid" do
+            subject.should include %{"price"}
+            subject.should include %{"address"}
+            validate_xsd(subject)
+          end
+        end
+      end
+
       context "when the model has a circular nested attribute reference" do
         with_model :plate do
           model do

metadata

@@ -1,100 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: schematic
-version: !ruby/object:Gem::Version
-  version: 0.5.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.5.6
 platform: ruby
-authors:
+authors: 
 - Case Commons, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2152311800 !ruby/object:Gem::Requirement
+  requirement: &id001 !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: *2152311800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: &2152311020 !ruby/object:Gem::Requirement
+  requirement: &id002 !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: *2152311020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &2152310340 !ruby/object:Gem::Requirement
+  requirement: &id003 !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: *2152310340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: with_model
-  requirement: &2152309480 !ruby/object:Gem::Requirement
+  requirement: &id004 !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: *2152309480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2152308540 !ruby/object:Gem::Requirement
+  requirement: &id005 !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: *2152308540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &2152307820 !ruby/object:Gem::Requirement
+  requirement: &id006 !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: *2152307820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: autotest
-  requirement: &2152307120 !ruby/object:Gem::Requirement
+  requirement: &id007 !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: *2152307120
+  version_requirements: *id007
 description: Automatic XSD generation from ActiveRecord models
-email:
+email: 
 - casecommons-dev@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .rvmrc
@@ -141,35 +145,38 @@ 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3959164304158595365
+      segments: 
       - 0
-      hash: -2905881266573223577
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3959164304158595365
+      segments: 
       - 0
-      hash: -2905881266573223577
+      version: "0"
 requirements: []
+
 rubyforge_project: schematic
 rubygems_version: 1.8.10
 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