schematic 0.0.3 → 0.0.4

data/lib/schematic/serializers/xsd.rb

@@ -109,7 +109,7 @@ module Schematic
       end
 
       def xsd_type_name
-        self.name
+        self.name.demodulize
       end
 
       def xsd_type_collection_name
@@ -117,7 +117,7 @@ module Schematic
       end
 
       def xsd_element_name
-        self.name.underscore.dasherize
+        xsd_type_name.underscore.dasherize
       end
 
       def xsd_element_collection_name

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -39,31 +39,67 @@ describe Schematic::Serializers::Xsd do
   describe ".to_xsd" do
 
     context "XSD validation" do
-      subject { SomeModel.to_xsd }
+      context "when the model is not namespaced" do
+        subject { SomeModel.to_xsd }
 
-      with_model :some_model do
-        table do |t|
-          t.string "some_string"
-          t.float "some_float"
-          t.datetime "some_datetime"
-          t.date "some_date"
-          t.boolean "some_boolean"
-        end
+        with_model :some_model do
+          table do |t|
+            t.string "some_string"
+            t.float "some_float"
+            t.datetime "some_datetime"
+            t.date "some_date"
+            t.boolean "some_boolean"
+          end
+
+          model do
+            validates :some_string, :presence => true
+            validates :some_date, :presence => true, :allow_blank => true
+            validates :some_datetime, :presence => true, :allow_blank => false
+          end
 
-        model do
-          validates :some_string, :presence => true
-          validates :some_date, :presence => true, :allow_blank => true
-          validates :some_datetime, :presence => true, :allow_blank => false
         end
+        it "should generate a valid XSD" do
+          xsd_schema_file = File.join(File.dirname(__FILE__), "xsd", "XMLSchema.xsd")
+          meta_xsd = Nokogiri::XML::Schema(File.open(xsd_schema_file))
 
+          doc = Nokogiri::XML.parse(subject)
+          meta_xsd.validate(doc).each do |error|
+            error.message.should be_nil
+          end
+        end
       end
-      it "should generate a valid XSD" do
-        xsd_schema_file = File.join(File.dirname(__FILE__), "xsd", "XMLSchema.xsd")
-        meta_xsd = Nokogiri::XML::Schema(File.open(xsd_schema_file))
 
-        doc = Nokogiri::XML.parse(subject)
-        meta_xsd.validate(doc).each do |error|
-          error.message.should be_nil
+      context "when the model is namespaced" do
+        before do
+          module Namespace; end
+        end
+
+        subject { Namespace::SomeModel.to_xsd }
+
+        with_model :some_model do
+          table do |t|
+            t.string "some_string"
+          end
+
+          model do
+            validates :some_string, :presence => true
+          end
+
+        end
+
+        before do
+          class Namespace::SomeModel < SomeModel
+          end
+        end
+
+        it "should generate a valid XSD" do
+          xsd_schema_file = File.join(File.dirname(__FILE__), "xsd", "XMLSchema.xsd")
+          meta_xsd = Nokogiri::XML::Schema(File.open(xsd_schema_file))
+
+          doc = Nokogiri::XML.parse(subject)
+          meta_xsd.validate(doc).each do |error|
+            error.message.should be_nil
+          end
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: schematic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency