osm 1.2.18.dev.6 → 1.2.18.dev.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODBjYWJhMTRjZDA3NTBmOGJhNjE3YmM2MjRhZmMwMDllM2Y3OGY0ZQ==
+    OGE3N2JlN2IzNGM4NWIxMGM5OTc1NzgxYTk0MTExYTM4NDc0MDY2NA==
   data.tar.gz: !binary |-
-    ZWQwN2ZlNGY5ZjkzZGIwYWU0YTM0MGNiNGI4NmM0ZjcxZmJkNDk1Mw==
+    NDM5ZDMyMzZmNTAwZjIwOTBlZGI0MjM5NDU1YTRiZTg3YmExMjI1Mw==
 SHA512:
   metadata.gz: !binary |-
-    NWZkNzgyNDI3ODU5N2UzNzM3YzkzOWI2MTQ0ZDJjODczYWRhY2U3OGVkMTY2
-    ODIyODY0MmUxZTVjN2JjNDY1OGI1Y2ExNTE0ZWQ4YmYwYzAxZTZhMDcyYWJi
-    YmMzYWYxNmIwMDI1Mjk5M2ZlZjMzODNmMTU2NmVlZGEwNzJmOGE=
+    MTQ4NTc1ZTYxNWQ3MGFhMmQ4NTYxNDY2NjFhM2FjOTQ5NDYzNDM4NGViM2Y0
+    YTQxYjFkZDU4MDc4MDUzMzU3YWJlMjI2NzFmZWJjMTgyZjc2M2E0MTU4YzI0
+    MzQyMDZmZmFmYzYzMjk2MTQ0ODkzZTY5OWYwNjYyMjVhYzZhZGI=
   data.tar.gz: !binary |-
-    YmZiOGMxNzMxMGQ3MmIzOWI0NzIyMGVjYzhkY2M5YmQ4ZWU5NGRlZmE4MTkx
-    Mjc2YWNkYjc5NDQ3NDRhZTQ5MzlmNTNkMmQ3ODU5YWM3MjY0ZjI3ZjFkNTNl
-    ZjgzNWEyNzcyODMyMWVlMWE1ODVkZDA4OWIxZTc3Y2JkNWVlNjE=
+    ZGI3NWNjMDgzNmEzNjY4YTBlZjIzZGMzNzQ3Njc1N2IyZGZmNzhkM2FmODJk
+    Mzc1MzhiODQyZDBjOWU3N2E5YjZiMzgwZmE5N2Q0YjVkYTEzMjIwZTdmZDQ2
+    MWI0Zjk3ZDc2N2MyOTM3YWZjNjI0ODQ5NmJlYmVhYTc0MDJjMTk=

data/lib/osm/member.rb

@@ -390,11 +390,11 @@ module Osm
       end # each attr to update
 
       # Do contacts
-      updated = contact.update(api, self, force) && updated
-      updated = primary_contact.update(api, self, force) && updated
-      updated = secondary_contact.update(api, self, force) && updated
-      updated = emergency_contact.update(api, self, force) && updated
-      updated = doctor.update(api, self, force) && updated
+      updated = (contact.nil? || contact.update(api, self, force)) && updated
+      updated = (primary_contact.nil? || primary_contact.update(api, self, force)) && updated
+      updated = (secondary_contact.nil? || secondary_contact.update(api, self, force)) && updated
+      updated = (emergency_contact.nil? ||emergency_contact.update(api, self, force)) && updated
+      updated = (doctor.nil? || doctor.update(api, self, force)) && updated
 
       # Finish off
       if updated

data/spec/array_of_validator_spec.rb

@@ -2,99 +2,105 @@
 require 'spec_helper'
 
 
-class FixnumTestModel < Osm::Model
-  attribute :array
-  validates :array, :array_of => {:item_type => Fixnum}
-end
+module ArrayOfValidatorSpec
 
-class TestItem
-  def initialize(attrs)
-    @valid = !!attrs[:valid]
-  end
-  def valid?
-    @valid
+  class FixnumTestModel < Osm::Model
+    attribute :array
+    validates :array, :array_of => {:item_type => Fixnum}
   end
-end
-
-class ValidTestModel < Osm::Model
-  attribute :array
-  validates :array, :array_of => {:item_type => TestItem, :item_valid=>true}
-end
-
-class InvalidTestModel < Osm::Model
-  attribute :array
-  validates :array, :array_of => {:item_type => TestItem, :item_valid=>false}
-end
-
-class NovalidTestModel < Osm::Model
-  attribute :array
-  validates :array, :array_of => {:item_type => TestItem}
-end
 
-
-describe "Array of validator" do
-
-  it "Allows an empty array" do
-    i = FixnumTestModel.new(array: [])
-    i.valid?.should == true
-    i.errors.count.should == 0
+  class TestItem
+    def initialize(attrs)
+      @valid = !!attrs[:valid]
+    end
+    def valid?
+      @valid
+    end
   end
 
-  describe ":item_type option" do
-
-    it "Allows arrays of the right type" do
-      i = FixnumTestModel.new(array: [1, 2, 3])
-      i.valid?.should == true
-      i.errors.count.should == 0
-    end
+  class ValidTestModel < Osm::Model
+    attribute :array
+    validates :array, :array_of => {:item_type => TestItem, :item_valid=>true}
+  end
 
-    it "Forbids arrays containing >= 1 incorrect type" do
-      i = FixnumTestModel.new(array: [1, '2', 3])
-      i.valid?.should == false
-      i.errors.count.should == 1
-      i.errors.messages.should == {:array=>["items in the Array must be a Fixnum"]}
-    end
+  class InvalidTestModel < Osm::Model
+    attribute :array
+    validates :array, :array_of => {:item_type => TestItem, :item_valid=>false}
+  end
 
+  class NovalidTestModel < Osm::Model
+    attribute :array
+    validates :array, :array_of => {:item_type => TestItem}
   end
 
-  describe ":valid option" do
 
-    it "Allows (in)valid items unless valid option is passed" do
-      i = NovalidTestModel.new(array: [TestItem.new(valid: false), TestItem.new(valid: true)])
+ describe "Array of validator" do
+
+    it "Allows an empty array" do
+      i = FixnumTestModel.new(array: [])
       i.valid?.should == true
       i.errors.count.should == 0
     end
 
-    describe "Valid option is false" do
+    describe ":item_type option" do
 
-      it "Contains all invalid items" do
-        i = InvalidTestModel.new(array: [TestItem.new(valid: false)])
+      it "Allows arrays of the right type" do
+        i = FixnumTestModel.new(array: [1, 2, 3])
         i.valid?.should == true
         i.errors.count.should == 0
       end
 
-      it "Contains a valid item" do
-        i = InvalidTestModel.new(array: [TestItem.new(valid: true)])
+      it "Forbids arrays containing >= 1 incorrect type" do
+        i = FixnumTestModel.new(array: [1, '2', 3])
         i.valid?.should == false
         i.errors.count.should == 1
-        i.errors.messages.should == {:array => ['contains a valid item']}
+        i.errors.messages.should == {:array=>["items in the Array must be a Fixnum"]}
       end
 
     end
 
-    describe "Valid option is true" do
+    describe ":valid option" do
 
-      it "Contains all valid items" do
-        i = ValidTestModel.new(array: [TestItem.new(valid: true)])
+      it "Allows (in)valid items unless valid option is passed" do
+        i = NovalidTestModel.new(array: [TestItem.new(valid: false), TestItem.new(valid: true)])
         i.valid?.should == true
         i.errors.count.should == 0
       end
 
-      it "Contains an invalid item" do
-        i = ValidTestModel.new(array: [TestItem.new(valid: false)])
-        i.valid?.should == false
-        i.errors.count.should == 1
-        i.errors.messages.should == {:array => ['contains an invalid item']}      end
+      describe "Valid option is false" do
+
+        it "Contains all invalid items" do
+          i = InvalidTestModel.new(array: [TestItem.new(valid: false)])
+          i.valid?.should == true
+          i.errors.count.should == 0
+        end
+
+        it "Contains a valid item" do
+          i = InvalidTestModel.new(array: [TestItem.new(valid: true)])
+          i.valid?.should == false
+          i.errors.count.should == 1
+          i.errors.messages.should == {:array => ['contains a valid item']}
+        end
+
+      end
+
+      describe "Valid option is true" do
+
+        it "Contains all valid items" do
+          i = ValidTestModel.new(array: [TestItem.new(valid: true)])
+          i.valid?.should == true
+          i.errors.count.should == 0
+        end
+
+        it "Contains an invalid item" do
+          i = ValidTestModel.new(array: [TestItem.new(valid: false)])
+          i.valid?.should == false
+          i.errors.count.should == 1
+          i.errors.messages.should == {:array => ['contains an invalid item']}
+        end
+
+      end
+
     end
 
   end

data/spec/hash_validator_spec.rb

@@ -1,133 +1,135 @@
 # encoding: utf-8
 require 'spec_helper'
 
+module HashValidatorSpec
 
-class KeyTypeTestModel
-  include ActiveAttr::Model
-  attribute :hash_attr
-  validates :hash_attr, :hash => {:key_type => Fixnum}
-end
+  class KeyTypeTestModel
+    include ActiveAttr::Model
+    attribute :hash_attr
+    validates :hash_attr, :hash => {:key_type => Fixnum}
+  end
 
-class KeyInTestModel
-  include ActiveAttr::Model
-  attribute :hash_attr
-  validates :hash_attr, :hash => {:key_in => [1, 2]}
-end
+  class KeyInTestModel
+    include ActiveAttr::Model
+    attribute :hash_attr
+    validates :hash_attr, :hash => {:key_in => [1, 2]}
+  end
 
-class ValueTypeTestModel
-  include ActiveAttr::Model
-  attribute :hash_attr
-  validates :hash_attr, :hash => {:value_type => Fixnum}
-end
+  class ValueTypeTestModel
+    include ActiveAttr::Model
+    attribute :hash_attr
+    validates :hash_attr, :hash => {:value_type => Fixnum}
+  end
 
-class ValueInTestModel
-  include ActiveAttr::Model
-  attribute :hash_attr
-  validates :hash_attr, :hash => {:value_in => [1, 2]}
-end
+  class ValueInTestModel
+    include ActiveAttr::Model
+    attribute :hash_attr
+    validates :hash_attr, :hash => {:value_in => [1, 2]}
+  end
 
 
-describe "Hash validator" do
+  describe "Hash validator" do
 
 
-  describe "Key type option" do
+    describe "Key type option" do
 
-    it "Has only correct keys" do
-      model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2'})
-      model.valid?.should == true
-      model.errors.count.should == 0
-    end
+      it "Has only correct keys" do
+        model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2'})
+        model.valid?.should == true
+        model.errors.count.should == 0
+      end
 
-    it "Has an incorrect key" do
-      model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3'})
-      model.valid?.should == false
-      model.errors.count.should == 1
-      model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).']}
-    end
+      it "Has an incorrect key" do
+        model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3'})
+        model.valid?.should == false
+        model.errors.count.should == 1
+        model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).']}
+      end
+
+      it "Has several incorrect keys" do
+        model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3', '4'=>'4'})
+        model.valid?.should == false
+        model.errors.count.should == 2
+        model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).', 'keys must be a Fixnum ("4" is not).']}
+      end
 
-    it "Has several incorrect keys" do
-      model = KeyTypeTestModel.new(hash_attr: {1=>'1', 2=>'2', '3'=>'3', '4'=>'4'})
-      model.valid?.should == false
-      model.errors.count.should == 2
-      model.errors.messages.should == {hash_attr: ['keys must be a Fixnum ("3" is not).', 'keys must be a Fixnum ("4" is not).']}
     end
 
-  end
 
+    describe "Key in option" do
 
-  describe "Key in option" do
+      it "Has only correct keys" do
+        model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2'})
+        model.valid?.should == true
+        model.errors.count.should == 0
+      end
 
-    it "Has only correct keys" do
-      model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2'})
-      model.valid?.should == true
-      model.errors.count.should == 0
-    end
+      it "Has an incorrect key" do
+        model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2', 3=>'3'})
+        model.valid?.should == false
+        model.errors.count.should == 1
+        model.errors.messages.should == {hash_attr: ['keys must be in [1, 2] (3 is not).']}
+      end
 
-    it "Has an incorrect key" do
-      model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2', 3=>'3'})
-      model.valid?.should == false
-      model.errors.count.should == 1
-      model.errors.messages.should == {hash_attr: ['keys must be in [1, 2] (3 is not).']}
-    end
+      it "Has several incorrect keys" do
+        model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2', 3=>'3', 4=>'4'})
+        model.valid?.should == false
+        model.errors.count.should == 2
+        model.errors.messages.should == {hash_attr: ['keys must be in [1, 2] (3 is not).', 'keys must be in [1, 2] (4 is not).']}
+      end
 
-    it "Has several incorrect keys" do
-      model = KeyInTestModel.new(hash_attr: {1=>'1', 2=>'2', 3=>'3', 4=>'4'})
-      model.valid?.should == false
-      model.errors.count.should == 2
-      model.errors.messages.should == {hash_attr: ['keys must be in [1, 2] (3 is not).', 'keys must be in [1, 2] (4 is not).']}
     end
 
-  end
 
+    describe "Value type option" do
 
-  describe "Value type option" do
+      it "Has only correct keys" do
+        model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2})
+        model.valid?.should == true
+        model.errors.count.should == 0
+      end
 
-    it "Has only correct keys" do
-      model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2})
-      model.valid?.should == true
-      model.errors.count.should == 0
-    end
+      it "Has an incorrect key" do
+        model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
+        model.valid?.should == false
+        model.errors.count.should == 1
+        model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).']}
+      end
 
-    it "Has an incorrect key" do
-      model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
-      model.valid?.should == false
-      model.errors.count.should == 1
-      model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).']}
-    end
+      it "Has several incorrect keys" do
+        model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
+        model.valid?.should == false
+        model.errors.count.should == 2
+        model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).', 'values must be a Fixnum ("4" for key "4" is not).']}
+      end
 
-    it "Has several incorrect keys" do
-      model = ValueTypeTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
-      model.valid?.should == false
-      model.errors.count.should == 2
-      model.errors.messages.should == {hash_attr: ['values must be a Fixnum ("3" for key "3" is not).', 'values must be a Fixnum ("4" for key "4" is not).']}
     end
 
-  end
+    describe "Value in option" do
 
+      it "Has only correct keys" do
+        model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2})
+        model.valid?.should == true
+        model.errors.count.should == 0
+      end
 
-  describe "Value in option" do
+      it "Has an incorrect key" do
+        model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
+        model.valid?.should == false
+        model.errors.count.should == 1
+        model.errors.messages.should == {hash_attr: ['values must be in [1, 2] ("3" for key "3" is not).']}
+      end
 
-    it "Has only correct keys" do
-      model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2})
-      model.valid?.should == true
-      model.errors.count.should == 0
-    end
+      it "Has several incorrect keys" do
+        model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
+        model.valid?.should == false
+        model.errors.count.should == 2
+        model.errors.messages.should == {hash_attr: ['values must be in [1, 2] ("3" for key "3" is not).', 'values must be in [1, 2] ("4" for key "4" is not).']}
+      end
 
-    it "Has an incorrect key" do
-      model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3'})
-      model.valid?.should == false
-      model.errors.count.should == 1
-      model.errors.messages.should == {hash_attr: ['values must be in [1, 2] ("3" for key "3" is not).']}
     end
 
-    it "Has several incorrect keys" do
-      model = ValueInTestModel.new(hash_attr: {'1'=>1, '2'=>2, '3'=>'3', '4'=>'4'})
-      model.valid?.should == false
-      model.errors.count.should == 2
-      model.errors.messages.should == {hash_attr: ['values must be in [1, 2] ("3" for key "3" is not).', 'values must be in [1, 2] ("4" for key "4" is not).']}
-    end
 
   end
 
-
-end
+end

data/spec/validity_validator_spec.rb

@@ -1,56 +1,59 @@
 # encoding: utf-8
 require 'spec_helper'
 
+module ValidityValidatorSpec
+  class TestItem
+    include ActiveAttr::Model
+    attribute :validity
+    validates_inclusion_of :validity, :in => [true]
+  end
 
-class TestItem
-  include ActiveAttr::Model
-  attribute :validity
-  validates_inclusion_of :validity, :in => [true]
-end
+  class TestModel
+    include ActiveAttr::Model
+    attribute :item
+    validates :item, :validity => true
+  end
+  class TestModelAllowNil
+    include ActiveAttr::Model
+    attribute :item
+    validates :item, :validity => {allow_nil: true}
+  end
+  class TestModelDisallowNil
+    include ActiveAttr::Model
+    attribute :item
+    validates :item, :validity => {allow_nil: false}
+  end
 
-class TestModel
-  include ActiveAttr::Model
-  attribute :item
-  validates :item, :validity => true
-end
-class TestModelAllowNil
-  include ActiveAttr::Model
-  attribute :item
-  validates :item, :validity => {allow_nil: true}
-end
-class TestModelDisallowNil
-  include ActiveAttr::Model
-  attribute :item
-  validates :item, :validity => {allow_nil: false}
-end
 
-describe "validity validator" do
+  describe "validity validator" do
 
-  it "Item is valid" do
-    model = TestModel.new(item: TestItem.new(validity: true))
-    model.valid?.should == true
-    model.errors.count.should == 0
-  end
+    it "Item is valid" do
+      model = TestModel.new(item: TestItem.new(validity: true))
+      model.valid?.should == true
+      model.errors.count.should == 0
+    end
 
-  it "Item is invalid" do
-    model = TestModel.new(item: TestItem.new(validity: false))
-    model.valid?.should == false
-    model.errors.count.should == 2
-    model.errors.messages.should == {:item => ['must be valid', 'validity attribute is invalid: is not included in the list']}
-  end
+    it "Item is invalid" do
+      model = TestModel.new(item: TestItem.new(validity: false))
+      model.valid?.should == false
+      model.errors.count.should == 2
+      model.errors.messages.should == {:item => ['must be valid', 'validity attribute is invalid: is not included in the list']}
+    end
 
-  describe "Allow nil" do
+    describe "Allow nil" do
 
-    it "Is true" do
-      TestModelAllowNil.new(item: TestItem.new(validity: true)).valid?.should == true
-      TestModelAllowNil.new(item: TestItem.new(validity: false)).valid?.should == false
-      TestModelAllowNil.new(item: nil).valid?.should == true
-    end
+      it "Is true" do
+        TestModelAllowNil.new(item: TestItem.new(validity: true)).valid?.should == true
+        TestModelAllowNil.new(item: TestItem.new(validity: false)).valid?.should == false
+        TestModelAllowNil.new(item: nil).valid?.should == true
+      end
+
+      it "Is false" do
+        TestModelDisallowNil.new(item: TestItem.new(validity: true)).valid?.should == true
+        TestModelDisallowNil.new(item: TestItem.new(validity: false)).valid?.should == false
+        TestModelDisallowNil.new(item: nil).valid?.should == false
+      end
 
-    it "Is false" do
-      TestModelDisallowNil.new(item: TestItem.new(validity: true)).valid?.should == true
-      TestModelDisallowNil.new(item: TestItem.new(validity: false)).valid?.should == false
-      TestModelDisallowNil.new(item: nil).valid?.should == false
     end
 
   end

data/version.rb

@@ -1,3 +1,3 @@
 module Osm
-  VERSION = "1.2.18.dev.6"
+  VERSION = "1.2.18.dev.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osm
 version: !ruby/object:Gem::Version
-  version: 1.2.18.dev.6
+  version: 1.2.18.dev.7
 platform: ruby
 authors:
 - Robert Gauld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport