mds_file_utils 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4397ac9fb6d6375d6c4094e432a1d4892ce0b2545014b8f2a33698f9733577ac
-  data.tar.gz: ae162e0bd938e53a9fe975763cd516bc6300f0f1879a7c8b00cf5cc85920e9d4
+  metadata.gz: f4922919722fa024374d42c8bc739b2ec80c8922c8047dc643675194fe7c7163
+  data.tar.gz: 59b410c799c42972ea3905c6bf8a0e4d16899b81f9a9ceeee0b3b27949d41da2
 SHA512:
-  metadata.gz: 2da669f6a590cfb20188af1b1d9b23e773cb281208908d6ecc9bb26768d35eca81cd2cf318e683b29c415f7099abd9bac481fe138228a09ed46021e557e305d8
-  data.tar.gz: 17287ebbc3611652782d50cca31e1b1ccfbad598312299d73b0f37691a1c2a08436ba2342958566410609c506a6533cab880f14976e538e953f11da2a02031dc
+  metadata.gz: 9dca16d1ebbf8ee0f64f667e067b3ef2fcd7cf8ae22414d869d3e54da58440ead5c5ca0e4cc86ca2e5d834dd9e7575fcaefe7ba2d599c1d1ecdfa63d3efceae0
+  data.tar.gz: 18a01149f20216ccaa8c743e5bf5dea3197d33c5d27668b9542293dc34b1bc3ca40c60065a605b5b5ac100986dbe432129b4cada3fbba6218f0af4266c8cf120

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-gem "activesupport", "= 7.0.8"
+gem 'activesupport', '6.1.7.6'
 gem "unzipMe", "~> 1.1.2"
-gem 'rubyzip', '~> 2.3'
+gem 'zipruby', '~> 0.3.6'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
+  gem "rspec", "~> 3.6"
   gem "rdoc", "~> 4.1"
   gem "bundler", "~> 2.4"
   gem 'psych', '~> 5.1'

data/lib/mds_file_utils/zip_analyzer.rb

@@ -1,4 +1,3 @@
-require 'zip'
 module MdsFileUtils
 
   class ZipAnalyzer
@@ -14,16 +13,10 @@ module MdsFileUtils
     end
 
     def valid_zip?
-      return false if @path.blank? || !File.exist?(@path)
+      return false if @path.blank?
+      return false unless File.exist?(@path)
       return false unless has_valid_extension?
-    
-      begin
-        Zip::File.open(@path) { |zip_file| }
-        
-        true # The zip file is valid
-      rescue Zip::Error => e
-        false # The zip file is not valid
-      end
+      UnzipmeValidator.new(@path).valid_zip?
     end
 
     def has_valid_extension?
@@ -33,7 +26,6 @@ module MdsFileUtils
 
     def is_composite?
       return false unless valid_zip?
-      puts "file_list: #{file_list}"
       file_list.count { | file | file =~ EXTENSION_REGEX } > 0
     end
 

data/lib/mds_file_utils.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'active_support/core_ext/object'
 require 'unzipMe'
-require 'zip'
 require 'mds_file_utils/zip_analyzer'
 require 'mds_file_utils/zip_splitter'

data/mds_file_utils.gemspec

@@ -6,12 +6,12 @@
 
 Gem::Specification.new do |s|
   s.name = "mds_file_utils"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Dave", "Kendra"]
-  s.date = "2023-10-04"
+  s.date = "2017-07-18"
   s.description = "A set of useful MDS file utilities."
   s.email = "kmulvey@providigm.com"
   s.extra_rdoc_files = [
@@ -37,34 +37,34 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/GitHubAdmin/mds_file_utils"
   s.licenses = ["MIT"]
-  s.rubygems_version = "3.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "A collection of MDS file utilities."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>.freeze, ["~> 7.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["6.1.7.6"])
       s.add_runtime_dependency(%q<unzipMe>, ["~> 1.1.2"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 2.4"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.6"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 2.4"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.3"])
     else
-      s.add_dependency(%q<activesupport>.freeze, ["~> 7.0"])
+      s.add_dependency(%q<activesupport>, ["6.1.7.6"])
       s.add_dependency(%q<unzipMe>, ["~> 1.1.2"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 2.4"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_dependency(%q<rspec>, ["~> 3.6"])
+      s.add_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_dependency(%q<bundler>, ["~> 2.4"])
+      s.add_dependency(%q<jeweler>, ["~> 2.3"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 7.0"])
+    s.add_dependency(%q<activesupport>, ["6.1.7.6"])
     s.add_dependency(%q<unzipMe>, ["~> 1.1.2"])
-    s.add_dependency(%q<rspec>.freeze, [">= 0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 2.4"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+    s.add_dependency(%q<rspec>, ["~> 3.6"])
+    s.add_dependency(%q<rdoc>, ["~> 4.1"])
+    s.add_dependency(%q<bundler>, ["~> 2.4"])
+    s.add_dependency(%q<jeweler>, ["~> 2.3"])
   end
 end
 

data/spec/zip_analyzer_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+require 'zipruby'
+
 
 describe MdsFileUtils::ZipAnalyzer do
 
@@ -57,35 +59,38 @@ describe MdsFileUtils::ZipAnalyzer do
       it "should respond with true if asked if a valid zip file has an extension of '.zip'" do
         @file_to_test = File.join('/tmp', 'file_to_test.zip')
         contained_file = File.join('/tmp', 'contained_file')
-      
-        # Create the contained file
         File.open(contained_file, 'w') { |f| f.puts "Hello" }
-      
-        # Create the zip file using RubyZip
-        ::Zip::File.open(@file_to_test, ::Zip::File::CREATE) do |zip_file|
-          zip_file.add('contained_file', contained_file)
+        
+        Zip::Archive.open(@file_to_test, Zip::CREATE) do |archive|
+          archive.add_file('file.txt', contained_file)
         end
+        
+        # Optionally, remove the contained file after creating the ZIP.
+        FileUtils.rm contained_file
+      
       
         za = MdsFileUtils::ZipAnalyzer.new(@file_to_test)
       
         za.valid_zip?.should be_truthy
-
-        
       end
+      
 
-      it "should respond with true if asked if a valid zip file has an extension of '.ZIP'" do
-        @file_to_test = File.join('/tmp', 'file_to_test.zip')
-        contained_file = File.join('/tmp', 'contained_file')
+      it "should respond with true if asked if a valid zip file has an extension of '.zip'" do
+        @file_to_test = File.join('/tmp', 'file_to_test.zip') # Use .zip extension for the ZIP file
+        contained_file = File.join('/tmp', 'contained_file.txt')
       
-        # Create the contained file
         File.open(contained_file, 'w') { |f| f.puts "Hello" }
       
-        # Create the zip file using RubyZip
-        ::Zip::File.open(@file_to_test, ::Zip::File::CREATE) do |zip_file|
-          zip_file.add('contained_file', contained_file)
+        # Create a new ZIP file
+        Zip::Archive.open(@file_to_test, Zip::CREATE) do |archive|
+          entry = archive.add_file('file.txt', contained_file) # Add the contained file to the ZIP archive
         end
       
+        # Optionally, remove the contained file after creating the ZIP.
+        FileUtils.rm contained_file
+      
         za = MdsFileUtils::ZipAnalyzer.new(@file_to_test)
+      
 
         za.valid_zip?.should be_truthy
       end
@@ -102,17 +107,28 @@ describe MdsFileUtils::ZipAnalyzer do
 
     it "should respond with true when asked if the file composite for a zip that contains nothing but files with a zip extension" do
       @file_to_test = File.join('/tmp', 'file_to_test.zip')
-      contained_file = File.join('/tmp', 'contained_file')
-    
-      # Create the contained file
-      File.open(contained_file, 'w') { |f| f.puts "Hello" }
-    
-      # Create the zip file using RubyZip
-      ::Zip::File.open(@file_to_test, ::Zip::File::CREATE) do |zip_file|
-        zip_file.add('contained_file.zip', contained_file)
+
+  # Create the ZIP files to go into the zip file
+    contained_paths = (1..2).map { |idx| File.join('/tmp', "contained_#{idx}.zip") }
+    contained_paths.each do |path|
+      # Create a dummy text file in /tmp directory
+      dummy_file_path = File.join('/tmp', 'dummy.txt')
+      File.open(dummy_file_path, 'w') { |f| f.puts "Hello, dummy!" }
+
+      # Create a new ZIP file containing the dummy.txt file
+      Zip::Archive.open(path, Zip::CREATE) do |archive|
+        entry = archive.add_file("dummy.txt", dummy_file_path)
       end
-    
-      za = MdsFileUtils::ZipAnalyzer.new(@file_to_test)
+    end
+
+    # Create a new ZIP file containing only ZIP files
+    Zip::Archive.open(@file_to_test, Zip::CREATE) do |archive|
+      contained_paths.each do |path|
+        entry = archive.add_file(File.basename(path), path) # Add the contained ZIP files to the ZIP archive
+      end
+    end
+
+  za = MdsFileUtils::ZipAnalyzer.new(@file_to_test)
       
       za.is_composite?.should be_truthy
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mds_file_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dave
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: unzipMe
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +43,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement