sheetsy 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b076008cee61a9a62811da5a448d4d67584867944789863fad1c8ed9463e7c
-  data.tar.gz: 3d61813f2caa7d34308f6cdced0458ff88964fdda77496197747f37c1eecaf4d
+  metadata.gz: 961ad80de96cffaf49ca35df5f2d041c28304f7ada1ca1c8ea615d7165358d33
+  data.tar.gz: 31e77af45fafb194cd03d397360f0cb822778fe42dc1a8cdef60fda9f3bf5ae3
 SHA512:
-  metadata.gz: 9bed1161ce8242f20335fc8ad03bff03629936bd2f965bc25570d351b542f6b178abb4df7c186c67b70a0543d451cf1398fab32db635b3ebad6873de698911bd
-  data.tar.gz: f71ddaf63e56078256009e72fdadd539c53069d9bbb5e615907e2b2c152059c0f9b442d7dac3c1d9d2820990101bce2307b5e0476ee42d257f59609fafbe29e2
+  metadata.gz: 632ecfa2ce5b8acd1a279f31087ec037a2d0db2d62c1cc07c9f89e39cc1bd36df75c3f1050b8e3c75edd84ed39a923a5ca464bc077bf3451ec2793b46caabe52
+  data.tar.gz: ed6813861f014ca1c00c7a5ef04d89c6ccb60f818990fe0a3a75ee60d99493841ad95993adc864945aacb8f55fccb4f5a2fede47431c4d7846e2b89a1b9f50bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sheetsy (1.2.0)
+    sheetsy (1.3.1)
       rake (~> 13.0)
       roo
       rspec (~> 3.0)
@@ -50,8 +50,8 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rspec-support (3.13.1)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -62,11 +62,11 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
-    thor (1.3.0)
+    thor (1.3.1)
     unicode-display_width (2.5.0)
 
 PLATFORMS

data/lib/sheetsy/converter.rb

@@ -49,7 +49,7 @@ module Sheetsy
       progress_bar.log str
     end
 
-    def process_csv(file)
+    def process_csv(file) # rubocop:disable Metrics/MethodLength
       debug "Processing as CSV"
 
       output_file_path = File.join(destination, "#{nameify(file)}.json")
@@ -57,12 +57,16 @@ module Sheetsy
 
       debug "File #{output_file_path}"
 
-      data = CSV.read(file, headers: true).map(&:to_h)
+      data = begin
+        CSV.read(file, headers: true).map(&:to_h)
+      rescue CSV::MalformedCSVError
+        CSV.read(file, headers: true, encoding: "iso-8859-1:utf-8").map(&:to_h)
+      end
       write_json(output_file_path, data)
       debug "Converted #{file} to #{output_file_path}\n\n"
     end
 
-    def process_excel(file)
+    def process_excel(file) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       debug "Processing as Excel"
       excel = Roo::Spreadsheet.open(file)
 
@@ -99,7 +103,7 @@ module Sheetsy
         process_excel(file)
       else
         debug "Unsupported file format: #{file}"
-        return
+        nil
       end
     end
 

data/lib/sheetsy/json_file.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sheetsy
+  class JSONFile
+    attr_reader :file_path, :data
+
+    def initialize(file_path)
+      @file_path = file_path
+    end
+
+    def data
+      @data ||= JSON.parse(File.read(file_path))
+    end
+
+    def inspect
+      to_s
+    end
+
+    def to_s
+      "#<#{self.class}:#{file_path}>"
+    end
+  end
+end

data/lib/sheetsy/reader.rb

@@ -13,14 +13,12 @@ module Sheetsy
       debug "Files found: #{files.count}"
 
       progress_bar.progress = 0
-      ret = {}
 
-      files.each do |file|
-        ret[file] = process_file(file)
+      @data = files.map do |file|
+        ret = JSONFile.new(file)
         progress_bar.increment
+        ret
       end
-
-      @data = ret
     end
 
     def overwrite?
@@ -46,15 +44,5 @@ module Sheetsy
 
       progress_bar.log str
     end
-
-    def process_file(file)
-      debug "File: #{file}"
-
-      JSON.parse(File.read(file))
-    end
-
-    def progress_bar
-      @progress_bar ||= ProgressBar.create(title: "Files", total: files.count)
-    end
   end
 end

data/lib/sheetsy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sheetsy
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

data/lib/sheetsy.rb

@@ -8,6 +8,7 @@ require "ruby-progressbar"
 
 require_relative "sheetsy/version"
 require_relative "sheetsy/converter"
+require_relative "sheetsy/json_file"
 require_relative "sheetsy/reader"
 require_relative "sheetsy/cli"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sheetsy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ryan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-21 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,6 +115,7 @@ files:
 - lib/sheetsy.rb
 - lib/sheetsy/cli.rb
 - lib/sheetsy/converter.rb
+- lib/sheetsy/json_file.rb
 - lib/sheetsy/reader.rb
 - lib/sheetsy/version.rb
 - sig/sheetsy.rbs