tdiary-io-mongodb 4.2.0 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27237ff28a4c7aa4abcc18ba8c5632fa7e40cfdf
-  data.tar.gz: 80c089e7233b40a66bf1a8ab0e75ec9ce7663c57
+  metadata.gz: e9d87a14e421d3e501b09a8b5e8ef446fbb7386e
+  data.tar.gz: 04cfd294fae76cce64f64b16dca43b415ad3f703
 SHA512:
-  metadata.gz: d20555be2ad95905f77d8d7f3883e5aa27e80f8d9f5061bcc721613d6af11f09dcabe88571d366b30a355631affc1e24a7c54a3ff0d8aab3b201cbceedb8ec45
-  data.tar.gz: c21327be947472cd5621e008ca60a365d431d74cd4ce430006b31f3d1a097129e1ca223b078ce02aec0d5c7dd622d0044782fd413d96be63f3b1242704ecfc2a
+  metadata.gz: bbbbac2194fad9e42866b3539e44593f47af05e28e694701a9237145b8bfde727676dbe06d9eeeee62ba84ded3d0b6eb4104f9b1926e155015dac7e68632edc3
+  data.tar.gz: '0578140605a1ebf9fd920af00085071916e8eafb74a1230fb8eded238e3da73ab3b343c0059222d9a4599260e2d40ba82db38f9c6ceb2b406974e5cadcab86dc'

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
+cache: bundler
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
+  - 2.2
+  - 2.3.3
+  - 2.4.0
+  - ruby-head
+
+before_install:
+     - gem update bundler
+
 script: bundle exec rake spec
+
 services:
   - mongodb

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'tdiary', github: 'tdiary/tdiary-core'
+gem 'tdiary-style-rd'

data/README.md

@@ -4,7 +4,7 @@ mongoid adapter for tDiary
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your tDiary's Gemfile.local:
 
     gem 'tdiary-io-mongodb'
 
@@ -12,10 +12,6 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install tdiary-io-mongodb
-
 ## Usage
 
 Add follow snipet to your tdiary.conf
@@ -24,6 +20,45 @@ Add follow snipet to your tdiary.conf
 @io_class = TDiary::IO::MongoDB
 ```
 
+## Migration
+
+`bin/tdiary-mongodb-convert` is utility that uploads tDiary default IO data to MongoDB.
+
+(1) Migrate tDiary configuration
+
+Migrate your tDiary configuration to MongoDB.
+
+```
+$ bundle exec tdiary-mongodb-convert -c $DATA_PATH/tdiary.conf -m $MONGODB_URI
+```
+
+ * $MONGODB_URI: the uri of mongodb (mongodb://)
+ * $DATA_PATH: the path of your tdiary data directory
+
+(2) Migrate tDiary data
+
+Migrate your tDiary data to MongoDB.
+
+```
+$ bundle exec tdiary-mongodb-convert -s ./lib/tdiary/style -m $MONGODB_URI $DATA_PATH
+```
+ * $MONGODB_URI: the uri of mongodb (mongodb://)
+ * $DATA_PATH: the path of your tdiary data directory
+
+### Note
+
+If you use the style provided by an external gem (like GFM style), append the gem to Gemfile and run `bundle`.
+
+```
+gem 'tdiary-style-gfm'
+gem 'tdiary-style-etdiary'
+gem 'tdiary-style-rd
+```
+
+### See also
+
+ * http://sho.tdiary.net/20150206.html#p01 (in Japanese)
+
 ## Contributing
 
 1. Fork it

data/lib/tdiary/io/mongodb.rb

@@ -110,6 +110,8 @@ module TDiary
 			include Cache
 
 			class << self
+				Mongo::Logger.level = Logger::WARN
+
 				def load_cgi_conf(conf)
 					db(conf)
 					if cgi_conf = Conf.all.first
@@ -131,7 +133,7 @@ module TDiary
 
 				def db(conf)
 					@@_db ||= Mongoid::Config.load_configuration(
-						{sessions:{default:{uri:(conf.database_url || 'mongodb://localhost:27017/tdiary')}}}
+						{clients:{default:{uri:(conf.database_url || 'mongodb://localhost:27017/tdiary')}}}
 					)
 				end
 

data/spec/spec_helper.rb

@@ -83,7 +83,7 @@ end
 
 RSpec.configure do |c|
 	c.after(:suite) do
-		Mongoid.default_session.collections.each do |collection|
+		Mongoid.default_client.database.collections.each do |collection|
 			collection.drop
 		end
 	end

data/tdiary-io-mongodb.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "tdiary-io-mongodb"
-  spec.version       = "4.2.0"
+  spec.version       = "5.0.3"
   spec.authors       = ["TADA Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{MongoDB adapter for tDiary}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid", "~> 4.0"
+  spec.add_dependency "mongoid", "~> 6.0"
   spec.add_dependency "hikidoc"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-io-mongodb
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 5.0.3
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: hikidoc
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: MongoDB adapter for tDiary