schematic 0.4.4 → 0.5.0

data/lib/schematic.rb

@@ -1,9 +1,16 @@
 module Schematic
-  class InvalidClass < Exception
+  class ClassMissingXmlSerializer < Exception
     def message
-      "This class does not include ActiveModel. You cannot generate an XSD from it."
+      "This class does not include ActiveModel::Serializers::Xml. You cannot generate an XSD from it."
     end
   end
+
+  class ClassMissingAttributes < Exception
+    def message
+      "This class does not implement #attributes. You cannot generate an XSD from it."
+    end
+  end
+
   module Generator
     autoload :Sandbox, 'schematic/generator/sandbox'
     autoload :Xsd, 'schematic/generator/xsd'

data/lib/schematic/generator/column.rb

@@ -34,6 +34,7 @@ module Schematic
 
       def minimum_occurrences_for_column
         return "1" if @required_methods.include?(@column.name.to_sym)
+        return "0" unless @klass.respond_to?(:_validators)
         @klass._validators[@column.name.to_sym].each do |column_validation|
           next unless column_validation.is_a?  ActiveModel::Validations::PresenceValidator
           if column_validation.options[:allow_blank] != true &&

data/lib/schematic/generator/column_validator.rb

@@ -20,6 +20,7 @@ module Schematic
       end
 
       def validators_for_column
+        return [] unless klass.respond_to?(:_validators)
         klass._validators[column.name.to_sym]
       end
     end

data/lib/schematic/generator/xsd.rb

@@ -78,12 +78,14 @@ module Schematic
       end
 
       def generate_column_elements(builder, additional_methods, ignored_methods, required_methods)
+        return unless @klass.respond_to?(:columns)
         @klass.columns.each do |column|
           Column.new(@klass, column, additional_methods, ignored_methods, required_methods).generate(builder)
         end
       end
 
       def generate_uniqueness_constraints(builder)
+        return unless @klass.respond_to?(:columns)
         @klass.columns.each do |column|
            Uniqueness.new(@klass, column).generate(builder)
         end
@@ -141,6 +143,7 @@ module Schematic
       end
 
       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
         end

data/lib/schematic/serializers/xsd.rb

@@ -3,7 +3,8 @@ module Schematic
     module Xsd
       class << self
         def extended(klass)
-          raise InvalidClass unless klass.ancestors.include?(ActiveRecord::Base)
+          raise ClassMissingXmlSerializer unless klass.ancestors.include?(ActiveModel::Serializers::Xml)
+          raise ClassMissingAttributes unless klass.instance_methods.include?(:attributes)
         end
       end
 

data/lib/schematic/version.rb

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

data/spec/schematic/serializers/xsd_extend_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 
 describe Schematic::Serializers::Xsd do
+  with_model :empty_model do
+  end
   before do
-    class EmptyModel < ActiveRecord::Base
-      def self.columns
-        []
-      end
+    class EmptyClass
+      include ActiveModel::Serializers::Xml
     end
   end
 
@@ -16,13 +16,42 @@ describe Schematic::Serializers::Xsd do
       it "should allow the model to be extended" do
         lambda {
           subject.class_eval do
-          extend Schematic::Serializers::Xsd
+            extend Schematic::Serializers::Xsd
           end
         }.should_not raise_error
       end
     end
 
-    context "when the model does not inherit ActiveRecord::Base" do
+    context "when the class has ActiveModel::Serializers::Xml as an ancestor" do
+      subject { EmptyClass }
+
+      it "should raise an exception" do
+        lambda {
+          subject.class_eval do
+            extend Schematic::Serializers::Xsd
+          end
+        }.should raise_error(Schematic::ClassMissingAttributes)
+      end
+
+      context "and it implements #attributes" do
+        before do
+          class EmptyClass
+            def attributes
+              {}
+            end
+          end
+        end
+        it "should allow the model to be extended" do
+          lambda {
+            subject.class_eval do
+              extend Schematic::Serializers::Xsd
+            end
+          }.should_not raise_error
+        end
+      end
+    end
+
+    context "when the class does not have ActiveModel::Serializers::Xml as an ancestor" do
       subject { Object }
 
       it "should raise an exception" do
@@ -30,7 +59,7 @@ describe Schematic::Serializers::Xsd do
           subject.class_eval do
           extend Schematic::Serializers::Xsd
           end
-        }.should raise_error(Schematic::InvalidClass)
+        }.should raise_error(Schematic::ClassMissingXmlSerializer)
       end
     end
   end

data/spec/schematic_serializers_xsd_spec.rb

@@ -13,6 +13,45 @@ describe Schematic::Serializers::Xsd do
   describe ".to_xsd" do
 
     context "XSD validation" do
+      context "for a normal class that has XML serialization" do
+        subject { SomeClass.to_xsd }
+
+        before do
+          class SomeClass
+            include ActiveModel::Serializers::Xml
+            def attributes=(hash)
+              @hash = hash
+            end
+
+            def attributes
+              @hash
+            end
+            extend Schematic::Serializers::Xsd
+            schematic do
+              add :foo
+            end
+
+          end
+        end
+
+        it "should generate a valid XSD" do
+          validate_xsd(subject)
+        end
+
+        it "should validate against it's own XSD" do
+          invalid_instance = SomeClass.new
+          invalid_instance.attributes = { "bar" => "foo" }
+          xml = [invalid_instance].to_xml
+          lambda {
+            validate_xml_against_xsd(xml, subject)
+          }.should raise_error
+
+          instance = SomeClass.new
+          instance.attributes = { "foo" => "bar" }
+          xml = [instance].to_xml
+          validate_xml_against_xsd(xml, subject)
+        end
+      end
       context "when the model is not namespaced" do
         subject { SomeModel.to_xsd }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153071180 !ruby/object:Gem::Requirement
+  requirement: &2160710780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153071180
+  version_requirements: *2160710780
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2153070760 !ruby/object:Gem::Requirement
+  requirement: &2160710120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153070760
+  version_requirements: *2160710120
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153070160 !ruby/object:Gem::Requirement
+  requirement: &2160709240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2153070160
+  version_requirements: *2160709240
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2153069700 !ruby/object:Gem::Requirement
+  requirement: &2160708640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153069700
+  version_requirements: *2160708640
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153069200 !ruby/object:Gem::Requirement
+  requirement: &2160707900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153069200
+  version_requirements: *2160707900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153068740 !ruby/object:Gem::Requirement
+  requirement: &2160707220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153068740
+  version_requirements: *2160707220
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2153068220 !ruby/object:Gem::Requirement
+  requirement: &2160700000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153068220
+  version_requirements: *2160700000
 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: 2874258645481789242
+      hash: 2951425198536234180
 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: 2874258645481789242
+      hash: 2951425198536234180
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.6