wahy 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8992df63d738bc270dcef57c353356f80792df9c04da329e0fe9bb678f819b7
-  data.tar.gz: d0c95b7f8fa2183d3d8fa46de749934d3f856f9311302296817c2b7efdb3475b
+  metadata.gz: 665ed20de1fda09d4a4e86b984f0da8b7f17447383ab0e8d57624b8326912513
+  data.tar.gz: d3cb429e690f296c81a746c4616eed472947f872d6f0def1ca05eaf9f04b7994
 SHA512:
-  metadata.gz: f305f0f9dae0d31b680b570541d4e8362953206d9683875e0c6dfbbaeab6d360bd79e046de03d14e0a5bc90094cb01f48e5d6e5506d39530c24b77581ce9ba41
-  data.tar.gz: e607ee3f7b4ac2d97e08d41e061f418879b977b89282b737e52597ce6c5b71abce84e0f7394d5c97fb13d90cee68245176d47d9415fceac94050c54e86f5a4c3
+  metadata.gz: a732cc0e89bd2a228d62a778740e1afdacec092ebf84d9da74ddb226a093408d48118b61ee33487a683c1a351d1eeea5140fb044775483ed10cbf80d6bbd4264
+  data.tar.gz: e683adf860b008fcfda72740adf5a227303bbdc272f75c17840df171be63d4d188a79e697fef969104540c754a766489125a652cf2f5b5fe6b6b81b8709501f6

data/README.md

@@ -65,19 +65,22 @@ wahy
 View a specific chapter in Turkish:
 
 ```bash
-wahy -l tur -s <chapter_name_or_number>
+wahy -l tur -s <chapter_number>  # If you know name of Chapter, you don't need to use -l --lang parameter.
+# With -l (`tur` or `eng`)  always use -s <Chapter number>
 ```
 
 View a specific verse:
 
 ```bash
-wahy -l tur -s <chapter_name_or_number> -a <verse_number>
+wahy -l tur -s <chapter_number> -a <verse_number>
+
+wahy -s <chapter_mame_or_number> -a <verse_number>
 ```
 
 Save output to a file:
 
 ```bash
-wahy -l tur -s <chapter_name_or_number> -a <verse_number> > output.txt
+wahy -s <chapter_name_or_number> -a <verse_number> > output.txt
 ```
 
 ## Library (API) Usage

data/lib/wahy/cli.rb

@@ -1,89 +1,134 @@
+# lib/wahy/cli.rb
 require 'optparse'
 require 'colorize'
 
 module Wahy
   class CLI
     def self.start(args)
-      # Set default options
-      options = { lang: 'eng', scripture: '1', ayah: 'all' }
+      options = {
+        lang: 'eng',
+        scripture: '1',
+        ayah: 'all',
+        list_chapters: false # Yeni: Listeleme seçeneği varsayılan olarak kapalı
+      }
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: wahy [options]"
 
-        opts.on("-l", "--lang LANGUAGE", "Language selection ('tur' or 'eng') - Default: eng") do |l|
+        opts.on("-l", "--lang LANG", "Pick language ('eng'|'tur' or 'en'|'tr') [Default: eng]") do |l|
           options[:lang] = l
         end
 
-        opts.on("-s", "--scripture SCRIPTURE", "Chapter name or ID (1-114) - Default: 1") do |s|
+        opts.on("-s", "--scripture SCRIPTURE", "Pick scripture name or number (1-114) [Default: 1]") do |s|
           options[:scripture] = s
         end
 
-        opts.on("-a", "--ayah AYAH", "Sign/Verse number or 'all' - Default: all") do |a|
+        opts.on("-a", "--ayah AYAH", "Pick sign/ayah number or 'all' [Default: all]") do |a|
           options[:ayah] = a
         end
 
-        opts.on("-h", "--help", "Prints this help") do
+        # Yeni: Sadece sureleri listelemek için argüman
+        opts.on("--list-chapters", "List all chapters in a table format for the selected language") do
+          options[:list_chapters] = true
+        end
+
+        opts.on("-h", "--help", "Prints this help menu") do
           puts opts
           exit
         end
       end
 
-      opt_parser.parse!(args)
-
       begin
-        # Fetch Data
-        doc = Wahy.new_data(options[:lang])
-        chapters = Wahy.chapters_data(doc)
-        chapter = Wahy.scripture_data(chapters, options[:scripture])
+        opt_parser.parse!(args)
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+        puts "CLI Error: #{e.message}".red
+        puts opt_parser
+        exit 1
+      end
 
-        if chapter.nil?
-          puts "Error: Scripture '#{options[:scripture]}' not found.".colorize(:red)
-          exit 1
-        end
+      run(options)
+    end
 
-        # Header preparation
-        chapter_id = chapter['ChapterID']
-        chapter_name = chapter['ChapterName']
-        title = "#{chapter_id}. #{chapter_name}"
+    def self.run(options)
+      begin
+        data = Wahy.new_data(options[:lang])
+      rescue => e
+        puts "Error: #{e.message}".red
+        exit 1
+      end
 
-        # Get terminal width for centering (fallback to 80 if it fails)
-        term_width = `tput cols`.to_i rescue 80
-        term_width = 80 if term_width == 0
+      quran = Wahy.chapters_data(data)
 
-        # Print centered and colored header
-        puts "\n"
-        puts title.center(term_width).colorize(:green).bold
-        puts ("=" * title.length).center(term_width).colorize(:green)
-        puts "\n"
+      # Eğer list-chapters bayrağı tetiklendiyse, tabloyu çiz ve programı sonlandır
+      if options[:list_chapters]
+        display_chapter_list(quran, options[:lang])
+        exit
+      end
 
-        signs = Wahy.sign_data(chapter)
+      # Listeleme istenmediyse normal okuma akışına devam et
+      chapter_node = Wahy.scripture_data(quran, options[:scripture])
 
-        # Print verses
-        if options[:ayah].to_s.downcase == 'all'
-          signs.each { |sign| print_sign(sign) }
+      unless chapter_node
+        puts "Error: Scripture '#{options[:scripture]}' could not be found.".red
+        exit 1
+      end
+
+      chapter_id = chapter_node['ChapterID']
+      chapter_name = chapter_node['ChapterName']
+      verses = chapter_node.xpath('Verse')
+
+      selected_verses = []
+      if options[:ayah].to_s.downcase == 'all'
+        selected_verses = verses
+      else
+        target_ayah = options[:ayah].to_s
+        match = verses.find { |v| v['VerseID'] == target_ayah }
+        if match
+          selected_verses = [match]
         else
-          sign = Wahy.take_specific_sign(signs, options[:ayah])
-          if sign.nil?
-            puts "Error: Ayah '#{options[:ayah]}' not found in this scripture.".colorize(:red)
-          else
-            print_sign(sign)
-          end
+          puts "Error: Ayah ##{target_ayah} not found in Chapter #{chapter_id} (#{chapter_name}).".red
+          exit 1
         end
-        puts "\n"
-      rescue => e
-        puts "An error occurred: #{e.message}".colorize(:red)
-        exit 1
       end
+
+      terminal_width = 75
+      puts "=" * terminal_width
+      header_title = "Chapter #{chapter_id}: #{chapter_name}"
+      puts header_title.center(terminal_width).upcase.cyan.bold
+      puts "=" * terminal_width
+      puts ""
+
+      selected_verses.each do |v|
+        verse_id = v['VerseID']
+        verse_text = v.text.strip
+
+        print "[#{verse_id}] ".green.bold
+        puts verse_text.white
+        puts ""
+      end
+      puts "=" * terminal_width
     end
 
-    private
+    # Yeni: Sureleri tablo halinde terminale basan yardımcı metod
+    def self.display_chapter_list(chapters, lang)
+      lang_display = lang.to_s.downcase.start_with?('t') ? "TURKISH" : "ENGLISH"
+
+      puts "=" * 50
+      puts " QURAN CHAPTERS (#{lang_display}) ".center(50).cyan.bold
+      puts "=" * 50
+
+      # Sütun başlıkları: Sola dayalı 10 karakter ID, sola dayalı 35 karakter İsim
+      puts sprintf("%-10s | %-35s", "ID", "CHAPTER NAME").yellow.bold
+      puts "-" * 50
+
+      chapters.each do |c|
+        id = c['ChapterID']
+        name = c['ChapterName']
+        # Sütun verilerini hizalayarak yazdır
+        puts sprintf("%-10s | %-35s", id, name)
+      end
 
-    # Helper method to print a single verse
-    def self.print_sign(sign)
-      verse_id = sign['VerseID']
-      # CDATA text parsing and whitespace stripping
-      text = sign.text.strip
-      puts "[#{verse_id}] ".colorize(:cyan).bold + text
+      puts "=" * 50
     end
   end
 end

data/lib/wahy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wahy
-  VERSION = "2.0.4"
+  VERSION = "2.0.6"
 end

data/wahy.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "A CLI tool and library to query the Holy Quran in TR/ENG."
   spec.description   = "Query and read the Holy Quran chapters and verses in the terminal with colored output. Includes both English and Turkish support."
-  spec.homepage      = "https://github.com/username/wahy"
+  spec.homepage      = "https://github.com/cptangry/wahy"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 4.0.2"
   # Uncomment the line below to require MFA for gem pushes.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wahy
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - cptangry
@@ -104,7 +104,7 @@ files:
 - lib/wahy/version.rb
 - sig/wahy.rbs
 - wahy.gemspec
-homepage: https://github.com/username/wahy
+homepage: https://github.com/cptangry/wahy
 licenses:
 - MIT
 metadata: {}