virtus 1.0.2 → 1.0.3

data/spec/shared/freeze_method_behavior.rb

@@ -32,6 +32,6 @@ shared_examples_for 'a #freeze method' do
   its(:frozen?) { should be(true) }
 
   it 'allows to access attribute' do
-    subject.name.should eql('John')
+    expect(subject.name).to eql('John')
   end
 end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ if ENV['COVERAGE'] == 'true'
 end
 
 require 'rspec'
+require 'rspec/its'
 require 'bogus/rspec'
 require 'virtus'
 require 'inflecto' # for resolving namespaced constant names

data/spec/unit/virtus/attribute/class_methods/build_spec.rb

@@ -7,7 +7,7 @@ describe Virtus::Attribute, '.build' do
   let(:type)    { String }
   let(:options) { {} }
 
-  share_examples_for 'a valid attribute instance' do
+  shared_examples_for 'a valid attribute instance' do
     it { should be_instance_of(Virtus::Attribute) }
 
     it { should be_frozen }
@@ -83,6 +83,14 @@ describe Virtus::Attribute, '.build' do
     its(:type) { should be(Axiom::Types::Integer) }
   end
 
+  context 'when type is a range' do
+    let(:type) { 0..10 }
+
+    it_behaves_like 'a valid attribute instance'
+
+    its(:type) { should be(Axiom::Types.infer(Range)) }
+  end
+
   context 'when type is a symbol of an existing class constant' do
     let(:type) { :String }
 

data/spec/unit/virtus/attribute/collection/class_methods/build_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe Virtus::Attribute, '.build' do
-  subject { described_class.build(type) }
+  subject { described_class.build(type, options) }
 
-  share_examples_for 'a valid collection attribute instance' do
+  let(:options) { {} }
+
+  shared_examples_for 'a valid collection attribute instance' do
     it { should be_instance_of(Virtus::Attribute::Collection) }
 
     it { should be_frozen }
@@ -91,4 +93,13 @@ describe Virtus::Attribute, '.build' do
       expect(subject.type.member_type).to be(Axiom::Types::String)
     end
   end
+
+  context 'when strict mode is used' do
+    let(:type) { Array[String] }
+    let(:options) { { strict: true } }
+
+    it 'sets strict mode for member type' do
+      expect(subject.member_type).to be_strict
+    end
+  end
 end

data/spec/unit/virtus/attribute/collection/coerce_spec.rb

@@ -50,4 +50,25 @@ describe Virtus::Attribute::Collection, '#coerce' do
       end
     end
   end
+
+  context 'when input is nil' do
+    let(:input) { nil }
+
+    fake(:coercer)     { Virtus::Attribute::Coercer }
+    fake(:member_type) { Virtus::Attribute }
+
+    let(:member_primitive) { Integer }
+
+    let(:object) {
+      described_class.build(
+        Array[member_primitive], coercer: coercer, member_type: member_type
+      )
+    }
+
+    it 'returns nil' do
+      stub(coercer).call(input) { input }
+
+      expect(subject).to be(input)
+    end
+  end
 end

data/spec/unit/virtus/attribute/hash/class_methods/build_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe Virtus::Attribute::Hash, '.build' do
-  subject { described_class.build(type) }
+  subject { described_class.build(type, options) }
 
-  share_examples_for 'a valid hash attribute instance' do
+  let(:options) { {} }
+
+  shared_examples_for 'a valid hash attribute instance' do
     it { should be_instance_of(Virtus::Attribute::Hash) }
 
     it { should be_frozen }
@@ -91,4 +93,14 @@ describe Virtus::Attribute::Hash, '.build' do
       )
     end
   end
+
+  context 'when strict mode is used' do
+    let(:type) { Hash[String => Integer] }
+    let(:options) { { :strict => true } }
+
+    it 'sets the strict mode for key/value types' do
+      expect(subject.key_type).to be_strict
+      expect(subject.value_type).to be_strict
+    end
+  end
 end

data/spec/unit/virtus/attribute_set/each_spec.rb

@@ -1,28 +1,31 @@
 require 'spec_helper'
 
 describe Virtus::AttributeSet, '#each' do
-  let(:name)       { :name                                   }
+  subject(:attribute_set) { described_class.new(parent, attributes) }
+
+  let(:name)       { :name }
   let(:attribute)  { Virtus::Attribute.build(String, :name => :name) }
-  let(:attributes) { [ attribute ]                           }
-  let(:parent)     { described_class.new                     }
-  let(:object)     { described_class.new(parent, attributes) }
-  let(:yields)     { Set[]                                   }
+  let(:attributes) { [ attribute ] }
+  let(:parent)     { described_class.new }
+  let(:yields)     { Set[] }
 
   context 'with no block' do
-    subject { object.each }
-
-    it { should be_instance_of(to_enum.class) }
+    it 'returns an enumerator when block is not provided' do
+      expect(attribute_set.each).to be_kind_of(Enumerator)
+    end
 
     it 'yields the expected attributes' do
-      subject.to_a.should eql(object.to_a)
+      result = []
+      attribute_set.each { |attribute| result << attribute }
+      expect(result).to eql(attributes)
     end
   end
 
   context 'with a block' do
-    subject { object.each { |attribute| yields << attribute } }
+    subject { attribute_set.each { |attribute| yields << attribute } }
 
     context 'when the parent has no attributes' do
-      it { should equal(object) }
+      it { should equal(attribute_set) }
 
       it 'yields the expected attributes' do
         expect { subject }.to change { yields.dup }.
@@ -35,12 +38,14 @@ describe Virtus::AttributeSet, '#each' do
       let(:parent_attribute) { Virtus::Attribute.build(String, :name => :parent_name) }
       let(:parent)           { described_class.new([ parent_attribute ])       }
 
-      it { should equal(object) }
+      it { should equal(attribute_set) }
 
       it 'yields the expected attributes' do
-        expect { subject }.to change { yields.dup }.
-          from(Set[]).
-          to(Set[ attribute, parent_attribute ])
+        result = []
+
+        attribute_set.each { |attribute| result << attribute }
+
+        expect(result).to eql([parent_attribute, attribute])
       end
     end
 
@@ -48,7 +53,7 @@ describe Virtus::AttributeSet, '#each' do
       let(:parent_attribute) { Virtus::Attribute.build(String, :name => name) }
       let(:parent)           { described_class.new([ parent_attribute ]) }
 
-      it { should equal(object) }
+      it { should equal(attribute_set) }
 
       it 'yields the expected attributes' do
         expect { subject }.to change { yields.dup }.

data/spec/unit/virtus/attribute_set/element_reference_spec.rb

@@ -12,6 +12,6 @@ describe Virtus::AttributeSet, '#[]' do
   it { should equal(attribute) }
 
   it 'allows indexed access to attributes by the string representation of their name' do
-    object[name.to_s].should equal(attribute)
+    expect(object[name.to_s]).to equal(attribute)
   end
 end

data/spec/unit/virtus/attribute_set/reset_spec.rb

@@ -42,9 +42,11 @@ describe Virtus::AttributeSet, '#reset' do
     it { should equal(object) }
 
     it 'includes changes from the parent' do
-      expect { parent << new_attribute; subject }.to change { object.to_set }.
-        from(Set[ attribute, parent_attribute ]).
-        to(Set[ attribute, new_attribute ])
+      expect(object.to_set).to eql(Set[attribute, parent_attribute])
+
+      parent << new_attribute
+
+      expect(subject.to_set).to eql(Set[attribute, new_attribute])
     end
   end
 

data/spec/unit/virtus/attribute_spec.rb

@@ -4,14 +4,15 @@ describe Virtus, '#attribute' do
   let(:name)    { :test }
   let(:options) { {} }
 
-  share_examples_for 'a class with boolean attribute' do
+  shared_examples_for 'a class with boolean attribute' do
     subject { Test }
 
     let(:object) { subject.new }
 
     it 'defines reader and writer' do
       object.test = true
-      expect(object.test).to be(true)
+
+      expect(object).to be_test
     end
 
     it 'defines predicate method' do
@@ -21,7 +22,7 @@ describe Virtus, '#attribute' do
     end
   end
 
-  share_examples_for 'an object with string attribute' do
+  shared_examples_for 'an object with string attribute' do
     it { should respond_to(:test) }
     it { should respond_to(:test=) }
 

data/spec/unit/virtus/attributes_reader_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Virtus, '#attributes' do
 
-  share_examples_for 'attribute hash' do
+  shared_examples_for 'attribute hash' do
     it 'includes all attributes' do
       subject.attributes = { :test => 'Hello World', :test_priv => 'Yo' }
 

data/spec/unit/virtus/attributes_writer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Virtus, '#attributes=' do
 
-  share_examples_for 'mass-assignment' do
+  shared_examples_for 'mass-assignment' do
     it 'allows writing known attributes' do
       subject.attributes = { :test => 'Hello World' }
 

data/spec/unit/virtus/model_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Virtus, '.model' do
-  share_examples_for 'a model with constructor' do
+  shared_examples_for 'a model with constructor' do
     it 'accepts attribute hash' do
       instance = subject.new(:name => 'Jane')
       expect(instance.name).to eql('Jane')
     end
   end
 
-  share_examples_for 'a model with mass-assignment' do
+  shared_examples_for 'a model with mass-assignment' do
     let(:attributes) do
       { :name => 'Jane', :something => nil }
     end
@@ -22,7 +22,7 @@ describe Virtus, '.model' do
     end
   end
 
-  share_examples_for 'a model with strict mode turned off' do
+  shared_examples_for 'a model with strict mode turned off' do
     it 'has attributes with strict set to false' do
       expect(subject.send(:attribute_set)[:name]).to_not be_strict
     end

data/spec/unit/virtus/module_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Virtus, '.module' do
-  share_examples_for 'a valid virtus object' do
+  shared_examples_for 'a valid virtus object' do
     it 'reads and writes attribute' do
       instance.name = 'John'
       expect(instance.name).to eql('John')
     end
   end
 
-  share_examples_for 'an object extended with virtus module' do
+  shared_examples_for 'an object extended with virtus module' do
     context 'with default configuration' do
       subject { Virtus.module }
 
@@ -114,4 +114,61 @@ describe Virtus, '.module' do
     end
   end
 
+  context 'as a peer to another module within a class' do
+    subject { Virtus.module }
+    let(:other)  { Module.new }
+
+    before do
+      other.send(:include, Virtus.module)
+      other.attribute :last_name, String, :default => 'Doe'
+      other.attribute :something_else
+      model.send(:include, mod)
+      model.send(:include, other)
+    end
+
+    it 'provides attributes for the model from both modules' do
+      expect(model.attribute_set[:name]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:something]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:last_name]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:something_else]).to be_kind_of(Virtus::Attribute)
+    end
+
+    it 'includes the attributes from both modules' do
+      expect(model.new.attributes.keys).to eq(
+        [:name, :something, :last_name, :something_else]
+      )
+    end
+  end
+
+  context 'with multiple other modules mixed into it' do
+    subject { Virtus.module }
+    let(:other)  { Module.new }
+    let(:yet_another)  { Module.new }
+
+    before do
+      other.send(:include, Virtus.module)
+      other.attribute :last_name, String, :default => 'Doe'
+      other.attribute :something_else
+      yet_another.send(:include, Virtus.module)
+      yet_another.send(:include, mod)
+      yet_another.send(:include, other)
+      yet_another.attribute :middle_name, String, :default => 'Foobar'
+      model.send(:include, yet_another)
+    end
+
+    it 'provides attributes for the model from all modules' do
+      expect(model.attribute_set[:name]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:something]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:last_name]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:something_else]).to be_kind_of(Virtus::Attribute)
+      expect(model.attribute_set[:middle_name]).to be_kind_of(Virtus::Attribute)
+    end
+
+    it 'includes the attributes from all modules' do
+      expect(model.new.attributes.keys).to eq(
+        [:name, :something, :last_name, :something_else, :middle_name]
+      )
+    end
+  end
+
 end

data/spec/unit/virtus/value_object_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Virtus::ValueObject do
-  share_examples_for 'a valid value object' do
+  shared_examples_for 'a valid value object' do
     subject { model.new(attributes) }
 
     let(:attributes) { Hash[:id => 1, :name => 'Jane Doe'] }
@@ -43,7 +43,7 @@ describe Virtus::ValueObject do
     end
   end
 
-  share_examples_for 'a valid value object with mass-assignment turned on' do
+  shared_examples_for 'a valid value object with mass-assignment turned on' do
     subject { model.new }
 
     it 'disallows mass-assignment' do

data/virtus.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
   gem.extra_rdoc_files = %w[LICENSE README.md TODO.md]
 
-  gem.add_dependency('descendants_tracker', '~> 0.0.3')
-  gem.add_dependency('equalizer',           '~> 0.0.9')
+  gem.add_dependency('descendants_tracker', '~> 0.0', '>= 0.0.3')
+  gem.add_dependency('equalizer',           '~> 0.0', '>= 0.0.9')
   gem.add_dependency('coercible',           '~> 1.0')
   gem.add_dependency('axiom-types',         '~> 0.1')
 end

metadata

@@ -1,78 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: coercible
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: axiom-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 description: Attributes on Steroids for Plain Old Ruby Objects
@@ -85,13 +88,13 @@ extra_rdoc_files:
 - README.md
 - TODO.md
 files:
-- .gitignore
-- .pelusa.yml
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".pelusa.yml"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
+- ".yardopts"
 - CONTRIBUTING.md
 - Changelog.md
 - Gemfile
@@ -209,27 +212,26 @@ files:
 homepage: https://github.com/solnic/virtus
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attributes on Steroids for Plain Old Ruby Objects
 test_files: []
 has_rdoc: