schematic 0.6.2 → 0.7.0

data/spec/schematic/serializers/xsd_xsd_minimum_occurrences_for_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Schematic::Serializers::Xsd do
 
@@ -9,38 +9,43 @@ describe Schematic::Serializers::Xsd do
     context "given a column with no validations" do
       with_model :some_model do
         table :id => false do |t|
-          t.string "title"
+          t.string 'title'
+        end
+
+        model do
+          self.primary_key = :title
         end
       end
 
-      it { should == 0 }
+      it { is_expected.to eq(0) }
     end
 
     context "given a column with presence of but allow blank" do
       with_model :some_model do
         table :id => false do |t|
-          t.string "title"
+          t.string 'title'
         end
         model do
+          self.primary_key = :title
           validates :title, :presence => true, :allow_blank => true
         end
       end
 
-      it { should == 0 }
+      it { is_expected.to eq(0) }
     end
 
     context "given a column with presence of and no allow blank" do
       with_model :some_model do
         table :id => false do |t|
-          t.string "title"
+          t.string 'title'
         end
         model do
+          self.primary_key = :title
           validates :title, :presence => true
         end
       end
 
-      it { should == 1 }
+      it { is_expected.to eq(1) }
     end
   end
-
 end

data/spec/schematic_serializers_xsd_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Schematic::Serializers::Xsd do
   before do
@@ -31,7 +31,6 @@ describe Schematic::Serializers::Xsd do
             schematic do
               add :foo
             end
-
           end
         end
 
@@ -41,14 +40,14 @@ describe Schematic::Serializers::Xsd do
 
         it "should validate against it's own XSD" do
           invalid_instance = SomeClass.new
-          invalid_instance.attributes = { "bar" => "foo" }
+          invalid_instance.attributes = { 'bar' => 'foo' }
           xml = [invalid_instance].to_xml
-          lambda {
+          expect {
             validate_xml_against_xsd(xml, subject)
-          }.should raise_error
+          }.to raise_error
 
           instance = SomeClass.new
-          instance.attributes = { "foo" => "bar" }
+          instance.attributes = { 'foo' => 'bar' }
           xml = [instance].to_xml
           validate_xml_against_xsd(xml, subject)
         end
@@ -59,17 +58,19 @@ describe Schematic::Serializers::Xsd do
 
         with_model :some_model do
           table :id => false do |t|
-            t.string "some_string"
-            t.text "some_text"
-            t.float "some_float"
-            t.integer "some_integer"
-            t.datetime "some_datetime"
-            t.date "some_date"
-            t.boolean "some_boolean"
+            t.string 'some_string'
+            t.text 'some_text'
+            t.float 'some_float'
+            t.integer 'some_integer'
+            t.datetime 'some_datetime'
+            t.date 'some_date'
+            t.boolean 'some_boolean'
             t.text "method_is_also_columns"
           end
 
           model do
+            self.primary_key = :some_string
+
             validates :some_string, :presence => true, :length => { :maximum => 100 }
             validates :some_text, :presence => true
             validates :some_date, :presence => true, :allow_blank => true
@@ -93,14 +94,14 @@ describe Schematic::Serializers::Xsd do
         end
 
         it "should validate against it's own XSD" do
-          instance = SomeModel.new(:some_string => "ExampleString",
+          instance = SomeModel.new(:some_string => 'ExampleString',
                                    :some_date => Date.today,
-                                   :some_text => "here is some text",
+                                   :some_text => 'here is some text',
                                    :some_datetime => DateTime.new,
                                    :some_boolean => true,
                                    :some_float => 1.5,
-                                   :method_is_also_columns => ["somevalues"],
-                                   :additional_method_array => {"somevalue" => "somekey"},
+                                   :method_is_also_columns => ['somevalues'],
+                                   :additional_method_array => {'somevalue' => 'somekey'},
                                    :some_integer => 2)
           xml = [instance].to_xml
           validate_xml_against_xsd(xml, subject)
@@ -116,7 +117,7 @@ describe Schematic::Serializers::Xsd do
 
         with_model :some_model do
           table do |t|
-            t.string "some_string"
+            t.string 'some_string'
           end
 
           model do
@@ -158,7 +159,7 @@ describe Schematic::Serializers::Xsd do
             accepts_nested_attributes_for :parent
           end
           ::Parent.class_eval do
-            has_many :children, :class_name => "Namespace::SubChild"
+            has_many :children, :class_name => 'Namespace::SubChild'
             accepts_nested_attributes_for :children
           end
         end
@@ -170,16 +171,16 @@ describe Schematic::Serializers::Xsd do
           child_instance = Namespace::SubChild.new(:parent_id => 123)
           child_instance.save!
           xml = [child_instance].to_xml
-          lambda {
+          expect {
             validate_xml_against_xsd(xml, subject)
-          }.should_not raise_error
+          }.not_to raise_error
         end
       end
 
       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
           model do
-            has_many :children, :class_name => "SpecialChild"
+            has_many :children, :class_name => 'SpecialChild'
             accepts_nested_attributes_for :children
           end
         end
@@ -197,8 +198,8 @@ describe Schematic::Serializers::Xsd do
         subject { Parent2.to_xsd }
 
         it "should generate a valid XSD" do
-          subject.should include "children-attributes"
-          subject.should_not include "special-children-attributes"
+          expect(subject).to include 'children-attributes'
+          expect(subject).not_to include 'special-children-attributes'
           validate_xsd(subject)
         end
       end
@@ -224,9 +225,9 @@ describe Schematic::Serializers::Xsd do
         subject { Car.to_xsd }
 
         it "should generate a valid XSD" do
-          subject.should include "engine-attributes"
-          subject.should_not include "engines-attributes"
-          subject.should_not include "Engines"
+          expect(subject).to include 'engine-attributes'
+          expect(subject).not_to include 'engines-attributes'
+          expect(subject).not_to include 'Engines'
           validate_xsd(subject)
         end
       end
@@ -255,7 +256,7 @@ describe Schematic::Serializers::Xsd do
         subject { Car.to_xsd }
 
         it "should generate a valid XSD" do
-          subject.should_not include "engine-attributes"
+          expect(subject).not_to include 'engine-attributes'
           validate_xsd(subject)
         end
       end
@@ -287,9 +288,9 @@ describe Schematic::Serializers::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"
+            expect(subject).to include 'child-attributes'
+            expect(subject).to include 'first-name'
+            expect(subject).not_to include 'last-name'
             validate_xsd(subject)
           end
         end
@@ -298,8 +299,8 @@ describe Schematic::Serializers::Xsd do
           subject { Child.to_xsd }
 
           it "should be valid" do
-            subject.should include "first-name"
-            subject.should include "last-name"
+            expect(subject).to include 'first-name'
+            expect(subject).to include 'last-name'
             validate_xsd(subject)
           end
         end
@@ -337,9 +338,9 @@ describe Schematic::Serializers::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"
+            expect(subject).to include 'child-attributes'
+            expect(subject).to include 'first-name'
+            expect(subject).to include 'last-name'
             validate_xsd(subject)
           end
         end
@@ -348,8 +349,8 @@ describe Schematic::Serializers::Xsd do
           subject { Child.to_xsd }
 
           it "should be valid" do
-            subject.should include "first-name"
-            subject.should include "last-name"
+            expect(subject).to include 'first-name'
+            expect(subject).to include 'last-name'
             validate_xsd(subject)
           end
         end
@@ -381,9 +382,9 @@ describe Schematic::Serializers::Xsd do
         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"}
+            expect(subject).to include %q{"house-attributes"}
+            expect(subject).to include %q{"price"}
+            expect(subject).not_to include %q{"address"}
             validate_xsd(subject)
           end
         end
@@ -391,8 +392,8 @@ describe Schematic::Serializers::Xsd do
         describe "the child XSD" do
           subject { House.to_xsd }
           it "should be valid" do
-            subject.should include %{"price"}
-            subject.should include %{"address"}
+            expect(subject).to include %q{"price"}
+            expect(subject).to include %q{"address"}
             validate_xsd(subject)
           end
         end
@@ -411,7 +412,7 @@ describe Schematic::Serializers::Xsd do
           end
 
           model do
-            belongs_to :university, class_name: "School"
+            belongs_to :university, class_name: 'School'
 
             accepts_nested_attributes_for :university
           end
@@ -472,9 +473,9 @@ describe Schematic::Serializers::Xsd do
         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"}
+            expect(subject).to include %q{"house-attributes"}
+            expect(subject).to include %q{"price"}
+            expect(subject).not_to include %q{"address"}
             validate_xsd(subject)
           end
         end
@@ -482,8 +483,8 @@ describe Schematic::Serializers::Xsd do
         describe "the child XSD" do
           subject { House.to_xsd }
           it "should be valid" do
-            subject.should include %{"price"}
-            subject.should include %{"address"}
+            expect(subject).to include %q{"price"}
+            expect(subject).to include %q{"address"}
             validate_xsd(subject)
           end
         end
@@ -632,7 +633,7 @@ describe Schematic::Serializers::Xsd do
             </xs:complexType>
           </xs:schema>
         XML
-        subject.should == sanitize_xml(xsd)
+        expect(subject).to eq(sanitize_xml(xsd))
       end
 
     end
@@ -646,6 +647,10 @@ describe Schematic::Serializers::Xsd do
           table :id => false do |t|
             t.float 'some_float'
           end
+
+          model do
+            self.primary_key = :some_float
+          end
         end
 
         it "should define the correct xsd element" do
@@ -662,7 +667,7 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          subject.should == xsd
+          expect(subject).to eq(xsd)
         end
 
       end
@@ -693,7 +698,7 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          sanitize_xml(SomeModel.to_xsd(:methods => {:foo_bar => nil})).should == xsd
+          expect(sanitize_xml(SomeModel.to_xsd(:methods => {:foo_bar => nil}))).to eq(xsd)
         end
       end
 
@@ -703,7 +708,7 @@ describe Schematic::Serializers::Xsd do
       with_model :ModelWithDifferentRoot do
         model do
           schematic do
-            root "my_root"
+            root 'my_root'
           end
         end
       end
@@ -711,10 +716,10 @@ describe Schematic::Serializers::Xsd do
       subject { ModelWithDifferentRoot.to_xsd }
 
       it "should use the new root tag name" do
-        subject.should_not include %{"model-with-different-root"}
-        subject.should_not include %{"model-with-different-roots"}
-        subject.should include %{"my-root"}
-        subject.should include %{"my-roots"}
+        expect(subject).not_to include %q{"model-with-different-root"}
+        expect(subject).not_to include %q{"model-with-different-roots"}
+        expect(subject).to include %q{"my-root"}
+        expect(subject).to include %q{"my-roots"}
         validate_xsd(subject)
       end
     end
@@ -724,26 +729,26 @@ describe Schematic::Serializers::Xsd do
   describe "#nested_attribute_name" do
     let(:xsd) {Schematic::Generator::Xsd.new(Object)}
     it "turns 'child' into 'children-attributes'" do
-      xsd.nested_attribute_name('child').should == "children-attributes"
+      expect(xsd.nested_attribute_name('child')).to eq('children-attributes')
     end
 
     it "turns 'children' into 'children-attributes'" do
-      xsd.nested_attribute_name('children').should == "children-attributes"
+      expect(xsd.nested_attribute_name('children')).to eq('children-attributes')
     end
 
     it "turns 'special-children' into 'special-children-attributes'" do
-      xsd.nested_attribute_name("special_children").should == "special-children-attributes"
+      expect(xsd.nested_attribute_name('special_children')).to eq('special-children-attributes')
     end
 
     it "properly converts symbols" do
-      xsd.nested_attribute_name(:very_special_children).should == "very-special-children-attributes"
+      expect(xsd.nested_attribute_name(:very_special_children)).to eq('very-special-children-attributes')
     end
   end
   context "when the model has a nested attribute with a different class name and foreign key than the has_many association" do
     with_model :foo do
       model do
-        has_one :bar, :class_name => "Quz", :foreign_key => "bar_id"
-        has_many :children, :class_name => "Quz", :foreign_key => "children_id"
+        has_one :bar, :class_name => 'Quz', :foreign_key => 'bar_id'
+        has_many :children, :class_name => 'Quz', :foreign_key => 'children_id'
         accepts_nested_attributes_for :children
         accepts_nested_attributes_for :bar
       end
@@ -771,11 +776,9 @@ describe Schematic::Serializers::Xsd do
       </foos>
       END
 
-      subject.should include "Quz"
-      subject.should include "Quzs"
+      expect(subject).to include 'Quz'
+      expect(subject).to include 'Quzs'
       validate_xml_against_xsd(test_xml, subject)
     end
   end
 end
-
-

data/spec/spec_helper.rb

@@ -1,120 +1,15 @@
-require "active_record"
-require "with_model"
-require "nokogiri"
-require "schematic"
-
 RSpec.configure do |config|
-  config.extend WithModel
-end
-
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
-
-def validate_xml_against_xsd(xml, xsd)
-  require "tempfile"
-  tempfile = Tempfile.new("schematic")
-  tempfile << xsd
-  tempfile.rewind
-  xsd =  Nokogiri::XML::Schema(tempfile)
-  doc = Nokogiri::XML.parse(xml)
-  errors = []
-  xsd.validate(doc).each do |error|
-    errors << error.message
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
   end
-  errors.should == []
-ensure
-  tempfile.close
-end
-
-def validate_xsd(xml)
-  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(xml)
-  meta_xsd.validate(doc).each do |error|
-    error.message.should be_nil
+  config.mock_with :rspec do |c|
+    c.syntax = :expect
   end
 end
 
-def sanitize_xml(xml)
-  xml.split("\n").reject(&:blank?).map(&:strip).join("\n")
-end
+require 'support/database'
+require 'support/helpers'
+require 'support/with_model'
 
-def generate_xsd_for_model(model, header_element = nil)
-  xsd_generator = model.schematic_sandbox.xsd_generator
-  output = <<-XML
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:complexType name="Integer">
-  <xs:simpleContent>
-  <xs:extension base="xs:integer">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Float">
-  <xs:simpleContent>
-  <xs:extension base="xs:float">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="String">
-  <xs:simpleContent>
-  <xs:extension base="xs:string">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Text">
-  <xs:simpleContent>
-  <xs:extension base="xs:string">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="DateTime">
-  <xs:simpleContent>
-  <xs:extension base="xs:dateTime">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Date">
-  <xs:simpleContent>
-  <xs:extension base="xs:date">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Boolean">
-  <xs:simpleContent>
-  <xs:extension base="xs:boolean">
-  <xs:attribute name="type" type="xs:string" use="optional"/>
-  <xs:attribute name="nil" type="xs:boolean" use="optional"/>
-  </xs:extension>
-  </xs:simpleContent>
-  </xs:complexType>
-  <xs:element name="#{xsd_generator.names.element_collection}" type="#{xsd_generator.names.collection_type}">
-  #{header_element}
-  </xs:element>
-  <xs:complexType name="#{xsd_generator.names.collection_type}">
-    <xs:sequence>
-      <xs:element name="#{xsd_generator.names.element}" type="#{xsd_generator.names.type}" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="type" type="xs:string" fixed="array"/>
-  </xs:complexType>
-  <xs:complexType name="#{xsd_generator.names.type}">
-    <xs:all>
-  #{yield}
-    </xs:all>
-  </xs:complexType>
-</xs:schema>
-  XML
-  sanitize_xml(output)
-end
+require 'schematic'