wherever-positions 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/lib/wherever/db_store/dataset.rb

@@ -1,14 +1,11 @@
 module DbStore
-  class Dataset
-    include Mongoid::Document
-    include DbStore::RecordMatcher
-    embedded_in :store, :inverse_of => :datasets, :class_name => 'DbStore::Store'
-    field :values, :type => Hash, :default => Hash.new(0)
-    
-    def price
-      self.store.marker.price
+  module DatasetConfig
+    def self.included(base)
+      base.send :include, Mongoid::Document
+      base.send :include, DbStore::RecordMatcher
+      base.field :values, :type => Hash, :default => Hash.new(0)
     end
-    
+  
     def diff(record)
       res = {}
       record.keys.each do |key|

data/lib/wherever/db_store/identifier.rb

@@ -1,10 +1,11 @@
 module DbStore
-  class Identifier
-    include Mongoid::Document
-    embedded_in :store, :inverse_of => :identifiers, :class_name => 'DbStore::Store'
-    include DbStore::RecordMatcher
+  module IdentifierConfig
+    def self.included(base)
+      base.send :include, Mongoid::Document
+      base.send :include, DbStore::RecordMatcher
     
-    field :_id, :type => Integer
-    field :version, :type => Integer
-  end
+      base.field :_id, :type => Integer
+      base.field :version, :type => Integer
+    end
+  end    
 end

data/lib/wherever/db_store/lookup.rb

@@ -4,6 +4,7 @@ module DbStore
     embeds_many :versions, :class_name => 'DbStore::Version'
     field :name, :type => String
     field :keys, :type => Hash
+    field :lookups, :type => Hash, :default => {}
   end
   
   class Version

data/lib/wherever/db_store.rb

@@ -7,4 +7,36 @@ require 'wherever/db_store/store'
 require 'wherever/db_store/dataset'
 require 'wherever/db_store/identifier'
 
-require 'wherever/db_store/lookup'
+require 'wherever/db_store/lookup'
+
+module DbStore
+  class << self
+    attr_reader :stores
+    def new_store(marker, keys)
+      @stores ||= {}
+      @stores[[marker, keys]] = Container.new(
+          get_store(marker, keys, :identifier),
+          get_store(marker, keys, :dataset)
+      )
+    end
+    
+    def get_store(marker, keys, db_type)
+      name = "#{marker.upcase}_#{keys.map(&:upcase).join('_')}_#{db_type.to_s.upcase}"
+      return "DbStore::#{name}".constantize if DbStore.constants.include?(name)
+      klass = Class.new do
+        include "DbStore::#{db_type.to_s.titlecase}Config".constantize
+        store_in :"#{marker}_#{keys.join('_')}_#{db_type}"
+      end
+      eval("DbStore::#{name}=klass")
+      klass
+    end
+    
+    class Container
+      attr_reader :identifiers, :datasets
+      
+      def initialize(identifier, dataset)
+        @identifiers, @datasets = identifier, dataset
+      end
+    end
+  end
+end

data/lib/wherever/wherever/accessors.rb

@@ -1,8 +1,11 @@
 class Wherever
   module Accessors
     def get_key_store(*keys)
-      mark = keys.last.is_a?(Hash) ? keys.pop["marker"] : marker
-      collection(mark).stores.find_or_create_by(:key => keys)
+      DbStore.new_store(get_marker(keys), keys)
+    end
+    
+    def get_marker(keys=[])
+      keys.last.is_a?(Hash) ? keys.pop["marker"] : marker
     end
     
     def collection(mark=marker)

data/lib/wherever/wherever/lookup.rb

@@ -10,13 +10,13 @@ class Wherever
           lookup, record = create_lookup_record(name, version)
           record.values = key_to_string(values)
           record.save
-          recalculate if set_price_lookup(version)
+          recalculate if set_price_lookup(name, version)
         end
       end
     
       self.class.class_eval do
-        define_method "get_#{name}" do |version, data|
-          lookup, record = get_lookup_record(name, version)
+        define_method "get_#{name}" do |marker, data|
+          lookup, record = get_lookup_record(name, marker)
           value_key = lookup.keys.map{|key| data[key]}.join('_')
           record.values[value_key] || 0
         end
@@ -30,9 +30,11 @@ class Wherever
       string_values
     end
     
-    def set_price_lookup(version)
-      return false if collection.price == version
-      collection.update_attributes(:price => version)
+    def set_price_lookup(name, version=nil, keys=[])
+      lookup = get_lookup(name)
+      return false if lookup.lookups[get_marker] == version
+      lookup.lookups[get_marker(keys)] = (version || lookup.lookups['current'])
+      lookup.save
     end
     
     def recalculate
@@ -49,18 +51,22 @@ class Wherever
       end
     end
     
-    def get_lookup_record(name, version)
-      lookup = DbStore::Lookup.where(:name => name).first
-      raise InvalidLookup, "Attempt to access invalid lookup: #{name}" unless lookup
-      return [lookup, lookup.versions.find_or_create_by(:name => version)]
+    def get_lookup_record(name, marker)
+      lookup = get_lookup(name)
+      return [lookup, lookup.versions.find_or_create_by(:name => lookup.lookups[marker])]
     end
     
     def create_lookup_record(name, version)
-      lookup = DbStore::Lookup.where(:name => name).first
-      raise InvalidLookup, "Attempt to access invalid lookup: #{name}" unless lookup
+      lookup = get_lookup(name)
       records = lookup.versions.where(:name => version)
       raise InvalidLookupSetter, "Lookup '#{version}' for '#{name}' already set" unless records.empty?
       return [lookup, lookup.versions.find_or_create_by(:name => version)]
     end
+    
+    def get_lookup(name)
+      lookup = DbStore::Lookup.where(:name => name).first
+      raise InvalidLookup, "Attempt to access invalid lookup: #{name}" unless lookup
+      lookup
+    end
   end
 end

data/lib/wherever/wherever/mark.rb

@@ -1,11 +1,18 @@
 class Wherever
   module Mark
     def mark(name)
-      marker = collection(name)
-      marker.price = collection.price
-      collection.stores.all.each do |store|
-        marker.stores.create(:key => store.key, :datasets => store.datasets.clone) unless store.key == ["unique"]
+      (['identifier'] + config.key_groups).each do |key|
+        keys = Array(key)
+        current_db = get_key_store(*keys)
+        new_db = get_key_store(*(keys + [{'marker' => name}]))
+        current_db.datasets.all.each do |record|
+          new_db.datasets.create!(record.attributes)
+        end
+        current_db.identifiers.all.each do |record|
+          new_db.identifiers.create!(record.attributes)
+        end
       end
+      set_price_lookup('price', nil, [{'marker' => name}])
     end
   end
 end

data/spec/wherever/adder_spec.rb

@@ -10,7 +10,7 @@ describe "Wherever" do
     context 'the unique dataset' do
       it 'inserts a record' do
         wherever.add({"settled" => 100, "unsettled" => 0}, options)
-        wherever.get_key_store("unique").datasets.should == 
+        wherever.get_key_store("unique").datasets.all.should == 
               [DbStore::Dataset.new("trade_id" => 12, "values" => {"unsettled" => 0, "settled" => 100}, "version" => 1, "fund_id" => 2)] 
       end
     end
@@ -18,7 +18,7 @@ describe "Wherever" do
     context 'the id dataset' do
       it 'inserts a record' do
         wherever.add({"settled" => 100, "unsettled" => 0}, options)
-        wherever.get_key_store("identifier").datasets.should ==
+        wherever.get_key_store("identifier").datasets.all.should ==
             [DbStore::Dataset.new("trade_id" => 12, "values" => {"unsettled" => 0, "settled" => 100}, "version" => 1, "fund_id" => 2)] 
       end
     end
@@ -27,9 +27,9 @@ describe "Wherever" do
       context 'with a single key' do
         it 'inserts a record' do
           wherever.add({"settled" => 100, "unsettled" => 0}, options)
-          wherever.get_key_store("fund").datasets.should ==
+          wherever.get_key_store("fund").datasets.all.should ==
               [DbStore::Dataset.new("values" => {"unsettled" => 0, "settled" => 100}, "fund_id" => 2)] 
-          wherever.get_key_store("fund").identifiers.should ==
+          wherever.get_key_store("fund").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 1)] 
         end
       end
@@ -41,14 +41,14 @@ describe "Wherever" do
         it 'inserts a record for each key combination' do
           wherever.add({"settled" => 100, "unsettled" => 0}, options)
 
-          wherever.get_key_store("fund").datasets.should ==
+          wherever.get_key_store("fund").datasets.all.should ==
               [DbStore::Dataset.new("values" => {"unsettled" => 0, "settled" => 100}, "fund_id" => 2)] 
-          wherever.get_key_store("fund").identifiers.should ==
+          wherever.get_key_store("fund").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 1)] 
 
-          wherever.get_key_store("security").datasets.should ==
+          wherever.get_key_store("security").datasets.all.should ==
               [DbStore::Dataset.new("values" => {"unsettled" => 0, "settled" => 100}, "security_id" => 4)] 
-          wherever.get_key_store("security").identifiers.should ==
+          wherever.get_key_store("security").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 1)] 
         end
       end
@@ -61,19 +61,19 @@ describe "Wherever" do
         it 'inserts a record for each key combination' do
           wherever.add({"settled" => 100, "unsettled" => 0}, options)
 
-          wherever.get_key_store("fund").datasets.should ==
+          wherever.get_key_store("fund").datasets.all.should ==
               [DbStore::Dataset.new("values" => {"unsettled" => 0, "settled" => 100}, "fund_id" => 2)] 
-          wherever.get_key_store("fund").identifiers.should ==
+          wherever.get_key_store("fund").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 1)] 
 
-          wherever.get_key_store("security").datasets.should ==
+          wherever.get_key_store("security").datasets.all.should ==
               [DbStore::Dataset.new("values" => {"unsettled" => 0, "settled" => 100}, "security_id" => 4)] 
-          wherever.get_key_store("security").identifiers.should ==
+          wherever.get_key_store("security").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 1)] 
 
-          wherever.get_key_store("fund", "security").datasets.should ==
+          wherever.get_key_store("fund", "security").datasets.all.should ==
               [DbStore::Dataset.new("fund_id" => 2, "security_id" => 4, "values" => {"unsettled" => 0, "settled" => 100})] 
-          wherever.get_key_store("fund", "security").identifiers.should ==
+          wherever.get_key_store("fund", "security").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 1)] 
         end
       end
@@ -91,7 +91,7 @@ describe "Wherever" do
       it 'add the change' do
         wherever.add({"settled" => 110, "unsettled" => 0}, options_second)
 
-        wherever.get_key_store("unique").datasets.should ==
+        wherever.get_key_store("unique").datasets.all.should ==
             [DbStore::Dataset.new("fund_id" => 2, "trade_id" => 12, "version" => 1, "values" => {"unsettled" => 0, "settled" => 100}),
              DbStore::Dataset.new("fund_id" => 2, "trade_id" => 12, "version" => 2, "values" => {"unsettled" => 0, "settled" => 10})] 
       end
@@ -101,7 +101,7 @@ describe "Wherever" do
       it 'updates the record' do
         wherever.add({"settled" => 110, "unsettled" => 0}, options_second)
 
-        wherever.get_key_store("identifier").datasets.should ==
+        wherever.get_key_store("identifier").datasets.all.should ==
             [DbStore::Dataset.new("fund_id" => 2, "trade_id" => 12, "version" => 2, "values" => {"unsettled" => 0, "settled" => 110})]
       end
     end
@@ -110,9 +110,9 @@ describe "Wherever" do
       context 'with a single key' do
         it 'inserts a record' do
           wherever.add({"settled" => 110, "unsettled" => 0}, options_second)
-          wherever.get_key_store("fund").datasets.should ==
-              [DbStore::Dataset.new("values" => {"unsettled" => 0, "settled" => 110}, "fund_id" => 2)] 
-          wherever.get_key_store("fund").identifiers.should ==
+          wherever.get_key_store("fund").datasets.all.should ==
+              [DbStore::Dataset.new("values"  => {"unsettled" => 0, "settled" => 110}, "fund_id" => 2)] 
+          wherever.get_key_store("fund").identifiers.all.should ==
               [DbStore::Identifier.new("trade_id" => 12, "version" => 2)] 
         end
       end

data/spec/wherever/custom_grouping_spec.rb

@@ -19,12 +19,12 @@ describe Wherever, 'with a custom grouping' do
     end
     
     it 'the identifier record' do
-      wherever.get_key_store("identifier").datasets.should ==
+      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.should ==
+      wherever.get_key_store("fund").datasets.all.should ==
           [DbStore::Dataset.new("values" => {"unsettled" => -250, "settled" => 100}, "fund_id" => 2)] 
     end
   end

data/spec/wherever/key_store_spec.rb

@@ -9,14 +9,26 @@ describe "Wherever" do
     context 'when a single element key' do
       let(:store) { wherever.get_key_store("fund") }
       it 'sets the class name' do
-        store.key.should == ["fund"]
+        store.identifiers.to_s.should == "DbStore::CURRENT_FUND_IDENTIFIER"
+        store.datasets.to_s.should == "DbStore::CURRENT_FUND_DATASET"
+      end
+
+      it 'sets the table' do
+        store.identifiers.collection_name.should == "current_fund_identifier"
+        store.datasets.collection_name.should == "current_fund_dataset"
       end
     end
 
     context 'when a multiple element keys' do
       let(:store) { wherever.get_key_store("fund", "security") }
       it 'sets the class name' do
-        store.key.should == ["fund", "security"]
+        store.identifiers.to_s.should == "DbStore::CURRENT_FUND_SECURITY_IDENTIFIER"
+        store.datasets.to_s.should == "DbStore::CURRENT_FUND_SECURITY_DATASET"
+      end
+
+      it 'sets the table' do
+        store.identifiers.collection_name.should == "current_fund_security_identifier"
+        store.datasets.collection_name.should == "current_fund_security_dataset"
       end
     end
   end

data/spec/wherever/mark_spec.rb

@@ -4,7 +4,7 @@ describe Wherever, 'mark a time point' do
   let(:create_options) { ["keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id"] }
   let(:wherever) { 
     Wherever.new(*create_options) do |values, data, record, keys|
-      price = wherever.get_price(record.price, record)
+      price = wherever.get_price('current', record)
       if keys.include?("security_id")
         values["position"] += data["position"] if data
         values["price"] =  price
@@ -26,17 +26,17 @@ describe Wherever, 'mark a time point' do
     wherever.create_lookup('price', ["security_id"])
     wherever.set_price('20111029_01', {4 => 12.5})
     wherever.add({"position" => 100}, options_one)
-    wherever.mark('COB 20111009')
+    wherever.mark('COB_20111009')
   end
 
   it 'can retrieve data via marker name' do
-    wherever.get({"fund_id" => 2}, 'COB 20111009').should == {"trade_value" => 1250}
+    wherever.get({"fund_id" => 2}, 'COB_20111009').should == {"trade_value" => 1250}
   end
   
   context 'adding new record' do
     it 'does not change marker record' do
       wherever.add({"position" => 100}, options_two)
-      wherever.get({"fund_id" => 2}, 'COB 20111009').should == {"trade_value" => 1250}
+      wherever.get({"fund_id" => 2}, 'COB_20111009').should == {"trade_value" => 1250}
       wherever.get({"fund_id" => 2}).should == {"trade_value" => 2500}
     end
   end
@@ -44,7 +44,7 @@ describe Wherever, 'mark a time point' do
   context 'adding price data' do
     it 'does not change marker record' do
       wherever.set_price('20111029_02', {4 => 13.5})
-      wherever.get({"fund_id" => 2}, 'COB 20111009').should == {"trade_value" => 1250}
+      wherever.get({"fund_id" => 2}, 'COB_20111009').should == {"trade_value" => 1250}
       wherever.get({"fund_id" => 2}).should == {"trade_value" => 1350}
     end
   end

data/spec/wherever/using_lookup_in_grouping_spec.rb

@@ -4,7 +4,7 @@ describe Wherever, 'using lookup in grouping calculation' do
   let(:create_options) { ["keys" => keys, "database" => 'wherever_test', "key_groups" => key_groups, "key" => "trade_id"] }
   let(:wherever) { 
     Wherever.new(*create_options) do |values, data, record, keys|
-      price = wherever.get_price(record.price, record)
+      price = wherever.get_price('current', record)
       if keys.include?("security_id")
         values["position"] += data["position"] if data
         values["price"] =  price
@@ -32,25 +32,25 @@ describe Wherever, 'using lookup in grouping calculation' do
       end
       
       it 'on identifier record' do
-        wherever.get_key_store("identifier").datasets.should ==
+        wherever.get_key_store("identifier").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"position" => 100, "price" => 12.5, "trade_value" => 1250}, 
                 "trade_id" => 12, "version" => 1, "fund_id" => 2, "security_id" => 4)] 
       end
       
       it 'on fund record' do
-        wherever.get_key_store("fund").datasets.should ==
+        wherever.get_key_store("fund").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"trade_value" => 1250}, "fund_id" => 2)] 
       end
 
       it 'on fund record with trade edit' do
         wherever.add({"position" => 110}, options_two)
-        wherever.get_key_store("fund").datasets.should ==
+        wherever.get_key_store("fund").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"trade_value" => 1375}, "fund_id" => 2)] 
       end
 
       it 'on fund record with two trades' do
         wherever.add({"position" => 200}, options_three)
-        wherever.get_key_store("fund").datasets.should ==
+        wherever.get_key_store("fund").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"trade_value" => 3750}, "fund_id" => 2)] 
       end
     end
@@ -70,7 +70,7 @@ describe Wherever, 'using lookup in grouping calculation' do
       it 'on identifier record' do
         wherever.create_lookup('price', ["security_id"])
         wherever.set_price('current', {4 => 12.5})
-        wherever.get_key_store("identifier").datasets.should ==
+        wherever.get_key_store("identifier").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"position" => 100, "price" => 12.5, "trade_value" => 1250}, 
                 "trade_id" => 12, "version" => 1, "fund_id" => 2, "security_id" => 4)] 
       end
@@ -78,7 +78,7 @@ describe Wherever, 'using lookup in grouping calculation' do
       it 'on fund record' do
         wherever.create_lookup('price', ["security_id"])
         wherever.set_price('current', {4 => 12.5})
-        wherever.get_key_store("fund").datasets.should ==
+        wherever.get_key_store("fund").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"trade_value" => 1250}, "fund_id" => 2)] 
       end
 
@@ -86,14 +86,14 @@ describe Wherever, 'using lookup in grouping calculation' do
         wherever.add({"position" => 110}, options_two)
         wherever.create_lookup('price', ["security_id"])
         wherever.set_price('current', {4 => 12.5})
-        wherever.get_key_store("fund").datasets.should ==
+        wherever.get_key_store("fund").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"trade_value" => 1375}, "fund_id" => 2)] 
       end
 
       it 'on fund record with two trades' do
         wherever.add({"position" => 200}, options_three)
         wherever.set_price('current', {4 => 12.5})
-        wherever.get_key_store("fund").datasets.should ==
+        wherever.get_key_store("fund").datasets.all.should ==
             [DbStore::Dataset.new("values" => {"trade_value" => 3750}, "fund_id" => 2)] 
       end
     end

data/wherever-positions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wherever-positions}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]
-  s.date = %q{2011-10-30}
+  s.date = %q{2011-11-02}
   s.description = %q{Allow Store of positions by multiple keys with teh option to mark specific points in time for use later}
   s.email = %q{dw_henry@yahoo.com.au}
   s.extra_rdoc_files = [
@@ -36,9 +36,7 @@ Gem::Specification.new do |s|
     "lib/wherever/db_store/dataset.rb",
     "lib/wherever/db_store/identifier.rb",
     "lib/wherever/db_store/lookup.rb",
-    "lib/wherever/db_store/marker.rb",
     "lib/wherever/db_store/record_matcher.rb",
-    "lib/wherever/db_store/store.rb",
     "lib/wherever/wherever.rb",
     "lib/wherever/wherever/accessors.rb",
     "lib/wherever/wherever/adder.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wherever-positions
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Henry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-30 00:00:00 +01:00
+date: 2011-11-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,9 +179,7 @@ files:
 - lib/wherever/db_store/dataset.rb
 - lib/wherever/db_store/identifier.rb
 - lib/wherever/db_store/lookup.rb
-- lib/wherever/db_store/marker.rb
 - lib/wherever/db_store/record_matcher.rb
-- lib/wherever/db_store/store.rb
 - lib/wherever/wherever.rb
 - lib/wherever/wherever/accessors.rb
 - lib/wherever/wherever/adder.rb

data/lib/wherever/db_store/marker.rb

@@ -1,12 +0,0 @@
-module DbStore
-  class Marker
-    include Mongoid::Document
-    embeds_many :stores, :class_name => 'DbStore::Store'
-    field :name, :type => String
-    field :price, :type => String
-    
-    def self.find_by_name(name)
-      find_or_create_by({:name => name})
-    end
-  end
-end

data/lib/wherever/db_store/store.rb

@@ -1,9 +0,0 @@
-module DbStore
-  class Store
-    include Mongoid::Document
-    embedded_in :marker, :inverse_of => :stores, :class_name => 'DbStore::Marker'
-    embeds_many :datasets, :class_name => 'DbStore::Dataset'
-    embeds_many :identifiers, :class_name => 'DbStore::Identifier'
-    field :key, :type => Array
-  end
-end