Improve sheets methods and upgrade dependencies

.ameba.yml

@@ -1,6 +1,7 @@
 Globs:
-  - 'src/**/*.cr'
-  - 'spec/**/*.cr'
+  - '**/*.cr'
+  - '!lib'
+  - '!tmp'
 
 Lint/Formatting:
   Enabled: false

.crystal-version

@@ -1 +1 @@
-1.11.0
+1.13.1

.github/workflows/main.yml

@@ -12,6 +12,7 @@ jobs:
   lints:
     name: Lints
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -22,7 +23,7 @@ jobs:
         with:
           crystal: ${{ env.CRYSTAL_VERSION }}
       - name: Crystal shard cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: lib
           key: ${{ runner.os }}-shards-${{ hashFiles('**/shard.lock') }}
@@ -33,6 +34,7 @@ jobs:
   tests:
     name: Tests
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -43,7 +45,7 @@ jobs:
         with:
           crystal: ${{ env.CRYSTAL_VERSION }}
       - name: Crystal shard cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: lib
           key: ${{ runner.os }}-${{ matrix.crystal }}-shards-${{ hashFiles('**/shard.lock') }}

.gitignore

@@ -1,14 +1,14 @@
 # Ignore crystal dependencies and generated binaries
-/lib
-/tmp
+lib/
+tmp/
 
 # Ignore binaries
-/bin/*
-!/bin/ameba.cr
-!/bin/coverage
-!/bin/release
+bin/*
+!bin/ameba.cr
+!bin/coverage
+!bin/release
 
 # Ignore coverage files
-/coverage
-/run_tests.cr
-/run_tests
+coverage/
+run_tests.cr
+run_tests

spec/xlsx-parser/book_spec.cr

@@ -54,11 +54,58 @@ describe XlsxParser::Book do
     end
   end
 
+  describe "#sheet_exists?" do
+    it "returns true if sheet with given name exists" do
+      book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
+      book.sheet_exists?("Sheet1").should be_truthy
+      book.close
+    end
+
+    it "returns false if sheet with given name does not exist" do
+      book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
+      book.sheet_exists?("NonexistentSheet").should be_falsey
+      book.close
+    end
+  end
+
+  describe "#sheet" do
+    it "returns sheet with given name" do
+      book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
+      sheet = book.sheet("Sheet1")
+      sheet.should be_a(XlsxParser::Sheet)
+      sheet.try(&.name).should eq("Sheet1")
+      book.close
+    end
+
+    it "returns nil if sheet with given name does not exist" do
+      book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
+      sheet = book.sheet("NonexistentSheet")
+      sheet.should be_nil
+      book.close
+    end
+  end
+
+  describe "#close" do
+    it "closes the previously opened file" do
+      book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
+      book.close
+      book.zip.closed?.should be_truthy
+    end
+  end
+
   describe "#style_types" do
     it "return an array of Sheet class instance" do
       book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
       book.style_types
       book.close
     end
   end
+
+  describe "#base_time" do
+    it "returns the base time from workbookPr" do
+      book = XlsxParser::Book.new("./spec/fixtures/sample.xlsx")
+      book.base_time.should eq(Time.utc(1899, 12, 30))
+      book.close
+    end
+  end
 end

src/xlsx-parser/book.cr

@@ -44,46 +44,22 @@ module XlsxParser
       rels = XML.parse(@zip["xl/_rels/workbook.xml.rels"].open(&.gets_to_end))
 
       @sheets = sheets_nodes.map do |sheet|
-        sheetname = sheet["name"]
-        sheetfile = rels.xpath_string(
+        sheet_file = rels.xpath_string(
           "string(//*[name()='Relationship' and contains(@Id,'#{sheet["id"]}')]/@Target)"
         )
-        Sheet.new(self, sheetfile, sheetname)
-      end
-    end
 
-    # Return True if the given sheet name appears in the workbook
-    def sheetname?(search_name : String)
-      this_sheet = sheetname search_name
-      if this_sheet.nil?
-        false
-      else
-        true
+        Sheet.new(self, sheet_file, sheet["name"])
       end
     end
 
-    # Return the Worksheet with the given name, or nil if that sheet name
-    # can't be found in the workbook
-    def sheetname(search_name : String)
-      found_sheet = nil
-      @sheets.each do | sheet |
-        if sheet.name == search_name
-          found_sheet = sheet
-          break
-        end
-      end
-
-      found_sheet
+    # Return true if sheet with given name exists otherwise return false
+    def sheet_exists?(name : String)
+      sheets.any? { |sheet| sheet.name == name }
     end
 
-    # Return an array of all sheet names in the current workbook
-    def sheetnames
-      name_list = [] of String
-      @sheets.each do | sheet |
-        name_list << sheet.name
-      end
-
-      name_list
+    # Return sheet with given name
+    def sheet(name : String) : Sheet?
+      sheets.find { |sheet| sheet.name == name }
     end
 
     # Close previously opened given file/filename