tdiary-io-mongodb 4.1.1.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d83e67043b04eb154ef1c0ecc2bc5ff3279e19a3
-  data.tar.gz: 081e18e51fee6655872bb72ddf31cdc5e741a9be
+SHA256:
+  metadata.gz: e238fc1411ee9e6c2799b957680df12df93b21e615d7cd1b6710a923fc94946a
+  data.tar.gz: bf84b576fdfca7607fda1f7b9b554f40f2ca3193c2e96590a1175bab348c5887
 SHA512:
-  metadata.gz: 2086944b2afb55cdd6e85766ee2a13f9403e8e5a8a97304c64e5fff5bf494912553c6d144c7daecffea60125d4b777421c46acd107a77b6ded4a221d84df17d4
-  data.tar.gz: 7595e470e22af7c62fe730bc5c524c862d5025dd35250990a752e4245bfce1a1fc97b53d785ee224e58498c99aabbf13b10b013687830b73b25591e920927a9f
+  metadata.gz: d39177a691525bf37a60c4f0bec0673db8c24487d9d7cd9ab6081f206ddbf4a1b478ab67601fc7fead882950c724644b90ddd87e526e867f9b65e1329812fb24
+  data.tar.gz: 95d8171ea0a0094f2b468e3dd10634a77b948609a7bd7aea98f26925e0440cca9c37fc8d318ef1702fcb8aabb1715352d022b9062c37a7ffd868721ec6ad4592

data/.travis.yml

@@ -1,8 +1,20 @@
 language: ruby
+cache: bundler
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
+before_install:
+
 script: bundle exec rake spec
+
 services:
   - mongodb

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongodb.gemspec
 gemspec
-
-gem 'tdiary', github: 'tdiary/tdiary-core'

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/bin/tdiary-mongodb-convert

@@ -10,6 +10,7 @@ require 'tdiary/referer_manager'
 require 'tdiary/style'
 require 'tdiary/cache/file'
 require 'ostruct'
+require 'tdiary/core_ext'
 
 def load_diaries(data_path, style_path)
 	require 'tdiary/io/default'

data/lib/tdiary/io/mongodb.rb

@@ -31,7 +31,7 @@ module TDiary
 				include Mongoid::Timestamps
 				store_in collection: "comments"
 
-				belongs_to :diary
+				belongs_to :diary, class_name: 'TDiary::IO::MongoDB::Diary'
 				field :name, type: String
 				field :mail, type: String
 				field :body, type: String
@@ -61,8 +61,8 @@ module TDiary
 				field :style, type: String
 				field :last_modified, type: Integer
 				field :visible, type: Boolean
-				has_many :comments, autosave: true
-				has_many :referers, autosave: true
+				has_many :comments, autosave: true, class_name: 'TDiary::IO::MongoDB::Comment'
+				has_many :referers, autosave: true, class_name: 'TDiary::IO::MongoDB::Referer'
 
 				index({diary_id: 1}, {unique: true})
 				index({year: 1, month: 1})
@@ -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
 
@@ -181,9 +183,15 @@ module TDiary
 			end
 
 			def calendar
+				mongo_project = {
+					"$group" => {
+						"_id" => {"year" => "$year", "month" => "$month"},
+						"count" => {"$sum" => 1}
+					}
+				}
 				calendar = Hash.new{|hash, key| hash[key] = []}
-				Diary.all.map{|d|[d.year, d.month]}.sort.uniq.each do |ym|
-					calendar[ym[0]] << ym[1]
+				Diary.collection.aggregate([mongo_project]).map do |cal|
+					calendar[cal['_id']['year']] << cal['_id']['month']
 				end
 				calendar
 			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,8 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "tdiary-io-mongodb"
-  spec.version       = "4.1.1.3"
-  spec.authors       = ["TADA Tadashi"]
+  spec.version       = "5.1.0"
+  spec.authors       = ["Tada, Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{MongoDB adapter for tDiary}
   spec.summary       = %q{MongoDB adapter for tDiary}
@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid"
+  spec.add_dependency "mongoid", "~> 7.0"
+  spec.add_dependency "mongo", "< 2.9.0"
   spec.add_dependency "hikidoc"
+  spec.add_dependency "tdiary", ">= 5.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-io-mongodb
 version: !ruby/object:Gem::Version
-  version: 4.1.1.3
+  version: 5.1.0
 platform: ruby
 authors:
-- TADA Tadashi
+- Tada, Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: hikidoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hikidoc
+  name: tdiary
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: MongoDB adapter for tDiary