xipai 0.0.1c → 0.0.1d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32279dd807c58c30d76cc2b94f21610257ed6798ee2bc1203b5e2247fcf9e73d
-  data.tar.gz: 4b67c5396ddcf8a7c10be0d439fe46bc2c43445468aa66c5d0d9e5d83f0b6e06
+  metadata.gz: f2d0407b20677317cc5dcf92749f50114b8927b0023ccae9c571e59277dc78d4
+  data.tar.gz: 34861b5d257c8951202f78eb032dd2b1640f2daf549d6df2b1c73adcda66129c
 SHA512:
-  metadata.gz: 99d0ebff0310e389bdac452e013809e80b92ecef7e4664c0ed7f01adc55346546f3bad30ef6b5592619b0f70724120a58d6f8e7760260a1a27c62616d4f1e59e
-  data.tar.gz: 7b0676bfc03c6c4cc14518627a49de5f96929034c7b117266c00e93c965e7940840f17f42cab51e9db63f95d8ec5a4edfc80e25a06297cca94ca6ad4dcb50329
+  metadata.gz: fbbe412e632afa2790b351dfc92efe8e8f86e052f840db290bd92cc8a49de3b2dfe937e1978dacd42778b27c0246597b1345a0acde764635b40267d087e76015
+  data.tar.gz: f260614e9b725f16e4317ce97d3e20882a8ea0260fa6b4db65d580297dcef0c6c697bbe56fe955a6c027ccf54a963bed150f4d0bce39299a9cfbd4e9aecb5024

data/lib/xipai/arrangement/lottery.rb

@@ -4,6 +4,7 @@ require File.expand_path("../../xipai/core", File.dirname(__FILE__))
 require File.expand_path("../../xipai/result", File.dirname(__FILE__))
 require File.expand_path("../../xipai/arrangement/base", File.dirname(__FILE__))
 require "optional"
+require "json"
 
 module Xipai
   module Arrangement
@@ -23,9 +24,12 @@ module Xipai
 
       def lottery(_items, _number_of_winners)
         return Some[_number_of_winners].match do |m|
-          m.some(->(x){x == 1}) {[_items[0]]}
-          m.some(->(x){x > 0}) {|x|_items[0..(x-1)]}
-          m.some() {raise "error: number_of_winners"}
+          m.some(->(x){x > 0}) {|x|
+            _items.sample(x, random: Random.new(
+              JSON.generate(_items).bytes.reduce(:*)
+            ))
+          }
+          m.some() {raise "Error: number_of_winners"}
         end
       end
 

data/lib/xipai/core.rb

@@ -11,8 +11,13 @@ module Xipai
         seed, hashcode = spinkle_hashcode_bytes(generate_seed(words), hashcode, opt)
 
         random = seed == 0 ? Random.new : Random.new(seed)
-
-        shuffled = normalize_items(items).shuffle!(random: random)
+        normalized_items = normalize_items(items)
+        shuffled =
+          normalized_items.shuffle!(
+            random: Random.new(JSON.generate(
+              normalized_items.shuffle!(random: random)
+            ).bytes.reduce(:+) + seed.to_i
+          ))
         return {
           hashcode: hashcode,
           shuffled: shuffled

data/lib/xipai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xipai
-  VERSION = "0.0.1c"
+  VERSION = "0.0.1d"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xipai
 version: !ruby/object:Gem::Version
-  version: 0.0.1c
+  version: 0.0.1d
 platform: ruby
 authors:
 - Hiroshi IKEGAMI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor