random-word 2.0.0 → 2.1.0

data/lib/random_word.rb

@@ -1,5 +1,6 @@
 require 'set'
 require 'pathname'
+require 'json'
 
 # Provides random, non-repeating enumerators of a large list of
 # english words. For example"
@@ -72,14 +73,14 @@ module RandomWord
 
     # @return [Enumerator] Random noun enumerator
     def nouns(opts = {})
-      @nouns ||= enumerator(load_word_list("nouns.dat"), exclude_list)
+      @nouns ||= enumerator(load_word_list("nouns.json"), exclude_list)
       word_list.set_constraints(opts)
       @nouns
     end
 
     # @return [Enumerator] Random adjective enumerator
     def adjs(opts = {})
-      @adjs ||= enumerator(load_word_list("adjs.dat"), exclude_list)
+      @adjs ||= enumerator(load_word_list("adjs.json"), exclude_list)
       word_list.set_constraints(opts)
       @adjs
     end
@@ -107,8 +108,8 @@ module RandomWord
     protected
 
     def load_word_list(name)
-      data_root = Pathname(File.dirname(__FILE__)) + "../data"
-      File.open(data_root + name){|f| Marshal.load(f)}
+      filename = File.join Pathname(File.dirname(__FILE__)), "../data", name
+      JSON.parse(File.read(filename))
     end
   end
 end

data/lib/random_word/version.rb

@@ -1,3 +1,3 @@
 module RandomWord
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: random-word
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Peter Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,8 +100,8 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
-- data/adjs.dat
-- data/nouns.dat
+- data/adjs.json
+- data/nouns.json
 - lib/random-word.rb
 - lib/random_word.rb
 - lib/random_word/version.rb
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Pick random words for factory data