wherever-positions 0.3.2 → 0.4.0

data/Gemfile.lock

@@ -1,8 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (2.3.14)
-    bson (1.2.4)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    bson (1.4.1)
     bson_ext (1.4.1)
     builder (3.0.0)
     columnize (0.3.4)
@@ -14,10 +19,10 @@ GEM
       term-ansicolor (>= 1.0.6)
     database_cleaner (0.6.7)
     diff-lcs (1.1.3)
-    durran-validatable (2.0.1)
     gherkin (2.5.4)
       json (>= 1.4.6)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -25,14 +30,13 @@ GEM
     json (1.6.1)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mongo (1.2.4)
-      bson (>= 1.2.4)
-    mongoid (1.9.5)
-      activesupport (< 3.0.0)
-      bson (~> 1.2.1)
-      durran-validatable (>= 2.0.1)
-      mongo (~> 1.2.1)
-      will_paginate (< 2.9)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongoid (2.3.2)
+      activemodel (~> 3.1)
+      mongo (~> 1.4)
+      tzinfo (~> 0.3.22)
+    multi_json (1.0.3)
     rake (0.9.2.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.11)
@@ -50,7 +54,7 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     term-ansicolor (1.0.7)
-    will_paginate (2.3.16)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/wherever/db_store.rb

@@ -17,13 +17,33 @@ module DbStore
           get_store(marker, keys, :dataset)
       )
     end
+
+    def new_lookup(name, keys=nil)
+      @stores ||= {}
+      @stores[name] = get_lookup(name, keys)
+    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)
+      build_class(name, "DbStore::#{db_type.to_s.titlecase}Config".constantize, :"#{marker}_#{keys.join('_')}_#{db_type}")
+    end
+    
+    def get_lookup(name, keys)
+      if keys
+        DbStore::Lookup.find_or_create_by(:name => name, :keys => keys)
+      end
+      name = "Lookup_#{name.upcase}"
+      return "DbStore::#{name}".constantize if DbStore.constants.include?(name)
+      raise "Missing lookup key from definition" unless keys
+
+      build_class(name, DbStore::VersionConfig, :"lookup_#{name}")
+    end
+    
+    def build_class(name, module_object, store_in)
       klass = DbStore.const_set(name, Class.new)
-      klass.send :include, "DbStore::#{db_type.to_s.titlecase}Config".constantize
-      klass.send :store_in, :"#{marker}_#{keys.join('_')}_#{db_type}"
+      klass.send :include, module_object
+      klass.send :store_in, store_in
       klass
     end
     

data/lib/wherever/db_store/lookup.rb

@@ -1,10 +1,10 @@
 module DbStore
   class Lookup
     include Mongoid::Document
-    embeds_many :versions, :class_name => 'DbStore::Version'
     field :name, :type => String
     field :keys, :type => Hash
     field :lookups, :type => Hash, :default => {}
+    field :current, :type => String
   end
   
   class Version
@@ -13,4 +13,12 @@ module DbStore
     field :name, :type => String
     field :values, :type => Hash, :default => Hash.new(0)
   end
+
+  module VersionConfig
+    def self.included(base)
+      base.send :include, Mongoid::Document
+      base.field :name, :type => String
+      base.field :values, :type => Hash, :default => Hash.new(0)
+    end
+  end
 end

data/lib/wherever/wherever/lookup.rb

@@ -1,24 +1,23 @@
 class Wherever
   module Lookup
     def create_lookup(name, keys)
-      lookup = DbStore::Lookup.find_or_create_by(:name => name)
-      lookup.keys = keys
-      lookup.save
+      lookup_class = DbStore.new_lookup(name, keys)
 
       self.class.class_eval do
         define_method "set_#{name}" do |version, values|
-          lookup, record = create_lookup_record(name, version)
-          record.values = key_to_string(values)
-          record.save
+          new_version?(name, version)
+          lookup_class.create(:name => version, :values => key_to_string(values))
           recalculate if set_price_lookup(name, version)
         end
       end
     
       self.class.class_eval do
         define_method "get_#{name}" do |marker, data|
-          lookup, record = get_lookup_record(name, marker)
+          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('_')
-          record.values[value_key] || 0
+          lookup_data.values[value_key] || 0
         end
       end
     end
@@ -32,8 +31,8 @@ class Wherever
     
     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'])
+      return false if lookup.current == version
+      lookup.lookups[get_marker(keys)] = (version || lookup.current)
       lookup.save
     end
     
@@ -56,11 +55,9 @@ class Wherever
       return [lookup, lookup.versions.find_or_create_by(:name => lookup.lookups[marker])]
     end
     
-    def create_lookup_record(name, version)
+    def new_version?(name, version)
       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)]
+      raise InvalidLookupSetter, "Lookup '#{version}' for '#{name}' already set" if lookup.lookups.values.include?(version)
     end
     
     def get_lookup(name)

data/wherever-positions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wherever-positions}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wherever-positions
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David Henry