modis 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c1496e1e5c9b430c4aa6257d4ec122d3cb1ee37
-  data.tar.gz: 68c023c5b84245530772181c7a2bf564ebe0712f
+  metadata.gz: 2bceb3d4a73d55abb1e394c0a5bc3b4d2aba0a5c
+  data.tar.gz: 0e12bc5e617999f6c6da40c96add042f9b43feb8
 SHA512:
-  metadata.gz: f77b3079fd2c210bb678b952710e188dda3eb1ae8d98d00f30b79b511671305df22a3d5863433c48c2a831bf795580afc8a6c1d6973530a0847e7a5f14cabfad
-  data.tar.gz: d22b018df72ac21e0bce75fba13816ecf7067b96602afae6f0d8d09321d2f24c8c194809d30bc221e543bcbc5bd4330157248eed20ac761c1560d0d647b99ddc
+  metadata.gz: 80a0a72e0ce9d49e440e10e030f5c3c0d91615780ea7bdafba3ff9fc2cfe31e88bcfdecaa7a27c0e7feb62322d576f5d178afebf2fee0fdec296f77fc0685abd
+  data.tar.gz: 3896ccbe329b3e308b5deccc2960e89c6bbc21f4121eb99967135b02f7eb12a0fc4f89755f68fc4c2d8f37cf4c7d8f331fe7174162bedbdb7d0c5123b4e085a8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modis (1.2.0)
+    modis (1.3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       connection_pool (>= 2)

data/lib/modis/attribute.rb

@@ -20,12 +20,13 @@ module Modis
         attribute :id, :integer
       end
 
-      def attribute(name, type = :string, options = {})
+      def attribute(name, types, options = {})
         name = name.to_s
+        types = Array[*types]
         raise AttributeError, "Attribute with name '#{name}' has already been specified." if attributes.key?(name)
-        raise UnsupportedAttributeType, type unless TYPES.include?(type)
+        types.each { |type| raise UnsupportedAttributeType, type unless TYPES.include?(type) }
 
-        attributes[name] = options.update(type: type)
+        attributes[name] = options.update(types: types)
         define_attribute_methods [name]
         class_eval <<-EOS, __FILE__, __LINE__
           def #{name}

data/lib/modis/persistence.rb

@@ -128,11 +128,11 @@ module Modis
     end
 
     def ensure_type(attribute, value)
-      type = self.class.attributes[attribute.to_s][:type]
-      type_classes = classes_for_type(type)
+      types = self.class.attributes[attribute.to_s][:types]
+      type_classes = types.map { |type| classes_for_type(type) }.flatten
 
       return unless value && !type_classes.include?(value.class)
-      raise Modis::AttributeCoercionError, "Received value of type '#{value.class}', expected '#{type}' for attribute '#{name}'."
+      raise Modis::AttributeCoercionError, "Received value of type '#{value.class}', expected '#{type_classes.join('\', \'')}' for attribute '#{attribute}'."
     end
 
     def classes_for_type(type)

data/lib/modis/version.rb

@@ -1,3 +1,3 @@
 module Modis
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/attribute_spec.rb

@@ -11,6 +11,7 @@ module AttributeSpec
     attribute :flag, :boolean
     attribute :array, :array
     attribute :hash, :hash
+    attribute :string_or_hash, [:string, :hash]
   end
 end
 
@@ -121,7 +122,7 @@ describe Modis::Attribute do
     end
 
     it 'raises an error if assigned a non-boolean value' do
-      expect { model.flag = 'unf!' }.to raise_error(Modis::AttributeCoercionError)
+      expect { model.flag = 'unf!' }.to raise_error(Modis::AttributeCoercionError, "Received value of type 'String', expected 'TrueClass', 'FalseClass' for attribute 'flag'.")
     end
   end
 
@@ -134,7 +135,7 @@ describe Modis::Attribute do
     end
 
     it 'raises an error when assigned another type' do
-      expect { model.array = { foo: :bar } }.to raise_error(Modis::AttributeCoercionError)
+      expect { model.array = { foo: :bar } }.to raise_error(Modis::AttributeCoercionError, "Received value of type 'Hash', expected 'Array' for attribute 'array'.")
     end
   end
 
@@ -147,7 +148,25 @@ describe Modis::Attribute do
     end
 
     it 'raises an error when assigned another type' do
-      expect { model.hash = [] }.to raise_error(Modis::AttributeCoercionError)
+      expect { model.hash = [] }.to raise_error(Modis::AttributeCoercionError, "Received value of type 'Array', expected 'Hash' for attribute 'hash'.")
+    end
+  end
+
+  describe 'variable type' do
+    it 'is coerced' do
+      model.string_or_hash = { foo: :bar }
+      model.save!
+      found = AttributeSpec::MockModel.find(model.id)
+      expect(found.string_or_hash).to eq(foo: :bar)
+
+      model.string_or_hash = 'test'
+      model.save!
+      found = AttributeSpec::MockModel.find(model.id)
+      expect(found.string_or_hash).to eq('test')
+    end
+
+    it 'raises an error when assigned another type' do
+      expect { model.string_or_hash = [] }.to raise_error(Modis::AttributeCoercionError, "Received value of type 'Array', expected 'String', 'Hash' for attribute 'string_or_hash'.")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ian Leitch