wherever-positions 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/wherever.rb

@@ -7,6 +7,7 @@ require 'wherever/wherever/adder'
 require 'wherever/wherever/getter'
 require 'wherever/wherever/lookup'
 require 'wherever/wherever/mark'
+require 'wherever/wherever/recalculate'
 require 'wherever/wherever'
 require 'wherever/configure'
 require 'wherever/wherever/adder'

data/lib/wherever/wherever.rb

@@ -7,6 +7,7 @@ class Wherever
   include Adder
   include Getter
   include Lookup
+  include Recalculate
   include Mark
   attr_reader :config, :marker
   
@@ -24,9 +25,17 @@ class Wherever
         end
       end
     end
-    
+    @summing = {}
     if options['method_logging']
       MethodLogging.add(self.class)
     end
   end
+  
+  def add_grouping(&grouping)
+    @grouping = grouping
+  end
+  
+  def add_summing(key, options)
+    @summing[key] = options
+  end
 end

data/lib/wherever/wherever/lookup.rb

@@ -37,34 +37,7 @@ class Wherever
       lookup.lookups[get_marker(keys)] = (version || lookup.current)
       lookup.save
     end
-    
-    def recalculate(name)
-      keys = get_lookup(name).keys
-      config.key_groups.each do |group|
-        if keys & group != keys
-          get_key_store(*group).datasets.delete_all
-        end
-      end
-      
-      identifier_set.datasets.all.each do |record|
-        @grouping.call(record.values, nil, record, config.keys)
-        record.save!
-        config.key_groups.each do |group|
-          if keys & group != keys
-            for_group(group, record.values, record, false)
-          end
-        end
-      end
-      config.key_groups.each do |group|
-        if keys & group == keys
-          get_key_store(*group).datasets.all.each do |record|
-            @grouping.call(record.values, nil, record, group)
-            record.save!
-          end
-        end
-      end
-    end
-    
+        
     def get_lookup_record(name, marker)
       lookup = get_lookup(name)
       return [lookup, lookup.versions.find_or_create_by(:name => lookup.lookups[marker])]

data/lib/wherever/wherever/recalculate.rb

@@ -0,0 +1,57 @@
+class Wherever
+  module Recalculate
+    def recalculate(name)
+      keys = get_lookup(name).keys
+      
+      recalculate_identifier
+
+      groups = config.key_groups
+      groups_with_key, groups_without_key = groups.partition do |group|
+        group & keys == keys
+      end
+      
+      groups_with_key.each do |group|
+        recalculate_with_key(group)
+      end
+      
+      @summing.each do |group, options|
+        groups_without_key.delete(group)
+        get_key_store(*group).datasets.delete_all
+        sum_group_for(StringHelper.add_method_to_id(group, false), options)
+      end
+      groups_without_key.each do |group|
+        get_key_store(*group).datasets.delete_all
+        identifier_set.datasets.all.each do |record|
+          for_group(group, record.values, record, false)
+        end
+      end
+    end
+
+    def sum_group_for(group, options)
+      group_by = options['group_by'] || lambda do |record| 
+        group.inject({}) { |r, v| r[v.to_id] = record[v.to_id]; r }
+      end
+      summer = options['summer'] || raise('Summer must be set.')
+      source = options['source'] || ['identifier']
+      
+      grouped = get_key_store(*source).datasets.all.group_by{|record| group_by.call(record)}
+      grouped.map do |key, records|
+        get_key_store(*group).datasets.create(key.merge(summer.call(records)))
+      end
+    end
+    
+    def recalculate_identifier
+      identifier_set.datasets.all.each do |record|
+        @grouping.call(record.values, nil, record, config.keys)
+        record.save!
+      end
+    end
+    
+    def recalculate_with_key(group)
+      get_key_store(*group).datasets.all.each do |record|
+        @grouping.call(record.values, nil, record, group)
+        record.save!
+      end
+    end
+  end
+end

data/spec/wherever/add_grouping_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Wherever, 'with a custom grouping' do
+  let(:create_options) { ["keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id"] }
+  let(:wherever) { Wherever.new(*create_options) }
+  
+  before do
+    wherever.add_grouping do |values, data, record, keys|
+      values["settled"] += data["settled"]
+      values["unsettled"] += data["settled"] * -2.5
+    end
+  end
+
+  context 'add a record' do
+    let(:keys) { ["fund"] }
+    let(:key_groups) { nil }
+    let(:options) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2}} }
+
+    before do
+      wherever.add({"settled" => 100, "unsettled" => 0}, options)
+    end
+    
+    it 'the identifier record' do
+      wherever.get_key_store("identifier").datasets.all.should ==
+          [DbStore::Dataset.new("values" => {"unsettled" => -250, "settled" => 100}, "fund_id" => 2, "version" => 1, "trade_id" => 12)] 
+    end
+
+    it 'the grouped record' do
+      wherever.get_key_store("fund").datasets.all.should ==
+          [DbStore::Dataset.new("values" => {"unsettled" => -250, "settled" => 100}, "fund_id" => 2)] 
+    end
+  end
+  
+  context 'get a record' do
+    let(:keys) { ["fund", "security"] }
+    let(:key_groups) { ["fund"] }
+    let(:options_one) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 14}} }
+    let(:options_two) { {"unique" => {"trade_id" => 15, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 14}} }
+
+    before do
+      wherever.add({"settled" => 100, "unsettled" => 0}, options_one)
+    end
+    
+    it 'gets the value for a non key field' do
+      wherever.get("security_id" => 14).should == {"settled" => 100, "unsettled" => -250}
+    end
+    
+    it 'gets the value for a non key field when multiple records' do
+      wherever.add({"settled" => 200, "unsettled" => 0}, options_two)
+      wherever.get("security_id" => 14).should == {"settled" => 300, "unsettled" => -750}
+    end
+  end
+end

data/spec/wherever/add_summing_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Wherever, 'with a custom grouping' do
+  let(:create_options) { ["keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id"] }
+  let(:wherever) { Wherever.new(*create_options) }
+  
+  before do
+    wherever.add_grouping do |values, data, record, keys|
+      if data
+        values["settled"] += data["settled"]
+        values["unsettled"] += data["settled"] * -2.5
+      end
+    end
+
+    summer = lambda do |records|
+      settled = records.sum{|r| r.values['settled']}
+      unsettled = records.sum{|r| r.values['unsettled']}
+      {'values' => {'settled' => 2 * settled, 'unsettled' => 2 * unsettled } }
+    end
+    wherever.add_summing(['fund', 'technical_instrument'], 'summer' => summer)
+    wherever.add_summing(['fund'], 'summer' => summer)
+    wherever.create_lookup('price', ["technical_instrument"])
+  end
+
+  context 'add a record' do
+    let(:keys) { ["fund"] }
+    let(:key_groups) { nil }
+    let(:options) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2, "technical_instrument_id" => 14}} }
+
+    before do
+      wherever.add({"settled" => 100, "unsettled" => 0}, options)
+      wherever.set_price('current', {4 => 12.5})
+    end
+    
+    it 'the identifier record' do
+      wherever.get_key_store("identifier").datasets.all.to_a.should ==
+          [DbStore::Dataset.new("values" => {"unsettled" => -250, "settled" => 100}, 
+                      "fund_id" => 2, "technical_instrument_id" => 14, "version" => 1, "trade_id" => 12)] 
+    end
+
+    it 'the grouped record' do
+      wherever.get_key_store("fund").datasets.all.to_a.should ==
+          [DbStore::Dataset.new("values" => {"unsettled" => -500, "settled" => 200}, "fund_id" => 2)] 
+    end
+  end
+  
+  context 'get a record' do
+    let(:keys) { ["fund", "technical_instrument"] }
+    let(:key_groups) { ["fund"] }
+    let(:options_one) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2, "technical_instrument_id" => 14}} }
+    let(:options_two) { {"unique" => {"trade_id" => 15, "version" => 1}, "keys" => {"fund_id" => 2, "technical_instrument_id" => 14}} }
+
+    before do
+      wherever.add({"settled" => 100, "unsettled" => 0}, options_one)
+      wherever.set_price('current', {4 => 12.5})
+    end
+    
+    it 'gets the value for a non key field' do
+      wherever.get("technical_instrument_id" => 14).should == {"settled" => 100, "unsettled" => -250}
+    end
+    
+    it 'gets the value for a non key field when multiple records' do
+      wherever.add({"settled" => 200, "unsettled" => 0}, options_two)
+      wherever.get("technical_instrument_id" => 14).should == {"settled" => 300, "unsettled" => -750}
+    end
+  end
+end

data/spec/wherever/full_run_spec.rb

@@ -1,29 +1,30 @@
 require 'spec_helper'
 
 describe Wherever, 'run file test' do
-  let(:wherever) do
-    Wherever.new("keys" => keys, "database" => 'wherever_test',
-                 "key_groups" => key_groups, "key" => "trade_id")  do |values, data, record, keys|
+  let(:wherever) { Wherever.new("keys" => keys, "database" => 'wherever_test',
+               "key_groups" => key_groups, "key" => "trade_id") }
+  let(:keys) { ["fund", "technical_instrument"] }
+  let(:key_groups) { [["fund"], ["fund", "technical_instrument"]] }
+    
+  before do
+    wherever.add_grouping do |values, data, record, keys|
       price = wherever.get_price('current', record)
-      if keys.include?("technical_instrument")
-        values["position"] ||= 0
-        values["position"] += data["position"] if data
-        values["price"] =  price
-      end
+      values["price"] =  price
       if data
+        values["position"] ||= 0
+        values["position"] += data["position"] 
         values["trade_value"] ||= 0
-        values["trade_value"] += data["position"] * price
+        values["trade_value"] += data["position"] * price 
       else
-        debugger unless values["position"]
-        debugger unless price 
         values["trade_value"] = values["position"] * price 
       end
     end
-  end
-  let(:keys) { ["fund", "technical_instrument"] }
-#  let(:key_groups) { [["fund"], ["fund", "technical_instrument"]] }
-  let(:key_groups) { [["fund"]] }
-  before do
+
+    summer = lambda do |records|
+      trade_value = records.sum{|r| r.values['trade_value']}
+      {'values' => {'trade_value' => trade_value } }
+    end
+    wherever.add_summing(['fund'], 'summer' => summer, 'source' => ['fund', 'technical_instrument'])
     wherever.create_lookup('price', ["technical_instrument"])
   end
   

data/wherever-positions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wherever-positions}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]
@@ -45,9 +45,12 @@ Gem::Specification.new do |s|
     "lib/wherever/wherever/getter.rb",
     "lib/wherever/wherever/lookup.rb",
     "lib/wherever/wherever/mark.rb",
+    "lib/wherever/wherever/recalculate.rb",
     "spec/data/test_file_1.script",
     "spec/method_logging_spec.rb",
     "spec/spec_helper.rb",
+    "spec/wherever/add_grouping_spec.rb",
+    "spec/wherever/add_summing_spec.rb",
     "spec/wherever/adder_spec.rb",
     "spec/wherever/custom_grouping_spec.rb",
     "spec/wherever/full_run_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wherever-positions
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - David Henry
@@ -202,9 +202,12 @@ files:
 - lib/wherever/wherever/getter.rb
 - lib/wherever/wherever/lookup.rb
 - lib/wherever/wherever/mark.rb
+- lib/wherever/wherever/recalculate.rb
 - spec/data/test_file_1.script
 - spec/method_logging_spec.rb
 - spec/spec_helper.rb
+- spec/wherever/add_grouping_spec.rb
+- spec/wherever/add_summing_spec.rb
 - spec/wherever/adder_spec.rb
 - spec/wherever/custom_grouping_spec.rb
 - spec/wherever/full_run_spec.rb