31 files changed, 648 insertions, 203 deletions

diff --git a/spec/ruby/core/struct/clone_spec.rb b/spec/ruby/core/struct/clone_spec.rb
new file mode 100644
index 0000000000..40c4d52d57
--- /dev/null
+++ b/spec/ruby/core/struct/clone_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/classes'
+require_relative 'shared/dup'
+
+describe "Struct-based class#clone" do
+  it_behaves_like :struct_dup, :clone
+end
diff --git a/spec/ruby/core/struct/constants_spec.rb b/spec/ruby/core/struct/constants_spec.rb
new file mode 100644
index 0000000000..7e8af1a211
--- /dev/null
+++ b/spec/ruby/core/struct/constants_spec.rb
@@ -0,0 +1,13 @@
+require_relative '../../spec_helper'
+
+describe "Struct::Group" do
+  it "is no longer defined" do
+    Struct.should_not.const_defined?(:Group)
+  end
+end
+
+describe "Struct::Passwd" do
+  it "is no longer defined" do
+    Struct.should_not.const_defined?(:Passwd)
+  end
+end
diff --git a/spec/ruby/core/struct/deconstruct_keys_spec.rb b/spec/ruby/core/struct/deconstruct_keys_spec.rb
new file mode 100644
index 0000000000..590e1ab40b
--- /dev/null
+++ b/spec/ruby/core/struct/deconstruct_keys_spec.rb
@@ -0,0 +1,130 @@
+require_relative '../../spec_helper'
+
+describe "Struct#deconstruct_keys" do
+  it "returns a hash of attributes" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([:x, :y]).should == {x: 1, y: 2}
+  end
+
+  it "requires one argument" do
+    struct = Struct.new(:x)
+    obj = struct.new(1)
+
+    -> {
+      obj.deconstruct_keys
+    }.should.raise(ArgumentError, /wrong number of arguments \(given 0, expected 1\)/)
+  end
+
+  it "returns only specified keys" do
+    struct = Struct.new(:x, :y, :z)
+    s = struct.new(1, 2, 3)
+
+    s.deconstruct_keys([:x, :y]).should == {x: 1, y: 2}
+    s.deconstruct_keys([:x]    ).should == {x: 1}
+    s.deconstruct_keys([]      ).should == {}
+  end
+
+  it "accepts string attribute names" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys(['x', 'y']).should == {'x' => 1, 'y' => 2}
+  end
+
+  it "accepts argument position number as well but returns them as keys" do
+    struct = Struct.new(:x, :y, :z)
+    s = struct.new(10, 20, 30)
+
+    s.deconstruct_keys([0, 1, 2]).should == {0 => 10, 1 => 20, 2 => 30}
+    s.deconstruct_keys([0, 1]   ).should == {0 => 10, 1 => 20}
+    s.deconstruct_keys([0]      ).should == {0 => 10}
+    s.deconstruct_keys([-1]     ).should == {-1 => 30}
+  end
+
+  it "ignores incorrect position numbers" do
+    struct = Struct.new(:x, :y, :z)
+    s = struct.new(10, 20, 30)
+
+    s.deconstruct_keys([0, 3]).should == {0 => 10}
+  end
+
+  it "support mixing attribute names and argument position numbers" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([0, :x]).should == {0 => 1, :x => 1}
+  end
+
+  it "returns an empty hash when there are more keys than attributes" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([:x, :y, :a]).should == {}
+  end
+
+  it "returns at first not existing attribute name" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([:a, :x]).should == {}
+    s.deconstruct_keys([:x, :a]).should == {x: 1}
+  end
+
+  it "returns at first not existing argument position number" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    s.deconstruct_keys([3, 0]).should == {}
+    s.deconstruct_keys([0, 3]).should == {0 => 1}
+  end
+
+  it "accepts nil argument and return all the attributes" do
+    struct = Struct.new(:x, :y)
+    obj = struct.new(1, 2)
+
+    obj.deconstruct_keys(nil).should == {x: 1, y: 2}
+  end
+
+  it "tries to convert a key with #to_int if index is not a String nor a Symbol, but responds to #to_int" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return(1)
+
+    s.deconstruct_keys([key]).should == { key => 2 }
+  end
+
+  it "raises a TypeError if the conversion with #to_int does not return an Integer" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    key = mock("to_int")
+    key.should_receive(:to_int).and_return("not an Integer")
+
+    -> {
+      s.deconstruct_keys([key])
+    }.should raise_consistent_error(TypeError, /can't convert MockObject into Integer/)
+  end
+
+  it "raises TypeError if index is not a String, a Symbol and not convertible to Integer" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    -> {
+      s.deconstruct_keys([0, []])
+    }.should.raise(TypeError, "no implicit conversion of Array into Integer")
+  end
+
+  it "raise TypeError if passed anything except nil or array" do
+    struct = Struct.new(:x, :y)
+    s = struct.new(1, 2)
+
+    -> { s.deconstruct_keys('x') }.should.raise(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys(1)   }.should.raise(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys(:x)  }.should.raise(TypeError, /expected Array or nil/)
+    -> { s.deconstruct_keys({})  }.should.raise(TypeError, /expected Array or nil/)
+  end
+end
diff --git a/spec/ruby/core/struct/deconstruct_spec.rb b/spec/ruby/core/struct/deconstruct_spec.rb
new file mode 100644
index 0000000000..aad82ac2ba
--- /dev/null
+++ b/spec/ruby/core/struct/deconstruct_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+
+describe "Struct#deconstruct" do
+  it "is an alias of Struct#to_a" do
+    Struct.instance_method(:deconstruct).should == Struct.instance_method(:to_a)
+  end
+end
diff --git a/spec/ruby/core/struct/dig_spec.rb b/spec/ruby/core/struct/dig_spec.rb
index 4e39e5a4ef..52e4d1dd9a 100644
--- a/spec/ruby/core/struct/dig_spec.rb
+++ b/spec/ruby/core/struct/dig_spec.rb
@@ -10,6 +10,16 @@ describe "Struct#dig" do
     @instance.dig(:a, :a).should == { b: [1, 2, 3] }
   end
 
+  it "accepts String keys" do
+    @instance.dig('a', 'a').should == { b: [1, 2, 3] }
+  end
+
+  it "returns the value by the index" do
+    instance = Struct.new(:a, :b).new(:one, :two)
+    instance.dig(0).should == :one
+    instance.dig(1).should == :two
+  end
+
   it "returns the nested value specified if the sequence includes an index" do
     @instance.dig(:a, :a, :b, 0).should == 1
   end
@@ -22,11 +32,11 @@ describe "Struct#dig" do
     instance = @klass.new(1)
     -> {
       instance.dig(:a, 3)
-    }.should raise_error(TypeError)
+    }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError if no arguments provided" do
-    -> { @instance.dig }.should raise_error(ArgumentError)
+    -> { @instance.dig }.should.raise(ArgumentError)
   end
 
   it "calls #dig on any intermediate step with the rest of the sequence as arguments" do
diff --git a/spec/ruby/core/struct/dup_spec.rb b/spec/ruby/core/struct/dup_spec.rb
index cb54b7ceee..8b50c39014 100644
--- a/spec/ruby/core/struct/dup_spec.rb
+++ b/spec/ruby/core/struct/dup_spec.rb
@@ -1,8 +1,11 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative 'shared/dup'
 
 describe "Struct-based class#dup" do
 
+  it_behaves_like :struct_dup, :dup
+
   # From https://github.com/jruby/jruby/issues/3686
   it "retains an included module in the ancestor chain for the struct's singleton class" do
     klass = Struct.new(:foo)
diff --git a/spec/ruby/core/struct/each_pair_spec.rb b/spec/ruby/core/struct/each_pair_spec.rb
index 1230ca9026..db146c81e9 100644
--- a/spec/ruby/core/struct/each_pair_spec.rb
+++ b/spec/ruby/core/struct/each_pair_spec.rb
@@ -21,11 +21,11 @@ describe "Struct#each_pair" do
   end
 
   it "returns self if passed a block" do
-    @car.each_pair {}.should equal(@car)
+    @car.each_pair {}.should.equal?(@car)
   end
 
   it "returns an Enumerator if not passed a block" do
-    @car.each_pair.should be_an_instance_of(Enumerator)
+    @car.each_pair.should.instance_of?(Enumerator)
   end
 
   it_behaves_like :struct_accessor, :each_pair
diff --git a/spec/ruby/core/struct/each_spec.rb b/spec/ruby/core/struct/each_spec.rb
index 41c0fbd4d0..4fbdfee02a 100644
--- a/spec/ruby/core/struct/each_spec.rb
+++ b/spec/ruby/core/struct/each_spec.rb
@@ -19,7 +19,7 @@ describe "Struct#each" do
 
   it "returns an Enumerator if not passed a block" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    car.each.should be_an_instance_of(Enumerator)
+    car.each.should.instance_of?(Enumerator)
   end
 
   it_behaves_like :struct_accessor, :each
diff --git a/spec/ruby/core/struct/element_reference_spec.rb b/spec/ruby/core/struct/element_reference_spec.rb
index 0f6d547f66..b94f3aae8c 100644
--- a/spec/ruby/core/struct/element_reference_spec.rb
+++ b/spec/ruby/core/struct/element_reference_spec.rb
@@ -3,7 +3,7 @@ require_relative 'fixtures/classes'
 
 describe "Struct[]" do
   it "is a synonym for new" do
-    StructClasses::Ruby['2.0', 'i686'].should be_kind_of(StructClasses::Ruby)
+    StructClasses::Ruby['2.0', 'i686'].should.is_a?(StructClasses::Ruby)
   end
 end
 
@@ -26,20 +26,20 @@ describe "Struct#[]" do
 
   it "fails when it does not know about the requested attribute" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car[3]        }.should raise_error(IndexError)
-    -> { car[-4]       }.should raise_error(IndexError)
-    -> { car[:body]    }.should raise_error(NameError)
-    -> { car['wheels'] }.should raise_error(NameError)
+    -> { car[3]        }.should.raise(IndexError)
+    -> { car[-4]       }.should.raise(IndexError)
+    -> { car[:body]    }.should.raise(NameError)
+    -> { car['wheels'] }.should.raise(NameError)
   end
 
   it "fails if passed too many arguments" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car[:make, :model] }.should raise_error(ArgumentError)
+    -> { car[:make, :model] }.should.raise(ArgumentError)
   end
 
   it "fails if not passed a string, symbol, or integer" do
     car = StructClasses::Car.new('Ford', 'Ranger')
-    -> { car[Object.new] }.should raise_error(TypeError)
+    -> { car[Object.new] }.should.raise(TypeError)
   end
 
   it "returns attribute names that contain hyphens" do
diff --git a/spec/ruby/core/struct/element_set_spec.rb b/spec/ruby/core/struct/element_set_spec.rb
index 6ba7b081a9..e5438ca09a 100644
--- a/spec/ruby/core/struct/element_set_spec.rb
+++ b/spec/ruby/core/struct/element_set_spec.rb