ico 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c064583f3bb03c8b2c7a4694c398cf335900de69
-  data.tar.gz: 3650715d02a41fe6ffc78af9dca2d40fedff8160
+  metadata.gz: 5a012e50b4d328b067cd6bc6c8eb90e88cd1b5b6
+  data.tar.gz: 8a2da2df36d786586806871a0e205e0cacb1acdb
 SHA512:
-  metadata.gz: db45233ea75ef0015f5e6adc091ed1747bdb1cfeb13fc947246772dae4e38e67354221f3cd70a858dd4c5efe7881f9ca620459e515538a19601105f162c27f36
-  data.tar.gz: 0512d897448380af03c439e6ad59717478cf3a860acaf2ea478edd9ddb7aa9ba71a8ebceb4ba0b93c34842bc6ec170129bd2aaa03fd62f53aada4697c83678e1
+  metadata.gz: e6c9f22a4bfe78001d2c80c852943639d82b6e1c5062a585835293d1fdbe7a07c7e82e753799b7de92eaca3e51f46172432caf59bbfaacc113f36476c50677c7
+  data.tar.gz: 77512c9b61c7268f65cdd434bc0e3d8d4cd64636efc9225672a456df8f6173b0d206d61629d4f1f9843e9ba2a2c97af5939cbc46af5f068a81aef88be6faa41c

data/Manifest.txt

@@ -7,6 +7,7 @@ LICENSE
 Manifest.txt
 README.md
 Rakefile
+ico.gemspec
 lib/core_ext/array/extract_options.rb
 lib/ico.rb
 lib/ico/icon_dir.rb

data/ico.gemspec

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+# stub: ico 0.1.1 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "ico"
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["So Awesome Man"]
+  s.date = "2017-04-02"
+  s.description = "ICO file format in Ruby"
+  s.email = "support@bordee.com"
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "History.txt"]
+  s.files = [".autotest", ".gitignore", ".hoeignore", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "ico.gemspec", "lib/core_ext/array/extract_options.rb", "lib/ico.rb", "lib/ico/icon_dir.rb", "lib/ico/icon_dir_entry.rb", "lib/ico/icon_image.rb", "lib/ico/utils.rb", "lib/ico/version.rb", "lib/tasks/ico.rake"]
+  s.homepage = "https://github.com/bordeeinc/ico"
+  s.licenses = ["MIT"]
+  s.rdoc_options = ["--title", "ico", "--markup", "markdown", "--quiet"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
+  s.rubygems_version = "2.2.5"
+  s.summary = "ICO file format in Ruby"
+
+  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<chunky_png>, ["= 1.3.8"])
+      s.add_runtime_dependency(%q<bit-struct>, ["= 0.15.0"])
+      s.add_runtime_dependency(%q<bmp-ruby>, ["= 0.1.1"])
+      s.add_development_dependency(%q<minitest>, ["~> 5.10"])
+      s.add_development_dependency(%q<hoe-yard>, [">= 0.1.3"])
+      s.add_development_dependency(%q<hoe-ignore>, ["~> 1.0"])
+      s.add_development_dependency(%q<hoe-bundler>, ["~> 1.2"])
+      s.add_development_dependency(%q<hoe-gemspec>, ["~> 1.0"])
+      s.add_development_dependency(%q<hoe-git>, ["~> 1.6"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8"])
+      s.add_development_dependency(%q<redcarpet>, ["~> 3.3"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.16"])
+    else
+      s.add_dependency(%q<chunky_png>, ["= 1.3.8"])
+      s.add_dependency(%q<bit-struct>, ["= 0.15.0"])
+      s.add_dependency(%q<bmp-ruby>, ["= 0.1.1"])
+      s.add_dependency(%q<minitest>, ["~> 5.10"])
+      s.add_dependency(%q<hoe-yard>, [">= 0.1.3"])
+      s.add_dependency(%q<hoe-ignore>, ["~> 1.0"])
+      s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
+      s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
+      s.add_dependency(%q<hoe-git>, ["~> 1.6"])
+      s.add_dependency(%q<yard>, ["~> 0.8"])
+      s.add_dependency(%q<redcarpet>, ["~> 3.3"])
+      s.add_dependency(%q<hoe>, ["~> 3.16"])
+    end
+  else
+    s.add_dependency(%q<chunky_png>, ["= 1.3.8"])
+    s.add_dependency(%q<bit-struct>, ["= 0.15.0"])
+    s.add_dependency(%q<bmp-ruby>, ["= 0.1.1"])
+    s.add_dependency(%q<minitest>, ["~> 5.10"])
+    s.add_dependency(%q<hoe-yard>, [">= 0.1.3"])
+    s.add_dependency(%q<hoe-ignore>, ["~> 1.0"])
+    s.add_dependency(%q<hoe-bundler>, ["~> 1.2"])
+    s.add_dependency(%q<hoe-gemspec>, ["~> 1.0"])
+    s.add_dependency(%q<hoe-git>, ["~> 1.6"])
+    s.add_dependency(%q<yard>, ["~> 0.8"])
+    s.add_dependency(%q<redcarpet>, ["~> 3.3"])
+    s.add_dependency(%q<hoe>, ["~> 3.16"])
+  end
+end

data/lib/ico.rb

@@ -32,23 +32,28 @@ module ICO
     # ensure .png extensions
     raise "more than PNG format files in #{filename_array.inspect}" if ICO::Utils.contains_other_than_ext?(fn_array, :png)
 
+    fn_array_length       = fn_array.length
     icon_dir              = ICO::IconDir.new
     icon_dir.image_count  = fn_array.length
-    offset                = ICO::IconDir::LENGTH_IN_BYTES + (fn_array.length * ICO::IconDirEntry::LENGTH_IN_BYTES)
-    entries               = fn_array.inject({}) {|h,fn| h[fn] = ICO::IconDirEntry.new; h}
-    images                = fn_array.inject({}) {|h,fn| h[fn] = ICO::IconImage.new; h}
-    images_hash           = ICO::Utils.sizes_hash(fn_array, true, true)
+    offset                = ICO::IconDir::LENGTH_IN_BYTES + (fn_array_length * ICO::IconDirEntry::LENGTH_IN_BYTES)
+    entries               = Array.new(fn_array_length) {ICO::IconDirEntry.new}
+    images                = Array.new(fn_array_length) {ICO::IconImage.new}
+    # reorder by image size
+    images_array          = ICO::Utils.sizes_hash(fn_array, true, true).values
 
-    images_hash.each do |size,fn| 
+    images_array.each_with_index do |fn,i| 
       img                 = ChunkyPNG::Image.from_file(fn)
+      #img_hash            = BMP::Utils.parse_image(img, ICO::IconImage::HEADER_SIZE_IN_BYTES)
       img_hash            = BMP::Utils.parse_image(img)
+      file_size           = img_hash[:image_size] + ICO::IconImage::HEADER_SIZE_IN_BYTES
 
-      entry               = entries[fn]
-      image               = images[fn]
+      entry               = entries[i]
+      image               = images[i]
 
       entry.width         = img_hash[:image_width] 
       entry.height        = img_hash[:image_height] 
-      entry.bytes_in_res  = img_hash[:file_size] 
+      #entry.bytes_in_res  = img_hash[:file_size] 
+      entry.bytes_in_res  = file_size
       entry.image_offset  = offset
 
       image.width         = img_hash[:image_width]
@@ -56,14 +61,12 @@ module ICO
       image.size_image    = img_hash[:image_size]  
       image.data          = img_hash[:pixel_array] 
 
-      offset              += img_hash[:file_size]
+      #offset              += img_hash[:file_size]
+      offset              += file_size
     end
 
-    # IconDirEntry section as binary data string
-    icon_dir.data         = images_hash.inject('') {|str,(k,v)| str += entries.fetch(v); str}
-
-    # IconImage section as binary data string
-    icon_dir.data         += images_hash.inject('') {|str,(k,v)| str += images.fetch(v); str}
+    # IconDirEntry + IconImage section as binary data string
+    icon_dir.data         = entries.join + images.join
 
     icon_dir
   end

data/lib/ico/version.rb

@@ -1,3 +1,3 @@
 module ICO
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ico
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - So Awesome Man
@@ -196,6 +196,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- ico.gemspec
 - lib/core_ext/array/extract_options.rb
 - lib/ico.rb
 - lib/ico/icon_dir.rb