vector_spec.rb in daru-0.0.3.1

- old
+ new

@@ -1,52 +1,52 @@
 require 'spec_helper.rb'
 
 describe Daru::Vector do
   context "#initialize" do
     it "initializes from an Array" do
-      dv = Daru::Vector.new :ravan, [1,2,3,4,5], [:ek, :don, :teen, :char, :pach]
+      dv = Daru::Vector.new [1,2,3,4,5], name: :ravan, index: [:ek, :don, :teen, :char, :pach]
 
       expect(dv.name) .to eq(:ravan)
       expect(dv.index).to eq(Daru::Index.new [:ek, :don, :teen, :char, :pach])
     end
 
     it "accepts Index object" do
       idx = Daru::Index.new [:yoda, :anakin, :obi, :padme, :r2d2]
 
-      dv = Daru::Vector.new :yoga, [1,2,3,4,5], idx
+      dv = Daru::Vector.new [1,2,3,4,5], name: :yoga, index: idx
 
       expect(dv.name) .to eq(:yoga)
       expect(dv.index).to eq(idx)
     end
 
     it "raises error for improper Index" do
       expect {
-        dv = Daru::Vector.new :yoga, [1,2,3,4,5], [:i, :j, :k]
+        dv = Daru::Vector.new [1,2,3,4,5], name: :yoga, index: [:i, :j, :k]
       }.to raise_error
 
       expect {
         idx = Daru::Index.new [:i, :j, :k]
-        dv  = Daru::Vector.new :yoga, [1,2,3,4,5], idx 
+        dv  = Daru::Vector.new [1,2,3,4,5], name: :yoda, index: idx 
       }.to raise_error
     end
 
     it "initializes without specifying an index" do
-      dv = Daru::Vector.new :vishnu, [1,2,3,4,5]
+      dv = Daru::Vector.new [1,2,3,4,5], name: :vishnu
 
       expect(dv.index).to eq(Daru::Index.new [0,1,2,3,4])
     end
 
     it "inserts nils for extra indices" do
-      dv = Daru::Vector.new :yoga, [1,2,3], [0,1,2,3,4]
+      dv = Daru::Vector.new [1,2,3], name: :yoga, index: [0,1,2,3,4]
 
       expect(dv).to eq([1,2,3,nil,nil].dv(:yoga))
     end
   end
 
   context "#[]" do
     before :each do
-      @dv = Daru::Vector.new :yoga, [1,2,3,4,5], [:yoda, :anakin, :obi, :padme, :r2d2]
+      @dv = Daru::Vector.new [1,2,3,4,5], name: :yoga, index: [:yoda, :anakin, :obi, :padme, :r2d2]
     end
 
     it "returns an element after passing an index" do
       expect(@dv[:yoda]).to eq(1)
     end
@@ -54,18 +54,18 @@
     it "returns an element after passing a numeric index" , :focus => true do
       expect(@dv[0]).to eq(1)
     end
 
     it "returns a vector with given indices for multiple indices" do
-      expect(@dv[:yoda, :anakin]).to eq(Daru::Vector.new(:yoga, [1,2], 
-        [:yoda, :anakin]))
+      expect(@dv[:yoda, :anakin]).to eq(Daru::Vector.new([1,2], name: :yoda, 
+        index: [:yoda, :anakin]))
     end
   end
 
   context "#[]=" do
     before :each do
-      @dv = Daru::Vector.new :yoga, [1,2,3,4,5], [:yoda, :anakin, :obi, :padme, :r2d2]
+      @dv = Daru::Vector.new [1,2,3,4,5], name: :yoga, index: [:yoda, :anakin, :obi, :padme, :r2d2]
     end
 
     it "assigns at the specified index" do
       @dv[:yoda] = 666
 
@@ -79,11 +79,11 @@
     end
   end
 
   context "#concat" do
     before :each do
-      @dv = Daru::Vector.new :yoga, [1,2,3,4,5], [:warwick, :thompson, :jackson, :fender, :esp]
+      @dv = Daru::Vector.new [1,2,3,4,5], name: :yoga, index: [:warwick, :thompson, :jackson, :fender, :esp]
     end
 
     it "concatenates a new element at the end of vector with index" do
       @dv.concat 6, :ibanez
 
@@ -92,11 +92,11 @@
       expect(@dv[:ibanez]).to eq(6)
       expect(@dv[5])      .to eq(6)
     end
 
     it "concatenates without index if index is default numeric" do
-      vector = Daru::Vector.new :nums, [1,2,3,4,5]
+      vector = Daru::Vector.new [1,2,3,4,5], name: :nums
 
       vector.concat 6
 
       expect(vector.index).to eq([0,1,2,3,4,5].to_index)
       expect(vector[5])   .to eq(6)
@@ -109,46 +109,46 @@
     end
   end
 
   context "#delete" do
     it "deletes specified value in the vector" do
-      dv = Daru::Vector.new :a, [1,2,3,4,5]
+      dv = Daru::Vector.new [1,2,3,4,5], name: :a
 
       dv.delete 3
 
-      expect(dv).to eq(Daru::Vector.new :a, [1,2,4,5])
+      expect(dv).to eq(Daru::Vector.new [1,2,4,5], name: :a)
     end
   end
 
   context "#delete_at" do
     before :each do
-      @dv = Daru::Vector.new :a, [1,2,3,4,5], [:one, :two, :three, :four, :five]
+      @dv = Daru::Vector.new [1,2,3,4,5], name: :a, index: [:one, :two, :three, :four, :five]
     end
 
     it "deletes element of specified index" do
       @dv.delete_at :one
 
-      expect(@dv).to eq(Daru::Vector.new :a, [2,3,4,5], [:two, :three, :four, :five])
+      expect(@dv).to eq(Daru::Vector.new [2,3,4,5], name: :a, index: [:two, :three, :four, :five])
     end
 
     it "deletes element of specified integer index" do
       @dv.delete_at 2
 
-      expect(@dv).to eq(Daru::Vector.new :a, [1,2,4,5], [:one, :two, :four, :five])
+      expect(@dv).to eq(Daru::Vector.new [1,2,4,5], name: :a, index: [:one, :two, :four, :five])
     end
   end
 
   context "#index_of" do
     it "returns index of specified value" do
-      dv = Daru::Vector.new :a, [1,2,3,4,5], [:one, :two, :three, :four, :five]
+      dv = Daru::Vector.new [1,2,3,4,5], name: :a, index: [:one, :two, :three, :four, :five]
 
       expect(dv.index_of(1)).to eq(:one)
     end
   end
 
   context "#to_hash" do
     it "returns the vector as a hash" do
-      dv = Daru::Vector.new :a, [1,2,3,4,5], [:one, :two, :three, :four, :five]
+      dv = Daru::Vector.new [1,2,3,4,5], name: :a, index: [:one, :two, :three, :four, :five]
 
       expect(dv.to_hash).to eq({one: 1, two: 2, three: 3, four: 4, five: 5})
     end
   end
 end if mri?
\ No newline at end of file