wherever-positions 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/string_helper.rb

@@ -0,0 +1,16 @@
+module StringHelper
+  class << self
+    def add_method_to_id(strings)
+      return nil unless strings
+      strings.each do |string|
+        if string.is_a?(Array)
+          add_method_to_id(string)
+        else
+          def string.to_id
+            "#{self}_id"
+          end
+        end
+      end
+    end 
+  end
+end

data/lib/wherever.rb

@@ -1,5 +1,6 @@
 require 'mongo'
 require 'mongoid'
+require 'string_helper'
 require 'wherever/wherever/accessors'
 require 'wherever/wherever/adder'
 require 'wherever/wherever/getter'

data/lib/wherever/configure.rb

@@ -13,8 +13,8 @@ class Configure
       config.master = mongo_connection
     end
   
-    @keys = options["keys"]
-    groups = options["key_groups"] || @keys.map{|k| k.gsub(/_id$/,'')}
+    @keys = StringHelper.add_method_to_id(options["keys"])
+    groups = StringHelper.add_method_to_id(options["key_groups"]) || @keys
     @key_groups = groups.map{|g| Array(g)}
   end
 end

data/lib/wherever/db_store.rb

@@ -31,9 +31,10 @@ module DbStore
     
     def get_lookup(name, keys)
       DbStore::Lookup.find_or_create_by(:name => name, :keys => keys) if keys
-      return "DbStore::Lookup#{name}".constantize if DbStore.constants.include?("Lookup#{name}")
+      class_name = "Lookup#{name.titlecase}"
+      return "DbStore::#{class_name}".constantize if DbStore.constants.include?(class_name)
       raise "Missing lookup key from definition" unless keys
-      build_class("Lookup#{name}", DbStore::VersionConfig, :"lookup_#{name}")
+      build_class(class_name, DbStore::VersionConfig, :"lookup_#{name}")
     end
     
     def build_class(name, module_object, store_in)

data/lib/wherever/db_store/lookup.rb

@@ -5,6 +5,10 @@ module DbStore
     field :keys, :type => Hash
     field :lookups, :type => Hash, :default => {}
     field :current, :type => String
+    
+    def keys
+      StringHelper.add_method_to_id(self['keys'])
+    end
   end
   
   class Version

data/lib/wherever/wherever/adder.rb

@@ -52,8 +52,7 @@ class Wherever
     def for_group(group_keys, values, id_record)
       key = {}
       group_keys.each do |key_values|
-        k_id = "#{key_values}_id"
-        key.merge!(k_id => @options["keys"][k_id])
+        key.merge!(key_values.to_id => @options["keys"][key_values.to_id])
       end
       store = get_key_store(*group_keys)
       record = store.datasets.find_or_create_by(key)

data/lib/wherever/wherever/getter.rb

@@ -5,7 +5,7 @@ class Wherever
       result = Hash.new(0)
       if keys.first == "identifier"
         get_key_store(*keys).datasets.where(selector).all.each do |record|
-          @grouping.call(result, record.values, result, config)
+          @grouping.call(result, record.values, result, keys)
         end
         result
       else
@@ -24,7 +24,7 @@ class Wherever
     end
     
     def check_keys(keys)
-      invalid_keys = (keys - config.keys)
+      invalid_keys = (keys - config.keys.map(&:to_id))
       raise InvalidSelector,"Unknown Selector: #{invalid_keys.join(' ')}" unless invalid_keys.empty?
     end
   end

data/lib/wherever/wherever/lookup.rb

@@ -16,7 +16,7 @@ class Wherever
           lookup = get_lookup(name)
           lookup_data = lookup_class.where(:name => lookup.lookups[marker]).first
           return 0 unless lookup_data 
-          value_key = lookup.keys.map{|key| data[key]}.join('_')
+          value_key = lookup.keys.map{|key| data[key.to_id]}.join('_')
           lookup_data.values[value_key] || 0
         end
       end
@@ -56,16 +56,13 @@ class Wherever
       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, nil)
+            @grouping.call(record.values, nil, record, group)
+            record.save!
           end
-          record.save!
         end
       end
     end
     
-    def temp(group_keys, values, id_record)
-    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/mark.rb

@@ -1,7 +1,7 @@
 class Wherever
   module Mark
     def mark(name)
-      copy_collections("current_identifier", "#{name}_identifier")
+      copy_collections("current_identifier_dataset", "#{name}_identifier_dataset")
       config.key_groups.each do |keys|
         [:identifier, :dataset].each do |db_type|
           db_id = "#{keys.join('_')}_#{db_type}"

data/spec/wherever/adder_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Wherever" do
   let(:wherever) { Wherever.new("keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id") }
-  let(:keys) { ["fund_id"] }
+  let(:keys) { ["fund"] }
   let(:key_groups) { nil }
     
   context 'adding the first record' do
@@ -35,7 +35,7 @@ describe "Wherever" do
       end
 
       context 'with a multiple keys' do
-        let(:keys) { ["fund_id", "security_id"] }
+        let(:keys) { ["fund", "security"] }
         let(:options) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 4}} }
         
         it 'inserts a record for each key combination' do
@@ -54,7 +54,7 @@ describe "Wherever" do
       end
 
       context 'with a multiple keys and grouping configured' do
-        let(:keys) { ["fund_id", "security_id"] }
+        let(:keys) { ["fund", "security"] }
         let(:key_groups) { ["fund", "security", ["fund", "security"]] }
         let(:options) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 4}} }
         

data/spec/wherever/custom_grouping_spec.rb

@@ -10,7 +10,7 @@ describe Wherever, 'with a custom grouping' do
   }
 
   context 'add a record' do
-    let(:keys) { ["fund_id"] }
+    let(:keys) { ["fund"] }
     let(:key_groups) { nil }
     let(:options) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2}} }
 
@@ -30,8 +30,8 @@ describe Wherever, 'with a custom grouping' do
   end
   
   context 'get a record' do
-    let(:keys) { ["fund_id", "security_id"] }
-    let(:key_groups) { ["fund_id"] }
+    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}} }
 

data/spec/wherever/getter_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Wherever" do
   let(:wherever) { Wherever.new("keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id") }
-  let(:keys) { ["fund_id"] }
+  let(:keys) { ["fund"] }
   let(:key_groups) { nil }
 
   context 'getting the record data' do
@@ -20,7 +20,7 @@ describe "Wherever" do
   end
   
   context 'a more complex example' do
-    let(:keys) { ["fund_id", "security_id"] }
+    let(:keys) { ["fund", "security"] }
     let(:key_groups) { ["fund", ["fund", "security"]] }
     let(:options) { {"unique" => {"trade_id" => 12, "version" => 2}, "keys" => {"fund_id" => 3, "security_id" => 12}} }
     

data/spec/wherever/key_store_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Wherever" do
   let(:wherever) { Wherever.new("keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id") }
-  let(:keys) { ["fund_id"] }
+  let(:keys) { ["fund"] }
   let(:key_groups) { nil }
     
   context 'get the key store' do

data/spec/wherever/mark_spec.rb

@@ -5,7 +5,7 @@ describe Wherever, 'mark a time point' do
   let(:wherever) { 
     Wherever.new(*create_options) do |values, data, record, keys|
       price = wherever.get_price('current', record)
-      if keys.include?("security_id")
+      if keys.include?("security")
         values["position"] += data["position"] if data
         values["price"] =  price
       end
@@ -16,14 +16,14 @@ describe Wherever, 'mark a time point' do
       end
     end
   }
-  let(:keys) { ["fund_id", "security_id"] }
+  let(:keys) { ["fund", "security"] }
   let(:key_groups) { ["fund", "security", ["fund", "security"]] }
   
   let(:options_one) { {"unique" => {"trade_id" => 12, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 4}} }
   let(:options_two) { {"unique" => {"trade_id" => 14, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 4}} }
 
   before do
-    wherever.create_lookup('price', ["security_id"])
+    wherever.create_lookup('price', ["security"])
     wherever.set_price('20111029_01', {4 => 12.5})
     wherever.add({"position" => 100}, options_one)
     wherever.mark('COB_20111009')

data/spec/wherever/setter_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Wherever, 'setting values' do
   let(:wherever) { Wherever.new("keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id") }
-  let(:keys) { ["fund_id"] }
+  let(:keys) { ["fund"] }
   let(:key_groups) { nil }
   
   context 'data storage' do
     before do
-      wherever.create_lookup('price', ["security_id"])
+      wherever.create_lookup('price', ["security"])
     end
     
     it 'can save and retrieve version data' do

data/spec/wherever/using_lookup_in_grouping_spec.rb

@@ -5,7 +5,7 @@ describe Wherever, 'using lookup in grouping calculation' do
   let(:wherever) { 
     Wherever.new(*create_options) do |values, data, record, keys|
       price = wherever.get_price('current', record)
-      if keys.include?("security_id")
+      if keys.include?("security")
         values["position"] += data["position"] if data
         values["price"] =  price
       end
@@ -16,7 +16,7 @@ describe Wherever, 'using lookup in grouping calculation' do
       end
     end
   }
-  let(:keys) { ["fund_id", "security_id"] }
+  let(:keys) { ["fund", "security"] }
   let(:key_groups) { ["fund", "security", ["fund", "security"]] }
   
   context 'add record after price' do
@@ -26,7 +26,7 @@ describe Wherever, 'using lookup in grouping calculation' do
       let(:options_three) { {"unique" => {"trade_id" => 14, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 4}} }
 
       before do
-        wherever.create_lookup('price', ["security_id"])
+        wherever.create_lookup('price', ["security"])
         wherever.set_price('current', {4 => 12.5})
         wherever.add({"position" => 100}, options_one)
       end
@@ -63,12 +63,12 @@ describe Wherever, 'using lookup in grouping calculation' do
       let(:options_three) { {"unique" => {"trade_id" => 14, "version" => 1}, "keys" => {"fund_id" => 2, "security_id" => 4}} }
 
       before do
-        wherever.create_lookup('price', ["security_id"])
+        wherever.create_lookup('price', ["security"])
         wherever.add({"position" => 100}, options_one)
       end
       
       it 'on identifier record' do
-        wherever.create_lookup('price', ["security_id"])
+        wherever.create_lookup('price', ["security"])
         wherever.set_price('current', {4 => 12.5})
         wherever.get_key_store("identifier").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"position" => 100, "price" => 12.5, "trade_value" => 1250}, 

data/wherever-positions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wherever-positions}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "features/support/env.rb",
     "features/wherever.feature",
     "lib/monkeypatch_for_mongoid_1.9.rb",
+    "lib/string_helper.rb",
     "lib/wherever.rb",
     "lib/wherever/configure.rb",
     "lib/wherever/db_store.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wherever-positions
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - David Henry
@@ -173,6 +173,7 @@ files:
 - features/support/env.rb
 - features/wherever.feature
 - lib/monkeypatch_for_mongoid_1.9.rb
+- lib/string_helper.rb
 - lib/wherever.rb
 - lib/wherever/configure.rb
 - lib/wherever/db_store.rb