file_type_detector_sfedu 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4c402e08497af69516d8d8c5626a9c4fa40e36fc357348a45395b4fdc00c0f
-  data.tar.gz: f0cb62187c310f14573ce1964b4459c68e27a75164c633f0485c5614e9566221
+  metadata.gz: 5a5b6d66dd409a03792b309a5a50070c32ec1cb8a3578d0d9f791511425013d5
+  data.tar.gz: 3a714ef0dd6ef17e4e05c562c4a3f4b10bceb11d8c8f297469c6c7063d7d3ebb
 SHA512:
-  metadata.gz: 2917a5ee6c5226b02cc0d794cdbe2509f05161cb8f89d07438e6630ecdf1bc227299209748d2717177e9db01aa2741e98dbb0c74e225231c91deeaae46b7713c
-  data.tar.gz: caeda6a5ffbd575493f1ef284838fed004e4b66ce217eafbe08a34a6d8b69ec120a6e273fb6d4a134873566c2f3f579f13518d817f467fc25939f60ff0a87c13
+  metadata.gz: 99e503196037d1ca0fb09ae51011f4f510ad81ff03045b356ee1e2df0eb7f4fc81d3aec90d20b9f7ee9b7a460ebf2aa65d71f59ffe8393d51d7bb884a0b1a49c
+  data.tar.gz: b4b0bd07b6ed8d92204dff6ee187d5375bdcbe44294b94b0a9d84526ed905ca1484c003d93c09ee6cc6404a104e94d02c0b575fb22ecd4d2b5604ffca127ebea

data/CHANGELOG.md

@@ -1,5 +1,19 @@
-## [Unreleased]
+## [Released]
 
-## [0.1.0] - 2024-03-18
+
+## [0.1.1] - 2024-03-31
 
 - Initial release
+
+
+## [0.2.0] - 2024-03-2
+
+- Tests have been updated to test functions more correctly
+- The existing code has been significantly improved:
+  - The functions have been optimized
+  - Removed unnecessary code
+  - Added error handling
+  - Improved code style
+  - Added functions for checking new types of extensions: png, jpeg/jpg, gif, json, xml
+- Updated the readme file
+- Other minor improvements

data/README.md

@@ -1,43 +1,56 @@
-# file_type_detector
-
-**file_type_detector** is a Ruby gem that allows you to determine the type of files based on their extension or content.
-
-## Installation
-
-Add this gem to your Gemfile and run `bundle install`:
-
-```ruby
-gem 'file_type_detector'
-```
-
-Alternatively, install it directly using the gem command:
-
-```ruby
-gem install file_type_detector
-```
-
-## Usage
-
-To use the gem, you need to create an instance of FileTypeDetector::FileTypeDetector, specifying the path to the file as the constructor argument. Then call the detect method to determine the file type.
-
-```ruby
-require 'file_type_detector'
-
-detector = FileTypeDetector::FileTypeDetector.new('path/to/your/file.pdf')
-puts detector.detect
-```
-Please replace `"path/to/your/file.pdf"` with the path to your file that you want to check.
-
-## Supported File Types
-The gem provides support for detecting the following file types:
-
-- PDF
-- PNG
-
-## Contributing
-
-You can contribute to the development of the gem by creating new detectors for other file types and improving existing code. Report bugs and submit feature requests through the [GitHub repository](https://github.com/synthematik/file_type_detector_gem).
-
-## License
-
-This gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+# file_type_detector_sfedu
+
+**file_type_detector_sfedu** is a Ruby gem that allows you to determine the type of files based on their extension or content.
+
+## Installation
+
+Add this gem to your Gemfile and run `bundle install`:
+
+```ruby
+gem "file_type_detector_sfedu"
+```
+
+Alternatively, install it directly using the gem command:
+
+```ruby
+gem install file_type_detector_sfedu
+```
+
+## Usage
+
+To use the gem, you need to call the `check` method with a parameter in the form of a file path:
+```ruby
+require "file_type_detector_sfedu"
+
+puts FileTypeDetector.check("path/to/your/file.pdf") # if it's truly pdf, value will be true, unless - false
+```
+`check` method will automatically detect the file type by its extension and tell if its contents match the extension.
+
+You can also use a specific detector:
+```ruby
+puts FileTypeDetector.pdf_check("path/to/your/real_pdf.pdf") # true
+puts FileTypeDetector.pdf_check("path/to/your/fake_pdf.pdf") # false
+
+puts FileTypeDetector.docx_check("path/to/your/real_docx.docx") # true
+puts FileTypeDetector.docx_check("path/to/your/fake_docx.docx") # false
+```
+
+## Supported File Types
+The gem provides support for detecting the following file types:
+
+- PDF
+- DOCX
+- PNG
+- GIF
+- JPEG/JPG
+- JSON
+- XML
+
+## Contributing and links
+
+You can contribute to the development of the gem by creating new detectors for other file types and improving existing code. Report bugs and submit feature requests through the [GitHub repository](https://github.com/synthematik/file_type_detector_gem).
+
+You can visit our gem's page here - [Rubygems.org](https://rubygems.org/gems/file_type_detector_sfedu)
+## License
+
+This gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/file_type_detector/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FileTypeDetector
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/file_type_detector.rb

@@ -3,93 +3,99 @@
 require_relative "file_type_detector/version"
 
 module FileTypeDetector
-  class Error < StandardError; end
+  # @param [String] file_path
+  # @return [Boolean]
+  def self.check(file_path)
+    if error_handling(file_path)
+      file_extension = File.extname(file_path).downcase
+
+      FILE_CHECKS.each do |check_function|
+        return check_function.call(file_path) if file_extension == ".#{check_function.name.to_s.split("_")[0]}"
+      end
+    end
 
-  # file_type_detector.rb
+    false
+  end
 
-  class FileTypeDetector
-    def initialize(file_path)
-      @file_path = file_path
-    end
+  # =============================================
+  # Error handling
+  def self.error_handling(file_path)
+    raise IOError, "File '#{file_path}' not found" unless File.exist?(file_path)
+    raise IOError, "File '#{file_path}' is not a file" unless File.file?(file_path)
+    raise IOError, "File '#{file_path}' is not available for reading" unless File.readable?(file_path)
 
-    def detect
-      detector.detect
-    end
+    true
+  end
 
-    private
+  # =============================================
+  # Write your methods here
+  def self.pdf_check(file_path)
+    return unless error_handling(file_path)
 
-    def detector
-      detectors.detect { |detector| detector.supported? }
-    end
+    File.read(file_path, 5) == "%PDF-"
 
-    def detectors
-      [
-        PDFDetector.new(@file_path),
-        PNGDetector.new(@file_path),
-      # Добавьте сюда новые детекторы для других типов файлов по мере необходимости
-      ]
-    end
   end
 
-  # Base Detector class
-  class Detector
-    def initialize(file_path)
-      @file_path = file_path
-    end
+  def self.docx_check(file_path)
+    return unless error_handling(file_path)
 
-    def supported?
-      raise NotImplementedError, "#{self.class} must implement supported?"
-    end
+    File.open(file_path, "rb") { |file| file.read(4) } == "PK\x03\x04"
 
-    def detect
-      raise NotImplementedError, "#{self.class} must implement detect"
-    end
   end
 
-  # Detector for PDF files
-  class PDFDetector < Detector
-    def supported?
-      File.extname(@file_path).downcase == '.pdf'
-    end
+  def self.png_check(file_path)
+    return unless error_handling(file_path)
+
+    first_bytes = File.open(file_path, "rb") { |file| file.read(16) }
+    first_bytes.start_with?("\x89PNG\r\n\x1A\n".b)
 
-    def detect
-      # Определяем тип PDF-файла
-      if File.read(@file_path, 5) == '%PDF-'
-        'PDF'
-      else
-        'Unknown' # Если содержимое файла не соответствует формату PDF
-      end
-    end
   end
 
-  # Detector for PNG files
-  class PNGDetector < Detector
-    def supported?
-      File.extname(@file_path).downcase == '.png'
-    end
+  def self.gif_check(file_path)
+    return unless error_handling(file_path)
+
+    first_bytes = File.open(file_path, "rb") { |file| file.read(6) }
+    %w[GIF87a GIF89a].include?(first_bytes)
 
-    def detect
-      # Определяем тип PNG-файла, возможно, с помощью какой-то библиотеки для работы с изображениями
-      # В данном примере просто возвращаем строку 'PNG'
-      'PNG'
-    end
   end
 
-end
+  def self.jpeg_check(file_path)
+    return unless error_handling(file_path)
+
+    first_bytes = File.open(file_path, "rb") { |file| file.read(2) }
+    first_bytes == "\xFF\xD8".b
+
+  end
+
+  def self.jpg_check(file_path)
+    jpeg_check(file_path)
+  end
+
+  def self.json_check(file_path)
+    return unless error_handling(file_path)
+
+    first_chars = File.open(file_path, "rb") { |file| file.read(2) }
+    first_chars.start_with?("{") || first_chars.start_with?("[")
+  end
+
+  def self.xml_check(file_path)
+    return unless error_handling(file_path)
+
+    (File.open(file_path, "rb") { |file| file.read(2) }) == "<?"
 
-def detect_file_type(file_path)
-  File.open(file_path, 'rb') do |file|
-    header = file.read(4)
-    if header.start_with?('%PDF')
-      return 'PDF'
-    elsif header.start_with?('GIF8')
-      return 'GIF'
-    elsif header.start_with?("\x89PNG\r\n\x1A\n")
-      return 'PNG'
-    elsif header.start_with?("\xFF\xD8\xFF")
-      return 'JPEG'
-    else
-      return 'Неизвестный тип файла'
-    end
   end
+
+  # =============================================
+  FILE_CHECKS = [
+    method(:pdf_check),
+    method(:docx_check),
+    method(:png_check),
+    method(:gif_check),
+    method(:jpeg_check),
+    method(:jpg_check),
+    method(:json_check),
+    method(:xml_check),
+    # Add your methods here
+  ].freeze
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_type_detector_sfedu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Garik
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies: []
 description: FileTypeDetector is a Ruby gem that provides functionality for determining
   the type of a file based on its extension or content.
@@ -30,7 +30,6 @@ files:
 - lib/file_type_detector.rb
 - lib/file_type_detector/version.rb
 - ruby_gem.gemspec
-- sig/ruby_gem.rbs
 homepage: https://github.com/synthematik/file_type_detector_gem
 licenses:
 - MIT

data/sig/ruby_gem.rbs

@@ -1,4 +0,0 @@
-module RubyGem
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end