tdiary-io-mongodb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f93930b365924ed1a58946c9a22e400bf6f1c7
-  data.tar.gz: 08c80ed7a8a4cd91190ddf6865f69d3f6f4d0e18
+  metadata.gz: 114f562916eb47fba2815a72cb0a4aed1a028f5e
+  data.tar.gz: f41a5913047cf0c763f6831f6c64a2fbeb98476d
 SHA512:
-  metadata.gz: 263dc101abb96dec4c02f49a2f3c2df9890963adf45f78308ba5cf579ff0f2a70b77d82fb362331daf4662324f3ac4140dcc9e87fe67bcd4f1eec757831cfe9a
-  data.tar.gz: 1cba6bb3d0eef4d96a2f42cb2dda1657013874be3143d8180832b45c6860d48e9f67af50a505c8f571c04c52a43618737d552d2bec4fa9deb54327606cac6162
+  metadata.gz: f64701eff4db012e0d29403ae3213a90e49168f25aca9ff8e619719f0b0e8f616afb6ebc8969b4a68c2b158e42d849717593bbda0e6c085ee55dc44370442f5a
+  data.tar.gz: 30e2ff164dee5657d62e0baceac33a53a98daa7df64894839cbf413d55edeffd42853021fb3bd85dbbcb352787563002e9bdc85b24c3acaf80de0e30a6f403e1

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+script: bundle exec rake spec
+services:
+  - mongodb

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/tdiary-mongodb-convert

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'erb'
+require 'tdiary/view_helper'
+require 'tdiary/base'
+require 'tdiary/comment'
+require 'tdiary/comment_manager'
+require 'tdiary/referer_manager'
+require 'tdiary/style'
+require 'tdiary/cache/file'
+require 'ostruct'
+
+def load_diaries(data_path, style_path)
+	require 'tdiary/io/default'
+
+	options = {
+		'style.path' => style_path
+	}
+	conf = OpenStruct.new({
+		data_path: "#{data_path}/",
+		options: options
+	})
+	tdiary = OpenStruct.new({conf: conf})
+	default_io = TDiary::IO::Default.new(tdiary)
+
+	default_io.calendar.each do |y, ms|
+		ms.each do |m|
+			puts "loading #{y}-#{m}"
+			month = Time.local(y.to_i, m.to_i)
+			default_io.transaction(month) do |diaries|
+				yield month, diaries
+				TDiary::TDiaryBase::DIRTY_NONE
+			end
+		end
+	end
+end
+
+def update_diaries(mongodb_io, month, new_diaries)
+	mongodb_io.transaction(month) do |diaries|
+		diaries.update(new_diaries)
+		TDiary::TDiaryBase::DIRTY_DIARY | TDiary::TDiaryBase::DIRTY_COMMENT
+	end
+end
+
+def store_diaries(data_path, style_path, mongo_url = nil)
+	require 'tdiary/io/mongodb'
+
+	options = {'style.path' => [style_path]}
+	conf = OpenStruct.new({options: options, database_url: mongo_url})
+	tdiary = OpenStruct.new({conf: conf})
+	TDiary::IO::MongoDB.load_cgi_conf(conf)
+	mongodb_io = TDiary::IO::MongoDB.new(tdiary)
+
+	load_diaries(data_path, style_path) do |month, diaries|
+		update_diaries(mongodb_io, month, diaries)
+	end
+end
+
+def store_conf(conf_path, mongo_url = nil)
+	require 'tdiary/io/mongodb'
+
+	conf = OpenStruct.new({options: {}, database_url: mongo_url})
+	tdiary = OpenStruct.new({conf: conf})
+
+	TDiary::IO::MongoDB.save_cgi_conf(conf, open(conf_path, &:read))
+end
+
+args = {}
+OptionParser.new do |opts|
+	opts.banner = 'Usage: tdiary-mongodb-convert [options] <data_path>'
+	opts.on('-c CONF', '--conf=CONF', 'store only tdiary.conf'){|v| args[:conf] = v}
+	opts.on('-s PATH', '--style=STYLE', 'style path'){|v| args[:style] = v}
+	opts.on('-m URL',  '--mongo=URL', 'URL of mongoDB'){|v| args[:mongo] = v}
+	opts.parse!(ARGV)
+
+	args[:data] = ARGV.shift
+	unless args[:data] || args[:conf]
+		$stderr.print opts.help
+		exit 1
+	end
+end
+
+if args[:conf]
+	store_conf(args[:conf], args[:mongo])
+else
+	store_diaries(args[:data], args[:style], args[:mongo])
+end

data/lib/tdiary/io/mongodb.rb

@@ -58,12 +58,50 @@ module TDiary
 				field :body, type: String
 				field :style, type: String
 				field :last_modified, type: Integer
+				field :visible, type: Boolean
 				has_many :comments, autosave: true
 				has_many :referers, autosave: true
 
 				index({diary_id: 1}, {unique: true})
 				index('comments.no' => 1)
 			end
+
+			class Plugin
+				include Mongoid::Document
+				include Mongoid::Timestamps
+				store_in collection: "plugins"
+
+				field :plugin, type: String
+				field :key, type: String
+				field :value, type: String
+
+				def self.get(plugin_name, key)
+					record = where(plugin: plugin_name, key: key).first
+					return record ? record.value : nil
+				end
+
+				def self.set(plugin_name, key, value)
+					record = where(plugin: plugin_name, key: key).first
+					if record
+						record.update_attributes(value: value)
+					else
+						record = self.new(plugin: plugin_name, key: key, value: value)
+						record.save!
+					end
+				end
+
+				def self.delete(plugin_name, key)
+					record = where(plugin: plugin_name, key: key).first
+					if record
+						record.delete
+					end
+				end
+
+				def self.keys(plugin_name)
+					records = where(plugin: plugin_name)
+					return records.map(&:key) rescue []
+				end
+			end
 	
 			include Cache
 
@@ -92,6 +130,31 @@ module TDiary
 						{sessions:{default:{uri:(conf.database_url || 'mongodb://localhost:27017/tdiary')}}}
 					)
 				end
+
+				def plugin_open(conf)
+					return nil
+				end
+
+				def plugin_close(storage)
+					# do nothing
+				end
+
+				def plugin_transaction(storage, plugin_name)
+					db = plugin_name.dup
+					def db.get(key)
+						Plugin.get(self, key)
+					end
+					def db.set(key, value)
+						Plugin.set(self, key, value)
+					end
+					def db.delete(key)
+						Plugin.delete(self, key)
+					end
+					def db.keys
+						Plugin.keys(self)
+					end
+					yield db
+				end
 			end
 
 			#

data/spec/tdiary/io/mongodb_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe TDiary::IO::MongoDB do
-	it 'is_a TDiary::IO::Base' do
-		expect { TDiary::IO::MongoDB.is_a?(TDiary::IO::Base) }.to be_true
+	it 'is based on TDiary::IO::Base' do
+		expect(TDiary::IO::MongoDB < TDiary::IO::Base).to be true
 	end
 
 	describe "#save_cgi_conf and #load_cgi_conf" do
@@ -26,6 +26,50 @@ describe TDiary::IO::MongoDB do
 		end
 	end
 
+	describe "plugin storage support" do
+		it ".plugin_open returns nil" do
+			expect(TDiary::IO::MongoDB.plugin_open(nil)).to be nil
+		end
+
+		it ".plugin_close do nothing" do
+			# nothing
+		end
+
+		describe ".plugin_transaction" do
+			let(:storage){ TDiary::IO::MongoDB.plugin_open(nil) }
+
+			it "store/restore data" do
+				TDiary::IO::MongoDB.plugin_transaction(storage, 'test_plugin') do |db|
+					db.set('test_key', 'test_value')
+					expect(db.get('test_key')).to eq('test_value')
+				end
+			end
+
+			it "update data" do
+				TDiary::IO::MongoDB.plugin_transaction(storage, 'test_plugin') do |db|
+					db.set('test_key', 'test_update')
+					expect(db.get('test_key')).to eq('test_update')
+				end
+			end
+
+			it "delete data" do
+				TDiary::IO::MongoDB.plugin_transaction(storage, 'test_plugin') do |db|
+					db.set('test_key', 'test_delete')
+					db.delete('test_key')
+					expect(db.get('test_key')).to eq(nil)
+				end
+			end
+
+			it "keys" do
+				TDiary::IO::MongoDB.plugin_transaction(storage, 'test_plugin') do |db|
+					db.set('test_key1', 'test_value1')
+					db.set('test_key2', 'test_value2')
+					expect(db.keys).to match_array ['test_key1', 'test_key2']
+				end
+			end
+		end
+	end
+
 	describe "#transaction" do
 		let(:io) { TDiary::IO::MongoDB.new(DummyTDiary.new) }
 		let(:today) { Time.now.strftime( '%Y%m%d' ) }

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       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["TADA Tadashi"]
   spec.email         = ["t@tdtds.jp"]
   spec.description   = %q{MongoDB adapter for tDiary}
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "mongoid"
+  spec.add_dependency "hikidoc"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-io-mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - TADA Tadashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hikidoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -83,15 +97,18 @@ dependencies:
 description: MongoDB adapter for tDiary
 email:
 - t@tdtds.jp
-executables: []
+executables:
+- tdiary-mongodb-convert
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/tdiary-mongodb-convert
 - lib/tdiary/io/mongodb.rb
 - spec/spec_helper.rb
 - spec/tdiary/io/mongodb_spec.rb
@@ -116,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MongoDB adapter for tDiary