gradient 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a4cda55417c291a922c291959867947aa8b93a
-  data.tar.gz: a5a1564b1ae76f25ebb4eed1f804123fa9cf6102
+  metadata.gz: 3c198e094a820d5824d667fc1c32ab3c6e5521d4
+  data.tar.gz: 7e7571355ef7e64e10ffa6ff6b0fab6440fde133
 SHA512:
-  metadata.gz: edf334904f263f9bfd9274d5f4cec5712c309c5b9a41e0032b982eee016edb76292da173dd2fb6cecedca30dd1ca963669b6c396e34d61d7ce0aa8742424980a
-  data.tar.gz: 68cc22eacc507b58b6d40bbc4bfca6919f328e53a0dfa06ced5f378e3dd0a576566e0e7034e6114369b5fbbd9c950ecbff8990d04daac8f586122b7ed3024a57
+  metadata.gz: eb0e346f524916b6110a60b143f49b53654eda7b7e8b10e5272c937096daa44df2c6ad4d3192204a8b8145a837a162e3ae941bf5b90b97cc1d32940e8078d003
+  data.tar.gz: a06de11eafc91cfa4f7d2ba0261dcbbc66a95e1c3aa3c6b4c917ae81be2697ee730b6044ced303037fd17e529c682bb6f94b79f2382ba2544fb3b26fb1a81f79

data/gradient.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "ruby-prof"
 end

data/lib/gradient/grd.rb

@@ -29,9 +29,7 @@ module Gradient
       def read(file)
         new.tap do |parser|
           File.open(file, "r") do |file|
-            while (string_buffer = file.gets)
-              parser.parse(string_buffer)
-            end
+            parser.parse(file.read)
           end
         end.maps
       end
@@ -84,7 +82,7 @@ module Gradient
     end
 
     private def clean_gradient(steps)
-      locations = steps.map { |g| g["Lctn"] }
+      locations = steps.map { |g| g.fetch("Lctn", 0.0) }
       min_location = locations.min
       max_location = locations.max
 
@@ -153,20 +151,24 @@ module Gradient
     end
 
     private def log(name, type, *args)
-      puts "#{Array.new(@shift, " ").join}#{name}(#{type}) #{ Array(args).join(", ") }" if ENV["ENABLE_LOG"]
+      puts "#{Array.new(@shift, " ").join}#{name}(#{type}) #{ Array(args).map(&:to_s).reject(&:empty?).join(", ") }" if ENV["ENABLE_LOG"]
     end
 
-    private def send_parse_method(type, name)
+    private def send_parse_method(type, name, rollback)
       if parse_method = PARSE_METHODS.fetch(type, nil)
         send(parse_method, name)
       else
-        parse_unknown(name)
+        parse_unknown(name, rollback)
       end
     end
 
     private def parse_entry
       length = current_slice_length
       length = 4 if length.zero?
+      length = 4 if length > 256
+
+      rollback = @offset
+
       continue!
 
       name = current_slice
@@ -175,7 +177,7 @@ module Gradient
       type = current_slice
       continue!
 
-      send_parse_method(type, name)
+      send_parse_method(type, name, rollback)
     end
 
     private def flush_current_gradient
@@ -214,10 +216,16 @@ module Gradient
       log(name, "vlls", size)
       upshift!
 
-      size.times do
+      size.times do |i|
         type = current_slice
         continue!
-        send_parse_method(type, name)
+
+        begin
+          if parse_method = PARSE_METHODS.fetch(type.strip, nil)
+            send(parse_method, name)
+          end
+        rescue ArgumentError => e
+        end
       end
 
       downshift!
@@ -248,32 +256,32 @@ module Gradient
       object_name_length = current_slice_length
       continue!
 
-      object_name = current_slice(object_name_length * 2)
+      object_name = current_slice(object_name_length * 2).strip
       continue!(object_name_length * 2)
 
       object_type_length = current_slice_length
       object_type_length = 4 if object_type_length.zero?
       continue!
 
-      object_type = current_slice(object_type_length)
+      object_type = current_slice(object_type_length).strip
       continue!(object_type_length)
 
       object_size = current_slice_length
       continue!
 
-      log(name, "objc", object_size, object_type, object_name)
-
       @current_object_name = name.strip
+      log(@current_object_name, "objc", object_size, object_type, object_name)
+
       case @current_object_name
       when "Grad"
         flush_current_gradient
       when "Clr"
         flush_current_color
-        @current_color = { "palette" => object_type.strip }
+        @current_color = { "palette" => object_type }
       end
 
       upshift!
-      object_size.times { parse_entry }
+      object_size.times { parse_entry if @offset < @buffer.length }
       downshift!
     end
 
@@ -343,28 +351,18 @@ module Gradient
     end
 
     private def parse_tdta(name)
-      log(name, "tdta")
-      parse_unknown(name)
+      size = current_slice_length
+      continue!
+      string = current_slice(size)
+      continue!(size)
+      log(name, "tdta", size, string)
     end
 
-    private def parse_unknown(name)
-      name = @buffer.slice(@offset + 8, 4)
-      log(name, "unknown", "Failed with simple case")
-
-      hex = []
-      ascii = []
-
-      (0...15).times do |i|
-        begin
-          ord = @buffer[@offset + i].ord
-          hex << "%02x" % ord
-          ascii << (ord < 32 || 126 < ord) ? "." : ord
-        rescue
-          log(name, "unknown", "Something failed")
-        end
-      end
-
-      fail [hex.join(" "), ascii.join].join("\n")
+    # Sometimes the offset is off by one byte.
+    # We roll back to the point before parsing an entry to try and parse it again.
+    private def parse_unknown(name, rollback)
+      @offset = rollback - 1
+      parse_entry if @offset < @buffer.length
     end
 
   end

data/lib/gradient/version.rb

@@ -1,3 +1,3 @@
 module Gradient
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gradient
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Philip Vieira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library for dealing with color gradients in ruby
 email:
 - zee@vall.in