cliptic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed7e4167bd109d3595030a840bfa5295f7fefea8306db6a8843e09feb5bf1c5
-  data.tar.gz: 76c18f65f31077f7611d37e94025a2133f272553291a0a1cda68eebb3428966a
+  metadata.gz: 5c15d9b0f8ee2715ed5b6bbfb6a0abde640380518e4ae10394189d1d7c5b938c
+  data.tar.gz: 8bb8ad98ae095391b859af404aa91640f00b72beabec64cfe1cf717280ed828f
 SHA512:
-  metadata.gz: 26e80fd00217904ed0d081cf8a676c339e82d2c586667ebf8f47daa542fb9b3ec427b8b89bb4860b087b28f555624d03ccfa56fd1d9050bd28dfe4dcaff1968f
-  data.tar.gz: 8c29f4b0fa7ef0c25db0256854917de5b868f3068099588dc423c1aa4aa8f23715c7124d15e5175577b161cf0e2e0109a5587f049aaba6ad9e8960618cba79e7
+  metadata.gz: 64d058d05dae4b2fde66d0d47cddef98104396ee26dda9a4484a1e2b5541a203211741d0ddc715f8d42c78db6ca4d41623da3f4ab6361ece44558661ec9eab22
+  data.tar.gz: d3594c6af426c9306becf1c53fedf901bad49b95a0369763f97b377ac7bd1603f4796bf1a4d94e5783e6e6d5c1ee8b5f06f9f9d5728539f4a963fc0af2dd2276

data/README.md

@@ -7,16 +7,15 @@
 - Puzzles are sourced from the free crosswords uploaded daily to [Lovatt's][1]. 
 - cliptic is written in Ruby using the ncurses library
 
-## New to 0.1.2
+## New to 0.1.3
 
 ### Bug Fixes
-- Screen setup/config file bug fix
-	* Previously screen resize prompt would not show if screen was too small due to inability to source default colours
-- Fix earliest date bug (thank you `samtell21` for pointing this out)
-- Center the resize prompt
+- Fix the ssl certificate bug that prevents fetching puzzles
+- Fix the "out of range" bug when moving to an undefined index using `g`
 
 ### Features
-- Add menu recolour feature
+- Add manual redraw feature to the main puzzle view. Called with `^L` (useful for terminal resize)
+- Add exit controls to the resize interface (`q` or `^C`)
 
 ## Features
 - VIM-like keybindings
@@ -108,14 +107,15 @@ rake build install
 
 ### Global Commands
 
-| Command | Action                                                                                                 |
-|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `^S`    | Save current progress (note that progress is saved when exiting puzzles by default)                |
+| Command | Action                                                                                              |
+|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `^S`    | Save current progress (note that progress is saved when exiting puzzles by default)        |
 | `^R`    | Reveals solution for focussed clue (note that this forfeits adding this puzzle to high scores) |
-| `^C`    | Exit puzzle                                                                                            |
-| `^E`    | Resets timer and progress for puzzle                                                                   |
-| `^G`    | Mark current progress (only relevant if auto_mark is set to 0)                                         |
-| `^P`    | Pause game                                                                                             |
+| `^C`    | Exit puzzle                                                                                         |
+| `^E`    | Resets timer and progress for puzzle                                                                |
+| `^G`    | Mark current progress (only relevant if auto_mark is set to 0)                                      |
+| `^P`    | Pause game                                                                                          |
+| `^L`    | Redraws the screen (useful on resizing terminal window)                                             |
 
 ### Navigation (Normal Mode)
 - There are several ways to navigate the cells of the cliptic grid in **NORMAL MODE**.

data/lib/cliptic/interface.rb

@@ -91,7 +91,8 @@ module Cliptic
       end
       def show
         while Screen.too_small?
-          draw; getch
+          draw
+          exit if (c = getch) == ?q || c == 3
         end
       end
       def prompt
@@ -179,6 +180,7 @@ module Cliptic
       def enter(pre_proc:->{hide}, post_proc:->{show})
         pre_proc.call if pre_proc
         opts.values[selector.cursor]&.call
+        reset_pos
         post_proc.call if post_proc
       end
       def back(post_proc:->{hide})
@@ -230,6 +232,7 @@ module Cliptic
       def enter
         hide
         Main::Player::Game.new(date:stat_date).play
+        reset_pos
         show
       end
       def reset_pos

data/lib/cliptic/main.rb

@@ -144,7 +144,9 @@ module Cliptic
             .dig(:cells, 0, :meta, :data).length > 0
         end
         def raw
-          @raw || Curl.get(URL, data).body
+          @raw || Curl.get(URL, data) do |curl|
+            curl.ssl_verify_peer = false
+          end.body
         end
       end
       class Cache < Request
@@ -422,17 +424,18 @@ module Cliptic
       end
       class Board
         include Puzzle, Windows
-        attr_reader :puzzle, :grid, :box, :cursor, :clue, :dir
-        def initialize(date:Date.today)
+        attr_reader :puzzle, :grid, :box, :cursor, :clue, :dir, :state
+        def initialize(date:Date.today)#, state:)
           @puzzle = Puzzle::Puzzle.new(date:date)
           @grid   = Grid.new(puzzle:puzzle)
           @box    = Cluebox.new(grid:grid)
           @cursor = Cursor.new(grid:grid)
+          #@state  = state
         end
         def setup(state:nil)
           grid.draw
           load_state(state:state)
-          set_clue(clue:puzzle.first_clue, mv:true)
+          set_clue(clue:puzzle.first_clue, mv:true) if !@clue
           update
           self
         end
@@ -556,7 +559,7 @@ module Cliptic
           puzzle.get_clue(y:y, x:x, dir:dir)
         end
         def get_clue_by_index(i:)
-          puzzle.get_clue_by_index(i:i, dir:dir)
+          puzzle.get_clue_by_index(i:i, dir:dir) || clue
         end
         def addch(char:)
           current_cell.write(char.upcase)
@@ -605,16 +608,13 @@ module Cliptic
         attr_accessor :mode, :continue, :unsaved
         def initialize(date:Date.today)
           @date  = date
-          @state = State.new(date:date)
-          @board = Board.new(date:date)
-          @top_b = Top_Bar.new(date:date)
-          @bot_b = Bottom_Bar.new
+          init_windows
           @timer = Timer.new(time:state.time, bar:top_b, 
                              callback:->{board.update})
           @ctrls = Controller.new(game:self)
           @unsaved  = false
           @continue = true
-          setup
+          draw
         end
         def play
           if state.done
@@ -624,10 +624,11 @@ module Cliptic
             game_and_timer_threads.map(&:join)
           end
         end
-        def setup
-          [top_b, bot_b].each(&:draw)
-          self.mode = :N
-          board.setup(state:state)
+        def redraw
+          save
+          Screen.clear
+          init_windows
+          draw
         end
         def unsaved=(bool)
           @unsaved = bool
@@ -676,6 +677,17 @@ module Cliptic
           Screen.clear
         end
         private
+        def init_windows
+          @state = State.new(date:date)
+          @board = Board.new(date:date)
+          @top_b = Top_Bar.new(date:date)
+          @bot_b = Bottom_Bar.new
+        end
+        def draw
+          [top_b, bot_b].each(&:draw)
+          self.mode = :N
+          board.setup(state:state)
+        end
         def completed
           save
           log_score
@@ -789,6 +801,7 @@ module Cliptic
               5  => ->{game.reset_menu.choose_opt},
               7  => ->{game.board.puzzle.check_all},
               9  => ->{game.board.swap_direction},
+              12 => ->{game.redraw},
               16 => ->{game.pause},
               18 => ->{game.reveal},
               19 => ->{game.save}

data/lib/cliptic/version.rb

@@ -1,3 +1,3 @@
 module Cliptic
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cliptic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Christian Welham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses