virtus 0.0.8 → 0.0.9

data/.travis.yml

@@ -4,11 +4,83 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
-  - rbx-2.0
+  - ruby-head
   - ree
   - jruby
-  - ruby-head
+  - rbx
+env:
+  -
+  - JRUBY_OPTS="--1.8"
+  - JRUBY_OPTS="--1.9"
+  - RBXOPT="-X18"
+  - RBXOPT="-X19"
+matrix:
+  exclude:
+    # exclude 1.8.7
+    - rvm: 1.8.7
+      env: JRUBY_OPTS="--1.8"
+    - rvm: 1.8.7
+      env: JRUBY_OPTS="--1.9"
+    - rvm: 1.8.7
+      env: RBXOPT="-X18"
+    - rvm: 1.8.7
+      env: RBXOPT="-X19"
+
+    # exclude 1.9.2
+    - rvm: 1.9.2
+      env: JRUBY_OPTS="--1.8"
+    - rvm: 1.9.2
+      env: JRUBY_OPTS="--1.9"
+    - rvm: 1.9.2
+      env: RBXOPT="-X18"
+    - rvm: 1.9.2
+      env: RBXOPT="-X19"
+
+    # exclude 1.9.3
+    - rvm: 1.9.3
+      env: JRUBY_OPTS="--1.8"
+    - rvm: 1.9.3
+      env: JRUBY_OPTS="--1.9"
+    - rvm: 1.9.3
+      env: RBXOPT="-X18"
+    - rvm: 1.9.3
+      env: RBXOPT="-X19"
+
+    # exclude ruby-head
+    - rvm: ruby-head
+      env: JRUBY_OPTS="--1.8"
+    - rvm: ruby-head
+      env: JRUBY_OPTS="--1.9"
+    - rvm: ruby-head
+      env: RBXOPT="-X18"
+    - rvm: ruby-head
+      env: RBXOPT="-X19"
+
+    # exclude ree
+    - rvm: ree
+      env: JRUBY_OPTS="--1.8"
+    - rvm: ree
+      env: JRUBY_OPTS="--1.9"
+    - rvm: ree
+      env: RBXOPT="-X18"
+    - rvm: ree
+      env: RBXOPT="-X19"
+
+    # exclude jruby
+    - rvm: jruby
+      env:
+    - rvm: jruby
+      env: RBXOPT="-X18"
+    - rvm: jruby
+      env: RBXOPT="-X19"
+
+    # exclude rbx
+    - rvm: rbx
+      env:
+    - rvm: rbx
+      env: JRUBY_OPTS="--1.8"
+    - rvm: rbx
+      env: JRUBY_OPTS="--1.9"
 notifications:
   email:
     - piotr.solnica@gmail.com

data/History.md

@@ -1,9 +1,15 @@
 # v0.0.8 to-be-released
 
+* [fixed] Fix in type lookup for anonymous classes (dkubb)
+
+[Compare v0.0.8..master](https://github.com/solnic/virtus/compare/v0.0.8...master)
+
+# v0.0.8 2011-08-25
+
 * [fixed] Fixed conflict with ActiveModel (RichGuk)
 * [changed] Renamed Coercion::String.to_class => Coercion::String.to_constant (emmanuel)
 
-[Compare v0.0.7..master](https://github.com/solnic/virtus/compare/v0.0.7...master)
+[Compare v0.0.7..master](https://github.com/solnic/virtus/compare/v0.0.7...v0.0.8)
 
 # v0.0.7 2011-07-31
 

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/lib/virtus/support/type_lookup.rb

@@ -64,7 +64,14 @@ module Virtus
     #
     # @api private
     def determine_type_from_primitive(primitive)
-      descendants.detect { |descendant| primitive <= descendant.primitive }
+      type = nil
+
+      descendants.reverse_each do |descendant|
+        next unless primitive <= descendant.primitive
+        type = descendant if type.nil? || type.primitive > descendant.primitive
+      end
+
+      type
     end
 
     # Return the class given a string
@@ -83,7 +90,7 @@ module Virtus
       end
     end
 
-    if RUBY_VERSION < '1.9'
+    if RUBY_VERSION < '1.9' || RUBY_ENGINE == 'rbx'
       def determine_type_from_string(string)
         if string =~ TYPE_FORMAT && const_defined?(string)
           const_get(string)

data/spec/unit/virtus/type_lookup/determine_type_spec.rb

@@ -3,21 +3,34 @@ require 'spec_helper'
 describe Virtus::TypeLookup, '#determine_type' do
   subject { object.determine_type(class_or_name) }
 
-  let(:object) do
+  let!(:object) do
     Class.new do
       extend Virtus::DescendantsTracker
       extend Virtus::TypeLookup
     end
   end
 
-  let(:descendant) do
-    object.const_set :String, Class.new(object) {
-      def self.primitive
-        ::String
-      end
+  let!(:default) do
+    object.const_set :Object, Class.new(object) {
+      def self.primitive() ::Object end
     }
   end
 
+  let!(:descendant) do
+    object.const_set :String, Class.new(default) {
+      def self.primitive() ::String end
+    }
+  end
+
+  # add a default subclass to the top of the stack
+  let!(:extra) { Class.new(default) }
+
+  # assert the classes are subclassed in a specific order that will trigger
+  # the bug that this commit fixes. Do not remove or change the order below.
+  it 'has the descendants in the expected order' do
+    object.descendants.should == [ extra, descendant, default ]
+  end
+
   context 'with a TypeLookup class' do
     context 'when the argument is a descendant of the object' do
       let(:class_or_name) { descendant }
@@ -42,7 +55,7 @@ describe Virtus::TypeLookup, '#determine_type' do
     context 'when the argument is an unknown class' do
       let(:class_or_name) { Class.new }
 
-      it { should be_nil }
+      it { should equal(default) }
     end
   end
 

data/virtus.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{virtus}
-  s.version = "0.0.8"
+  s.name = "virtus"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Piotr Solnica}]
-  s.date = %q{2011-08-25}
-  s.description = %q{Attributes for your plain ruby objects}
-  s.email = [%q{piotr@rubyverse.com}]
+  s.authors = ["Piotr Solnica"]
+  s.date = "2011-10-11"
+  s.description = "Attributes for your plain ruby objects"
+  s.email = ["piotr@rubyverse.com"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md",
@@ -166,10 +166,10 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "virtus.gemspec"
   ]
-  s.homepage = %q{https://github.com/solnic/virtus}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Attributes for your plain ruby objects}
+  s.homepage = "https://github.com/solnic/virtus"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Attributes for your plain ruby objects"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,82 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: virtus
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: &70244296925160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  name: backports
   type: :development
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70244296925160
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70244296924200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  name: jeweler
   type: :development
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70244296924200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70244296923000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
-  name: rspec
   type: :development
   prerelease: false
-  requirement: *id003
+  version_requirements: *70244296923000
 description: Attributes for your plain ruby objects
-email: 
+email:
 - piotr@rubyverse.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - TODO
-files: 
+files:
 - .rvmrc
 - .travis.yml
 - .yardopts
@@ -226,36 +203,29 @@ files:
 - virtus.gemspec
 homepage: https://github.com/solnic/virtus
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4092436988871240492
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Attributes for your plain ruby objects
 test_files: []
-