virtus 1.0.1 → 1.0.2

data/.travis.yml

@@ -1,16 +1,18 @@
 language: ruby
 before_install: gem install bundler
 bundler_args: --without yard guard benchmarks
-script: "bundle exec rake spec"
+script: "bundle exec rake metrics:coverage spec:integration"
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx
   - ruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: rbx
 notifications:
   email:
     - piotr.solnica@gmail.com

data/Changelog.md

@@ -1,9 +1,17 @@
-# v1.0.0 2013-12-10
+# v1.0.2 2014-12-03
+
+* [improvement] Don’t override already-defined default values when freezing (amarshall)
+* [improvement] Improved performance of `AttributeSet#each` (Antti)
+* updated axiom-types dependency to ~> 0.1 (solnic)
+
+[Compare v1.0.1..v1.0.2](https://github.com/solnic/virtus/compare/v1.0.1...v1.0.2)
+
+# v1.0.1 2013-12-10
 
 * [feature] re-introduce `ValueObject#with`, which was removed in the past (senny)
 * [fixed] strict mode for Boolean type (solnic)
 
-[Compare v1.0.0..master](https://github.com/solnic/virtus/compare/v1.0.0...master)
+[Compare v1.0.0..v1.0.1](https://github.com/solnic/virtus/compare/v1.0.0...v1.0.1)
 
 # v1.0.0 2013-10-16
 

data/Gemfile.devtools

@@ -1,24 +1,28 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.7'
+  gem 'rake',       '~> 10.1.0'
+  gem 'rspec',      '~> 2.14.1'
+  gem 'rspec-core', '~> 2.14.8'
+  gem 'yard',       '~> 0.8.7'
+
+  platform :rbx do
+    gem 'rubysl-singleton', '~> 2.0.0'
+  end
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.2.0'
+  gem 'kramdown', '~> 1.3.2'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.8.1'
-  gem 'guard-bundler', '~> 1.0.0'
-  gem 'guard-rspec',   '~> 3.0.2'
-  gem 'guard-rubocop', '~> 0.2.0'
-  gem 'guard-mutant',  '~> 0.0.1'
+  gem 'guard',         '~> 2.4.0'
+  gem 'guard-bundler', '~> 2.0.0'
+  gem 'guard-rspec',   '~> 4.2.6'
+  gem 'guard-rubocop', '~> 1.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 1.3.0'
+  gem 'listen',     '~> 2.5.0'
   gem 'rb-fchange', '~> 0.0.6', require: false
   gem 'rb-fsevent', '~> 0.9.3', require: false
   gem 'rb-inotify', '~> 0.9.0', require: false
@@ -30,17 +34,24 @@ group :guard do
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.6.7'
+  gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
-  gem 'flog',      '~> 4.1.1'
+  gem 'flog',      '~> 4.2.0'
   gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.13.0'
-  gem 'simplecov', '~> 0.7.1'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'yardstick', '~> 0.9.9'
 
   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'
+    gem 'rubysl-logger',      '~> 2.0.0'
+    gem 'rubysl-open-uri',    '~> 2.0.0'
+    gem 'rubysl-prettyprint', '~> 2.0.2'
+  end
 end
 
 group :benchmarks do

data/README.md

@@ -6,12 +6,14 @@ Virtus
 [![Dependency Status](https://gemnasium.com/solnic/virtus.png)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/solnic/virtus.png)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/solnic/virtus/badge.png?branch=master)][coveralls]
+[![Inline docs](http://inch-pages.github.io/github/solnic/virtus.png)][inchpages]
 
 [gem]: https://rubygems.org/gems/virtus
 [travis]: https://travis-ci.org/solnic/virtus
 [gemnasium]: https://gemnasium.com/solnic/virtus
 [codeclimate]: https://codeclimate.com/github/solnic/virtus
 [coveralls]: https://coveralls.io/r/solnic/virtus
+[inchpages]: http://inch-pages.github.io/github/solnic/virtus
 
 This is a partial extraction of the DataMapper [Property
 API](http://rubydoc.info/github/datamapper/dm-core/master/DataMapper/Property)
@@ -427,48 +429,6 @@ user.set_unique_id('1234-1234')
 user.unique_id # => '1234-1234'
 ```
 
-Coercions
----------
-
-Virtus uses [Coercible](https://github.com/solnic/coercible) for coercions. This
-feature is turned on by default. You can turn it off for all attributes like that:
-
-```ruby
-# Turn coercions off globally
-Virtus.coerce(false)
-
-# ...or you can turn it off for a single attribute
-class User
-  include Virtus.model
-
-  attribute :name, String, :coerce => false
-end
-```
-
-You can configure coercers too:
-
-```ruby
-Virtus.coercer do |config|
-  config.string.boolean_map = { 'yup' => true, 'nope' => false }
-end
-
-# Virtus.coercer instance is used by default for all attributes.
-# You *can* override it for a single attribute if you want:
-
-my_cool_coercer = Coercible::Coercer.new do |config|
-  # some customization
-end
-
-class User
-  include Virtus.model
-
-  attribute :name, String, :coercer => my_cool_coercer
-end
-```
-
-Please check out [Coercible README](https://github.com/solnic/coercible/blob/master/README.md)
-for more information.
-
 ## Strict Coercion Mode
 
 By default Virtus returns the input value even when it couldn't coerce it to the expected type.
@@ -562,27 +522,3 @@ Contributing
 * Commit, do not mess with Rakefile or version
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
-
-License
--------
-
-Copyright (c) 2011-2013 Piotr Solnica
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/virtus/attribute/accessor.rb

@@ -34,6 +34,17 @@ module Virtus
         descendant.instance_variable_set('@instance_variable_name', "@#{name}")
       end
 
+      # Return if attribute value is defined
+      #
+      # @param [Object] instance
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def defined?(instance)
+        instance.instance_variable_defined?(instance_variable_name)
+      end
+
       # Return value of the attribute
       #
       # @param [Object] instance

data/lib/virtus/attribute_set.rb

@@ -43,7 +43,7 @@ module Virtus
     # @api public
     def each
       return to_enum unless block_given?
-      @index.values.uniq.each { |attribute| yield attribute }
+      @index.each { |name, attribute| yield attribute if name.kind_of?(Symbol) }
       self
     end
 
@@ -209,7 +209,7 @@ module Virtus
 
     # @api private
     def skip_default?(object, attribute)
-      attribute.lazy? || object.instance_variable_defined?(attribute.instance_variable_name)
+      attribute.lazy? || attribute.defined?(object)
     end
 
     # Merge the attributes into the index

data/lib/virtus/instance_methods.rb

@@ -191,7 +191,7 @@ module Virtus
     #
     # @api public
     def set_default_attributes!
-      attribute_set.set_defaults(self, proc { |_| false })
+      attribute_set.set_defaults(self, proc { |object, attribute| attribute.defined?(object) })
       self
     end
 

data/lib/virtus/support/equalizer.rb

@@ -65,7 +65,7 @@ module Virtus
     def define_hash_method
       keys = @keys
       define_method(:hash) do
-        keys.map { |key| send(key).hash }.reduce(self.class.hash, :^)
+        keys.map { |key| send(key) }.push(self.class).hash
       end
     end
 

data/lib/virtus/version.rb

@@ -1,3 +1,3 @@
 module Virtus
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ if ENV['COVERAGE'] == 'true'
     add_filter       'config/'
     add_filter       'spec'
     add_filter       '.bundle'
-    minimum_coverage 98
   end
 end
 

data/spec/unit/virtus/attribute/defined_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Virtus::Attribute, '#defined?' do
+  subject { object.defined?(instance) }
+
+  let(:object) { described_class.build(String, :name => name) }
+
+  let(:model)    { Class.new { attr_accessor :test } }
+  let(:name)     { :test }
+  let(:instance) { model.new }
+
+  context 'when the attribute value has not been defined' do
+    it { should be(false) }
+  end
+
+  context 'when the attribute value has been defined' do
+    before { instance.test = nil }
+    it { should be(true) }
+  end
+end

data/spec/unit/virtus/freeze_spec.rb

@@ -9,6 +9,7 @@ describe Virtus, '#freeze' do
 
       attribute :name, String,  :default => 'foo', :lazy => true
       attribute :age,  Integer, :default => 30
+      attribute :rand, Float,   :default => Proc.new { rand }
     }
   }
 
@@ -18,4 +19,16 @@ describe Virtus, '#freeze' do
 
   its(:name) { should eql('foo') }
   its(:age)  { should be(30) }
+
+  it "does not change dynamic default values" do
+    original_value = object.rand
+    object.freeze
+    expect(object.rand).to eq original_value
+  end
+
+  it "does not change default attributes that have been explicitly set" do
+    object.rand = 3.14
+    object.freeze
+    expect(object.rand).to eq 3.14
+  end
 end

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.1')
-  gem.add_dependency('equalizer',           '~> 0.0.7')
+  gem.add_dependency('descendants_tracker', '~> 0.0.3')
+  gem.add_dependency('equalizer',           '~> 0.0.9')
   gem.add_dependency('coercible',           '~> 1.0')
-  gem.add_dependency('axiom-types',         '~> 0.0.5')
+  gem.add_dependency('axiom-types',         '~> 0.1')
 end

metadata

@@ -1,46 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: virtus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-03-12 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.1
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        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.7
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: coercible
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,17 +62,19 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: axiom-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.1'
 description: Attributes on Steroids for Plain Old Ruby Objects
 email:
 - piotr.solnica@gmail.com
@@ -163,6 +172,7 @@ files:
 - spec/unit/virtus/attribute/collection/class_methods/build_spec.rb
 - spec/unit/virtus/attribute/collection/coerce_spec.rb
 - spec/unit/virtus/attribute/custom_collection_spec.rb
+- spec/unit/virtus/attribute/defined_spec.rb
 - spec/unit/virtus/attribute/embedded_value/class_methods/build_spec.rb
 - spec/unit/virtus/attribute/embedded_value/coerce_spec.rb
 - spec/unit/virtus/attribute/get_spec.rb
@@ -199,26 +209,27 @@ 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: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Attributes on Steroids for Plain Old Ruby Objects
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6888ad6cccbdd89e1d41781ceafcc78502aea7d6
-  data.tar.gz: 6638f3068fdee7c541917a7171501a79be0077ea
-SHA512:
-  metadata.gz: de43cc6cccde89c7009fcb77301e34aa062aea154cfbffc2655efd28d35e41bf0cb0eec547b522cc16861ea66805a7594fa532f2d147366dee5482ae69a9f73f
-  data.tar.gz: 982101e49074af9ce296b4a647e9855e94dd327d7ab35196fb542201d83503b2c2e75e9d4e074e01e5e1565943f26f05b1784c8cca4501d5b638f6ff1992bbe7