schematic 0.6.2 → 0.7.0

data/spec/schematic/generator/uniqueness_spec.rb

@@ -1,31 +1,32 @@
-require "spec_helper"
+require 'spec_helper'
 
-describe Schematic::Generator::Uniqueness do
+describe "Schematic::Generator::Uniqueness" do
   describe ".to_xsd" do
     context "with a model with a uniqueness validation" do
       subject { sanitize_xml(TestModel.to_xsd) }
       with_model :test_model do
         table :id => false do |t|
-          t.string "some_field"
+          t.string 'some_field'
         end
 
         model do
+          self.primary_key = :some_field
           validates :some_field, :uniqueness => true
         end
       end
 
       it "should validate against it's own XSD" do
-        first_instance = TestModel.new(:some_field => "first")
-        another_instance = TestModel.new(:some_field => "second")
-        duplicate_instance = TestModel.new(:some_field => "first")
+        first_instance = TestModel.new(:some_field => 'first')
+        another_instance = TestModel.new(:some_field => 'second')
+        duplicate_instance = TestModel.new(:some_field => 'first')
         xml = [first_instance, duplicate_instance, another_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, subject)
-        }.should raise_error
+        }.to raise_error
         xml = [first_instance, another_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, subject)
-        }.should_not raise_error
+        }.not_to raise_error
       end
 
       it "should mark that the field with the allowed values" do
@@ -48,7 +49,7 @@ describe Schematic::Generator::Uniqueness do
           XML
         end
 
-        subject.should == xsd
+        expect(subject).to eq(xsd)
       end
     end
 
@@ -57,28 +58,29 @@ describe Schematic::Generator::Uniqueness do
 
       shared_examples_for "single field in scope" do
         it "should validate against it's own XSD" do
-          first_instance = TestModel.new(:some_field => "first", :other_field => "unique")
-          another_instance = TestModel.new(:some_field => "first", :other_field => "alsounique")
-          duplicate_instance = TestModel.new(:some_field => "first", :other_field => "unique")
+          first_instance = TestModel.new(:some_field => 'first', :other_field => 'unique')
+          another_instance = TestModel.new(:some_field => 'first', :other_field => 'alsounique')
+          duplicate_instance = TestModel.new(:some_field => 'first', :other_field => 'unique')
           xml = [first_instance, duplicate_instance, another_instance].to_xml
-          lambda {
+          expect {
             validate_xml_against_xsd(xml, subject)
-          }.should raise_error
+          }.to raise_error
           xml = [first_instance, another_instance].to_xml
-          lambda {
+          expect {
             validate_xml_against_xsd(xml, subject)
-          }.should_not raise_error
+          }.not_to raise_error
         end
       end
 
       context "when the scope is a symbol" do
         with_model :test_model do
           table :id => false do |t|
-            t.string "some_field"
-            t.string "other_field"
+            t.string 'some_field'
+            t.string 'other_field'
           end
 
           model do
+            self.primary_key = :some_field
             validates :some_field, :uniqueness => { :scope => :other_field }
           end
         end
@@ -89,11 +91,12 @@ describe Schematic::Generator::Uniqueness do
       context "when the scope is an array" do
         with_model :test_model do
           table :id => false do |t|
-            t.string "some_field"
-            t.string "other_field"
+            t.string 'some_field'
+            t.string 'other_field'
           end
 
           model do
+            self.primary_key = :some_field
             validates :some_field, :uniqueness => { :scope => [:other_field] }
           end
         end
@@ -106,40 +109,38 @@ describe Schematic::Generator::Uniqueness do
       subject { sanitize_xml(TestModel.to_xsd) }
       with_model :test_model do
         table :id => false do |t|
-          t.string "some_field"
-          t.string "other_field"
+          t.string 'some_field'
+          t.string 'other_field'
         end
 
         model do
+          self.primary_key = :some_field
           validates :some_field, :uniqueness => true
           validates :other_field, :uniqueness => true
         end
       end
 
       it "should validate against it's own XSD" do
-        first_instance = TestModel.new(:some_field => "first", :other_field => "unique")
-        another_instance = TestModel.new(:some_field => "another", :other_field => "alsounique")
-        duplicate_instance = TestModel.new(:some_field => "first", :other_field => "duplicate")
-        other_duplicate_instance = TestModel.new(:some_field => "fourth", :other_field => "unique")
+        first_instance = TestModel.new(:some_field => 'first', :other_field => 'unique')
+        another_instance = TestModel.new(:some_field => 'another', :other_field => 'alsounique')
+        duplicate_instance = TestModel.new(:some_field => 'first', :other_field => 'duplicate')
+        other_duplicate_instance = TestModel.new(:some_field => 'fourth', :other_field => 'unique')
 
         xml = [first_instance, duplicate_instance, another_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, subject)
-        }.should raise_error
+        }.to raise_error
 
         xml = [first_instance, other_duplicate_instance, another_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, subject)
-        }.should raise_error
+        }.to raise_error
 
         xml = [first_instance, another_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, subject)
-        }.should_not raise_error
+        }.not_to raise_error
       end
     end
-
   end
 end
-
-

data/spec/schematic/serializers/xsd_extend_spec.rb

@@ -1,8 +1,8 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Schematic::Serializers::Xsd do
-  with_model :empty_model do
-  end
+  with_model :empty_model
+
   before do
     class EmptyClass
       include ActiveModel::Serializers::Xml
@@ -14,11 +14,11 @@ describe Schematic::Serializers::Xsd do
       subject { EmptyModel }
 
       it "should allow the model to be extended" do
-        lambda {
+        expect {
           subject.class_eval do
             extend Schematic::Serializers::Xsd
           end
-        }.should_not raise_error
+        }.not_to raise_error
       end
     end
 
@@ -26,11 +26,11 @@ describe Schematic::Serializers::Xsd do
       subject { EmptyClass }
 
       it "should raise an exception" do
-        lambda {
+        expect {
           subject.class_eval do
             extend Schematic::Serializers::Xsd
           end
-        }.should raise_error(Schematic::ClassMissingAttributes)
+        }.to raise_error(Schematic::ClassMissingAttributes)
       end
 
       context "and it implements #attributes" do
@@ -42,11 +42,11 @@ describe Schematic::Serializers::Xsd do
           end
         end
         it "should allow the model to be extended" do
-          lambda {
+          expect {
             subject.class_eval do
               extend Schematic::Serializers::Xsd
             end
-          }.should_not raise_error
+          }.not_to raise_error
         end
       end
     end
@@ -55,11 +55,11 @@ describe Schematic::Serializers::Xsd do
       subject { Object }
 
       it "should raise an exception" do
-        lambda {
+        expect {
           subject.class_eval do
           extend Schematic::Serializers::Xsd
           end
-        }.should raise_error(Schematic::ClassMissingXmlSerializer)
+        }.to raise_error(Schematic::ClassMissingXmlSerializer)
       end
     end
   end

data/spec/schematic/serializers/xsd_validation_presence_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Schematic::Serializers::Xsd do
   describe ".to_xsd" do
@@ -7,10 +7,11 @@ describe Schematic::Serializers::Xsd do
       context "when allow blank is true" do
         with_model :some_model do
           table :id => false do |t|
-            t.string "title"
+            t.string 'title'
           end
 
           model do
+            self.primary_key = :title
             validate :title, :presence => true, :allow_blank => true
           end
         end
@@ -29,17 +30,18 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          subject.should == xsd
+          expect(subject).to eq(xsd)
         end
       end
 
       context "when allow blank is false" 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
@@ -58,18 +60,19 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          subject.should == xsd
+          expect(subject).to eq(xsd)
         end
       end
 
       context "when there is a condition" do
         with_model :some_model do
           table :id => false do |t|
-            t.string "title"
-            t.string "description"
+            t.string 'title'
+            t.string 'description'
           end
 
           model do
+            self.primary_key = :title
             validates :title, :presence => true, :if => lambda { |model| false }
             validates :description, :presence => true, :unless => lambda { |model| true }
           end
@@ -97,7 +100,7 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          subject.should == xsd
+          expect(subject).to eq(xsd)
         end
       end
     end
@@ -107,10 +110,11 @@ describe Schematic::Serializers::Xsd do
       context "when allow blank is true" do
         with_model :some_model do
           table :id => false do |t|
-            t.boolean "current"
+            t.boolean 'current'
           end
 
           model do
+            self.primary_key = :current
             schematic do
               required :current
             end
@@ -131,7 +135,7 @@ describe Schematic::Serializers::Xsd do
             XML
           end
 
-          subject.should == xsd
+          expect(subject).to eq(xsd)
         end
       end
     end
@@ -145,6 +149,7 @@ describe Schematic::Serializers::Xsd do
         end
 
         model do
+          self.primary_key = :some_field
           validates_presence_of :some_field
 
           schematic do
@@ -167,7 +172,7 @@ describe Schematic::Serializers::Xsd do
           XML
         end
 
-        subject.should == xsd
+        expect(subject).to eq(xsd)
       end
     end
   end

data/spec/schematic/serializers/xsd_xsd_ignore_methods_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Schematic::Serializers::Xsd do
   describe "schematic#ignore keyword" do
@@ -8,6 +8,7 @@ describe Schematic::Serializers::Xsd do
       end
 
       model do
+        self.primary_key = :title
         schematic do
           ignore :title
         end
@@ -18,8 +19,7 @@ describe Schematic::Serializers::Xsd do
       xsd = generate_xsd_for_model(SomeModel) do
       end
 
-      sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+      expect(sanitize_xml(SomeModel.to_xsd)).to eq(xsd)
     end
   end
-
 end

data/spec/schematic/serializers/xsd_xsd_methods_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Schematic::Serializers::Xsd do
   describe "Adding additional methods" do
@@ -33,7 +33,7 @@ describe Schematic::Serializers::Xsd do
           XML
         end
 
-        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+        expect(sanitize_xml(SomeModel.to_xsd)).to eq(xsd)
       end
     end
 
@@ -44,6 +44,7 @@ describe Schematic::Serializers::Xsd do
         end
 
         model do
+          self.primary_key = :foo
           validates :foo_bar, :inclusion => { :in => [1,2,3] }
 
           def foo_bar=(value)
@@ -90,7 +91,7 @@ describe Schematic::Serializers::Xsd do
           XML
         end
 
-        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+        expect(sanitize_xml(SomeModel.to_xsd)).to eq(xsd)
       end
 
       it "should validate against the xsd" do
@@ -98,14 +99,14 @@ describe Schematic::Serializers::Xsd do
 
         invalid_instance = SomeModel.new(:foo_bar => "d")
         xml = [invalid_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, xsd)
-        }.should raise_error
+        }.to raise_error
         valid_instance = SomeModel.new(:foo_bar => 1)
         xml = [valid_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, xsd)
-        }.should_not raise_error
+        }.not_to raise_error
       end
     end
 
@@ -116,6 +117,7 @@ describe Schematic::Serializers::Xsd do
         end
 
         model do
+          self.primary_key = :foo
 
           attr_accessor :bar
 
@@ -157,22 +159,22 @@ describe Schematic::Serializers::Xsd do
             </xs:element>
           XML
         end
-        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+        expect(sanitize_xml(SomeModel.to_xsd)).to eq(xsd)
       end
 
       it "should validate against the xsd" do
         xsd = SomeModel.to_xsd
 
-        invalid_instance = SomeModel.new(:bar => "invalid option")
+        invalid_instance = SomeModel.new(:bar => 'invalid option')
         xml = [invalid_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, xsd)
-        }.should raise_error
-        valid_instance = SomeModel.new(:bar => "b")
+        }.to raise_error
+        valid_instance = SomeModel.new(:bar => 'b')
         xml = [valid_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, xsd)
-        }.should_not raise_error
+        }.not_to raise_error
       end
     end
 
@@ -183,6 +185,8 @@ describe Schematic::Serializers::Xsd do
         end
 
         model do
+          self.primary_key = :bar
+
           def foo=(value)
             @foo = value
           end
@@ -192,7 +196,7 @@ describe Schematic::Serializers::Xsd do
           end
 
           def self.xsd_foo_enumeration_restrictions
-            ["1", "2", "3"]
+            ['1', '2', '3']
           end
 
           schematic do
@@ -236,21 +240,21 @@ describe Schematic::Serializers::Xsd do
             </xs:element>
           XML
         end
-        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+        expect(sanitize_xml(SomeModel.to_xsd)).to eq(xsd)
       end
 
       it "should validate against its own XSD" do
-        invalid_instance = SomeModel.new(:foo => ["a", "b"])
+        invalid_instance = SomeModel.new(:foo => ['a', 'b'])
         xml = [invalid_instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, SomeModel.to_xsd)
-        }.should raise_error
+        }.to raise_error
 
-        instance = SomeModel.new(:foo => ["1", "2"])
+        instance = SomeModel.new(:foo => ['1', '2'])
         xml = [instance].to_xml
-        lambda {
+        expect {
           validate_xml_against_xsd(xml, SomeModel.to_xsd)
-        }.should_not raise_error
+        }.not_to raise_error
       end
     end
 
@@ -308,9 +312,8 @@ describe Schematic::Serializers::Xsd do
           XML
         end
 
-        sanitize_xml(SomeModel.to_xsd).should eq(xsd)
+        expect(sanitize_xml(SomeModel.to_xsd)).to eq(xsd)
       end
     end
   end
 end
-