Fixes for 1.8.7 and jruby

.travis.yml

@@ -1,3 +1,5 @@
 script: "bundle exec rspec spec/"
 rvm:
+  - 1.8.7
   - 1.9.2
+  - jruby

lib/virtus/class_methods.rb

@@ -1,20 +1,5 @@
 module Virtus
   module ClassMethods
-    # Chains Class.new to be able to set attributes during initialization of
-    # an object.
-    #
-    # @param [Hash] attributes
-    #   the attributes hash to be set
-    #
-    # @return [Object]
-    #
-    # @api private
-    def new(attributes = {})
-      model = super
-      model.attributes = attributes
-      model
-    end
-
     # Defines an attribute on an object's class.
     #
     # Usage:

lib/virtus/instance_methods.rb

@@ -1,5 +1,18 @@
 module Virtus
   module InstanceMethods
+    # Chains Class.new to be able to set attributes during initialization of
+    # an object.
+    #
+    # @param [Hash] attributes
+    #   the attributes hash to be set
+    #
+    # @return [Object]
+    #
+    # @api private
+    def initialize(attributes = {})
+      self.attributes = attributes
+    end
+
     # Returns a value of the attribute with the given name
     #
     # @param [Symbol] name
@@ -13,7 +26,6 @@ def attribute_get(name)
       __send__(name)
     end
 
-
     # Sets a value of the attribute with the given name
     #
     # @param [Symbol] name

spec/integration/virtus/class_methods/attribute_spec.rb

@@ -25,35 +25,35 @@
     end
 
     it "creates attribute writer" do
-      described_class.public_instance_methods.should include(:"name=")
+      described_class.public_instance_methods.should include('name=')
     end
 
     it "creates attribute reader" do
-      described_class.public_instance_methods.should include(:name)
+      described_class.public_instance_methods.should include('name')
     end
 
     it "creates attribute private reader when :accessor => :private" do
-      described_class.private_instance_methods.should include(:email)
+      described_class.private_instance_methods.should include('email')
     end
 
     it "creates attribute private writer when :accessor => :private" do
-      described_class.private_instance_methods.should include(:"email=")
+      described_class.private_instance_methods.should include('email=')
     end
 
     it "creates attribute protected reader when :accessor => :protected" do
-      described_class.protected_instance_methods.should include(:address)
+      described_class.protected_instance_methods.should include('address')
     end
 
     it "creates attribute protected writer when :accessor => :protected" do
-      described_class.protected_instance_methods.should include(:"address=")
+      described_class.protected_instance_methods.should include('address=')
     end
 
     it "creates attribute private reader when :reader => :private" do
-      described_class.private_instance_methods.should include(:age)
+      described_class.private_instance_methods.should include('age')
     end
 
     it "creates attribute protected writer when :writer => :protected" do
-      described_class.protected_instance_methods.should include(:"bday=")
+      described_class.protected_instance_methods.should include('bday=')
     end
   end
 end

spec/unit/virtus/attributes/date_spec.rb

@@ -26,7 +26,7 @@
 
     context 'with a time' do
       it_should_behave_like "a correct date" do
-        let(:value) { Time.new(year, month, day) }
+        let(:value) { Time.local(year, month, day) }
       end
     end
 

spec/unit/virtus/attributes/time_spec.rb

@@ -64,7 +64,7 @@
     end
 
     context 'with a non-date value' do
-      let(:value) { 'non-date' }
+      let(:value) { '2999' }
       it { should == value }
     end
   end

spec/unit/virtus/class_methods/new_spec.rb

@@ -16,7 +16,8 @@ def self.new(attributes)
         model
       end
 
-      def initialize(a=nil)
+      def initialize(attributes = {})
+        super
         @email = "john@domain.com"
       end
     end