virtus 1.0.3 → 1.0.4

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

@@ -12,7 +12,7 @@ describe Virtus::AttributeSet, '#merge' do
     let(:attributes) { [] }
     let(:attribute)  { Virtus::Attribute.build(String, :name => name) }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
     it 'adds an attribute' do
       expect { subject }.to change { object.to_a }.from(attributes).to([attribute])
@@ -23,7 +23,7 @@ describe Virtus::AttributeSet, '#merge' do
     let(:attributes) { [Virtus::Attribute.build(String, :name => name)] }
     let(:attribute)  { Virtus::Attribute.build(String, :name => name) }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
     it 'replaces the original attribute' do
       expect { subject }.to change { object.to_a }.from(attributes).to([attribute])

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

@@ -11,27 +11,36 @@ describe Virtus::AttributeSet, '#reset' do
   context 'when the parent has no attributes' do
     let(:parent) { described_class.new }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
-    its(:to_set) { should == Set[ attribute ] }
+    describe '#to_set' do
+      subject { super().to_set }
+      it { is_expected.to eq(Set[ attribute ]) }
+    end
   end
 
   context 'when the parent has attributes that are not duplicates' do
     let(:parent_attribute) { Virtus::Attribute.build(String, :name => :parent_name) }
     let(:parent)           { described_class.new([ parent_attribute ])       }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
-    its(:to_set) { should == Set[ attribute, parent_attribute ] }
+    describe '#to_set' do
+      subject { super().to_set }
+      it { is_expected.to eq(Set[ attribute, parent_attribute ]) }
+    end
   end
 
   context 'when the parent has attributes that are duplicates' do
     let(:parent_attribute) { Virtus::Attribute.build(String, :name => name) }
     let(:parent)           { described_class.new([ parent_attribute ]) }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
-    its(:to_set) { should == Set[ attribute ] }
+    describe '#to_set' do
+      subject { super().to_set }
+      it { is_expected.to eq(Set[ attribute ]) }
+    end
   end
 
   context 'when the parent has changed' do
@@ -39,7 +48,7 @@ describe Virtus::AttributeSet, '#reset' do
     let(:parent)           { described_class.new([ parent_attribute ])       }
     let(:new_attribute)    { Virtus::Attribute.build(String, :name => :parent_name) }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
     it 'includes changes from the parent' do
       expect(object.to_set).to eql(Set[attribute, parent_attribute])
@@ -53,7 +62,7 @@ describe Virtus::AttributeSet, '#reset' do
   context 'when the parent is nil' do
     let(:parent) { nil }
 
-    it { should equal(object) }
+    it { is_expected.to equal(object) }
 
     it 'includes changes from the parent' do
       expect { subject }.to_not change { object.to_set }

data/spec/unit/virtus/attribute_spec.rb

@@ -23,8 +23,8 @@ describe Virtus, '#attribute' do
   end
 
   shared_examples_for 'an object with string attribute' do
-    it { should respond_to(:test) }
-    it { should respond_to(:test=) }
+    it { is_expected.to respond_to(:test) }
+    it { is_expected.to respond_to(:test=) }
 
     it 'can write and read the attribute' do
       subject.test = :foo
@@ -218,8 +218,8 @@ describe Virtus, '#attribute' do
       }
     }
 
-    it { should respond_to(:test) }
-    it { should respond_to(:test=) }
+    it { is_expected.to respond_to(:test) }
+    it { is_expected.to respond_to(:test=) }
 
     it 'writes and reads attributes' do
       subject.test = :foo

data/spec/unit/virtus/element_reader_spec.rb

@@ -17,5 +17,5 @@ describe Virtus, '#[]' do
     object.test = 'foo'
   end
 
-  it { should eq('foo') }
+  it { is_expected.to eq('foo') }
 end

data/spec/unit/virtus/freeze_spec.rb

@@ -15,10 +15,17 @@ describe Virtus, '#freeze' do
 
   let(:object) { model.new }
 
-  it { should be_frozen }
+  it { is_expected.to be_frozen }
 
-  its(:name) { should eql('foo') }
-  its(:age)  { should be(30) }
+  describe '#name' do
+    subject { super().name }
+    it { is_expected.to eql('foo') }
+  end
+
+  describe '#age' do
+    subject { super().age }
+    it { is_expected.to be(30) }
+  end
 
   it "does not change dynamic default values" do
     original_value = object.rand

data/spec/unit/virtus/model_spec.rb

@@ -148,8 +148,8 @@ describe Virtus, '.model' do
         model.send(:include, mod)
       end
 
-      it { should_not respond_to(:attributes) }
-      it { should_not respond_to(:attributes=) }
+      it { is_expected.not_to respond_to(:attributes) }
+      it { is_expected.not_to respond_to(:attributes=) }
     end
 
     context 'with an instance' do
@@ -159,8 +159,39 @@ describe Virtus, '.model' do
         subject.extend(mod)
       end
 
-      it { should_not respond_to(:attributes) }
-      it { should_not respond_to(:attributes=) }
+      it { is_expected.not_to respond_to(:attributes) }
+      it { is_expected.not_to respond_to(:attributes=) }
+    end
+  end
+
+  context 'when :required is set' do
+    let(:mod)   { Virtus.model(:required => false) }
+    let(:model) { Class.new }
+
+    context 'with a class' do
+      subject { model.new }
+
+      before do
+        model.send(:include, mod)
+        model.attribute :name, String
+      end
+
+      it 'has attributes with :required option inherited from module' do
+        expect(model.attribute_set[:name]).to_not be_required
+      end
+    end
+
+    context 'with an instance' do
+      subject { model.new }
+
+      before do
+        subject.extend(mod)
+        subject.attribute :name, String
+      end
+
+      it 'has attributes with strict set to true' do
+        expect(subject.send(:attribute_set)[:name]).not_to be_required
+      end
     end
   end
 end

data/spec/unit/virtus/set_default_attributes_spec.rb

@@ -18,8 +18,15 @@ describe Virtus, '#set_default_attributes!' do
     object.set_default_attributes!
   end
 
-  it { should be(object) }
+  it { is_expected.to be(object) }
 
-  its(:name) { should eql('foo') }
-  its(:age)  { should be(30) }
+  describe '#name' do
+    subject { super().name }
+    it { is_expected.to eql('foo') }
+  end
+
+  describe '#age' do
+    subject { super().age }
+    it { is_expected.to be(30) }
+  end
 end

data/spec/unit/virtus/value_object_spec.rb

@@ -6,8 +6,15 @@ describe Virtus::ValueObject do
 
     let(:attributes) { Hash[:id => 1, :name => 'Jane Doe'] }
 
-    its(:id)   { should be(1) }
-    its(:name) { should eql('Jane Doe') }
+    describe '#id' do
+      subject { super().id }
+      it { is_expected.to be(1) }
+    end
+
+    describe '#name' do
+      subject { super().name }
+      it { is_expected.to eql('Jane Doe') }
+    end
 
     it 'sets private writers' do
       expect(subject.class.attribute_set[:id]).to_not be_public_writer
@@ -95,7 +102,10 @@ describe Virtus::ValueObject do
 
           let(:attributes) { Hash[:id => 1, :name => 'Jane Doe', :email => 'jane@doe.com'] }
 
-          its(:email) { should eql('jane@doe.com') }
+          describe '#email' do
+            subject { super().email }
+            it { is_expected.to eql('jane@doe.com') }
+          end
 
           it 'sets private writers for additional values' do
             expect(subclass.attribute_set[:email]).to_not be_public_writer

data/virtus.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/virtus/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "virtus"
-  gem.version     = Virtus::VERSION
+  gem.version     = Virtus::VERSION.dup
   gem.authors     = [ "Piotr Solnica" ]
   gem.email       = [ "piotr.solnica@gmail.com" ]
   gem.description = "Attributes on Steroids for Plain Old Ruby Objects"
@@ -18,7 +18,9 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w[LICENSE README.md TODO.md]
 
   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')
+  gem.add_dependency('equalizer', '~> 0.0', '>= 0.0.9')
+  gem.add_dependency('coercible', '~> 1.0')
+  gem.add_dependency('axiom-types', '~> 0.1')
+
+  gem.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descendants_tracker
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Attributes on Steroids for Plain Old Ruby Objects
 email:
 - piotr.solnica@gmail.com
@@ -98,17 +112,11 @@ files:
 - CONTRIBUTING.md
 - Changelog.md
 - Gemfile
-- Gemfile.devtools
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - TODO.md
-- config/flay.yml
-- config/flog.yml
-- config/mutant.yml
-- config/reek.yml
-- config/yardstick.yml
 - lib/virtus.rb
 - lib/virtus/attribute.rb
 - lib/virtus/attribute/accessor.rb

data/Gemfile.devtools

@@ -1,71 +0,0 @@
-# encoding: utf-8
-
-group :development do
-  gem 'rake',       '~> 10.3.2'
-  gem 'rspec',      '~> 3.0.0'
-  gem 'rspec-its',  '~> 1.0.1'
-  gem 'yard',       '~> 0.8.7.4'
-
-  platform :rbx do
-    gem 'rubysl-singleton', '~> 2.0.0'
-  end
-end
-
-group :yard do
-  gem 'kramdown', '~> 1.3.3'
-end
-
-group :guard do
-  gem 'guard',         '~> 2.6.1'
-  gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.9'
-  gem 'guard-rubocop', '~> 1.1.0'
-
-  # file system change event handling
-  gem 'listen',     '~> 2.7.7'
-  gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.4', require: false
-  gem 'rb-inotify', '~> 0.9.5', require: false
-
-  # notification handling
-  gem 'libnotify',               '~> 0.8.3', require: false
-  gem 'rb-notifu',               '~> 0.0.4', require: false
-  gem 'terminal-notifier-guard', '~> 1.5.3', require: false
-end
-
-group :metrics do
-  gem 'coveralls', '~> 0.7.0'
-  gem 'flay',      '~> 2.5.0'
-  gem 'flog',      '~> 4.2.1'
-  gem 'reek',      '~> 1.3.7'
-  gem 'rubocop',   '~> 0.23.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.9'
-
-  platforms :mri do
-    gem 'mutant',       '~> 0.5.23'
-    gem 'mutant-rspec', '~> 0.5.21'
-  end
-
-  platforms :ruby_19, :ruby_20 do
-    gem 'yard-spellcheck', '~> 0.1.5'
-  end
-
-  platform :rbx do
-    gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.11'
-    gem 'rubysl-logger',      '~> 2.0.0'
-    gem 'rubysl-open-uri',    '~> 2.0.0'
-    gem 'rubysl-prettyprint', '~> 2.0.3'
-  end
-end
-
-group :benchmarks do
-  gem 'rbench', '~> 0.2.3'
-end
-
-platform :jruby do
-  group :jruby do
-    gem 'jruby-openssl', '~> 0.9.4'
-  end
-end

data/config/flay.yml

@@ -1,3 +0,0 @@
----
-threshold: 24
-total_score: 437

data/config/flog.yml

@@ -1,2 +0,0 @@
----
-threshold: 33

data/config/mutant.yml

@@ -1,15 +0,0 @@
----
-name: virtus
-namespace:
-  - 'Virtus::Attribute'
-  - 'Virtus::AttributeSet'
-  - 'Virtus::Builder'
-  - 'Virtus::ClassInclusions'
-  - 'Virtus::ClassMethods'
-  - 'Virtus::Configuration'
-  - 'Virtus::ConstMissingExtensions'
-  - 'Virtus::Extensions'
-  - 'Virtus::InstanceMethods'
-  - 'Virtus::Model'
-  - 'Virtus::ModuleExtensions'
-  - 'Virtus::ValueObject'

data/config/reek.yml

@@ -1,146 +0,0 @@
----
-Attribute:
-  enabled: false
-BooleanParameter:
-  enabled: true
-  exclude: []
-ClassVariable:
-  enabled: true
-  exclude: []
-ControlParameter:
-  enabled: true
-  exclude:
-    - 'Virtus::InstanceMethods::Constructor#initialize'
-DataClump:
-  enabled: true
-  max_copies: 2
-  min_clump_size: 2
-  exclude:
-    - 'Virtus::AttributeSet'
-DuplicateMethodCall:
-  enabled: false
-FeatureEnvy:
-  enabled: true
-  exclude:
-    - 'Virtus::Attribute::Boolean#value_coerced?'
-    - 'Virtus::AttributeSet#get'
-    - 'Virtus::AttributeSet#set'
-    - 'Virtus::AttributeSet#skip_default?'
-    - 'Virtus::Builder#add_extended_hook'
-    - 'Virtus::Builder#add_included_hook'
-    - 'Virtus::InstanceMethods#assert_valid_name'
-    - 'Virtus::TypeLookup#determine_type_from_primitive'
-IrresponsibleModule:
-  enabled: true
-  exclude: []
-LongParameterList:
-  enabled: true
-  exclude:
-    - 'Virtus::AttributeSet#define_reader_method'
-    - 'Virtus::AttributeSet#define_writer_method'
-    - 'Virtus::Extensions::Methods#attribute'
-    - 'Virtus::ModuleExtensions#attribute'
-    - 'Virtus::ModuleExtensions#self.setup'
-    - 'Virtus::ValueObject::ClassMethods#attribute'
-  max_params: 2
-LongYieldList:
-  enabled: true
-  exclude: []
-  max_params: 2
-NestedIterators:
-  enabled: true
-  max_allowed_nesting: 1
-  ignore_iterators: []
-  exclude:
-    - 'Virtus::Builder#add_extended_hook'
-    - 'Virtus::Builder#add_included_hook'
-    - 'Virtus::ModuleBuilder#add_included_hook'
-    - 'Virtus::Equalizer#define_cmp_method'
-    - 'Virtus::Equalizer#define_hash_method'
-    - 'Virtus::Equalizer#define_inspect_method'
-NilCheck:
-  enabled: true
-  exclude:
-    - 'Virtus::Attribute::EmbeddedValue::FromOpenStruct#call'
-    - 'Virtus::Attribute::EmbeddedValue::FromStruct#call'
-    - 'Virtus::Attribute::Strict#coerce'
-    - 'Virtus::Options#options'
-    - 'Virtus::TypeLookup#determine_type_from_primitive'
-RepeatedConditional:
-  enabled: true
-  max_ifs: 1
-  exclude:
-    - 'Virtus::AttributeSet'
-    - 'Virtus::Builder'
-TooManyInstanceVariables:
-  enabled: true
-  max_instance_variables: 3
-  exclude:
-    - 'Virtus::Attribute'
-    - 'Virtus::Attribute::Builder'
-    - 'Virtus::Configuration'
-TooManyMethods:
-  enabled: true
-  max_methods: 6
-  exclude:
-    - 'Virtus::Equalizer'
-    - 'Virtus::Builder'
-    - 'Virtus::Attribute'
-    - 'Virtus::AttributeSet'
-TooManyStatements:
-  enabled: true
-  max_statements: 4
-  exclude:
-    - 'Virtus#self.included'
-    - 'Virtus::Attribute::Builder#self.determine_type'
-    - 'Virtus::Attribute::Collection#self.infer'
-    - 'Virtus::Attribute::Hash#self.infer'
-    - 'Virtus::Builder#add_extended_hook'
-    - 'Virtus::Builder#add_included_hook'
-    - 'Virtus::ModuleBuilder#add_included_hook'
-    - 'Virtus::ClassInclusions#self.included'
-    - 'Virtus::ClassMethods#self.extended'
-    - 'Virtus::Extensions#self.extended'
-    - 'Virtus::ModuleExtensions#included'
-    - 'Virtus::TypeLookup#determine_type_from_primitive'
-    - 'Virtus::ValueObject#self.included'
-UncommunicativeMethodName:
-  enabled: true
-  reject:
-  - !ruby/regexp /^[a-z]$/
-  - !ruby/regexp /[0-9]$/
-  - !ruby/regexp /[A-Z]/
-UncommunicativeModuleName:
-  enabled: true
-  exclude: []
-  reject:
-  - !ruby/regexp /^.$/
-  - !ruby/regexp /[0-9]$/
-  accept: []
-UncommunicativeParameterName:
-  enabled: true
-  exclude: []
-  reject:
-  - !ruby/regexp /^.$/
-  - !ruby/regexp /[0-9]$/
-  - !ruby/regexp /[A-Z]/
-  accept: ['_']
-UncommunicativeVariableName:
-  enabled: true
-  exclude: []
-  reject:
-  - !ruby/regexp /^.$/
-  - !ruby/regexp /[0-9]$/
-  - !ruby/regexp /[A-Z]/
-  accept: []
-UnusedParameters:
-  enabled: true
-  exclude: []
-UtilityFunction:
-  enabled: true
-  max_helper_calls: 0
-  exclude:
-    - 'Virtus::Attribute::Boolean#value_coerced?'
-    - 'Virtus::AttributeSet#set_default'
-    - 'Virtus::AttributeSet#skip_default?'
-    - 'Virtus::Extensions::Methods#merge_options'