schematic 0.5.8 → 0.5.9

data/lib/schematic/generator/uniqueness.rb

@@ -5,7 +5,7 @@ module Schematic
       def generate(builder)
         for_validator ActiveRecord::Validations::UniquenessValidator do |validator|
           unique_name = validator.attributes.first.to_s.dasherize
-          additional_fields = (validator.options[:scope] || []).map(&:to_s).map(&:dasherize)
+          additional_fields = (Array.wrap(validator.options[:scope]) || []).map(&:to_s).map(&:dasherize)
 
           names = Schematic::Generator::Names.new(@klass)
           builder.xs :unique, "name" => "#{unique_name}-must-be-unique" do |unique|

data/lib/schematic/version.rb

@@ -1,3 +1,3 @@
 module Schematic
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/spec/schematic/generator/uniqueness_spec.rb

@@ -54,29 +54,51 @@ describe Schematic::Generator::Uniqueness do
 
     context "for a model with a column with uniqueness with scope" 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"
+
+      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")
+          xml = [first_instance, duplicate_instance, another_instance].to_xml
+          lambda {
+            validate_xml_against_xsd(xml, subject)
+          }.should raise_error
+          xml = [first_instance, another_instance].to_xml
+          lambda {
+            validate_xml_against_xsd(xml, subject)
+          }.should_not raise_error
         end
+      end
 
-        model do
-          validates :some_field, :uniqueness => { :scope => [:other_field] }
+      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"
+          end
+
+          model do
+            validates :some_field, :uniqueness => { :scope => :other_field }
+          end
         end
+
+        it_behaves_like "single field in scope"
       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 => "first", :other_field => "alsounique")
-        duplicate_instance = TestModel.new(:some_field => "first", :other_field => "unique")
-        xml = [first_instance, duplicate_instance, another_instance].to_xml
-        lambda {
-          validate_xml_against_xsd(xml, subject)
-        }.should raise_error
-        xml = [first_instance, another_instance].to_xml
-        lambda {
-          validate_xml_against_xsd(xml, subject)
-        }.should_not raise_error
+      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"
+          end
+
+          model do
+            validates :some_field, :uniqueness => { :scope => [:other_field] }
+          end
+        end
+
+        it_behaves_like "single field in scope"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schematic
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-12-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152968460 !ruby/object:Gem::Requirement
+  requirement: &2152959400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152968460
+  version_requirements: *2152959400
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152967400 !ruby/object:Gem::Requirement
+  requirement: &2152958280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152967400
+  version_requirements: *2152958280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152965580 !ruby/object:Gem::Requirement
+  requirement: &2152957200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2152965580
+  version_requirements: *2152957200
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2152964860 !ruby/object:Gem::Requirement
+  requirement: &2152955660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.4
   type: :development
   prerelease: false
-  version_requirements: *2152964860
+  version_requirements: *2152955660
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152964260 !ruby/object:Gem::Requirement
+  requirement: &2152954800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152964260
+  version_requirements: *2152954800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152963260 !ruby/object:Gem::Requirement
+  requirement: &2152953920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152963260
+  version_requirements: *2152953920
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2152962680 !ruby/object:Gem::Requirement
+  requirement: &2152952540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152962680
+  version_requirements: *2152952540
 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: -2592805779284739061
+      hash: -3956753853577588500
 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: -2592805779284739061
+      hash: -3956753853577588500
 requirements: []
 rubyforge_project: schematic
 rubygems_version: 1.8.10