archive-zip 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd99221a399fb578d4b75ae55e330e156d1f3d56
-  data.tar.gz: e76e2ad7ff8f5ff1c545d90287065e41850e35a3
+  metadata.gz: 9138f623736687f7bffedd8be706a604ef986143
+  data.tar.gz: 6098fe76a711d2a74aa6a69918eb507fd6de5654
 SHA512:
-  metadata.gz: 12fce07dfaa1ad74b68b41ec373c2a17101dff73aeed2500874ab2e112933086311881fe5ea15f46a6db3b73f6a3d7c7cfe8c7772bccbee4e7ae070ca4314db1
-  data.tar.gz: e5941deb576206a4b6d0253b61d5d3b7cdf10c06ad716a4ff0fc4bd1fbc9926d3ff1b2265a04680382ed9f2f1209e89af7cbd6d6053d14cb8f4f3380c702bf8c
+  metadata.gz: 319cd9c5e8882d05032abb80e8f6cd6cab9459226eb95be0458caaf950239d1d2d03495d3338af12f1c950fd68fd7e76d33f74af322de520ad64a066b03831f0
+  data.tar.gz: 6763e8e864211d2277d8bcd6a3cec53a2c51a7a4b84f004c4d5a9b4f740cafc714b145537a7fe8faa0f73b90ac398962fbcf390ef30a51f126444ea3a47145d8

data/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2015 Jeremy Bopp
+Copyright (c) 2016 Jeremy Bopp
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/NEWS.md

@@ -6,6 +6,12 @@ detailed information is available in the rest of the documentation.
 **NOTE:** Date stamps in the following entries are in YYYY/MM/DD format.
 
 
+## v0.9.0 (2016/12/18)
+
+### Fixes
+
+* Initialize DOSTime correctly when not given a struct to parse.
+
 ## v0.8.0 (2015/01/05)
 
 ### Fixes

data/README.md

@@ -228,7 +228,7 @@ be more easily accepted if they are consistent with the rest of the code.
 ```
 (The MIT License)
 
-Copyright (c) 2015 Jeremy Bopp
+Copyright (c) 2016 Jeremy Bopp
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/archive/support/time.rb

@@ -45,7 +45,7 @@ module Archive
     def initialize(dos_time = nil)
       case dos_time
       when nil
-        @dos_time = Time.now.to_dos_time.dos_time
+        @dos_time = Time.now.to_dos_time.to_i
       when Integer
         @dos_time = dos_time
       else
@@ -54,6 +54,8 @@ module Archive
         end
         @dos_time = dos_time.unpack('V')[0]
       end
+
+      validate
     end
 
     # Returns -1 if _other_ is a time earlier than this one, 0 if _other_ is the
@@ -86,5 +88,32 @@ module Archive
       year   = ((0b1111111 << 25 & @dos_time) >> 25) + 1980
       return Time.local(year, month, day, hour, minute, second)
     end
+
+    private
+
+    def validate
+      second = (0b11111         & @dos_time)
+      minute = (0b111111  << 5  & @dos_time) >>  5
+      hour   = (0b11111   << 11 & @dos_time) >> 11
+      day    = (0b11111   << 16 & @dos_time) >> 16
+      month  = (0b1111    << 21 & @dos_time) >> 21
+      year   = (0b1111111 << 25 & @dos_time) >> 25
+
+      if second > 29
+        raise ArgumentError, 'second must not be greater than 29'
+      elsif minute > 59
+        raise ArgumentError, 'minute must not be greater than 59'
+      elsif hour > 24
+        raise ArgumentError, 'hour must not be greater than 24'
+      elsif day < 1
+        raise ArgumentError, 'day must not be less than 1'
+      elsif month < 1
+        raise ArgumentError, 'month must not be less than 1'
+      elsif month > 12
+        raise ArgumentError, 'month must not be greater than 12'
+      elsif year > 119
+        raise ArgumentError, 'year must not be greater than 119'
+      end
+    end
   end
 end

data/lib/archive/zip/version.rb

@@ -2,5 +2,5 @@
 
 module Archive; class Zip
   # The current version of this gem.
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end; end

data/spec/archive/dos_time_spec.rb

@@ -0,0 +1,113 @@
+# encoding: UTF-8
+
+require 'minitest/autorun'
+
+require 'archive/support/time'
+
+describe 'Archive::DOSTime.new' do
+  let(:epoc) { 0b0000000_0001_00001_00000_000000_00000 }
+  let(:end_times) { 0b1110111_1100_11111_11000_111011_11101 }
+
+  it 'uses the current time when no structure is given' do
+    now = Time.now.localtime
+    dos_time = Archive::DOSTime.new.to_time
+
+    now.year.must_be_close_to(dos_time.year, 1)
+    now.month.must_be_close_to(dos_time.month, 1)
+    now.day.must_be_close_to(dos_time.day, 1)
+    now.hour.must_be_close_to(dos_time.hour, 1)
+    now.min.must_be_close_to(dos_time.min, 1)
+    now.sec.must_be_close_to(dos_time.sec, 3)
+  end
+
+  it 'accepts valid Integer structures' do
+    Archive::DOSTime.new(epoc)
+    Archive::DOSTime.new(end_times)
+  end
+
+  it 'accepts valid String structures' do
+    Archive::DOSTime.new([epoc].pack('V'))
+    Archive::DOSTime.new([end_times].pack('V'))
+  end
+
+  it 'rejects invalid Integer structures' do
+    # Second must not be greater than 29.
+    proc {
+      Archive::DOSTime.new(epoc | 0b0000000_0000_00000_00000_000000_11110)
+    }.must_raise(ArgumentError)
+
+    # Minute must not be greater than 59.
+    proc {
+      Archive::DOSTime.new(epoc | 0b0000000_0000_00000_00000_111100_00000)
+    }.must_raise(ArgumentError)
+
+    # Hour must not be greater than 24.
+    proc {
+      Archive::DOSTime.new(epoc | 0b0000000_0000_00000_11001_000000_00000)
+    }.must_raise(ArgumentError)
+
+    # Day must not be zero.
+    proc {
+      Archive::DOSTime.new(epoc & 0b1111111_1111_00000_11111_111111_11111)
+    }.must_raise(ArgumentError)
+
+    # Month must not be zero.
+    proc {
+      Archive::DOSTime.new(epoc & 0b1111111_0000_11111_11111_111111_11111)
+    }.must_raise(ArgumentError)
+
+    # Month must not be greater than 12.
+    proc {
+      Archive::DOSTime.new(epoc | 0b0000000_1101_00000_00000_000000_00000)
+    }.must_raise(ArgumentError)
+
+    # Year must not be greater than 119.
+    proc {
+      Archive::DOSTime.new(epoc | 0b1111000_0000_00000_00000_000000_00000)
+    }.must_raise(ArgumentError)
+  end
+
+  it 'rejects invalid String structures' do
+    # Second must not be greater than 29.
+    proc {
+      packed = [epoc | 0b0000000_0000_00000_00000_000000_11110].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+
+    # Minute must not be greater than 59.
+    proc {
+      packed = [epoc | 0b0000000_0000_00000_00000_111100_00000].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+
+    # Hour must not be greater than 24.
+    proc {
+      packed = [epoc | 0b0000000_0000_00000_11001_000000_00000].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+
+    # Day must not be zero.
+    proc {
+      packed = [epoc & 0b1111111_1111_00000_11111_111111_11111].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+
+    # Month must not be zero.
+    proc {
+      packed = [epoc & 0b1111111_0000_11111_11111_111111_11111].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+
+    # Month must not be greater than 12.
+    proc {
+      packed = [epoc | 0b0000000_1101_00000_00000_000000_00000].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+
+    # Year must not be greater than 119.
+    proc {
+      packed = [epoc | 0b1111000_0000_00000_00000_000000_00000].pack('V')
+      Archive::DOSTime.new(packed)
+    }.must_raise(ArgumentError)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archive-zip
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jeremy Bopp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: io-like
@@ -147,6 +147,7 @@ files:
 - lib/archive/zip/extra_field/raw.rb
 - lib/archive/zip/extra_field/unix.rb
 - lib/archive/zip/version.rb
+- spec/archive/dos_time_spec.rb
 - spec/archive/zip/archive_spec.rb
 - spec/archive/zip/codec/deflate/compress/checksum_spec.rb
 - spec/archive/zip/codec/deflate/compress/close_spec.rb
@@ -273,6 +274,7 @@ signing_key:
 specification_version: 4
 summary: Simple, extensible, pure Ruby ZIP archive support.
 test_files:
+- spec/archive/dos_time_spec.rb
 - spec/archive/zip/archive_spec.rb
 - spec/archive/zip/codec/deflate/compress/checksum_spec.rb
 - spec/archive/zip/codec/deflate/compress/close_spec.rb