iching 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567e0c98f1b44a86ebdc288e809e6172e639a0d4c5eab59cd439fd30ce9a607a
-  data.tar.gz: 39f7e2a9e4dbeaf798b1edd9efb8147f825d5295626c32eb0726f9262adef374
+  metadata.gz: cff67291520838e0821b0e0648424d8beba77a291a64ee051753a5883b39418a
+  data.tar.gz: da51e48699b6ab49bd6ec874672d4b23e7aa46f6215ce6e1ec9323fe6adb3de6
 SHA512:
-  metadata.gz: 8bac72fe8e70ebfd6ebb418e6eb117426c2d244735f8922e4db54b342030956895fe49670020e86172421d8fa1476732a1b239a282cdf51ca299cf3e6cd29bbc
-  data.tar.gz: 745bf6b04d09f04a92a856c08857b755bc48a3115366c91b6e1fc527c2e89515b547afa2986a7f5dd00ba23aef316f85dfad1d335681d9a7b4aa9eb7849a7fd3
+  metadata.gz: 9d5bbebbd7b3195f58554c1bdb5e3d8ac3f70fa5507990585e0c29872b5621b51ffe179d8c6b5a20b9bf437daf9ff3cbe7a94eed277f533a6dfe61cd7218639e
+  data.tar.gz: 24d2b091dbd5af5bc0b27e7aaed93cb9b47586e4c69ffe7657bb4bf8cac6c6c5ca664755c2cf77553f030685205a2c8c852145d94a7d793b1d08661b4fbff0ad

data/iching.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "iching"
-  s.version     = "0.2.0"
+  s.version     = "0.3.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matt Mills"]
   s.email       = ["sunrisetimes@gmail.com"]

data/lib/dictionaries.rb

@@ -1,9 +1,6 @@
 # encoding: UTF-8
 module Dictionaries
-  def hex
-    6.times.map{ Random.new.rand(6..9) }.reverse  
-  end
-  
+
   def list
     { '111111'=> '1. Force (乾 qián); The Creative; Possessing Creative Power & Skill',
       '000000'=> '2. Field (坤 kūn); The Receptive; Needing Knowledge & Skill; Do not force matters and go with the flow',
@@ -70,20 +67,4 @@ module Dictionaries
       '101010'=> '63. Already_Fording (既濟 jì jì); After Completion; Completion',
       '010101'=> '64. Not-Yet Fording (未濟 wèi jì); Before Completion; Incompletion'}
   end
-    
-  def hexagram1_key
-    { 6 => '-- --', 7 => '-----', 8 => '-- --', 9 => '-----'}
-  end
-
-  def hexagram2_key 
-    { 6 => '-----', 7 => '-----', 8 => '-- --', 9 => '-- --'}
-  end
-  
-  def binhex1_key
-    { 6 => '0', 7 => '1', 8 => '0', 9 => '1'}
-  end
-
-  def binhex2_key 
-    { 6 => '1', 7 => '1', 8 => '0', 9 => '0'}
-  end
 end

data/lib/iching.rb

@@ -2,32 +2,52 @@
 require 'dictionaries.rb'
 
 class Iching
-  include ::Dictionaries
+  def hex
+    @hex ||= 6.times.map{ Random.new.rand(6..9) }.reverse
+  end
 
   def display
-    @current_hex = hex()
-    if Random.new.rand(1..20) > 1
-      puts hex_symbol, hex_name, hex_symbol(2), hex_name(2)
-    else
-      puts "A suffusion of yellow."
-    end
-  end
-
-  def hex_name(second = false)
-    unless second
-      bin_hex = @current_hex.inject('') {|store,stick| store << binhex1_key[stick]}
-    else
-      bin_hex = @current_hex.inject('') {|store,stick| store << binhex1_key[stick]}
-    end
-    bin_hex.reverse!
-    return list[bin_hex]
-  end
-
-  def hex_symbol(second = false)
-    unless second
-      @current_hex.inject('') {|store, stick| store << hexagram1_key[stick] + "\n"}
-    else
-      @current_hex.inject('') {|store, stick| store << hexagram2_key[stick] + "\n"}
-    end
+    # puts "A suffusion of yellow." && return if Random.new.rand(1..20) <= 1
+    hex1 = Hex1.new(hex)
+    hex2 = Hex2.new(hex)
+    puts hex1.hex_symbol, hex1.hex_name, hex2.hex_symbol, hex2.hex_name
+  end
+
+end
+
+class Hex1
+  include ::Dictionaries
+
+  attr_reader :hex
+
+  def initialize(hex)
+    @hex = hex
+  end
+
+  def bin_hex_key
+    { 6 => '0', 7 => '1', 8 => '0', 9 => '1'}
+  end
+
+  def hexagram_key
+    { 6 => '-- --', 7 => '-----', 8 => '-- --', 9 => '-----'}
+  end
+
+  def hex_symbol
+    hex.map{|n| hexagram_key[n] }.join("\n")
+  end
+
+  def hex_name
+    hex_binary = hex.map{|n| bin_hex_key[n]}.join("").reverse()
+    return list[hex_binary]
+  end
+end
+
+class Hex2 < Hex1
+  def bin_hex_key
+    { 6 => '1', 7 => '1', 8 => '0', 9 => '0'}
+  end
+
+  def hexagram_key
+    { 6 => '-----', 7 => '-----', 8 => '-- --', 9 => '-- --'}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iching
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Mills
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Generate an Iching hexagram and access various things about it.
 email:
@@ -29,7 +29,7 @@ homepage: http://github.com/mattmills/iching
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -44,8 +44,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: tell the future (but not really)
 test_files: []