moped_mapping 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9914d0817e9fd1c72047906175ef4c94ee22d21e
-  data.tar.gz: ebe492719c88fcfa2e3994701e661adb1a95ef72
+  metadata.gz: d5540e7bc213fbc26a538c5e82d2d32ce7caa4a4
+  data.tar.gz: caa85807755e177a26ea19543d2b93dc7b6ad4f8
 SHA512:
-  metadata.gz: 193749ea662a6afac1cdc44bcc5cd1f3236f559f9438afc9eb5f7b7fb6d16690126066117721f18dc0764c916e83f6c8542d5e193d9dbe19decdacca0ead329e
-  data.tar.gz: 067a2b33d1f6d28b72fd8ea7567206b82907e741a8c387530ff9e1b21d52515c396396ea13cbb64a2b1642bbdea37b329d334c92d07175ff06e5cec2dc9ac510
+  metadata.gz: 6d39d0a78aa0a5ee1705c2836f280651a7cb2bb03b201bf555c01ef18fd2a362cb6c0955bdc74786a36714b7a708c6168cd1e0214e602341b866b22c500cc573
+  data.tar.gz: 3dc7b612454fa56b99197ceb2c135cad6100622e1a1765a6d87bc12c6e93d6dd30b557d3ab8397dac05121f7311e65f741b49440b5003af76dfad0230d663558

data/lib/moped_mapping.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require "moped_mapping/version"
 
 require 'moped'
@@ -38,6 +39,20 @@ module MopedMapping
     result
   end
 
+  # mainスレッド以外からmainスレッドのデータを書き換えるときに使用します
+  def update_main_collection_map(db_name, mapping)
+    Mutex.new.synchronize do
+      mt = Thread.main
+      mt[:MopedMapping_db_collection_map] ||= {}
+      mt[:MopedMapping_db_collection_map][db_name] = mapping
+      ct = Thread.current
+      unless ct == mt
+        ct[:MopedMapping_db_collection_map] ||= {}
+        ct[:MopedMapping_db_collection_map][db_name] = mapping
+      end
+    end
+  end
+
   def mapped_name(database, collection)
     return collection unless MopedMapping.enabled
     mapping = db_collection_map[database]

data/lib/moped_mapping/version.rb

@@ -1,3 +1,3 @@
 module MopedMapping
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/moped_mapping_spec.rb

@@ -82,8 +82,60 @@ describe MopedMapping do
         col.find.count.should == 3
       end
     end
+
+    it "update thread local mapping" do
+      MopedMapping.collection_map(@database_name,{"items" => "items@2" })
+      MopedMapping.enable
+
+      expect(MopedMapping.db_collection_map[@database_name]["items"]).to eq "items@2"
+
+      t = Thread.new do
+        expect(MopedMapping.db_collection_map[@database_name]["items"]).to eq "items@2"
+        MopedMapping.collection_map(@database_name, {"items" => "items@3"})
+        expect(MopedMapping.db_collection_map[@database_name]["items"]).to eq "items@3"
+        Thread.pass
+      end
+      t.join
+
+      MopedMapping.update_main_collection_map(@database_name, {"items" => "items@2"})
+
+      t = Thread.new do
+        MopedMapping.update_main_collection_map(@database_name, {"items" => "items@2"})
+        Thread.pass
+      end
+      t.join
+
+    end
+
   end
 
+  describe :update_main_collection_map do
+    it "update main mapping" do
+      MopedMapping.collection_map(@database_name,{"items" => "items@2" })
+      MopedMapping.enable
+
+      expect(MopedMapping.db_collection_map[@database_name]["items"]).to eq "items@2"
+
+      t = Thread.new do
+        expect(MopedMapping.db_collection_map[@database_name]["items"]).to eq "items@2"
+        MopedMapping.update_main_collection_map(@database_name, {"items" => "items@3"})
+        expect(MopedMapping.db_collection_map[@database_name]["items"]).to eq "items@3"
+        Thread.pass
+      end
+      t.join
+
+      MopedMapping.update_main_collection_map(@database_name, {"items" => "items@3"})
+
+      t = Thread.new do
+        MopedMapping.update_main_collection_map(@database_name, {"items" => "items@3"})
+        Thread.pass
+      end
+      t.join
+
+    end
+  end
+
+
   describe :create do
     it "actual usage" do
       MopedMapping.collection_map(@database_name,{"items" => "items@4" })

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: moped_mapping
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tengine_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: make mapping from moped collection object to MongoDB actual collection
@@ -74,7 +74,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,17 +101,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: make mapping from moped collection object to MongoDB actual collection by