randwordjp 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43266918843165e065c787dfc7bfbbba28f0781a
-  data.tar.gz: 5396855a700c7c31c081368b71565131bc0237e8
+  metadata.gz: 36d6656d6d57df266ed55a4dd2401e5f58e9ee38
+  data.tar.gz: 9ab41c7e2c034c9b9979f6641bc33b358a9bffa2
 SHA512:
-  metadata.gz: 1b73c5a53b83622ed64f53be90ac1cc553cd7052ddd855022049c09b2fd360f8f93a86b4bb82e02d2409a3fddc87776f8bce575c590fff6e02a510e82fef4995
-  data.tar.gz: bb9a6a0c8e26f82e2281ea6acae6541d52a2c146f9dc2ce932e77843bb82197350fe5cdf41b7a1759fb5f2bf45fe66da4ff591725506fd0a46b6a84af6f3a590
+  metadata.gz: 8be980ba0c27de4ae04a06f65772ae6193758702bb03aa89ee0e65bc09b1f0c1e500118c42e2945f71aa224a743df4c8ea6626aa898fa76576655df8e411052a
+  data.tar.gz: 20e3e07af0e994d059360b3d74444220db60298438d1391ae031da5a114424a728e414280b0e33132aec543f5679ad46fe61987f78dfff30754fd82c9c3a00ec

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.19
+2.2.0

data/lib/randwordjp/version.rb

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

data/lib/randwordjp.rb

@@ -159,16 +159,20 @@ module Randwordjp
 
   # Hash型の名前データを取得する
   # genderは男性はMで女性はFになります。
+  # @param [Symbol] opt[:only] :male 男性のみの出力 :female 女性のみの出力
   # @return [Hash] :kanji => 漢字名, :kana => 読み仮名, :gender => 性別
-  def self.namae
+  def self.namae(opt = {only: false } )
     table = 'namaelist'
     Sequel.connect(@db_connect) do |db|
       data = db.from(table)
-      id = Random.rand(data.count + 1)
-      while id == 0
-        id = Random.rand(data.count + 1)
+      if opt[:only] == :male
+        data = data.where(gender: 1)
+      elsif opt[:only] == :female
+        data = data.where(gender: 2)
       end
-      @namae_datum = data.select(:kanji, :yomi, :gender).where(id: id).first
+      no = Random.rand(data.count)
+      data = data.select(:kanji, :yomi, :gender)
+      @namae_datum = data.limit(1).offset(no).first
     end
     gender = 'M'
     if @namae_datum[:gender] == 2

data/spec/randwordjp_spec.rb

@@ -75,6 +75,14 @@ describe Randwordjp do
       expect(Randwordjp.namae).not_to eq nil
     end
 
+    it 'only male data' do
+      expect(Randwordjp.namae(only: :male)).not_to eq nil
+    end
+
+    it 'only female data' do
+      expect(Randwordjp.namae(only: :female)).not_to eq nil
+    end
+
     it 'namae have :kana at return hash' do
       expect(Randwordjp.namae[:kana]).not_to eq nil
     end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: randwordjp
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - inpwjp
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !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: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
+  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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   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'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: get Japanese random words.
 email:
 - inpw@mua.biglobe.ne.jp
@@ -73,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
@@ -93,24 +93,24 @@ 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:
+rubyforge_project: 
 rubygems_version: 2.4.5
-signing_key:
+signing_key: 
 specification_version: 4
 summary: get Japanese random words.
 test_files: