randwordjp 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c2b21f8689fca5f9354b5ec9a6b14dd61fdd4e
-  data.tar.gz: 5e3bf5611d1f9525e48ee5896d0a5ed79d6f2ac0
+  metadata.gz: 3f8e07532ffe0153676264159c221c4b1fe80d0d
+  data.tar.gz: 91b94a9e0479ead6a744cfcd57ee67564f23f640
 SHA512:
-  metadata.gz: a6ee7aa47401586072a884a7ab47cc74e63532309f630a55852994dbe87441eabf05160f880f189ef007cc3aa630102ffe9180f2f9850205066a32dd23737163
-  data.tar.gz: 22c2a7e30aaf6f114236476f819147c9484de464cbb40f16f9467e40f1a02467cafd8f8e370934b78312e232a736d9a70d67be4b6f19f8b4b9a55f1ab9d32445
+  metadata.gz: a966134dc0ad61b1e4d66753c7c61b6c166e2fa7d0d9262ba6554d664510cabd6fb7816ecdc9ce979cb66d39a77ee12550bf4d8377762a3bf5322eee831964fe
+  data.tar.gz: a32c95fd8e85327ac799ddfa096a0c588e8ff35a67fab8829ff37d21aea134395d3ba3619466cb4b8c4b4b322e474790a8aa799ac0e9de22ee3cd4b1a52fc4fd

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 mkmf.log
 Guardfile
 .rubocop.yml
+.ruby-version

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+jruby-1.7.19

data/lib/randwordjp/version.rb

@@ -2,5 +2,5 @@
 # ランダムで日本語文字列などを生成するライブラリとなります。
 # can get random words(sentence).
 module Randwordjp
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/randwordjp.rb

@@ -2,23 +2,23 @@
 require 'randwordjp/version'
 require 'date'
 require 'yaml'
+require 'sequel'
 
 # Randwordjp
 # ランダムで日本語文字列などを生成するライブラリとなります。
 # can get random words(sentence).
 module Randwordjp
-@java_platform = false
+
+  @dbfile = File.dirname(__FILE__) + '/randwordjp.db'
+  @yamlfile = File.dirname(__FILE__) + '/randwordjp.yml'
+
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
     require 'jdbc/sqlite3'
-    Jdbc::SQLite3.load_driver
-    @jdbc_sqlite = 'jdbc:sqlite:'
-    @java_platform = true
-    @dbfile = 'lib/randwordjp.db'
+    @db_connect = 'jdbc:sqlite:' + @dbfile
   else
     require 'sqlite3'
-    @dbfile = 'lib/randwordjp.db'
+    @db_connect = 'sqlite://' + @dbfile
   end
-  @yamlfile = 'lib/randwordjp.yml'
 
   # 半角数字の文字列を取得する
   # @param [Integer] length 文字列長 # @return [String] lengthで指定した文字列長の数字文字列
@@ -146,32 +146,12 @@ module Randwordjp
   # @return [Hash] :kanji => 漢字名, :kana => 読み仮名
   def self.myoji
     table = 'myojilist'
-    if @java_platform
-      connection = java.sql.DriverManager.getConnection('jdbc:sqlite:lib/randwordjp.db')
-      statement = connection.createStatement() 
-      sql = "select count(*) from #{table};"
-      rs = statement.executeQuery(sql)
-      rs.next
-      count = rs.getObject(1)
-      id = Random.rand(count)
-      sql = "select kanji,yomi from #{table} where id = #{id};"
-      rs = statement.executeQuery(sql)
-      rs.next
-      kanji = rs.getObject(1)
-      kana = rs.getObject(2)
-      connection.close
-    else
-      db = SQLite3::Database.new(@dbfile)
-      sql = "select count(*) from #{table};"
-      count = ((db.execute(sql))[0][0]).to_i
-      id = Random.rand(count)
-      sql = "select * from #{table} where id = #{id};"
-      data = db.execute(sql)
-      db.close
-      kanji = data[0][1]
-      kana = data[0][2]
+    Sequel.connect(@db_connect) do |db|
+      data = db.from(table)
+      id = Random.rand(data.count)
+      @myoji_datum = data.select(:kanji, :yomi).where(id: id).first
     end
-    { kanji: kanji, kana: kana }
+    { kanji: @myoji_datum[:kanji], kana: @myoji_datum[:yomi] }
   end
 
   # Hash型の名前データを取得する
@@ -179,36 +159,15 @@ module Randwordjp
   # @return [Hash] :kanji => 漢字名, :kana => 読み仮名, :gender => 性別
   def self.namae
     table = 'namaelist'
-    if @java_platform
-      connection = java.sql.DriverManager.getConnection('jdbc:sqlite:lib/randwordjp.db')
-      statement = connection.createStatement() 
-      sql = "select count(*) from #{table};"
-      rs = statement.executeQuery(sql)
-      rs.next
-      count = rs.getObject(1)
-      id = Random.rand(count)
-      sql = "select kanji,yomi,gender from #{table} where id = #{id};"
-      rs = statement.executeQuery(sql)
-      rs.next
-      kanji = rs.getObject(1)
-      kana = rs.getObject(2)
-      gender_base = rs.getObject(3)
-      connection.close
-    else
-      db = SQLite3::Database.new(@dbfile)
-      sql = "select count(*) from #{table};"
-      id = Random.rand(((db.execute(sql))[0][0]).to_i)
-      sql = "select * from #{table} where id = #{id};"
-      data = db.execute(sql)
-      kanji = data[0][1]
-      kana = data[0][2]
-      gender_base = data[0][3]
-      db.close
+    Sequel.connect(@db_connect) do |db|
+      data = db.from(table)
+      id = Random.rand(data.count)
+      @namae_datum = data.select(:kanji,:yomi,:gender).where(id: id).first
     end
     gender = 'M'
-    if gender_base == 2
+    if @namae_datum[:gender] == 2
       gender = 'F'
     end
-    { kanji: kanji, kana: kana, gender: gender }
+    { kanji: @namae_datum[:kanji], kana: @namae_datum[:yomi], gender: gender }
   end
 end

data/randwordjp.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'sequel'
   spec.add_development_dependency 'sqlite3' if $platform.to_s == 'ruby'
   spec.add_development_dependency 'jdbc-sqlite3' if $platform.to_s == 'java'
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: randwordjp
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - inpwjp
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: sequel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: get Japanese random words.
 email:
 - inpw@mua.biglobe.ne.jp
@@ -59,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -79,27 +93,26 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.5
+signing_key:
 specification_version: 4
 summary: get Japanese random words.
 test_files:
 - spec/randwordjp_spec.rb
 - spec/spec_helper.rb
-has_rdoc: