tdiary-io-rdb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1f3278cfb2194a6bacca2be1f34daff5544401
-  data.tar.gz: ae93406a10b408c0ea0c85d759b7ee21ce2cd77f
+  metadata.gz: 227494226d6c740d601ad66f540837eec6715d8d
+  data.tar.gz: e7374c6d14e51de521372679c4b7d06289741fef
 SHA512:
-  metadata.gz: e2dfb2b922649ac5b2e1649df445ee99184376b341e8df0db19af7a37e2c929845dcb1ac1c420fa2f2b82a37b35a33bf430a59834e9444a464f315667ba4a64a
-  data.tar.gz: 921b64e1a0caffa1cdc1ab907d07b3cee3d9eea0363d1df3c58036156bd1369fef84c8a85e56fef6b95ccb09875a626ea868ecd581e3f5fbb0f56461eb468b05
+  metadata.gz: 50ccdb27765b59cf5db35e7cc4cc13b92f799c56643c1da0070acc47585a88f082d3db9e57aa1be4c0eb79cbf0123aa331ca358b7b3eb7144d0badef07b7320e
+  data.tar.gz: 4a5977040814b7627400693f9d9303fd54fb8c95dd9fc8b29abce937bad47b6f716db4ffc22b1c81d1533fe98becbdf4bad9bf70eac488d0921ffb2dd6ad7261

data/.travis.yml

@@ -1,5 +1,9 @@
 language: ruby
+sudo: false
 rvm:
   - 2.0.0
-  - 1.9.3
-script: bundle exec rspec spec
+  - 2.1
+  - 2.2
+  - 2.3.0
+  - ruby-head
+script: bundle exec rspec spec

data/README.md

@@ -1,6 +1,8 @@
-# Tdiary::Io::Rdb
+# TDiary::IO::Rdb
 
-TODO: Write a gem description
+[![Gem Version](https://badge.fury.io/rb/tdiary-io-rdb.png)](https://rubygems.org/gems/tdiary-io-rdb) [![Build Status](https://secure.travis-ci.org/tdiary/tdiary-io-rdb.png)](https://travis-ci.org/tdiary/tdiary-io-rdb)
+
+RDB like sqlite, mysql and postgresql adapter for tDiary
 
 ## Installation
 
@@ -18,7 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Add follow snipet to your tdiary.conf
+
+```ruby
+@io_class = TDiary::IO::Rdb
+```
 
 ## Contributing
 

data/lib/tdiary/io/rdb.rb

@@ -23,7 +23,7 @@ module TDiary
       def restore_comment(diaries)
         diaries.each do |date, diary_object|
           db[:comments].filter(:diary_id => date).order_by(:no).select(:name, :mail, :last_modified, :visible, :comment).each do |row|
-            comment = Comment.new(row[:name], row[:mail], row[:comment], Time.at(row[:last_modified].to_i))
+            comment = TDiary::Comment.new(row[:name], row[:mail], row[:comment], Time.at(row[:last_modified].to_i))
             comment.show = row[:visible]
             diary_object.add_comment(comment)
           end
@@ -36,15 +36,15 @@ module TDiary
           diary.each_comment(diary.count_comments(true)) do |com|
             no += 1
             date = {
-              :diary_id => diary_id,
-              :no => no
+              diary_id: diary_id,
+              no: no
             }
             body = {
-              :name => com.name,
-              :mail => com.mail,
-              :last_modified => com.date.to_i,
-              :visible => com.visible?,
-              :comment => com.body
+              name: com.name,
+              mail: com.mail,
+              last_modified: com.date.to_i,
+              visible: com.visible?,
+              comment: com.body
             }
             comment = db[:comments].filter(date)
             if comment.count > 0
@@ -92,31 +92,35 @@ module TDiary
         end
 
         def db(conf)
-          @@_db ||= Sequel.connect(conf.database_url || ENV['DATABASE_URL'])
+          @@_db ||= Sequel.connect(conf.database_url || ENV['DATABASE_URL']).tap{|db|
+            db.extension(:connection_validator)
+            db.pool.connection_validation_timeout = -1
+          }
+
+          @@_db.test_connection
 
           @@_db.create_table :conf do
-            String :body, :text => true
+            String :body, text: true
           end unless @@_db.table_exists?(:conf)
 
           @@_db.create_table :diaries do
-            String :diary_id, :size => 8
-            String :year, :size => 4
-            String :month, :size => 2
-            String :day, :size => 2
-            String :title, :text => true
-            String :body, :text => true
-            String :style, :text => true
+            String :diary_id, size: 8, primary_key: true
+            String :year, size: 4
+            String :month, size: 2
+            String :day, size: 2
+            String :title, text: true
+            String :body, text: true
+            String :style, text: true
             Fixnum :last_modified
             TrueClass :visible
-            primary_key :diary_id
           end unless @@_db.table_exists?(:diaries)
 
           @@_db.create_table :comments do
-            String :diary_id, :size => 8
+            String :diary_id, size: 8
             Fixnum :no
-            String :name, :text => true
-            String :mail, :text => true
-            String :comment, :text => true
+            String :name, text: true
+            String :mail, text: true
+            String :comment, text: true
             Fixnum :last_modified
             TrueClass :visible
             primary_key [:diary_id, :no]
@@ -164,7 +168,7 @@ module TDiary
       def restore(date, diaries, month = true)
         query = db[:diaries].select(:diary_id, :title, :last_modified, :visible, :body, :style)
         query = if month && /(\d\d\d\d)(\d\d)(\d\d)/ =~ date
-                  query.filter(:year => $1, :month => $2)
+                  query.filter(:year => $1, month: $2)
                 else
                   query.filter(:diary_id => date)
                 end
@@ -184,18 +188,18 @@ module TDiary
         diaries.each do |diary_id, diary|
           date = if /(\d\d\d\d)(\d\d)(\d\d)/ =~ diary_id
                    {
-              :year => $1,
-              :month => $2,
-              :day => $3,
-              :diary_id => diary_id
+              year: $1,
+              month: $2,
+              day: $3,
+              diary_id: diary_id
             }
                  end
           body = {
-            :title => diary.title,
-            :last_modified => diary.last_modified.to_i,
-            :style => diary.style,
-            :visible => diary.visible?,
-            :body => diary.to_src
+            title: diary.title,
+            last_modified: diary.last_modified.to_i,
+            style: diary.style,
+            visible: diary.visible?,
+            body: diary.to_src
           }
 
           entry = db[:diaries].filter(date)

data/spec/tdiary/io/rdb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe TDiary::IO::Rdb do
   it 'is_a TDiary::IO::Base' do
-    expect { TDiary::IO::Rdb.is_a?(TDiary::IO::Base) }.to be_true
+    expect(TDiary::IO::Rdb.new(DummyTDiary.new)).to be_a(TDiary::IO::Base)
   end
 
   describe "#save_cgi_conf and #load_cgi_conf" do

data/tdiary-io-rdb.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "tdiary-io-rdb"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["SHIBATA Hiroshi"]
   spec.email         = ["shibata.hiroshi@gmail.com"]
   spec.summary       = %q{rdb adapter for tDiary}
@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-io-rdb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-02 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 description: rdb adapter for tDiary
 email:
 - shibata.hiroshi@gmail.com
@@ -104,10 +104,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: rdb adapter for tDiary
 test_files:
 - spec/spec_helper.rb
 - spec/tdiary/io/rdb_spec.rb
+has_rdoc: