orders 0.0.2 → 0.0.3

data/HISTORY

@@ -9,3 +9,7 @@
 == 0.0.2 / 2011-03-19
 
 * Namespace renamed to Orders
+
+== 0.0.3 / 2011-03-19
+
+* Feature-parity with legacy code

data/README.rdoc

@@ -20,7 +20,7 @@ Data structures need to be:
 
 == INSTALL:
 
-  $ sudo gem install order_book
+  $ sudo gem install orders
 
 == LICENSE:
 Copyright (c) 2011 Arvicco. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/orders/indexed_list.rb

@@ -22,9 +22,18 @@ module Orders
       self
     end
 
-    # Calls #remove for each item in list
+    # Removes item with given index from the list
+    def delete_by_index index
+      remove self[index] if self[index]
+    end
+
+    # Removes either all items, or items for which given block returns trueish value
     def clear
-      each_value { |item| remove item }
+      if block_given?
+        each {|item| remove item if yield item}
+      else
+        each_value { |item| remove item }
+      end
     end
 
     # Yields list items in order of their index

data/lib/orders/order_book.rb

@@ -18,6 +18,7 @@ module Orders
     def add item
       if item.price > 0
         @changed = true # Marking DOM as changed
+        item.order_book = self
         super
       else
         self
@@ -27,6 +28,7 @@ module Orders
     # Does not call super!
     def remove item
       @changed = true if delete index item # Marking DOM as changed
+      item.order_book = nil
       self
     end
   end

data/lib/orders/order_list.rb

@@ -16,8 +16,17 @@ module Orders
     end
 
     def add item
-      @order_books[item.isin_id] ||= Orders::OrderBook.new item.isin_id
+      order_book = @order_books[item.isin_id] ||= Orders::OrderBook.new(item.isin_id)
+      old_item = self[index item]
+      remove old_item if old_item # Remove old item with the same index(id)
+      order_book.add item         # Add item to appropriate order book
       super
     end
+
+    def remove item
+      # Removing item from appropriate order book when it's deleted from order list
+      @order_books[item.isin_id].remove item if delete index item
+      self
+    end
   end
 end

data/spec/orders/indexed_list_spec.rb

@@ -8,6 +8,7 @@ describe Orders::IndexedList do
   before(:each) do
     @item = Object.new
     @item1 = Object.new
+    @item2 = Object.new
   end
 
   it_behaves_like 'index_list'

data/spec/orders/order_book_spec.rb

@@ -7,8 +7,9 @@ describe Orders::OrderBook do
 
   before(:each) do
     @item = Orders::OrderBookItem.new :id => 0, :price => 20
-    @item1 = Orders::OrderBookItem.new :id => 1, :price => 10
-    @zero_price_item = Orders::OrderBookItem.new :id => 2, :price => 0
+    @item1 = Orders::OrderBookItem.new :id => 1, :price => 15
+    @item2 = Orders::OrderBookItem.new :id => 2, :price => 10
+    @zero_price_item = Orders::OrderBookItem.new :id => 3, :price => 0
   end
 
   it_behaves_like 'index_list'
@@ -37,6 +38,12 @@ describe Orders::OrderBook do
         subject.add(@zero_price_item)
         subject.changed.should == false
       end
+
+      it 'does not set item`s order_book property' do
+        subject.remove(@zero_price_item)
+        @zero_price_item.order_book.should == nil
+      end
+
     end
 
     it 'sets changed status to true if item was added' do
@@ -44,6 +51,10 @@ describe Orders::OrderBook do
       subject.changed.should == true
     end
 
+    it 'sets added item`s order_book property' do
+      subject.add(@item1)
+      @item1.order_book.should == subject
+    end
   end
 
   describe 'removing item' do
@@ -57,6 +68,11 @@ describe Orders::OrderBook do
       subject.changed.should == true
     end
 
+    it 'unsets removed item`s order_book property' do
+      subject.remove(@item)
+      @item.order_book.should == nil
+    end
+
     context 'that is not in list' do
 
       it 'returns self' do

data/spec/orders/order_list_spec.rb

@@ -2,16 +2,61 @@ require 'spec_helper'
 require 'spec_helper'
 require 'orders/shared_examples.rb'
 
-#noinspection RubyResolve
+shared_examples_for 'adding_item_to_order_books' do
+  it_behaves_like 'creating_order_books'
+
+  it 'adds this item to appropriate order book' do
+    subject.add new_item
+    order_book = subject.order_books[new_item.isin_id]
+    order_book.should have_key new_item.price
+    order_book[new_item.price].should == new_item
+  end
+end
+
+shared_examples_for 'not_adding_item_to_order_books' do
+  it_behaves_like 'creating_order_books'
+
+  it 'does not add this item to order list' do
+    subject.add new_item
+    order_book = subject.order_books[new_item.isin_id]
+    order_book.should_not have_key new_item.price
+    order_book[new_item.price].should == nil
+  end
+end
+
+shared_examples_for 'creating_order_books' do
+  it 'creates appropriate order book' do
+    subject.add(new_item)
+    subject.order_books.should have(expected_number_of_books).books
+    order_book = subject.order_books[new_item.isin_id]
+    order_book.should be_an Orders::OrderBook
+    order_book.isin_id.should == new_item.isin_id
+  end
+
+  it 'sets item`s order_book property correctly' do
+    subject.add(new_item)
+    if new_item.price == 0
+      new_item.order_book.should == nil
+    else
+      order_book = subject.order_books[new_item.isin_id]
+      new_item.order_book.should == order_book
+    end
+  end
+end
+
 describe Orders::OrderList do
   subject { Orders::OrderList.new }
   let(:item_index) { @item.id }
 
   before(:each) do
-    @item = Orders::OrderBookItem.new :id => 0, :price => 20
-    @item1 = Orders::OrderBookItem.new :id => 1, :price => 10
-    @zero_price_item = Orders::OrderBookItem.new :id => 2, :price => 0
-    @repeat_zero_price_item = Orders::OrderBookItem.new :id => 0, :price => 0
+    @item = Orders::OrderBookItem.new :isin_id => 1234, :id => 0, :price => 20
+    @item1 = Orders::OrderBookItem.new :isin_id => 1234, :id => 1, :price => 10
+    @same_isin_item = @item1
+    @item2 = Orders::OrderBookItem.new :isin_id => 5678, :id => 2, :price => 10
+    @diff_isin_item = @item2
+    @zero_price_item = Orders::OrderBookItem.new :isin_id => 1234, :id => 3, :price => 0
+    @repeat_item = Orders::OrderBookItem.new :isin_id => 1234, :id => 0, :price => 13
+    @repeat_zero_price_item = Orders::OrderBookItem.new :isin_id => 1234, :id => 0, :price => 0
   end
 
   it_behaves_like 'index_list'
@@ -19,38 +64,75 @@ describe Orders::OrderList do
   specify { subject.order_books.should be_empty }
 
   describe 'adding item' do
+    let(:expected_number_of_books) { 1 }
+
     context 'to empty OrderList' do
-      it 'creates appropriate order book' do
-        subject.add(@item)
-        subject.order_books.should_not be_empty
-        subject.order_books[@item.isin_id].should be_an Orders::OrderBook
-        subject.order_books.should have(1).book
-      end
+      let(:new_item) { @item }
+
+      it_behaves_like 'adding_item_to_order_books'
 
+      context 'with zero price' do
+        let(:new_item) { @zero_price_item }
+
+        it_behaves_like 'not_adding_item_to_order_books'
+      end
     end
 
     context 'to non-empty OrderList' do
       before(:each) do
         subject.add(@item).size.should == 1
       end
+
+      context 'with existing isin' do
+        let(:new_item) { @same_isin_item }
+
+        it_behaves_like 'adding_item_to_order_books'
+      end
+
+      context 'with different isin' do
+        let(:new_item) { @diff_isin_item }
+        let(:expected_number_of_books) { 2 }
+
+        it_behaves_like 'adding_item_to_order_books'
+      end
+
+      context 'with zero price' do
+        let(:new_item) { @zero_price_item }
+
+        it_behaves_like 'not_adding_item_to_order_books'
+      end
+
+      context 'with repeat isin/id and non-zero price' do
+        let(:new_item) { @repeat_item }
+
+        it_behaves_like 'adding_item_to_order_books'
+
+        it 'changes price of item in list' do
+          subject.add new_item
+          subject[item_index].price.should_not == @item.price
+          subject[item_index].price.should == @repeat_item.price
+        end
+
+        it 'removes old item from appropriate order book' do
+          subject.add new_item
+          order_book = subject.order_books[@item.isin_id]
+          order_book.should_not have_key @item.price
+        end
+      end
+
+      context 'with repeat isin/id and zero price' do
+        let(:new_item) { @repeat_zero_price_item }
+
+        it_behaves_like 'not_adding_item_to_order_books'
+
+        it 'removes old item from appropriate order book' do
+          subject.add new_item
+          order_book = subject.order_books[@item.isin_id]
+          order_book.should_not have_key @item.price
+        end
+      end
     end
-#    context 'with zero price' do
-#      it 'returns self' do
-#        subject.add(@zero_price_item).should == subject
-#      end
-#
-#      it 'does not add such item to the list' do
-#        subject.add(@zero_price_item)
-#        subject[subject.index @zero_price_item].should == nil
-#        subject.size.should == 1
-#      end
-#
-#      it 'does not set changed status to true' do
-#        subject.add(@zero_price_item)
-#        subject.changed.should == false
-#      end
-#    end
-#
+
     it 'sets changed status to true if item was added' do
       subject.add(@item1)
     end
@@ -58,27 +140,40 @@ describe Orders::OrderList do
   end
 
   describe 'removing item' do
-#    before(:each) do
-#      subject.add(@item).size.should == 1
-##      @item.order_book?
-#    end
-#
-#    it 'sets changed status to true if item was removed' do
-#      subject.remove(@item)
-#      subject.changed.should == true
-#    end
-#
-#    context 'that is not in list' do
-#
-#      it 'returns self' do
-#        subject.remove(@item1).should == subject
-#      end
-#
-#      it 'does not set changed status to true' do
-#        subject.remove(@item1)
-#        subject.changed.should == false
-#      end
-#    end
+    before(:each) do
+      subject.add(@item).size.should == 1
+    end
+
+    context 'with existing item' do
+      let(:unwanted_item) { @item }
+      let(:expected_size) { 0 }
+
+      it 'deletes item from the list' do
+        subject.remove(unwanted_item)
+        subject[unwanted_item.id].should == nil
+        subject.size.should == expected_size
+      end
+
+      it 'removes item from its related order book' do
+        subject.remove(unwanted_item)
+        subject.order_books[unwanted_item.isin_id].should_not have_key unwanted_item.price
+      end
+    end
+
+    context 'with non-existing item' do
+      let(:unwanted_item) { @item1 }
+      let(:expected_size) { 1 }
+
+      it 'still returns the list itself' do
+        subject.remove(unwanted_item).should == subject
+      end
+
+      it 'deletes nothing from the list' do
+        subject.remove(unwanted_item)
+        subject[@item.id].should == @item
+        subject.size.should == expected_size
+      end
+    end
   end
 end
 

data/spec/orders/shared_examples.rb

@@ -43,29 +43,112 @@ shared_examples_for 'index_list' do
   describe '#remove' do
     before(:each) { subject.add(@item).add(@item1).size.should == 2 }
 
-    it 'returns self for easy method chaining' do
-      subject.remove(@item).should == subject
+    context 'removing existing item' do
+      it 'returns self for easy method chaining' do
+        subject.remove(@item).should == subject
+      end
+
+      it 'removes item from indexed list' do
+        subject.remove(@item)
+        subject.values.should_not include @item
+        subject[item_index].should == nil
+      end
+
+      it 'does not remove other items' do
+        subject.remove(@item)
+        subject.values.should include @item1
+        subject.size.should == 1
+      end
     end
 
-    it 'removes item from indexed list' do
-      subject.remove(@item)
-      subject.values.should_not include @item
-      subject[item_index].should == nil
-      subject.size.should == 1
+    context 'deleting non-existing items by index' do
+      it 'still returns self' do
+        subject.remove(@item2).should == subject
+      end
+
+      it 'removes nothing from the list' do
+        subject.remove(@item2)
+        subject.values.should include @item, @item1
+        subject.size.should == 2
+      end
+    end
+  end
+
+  describe '#delete_by_index' do
+    before(:each) { subject.add(@item).add(@item1) }
+    context 'deleting existing item by index' do
+
+      it 'returns self' do
+        subject.delete_by_index(item_index).should == subject
+      end
+
+      it 'deletes item with given index from the list' do
+        subject.delete_by_index(item_index)
+        subject.values.should_not include @item
+        subject[item_index].should == nil
+      end
+
+      it 'calls #remove on this item to properly remove it' do
+        subject.should_receive(:remove).with(@item)
+        subject.delete_by_index(item_index)
+      end
+
+      it 'does not remove other items' do
+        subject.delete_by_index(item_index)
+        subject.values.should include @item1
+        subject.size.should == 1
+      end
+    end
+
+    context 'deleting non-existing items by index' do
+      it 'returns nil' do
+        subject.delete_by_index(subject.index @item2).should == nil
+      end
+
+      it 'removes nothing from the list' do
+        subject.delete_by_index(subject.index @item2)
+        subject.values.should include @item, @item1
+        subject.size.should == 2
+      end
     end
   end
 
   describe '#clear' do
     before(:each) { subject.add(@item).add(@item1) }
 
-    it 'removes all items from list' do
-      subject.clear
-      subject.should be_empty
+    context 'without block' do
+      it 'removes all items from list' do
+        subject.clear
+        subject.should be_empty
+      end
+
+      it 'ensures that #remove method is called once for each item in list' do
+        subject.should_receive(:remove).twice
+        subject.clear
+      end
     end
 
-    it 'ensures that #remove method is called once for each item in list' do
-      subject.should_receive(:remove).twice
-      subject.clear
+    context 'with block given' do
+      it 'yields items from list in index order' do
+        @count = 0
+        @items = []
+        subject.clear do |item|
+          @count += 1
+          @items << item
+        end
+        @count.should == 2
+        if subject.index(@item) < subject.index(@item1)
+          @items.should == [@item, @item1]
+        else
+          @items.should == [@item1, @item]
+        end
+      end
+
+      it 'only removes items for which given block returns true' do
+        subject.should_receive(:remove).once
+        subject.clear { |item| true if item == @item1 }
+        subject.should have_key item_index
+      end
     end
   end
 
@@ -74,24 +157,17 @@ shared_examples_for 'index_list' do
 
     it 'yields items from list in index order' do
       @count = 0
+      @items = []
       subject.each do |item|
         @count += 1
-        case @count
-          when 1
-            if subject.index(@item) < subject.index(@item1)
-              item.should == @item
-            else
-              item.should == @item1
-            end
-          when 2
-            if subject.index(@item) < subject.index(@item1)
-              item.should == @item1
-            else
-              item.should == @item
-            end
-        end
+        @items << item
       end
       @count.should == 2
+      if subject.index(@item) < subject.index(@item1)
+        @items.should == [@item, @item1]
+      else
+        @items.should == [@item1, @item]
+      end
     end
 
     it 'returns list item in array, sorted by their index, if no block given' do

metadata

@@ -2,7 +2,7 @@
 name: orders
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - arvicco