wherever-positions 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/wherever.rb

@@ -1,3 +1,4 @@
+require 'mongo'
 require 'mongoid'
 require 'wherever/wherever/accessors'
 require 'wherever/wherever/adder'

data/lib/wherever/db_store.rb

@@ -30,14 +30,10 @@ module DbStore
     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)
+      DbStore::Lookup.find_or_create_by(:name => name, :keys => keys) if keys
+      return "DbStore::Lookup#{name}".constantize if DbStore.constants.include?("Lookup#{name}")
       raise "Missing lookup key from definition" unless keys
-
-      build_class(name, DbStore::VersionConfig, :"lookup_#{name}")
+      build_class("Lookup#{name}", DbStore::VersionConfig, :"lookup_#{name}")
     end
     
     def build_class(name, module_object, store_in)

data/lib/wherever/wherever/mark.rb

@@ -1,15 +1,16 @@
 class Wherever
   module Mark
     def mark(name)
-      (['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)
+      configuration = if Mongoid::Config.respond_to?(:master) 
+        Mongoid::Config
+      else
+        Mongoid::Config.instance
+      end
+      configuration.master.eval("db.current_identifier.find().forEach( function(x){db.#{name}_identifier.insert(x)} )")
+      config.key_groups.each do |keys|
+        [:identifier, :dataset].each do |db_type|
+          db_id = "#{keys.join('_')}_#{db_type}"
+          configuration.master.eval("db.current_#{db_id}.find().forEach( function(x){db.#{name}_#{db_id}.insert(x)} )")
         end
       end
       set_price_lookup('price', nil, [{'marker' => name}])

data/wherever-positions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wherever-positions}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry"]
-  s.date = %q{2011-11-03}
+  s.date = %q{2011-11-04}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wherever-positions
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - David Henry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 +00:00
+date: 2011-11-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency