sequence_logo 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed1b2f635b68cfa6d69d47f1e122c81f917e286
-  data.tar.gz: 493c1d3b807804a5f9ee670df8d7fbc5f6fe883f
+  metadata.gz: 2411aa5c78c5efae4860eafaa8743acbbc526f04
+  data.tar.gz: b4451fceda9c126ed40a8db058b649f626a0ba7a
 SHA512:
-  metadata.gz: b6f56777b12c9dd26c0f3523f3762246baa42a070b045126fabb1b3250b9bba5baa4ff8685a80d06c2b8fabdd095a0c5512a3c0c7096016dd65f1983b24f12e8
-  data.tar.gz: d8bed3b3cab1287681a440b020166f8a5012f02ffb61bfb87ddb7437d23b07298c85cd68fc8a0713020ec8470362d7ea0ae4ad2738140553dfc595f7e5d00752
+  metadata.gz: 32b810e2ed04ede3d15face6e91cf9fe677a30217f24c9f535fdd97f681028fd706d8c0f488d3198d984ab455bce982de0717367c6fc315462e8ff7f2419bb1c
+  data.tar.gz: fcf545d611c2ce7fd9b449273e25fac6fe094b158b9c676b39b934f8e84f480f4a4697e54779263832594e1b26f59b87f0585133cf89226309631c62ebf18f44

data/TODO.txt

@@ -1,8 +1,6 @@
 AssetsPath shouldn't be used at draw_logo level because it makes it impossible to change scheme on one folder that is outside the gem
 And how to make possible use schemes inside the assets path
 
-Make use of Tempfile in glue_logos.
-
 Make tests
 
-Wrap execs into methods
+Wrap execs into methods

data/lib/sequence_logo/canvas_factory.rb

@@ -62,7 +62,7 @@ module SequenceLogo
     def rescale_letters(letters_with_heights)
       letters_with_heights
         .reject{|part_of_height, letter| y_unit * part_of_height <= 1 }
-        .map{|part_of_height, letter| [(y_unit * part_of_height), letter] }
+        .map{|part_of_height, letter| [(y_unit * part_of_height).round, letter] }
     end
     private :logo_for_ordered_letters_nonscaling, :rescale_letters
 

data/lib/sequence_logo/exec/sequence_logo.rb

@@ -6,12 +6,12 @@ def in_necessary_orientations(objects_to_render, orientation, logo_folder)
   objects_to_render.map do |infos|
     case orientation
     when :direct
-      {renderable: infos[:renderable], filename: File.join(logo_folder, "#{infos[:name]}.png") }
+      {renderable: infos[:renderable], filename: "#{infos[:name]}.png" }
     when :revcomp
-      {renderable: infos[:renderable].revcomp, filename: File.join(logo_folder, "#{infos[:name]}.png") }
+      {renderable: infos[:renderable].revcomp, filename: "#{infos[:name]}.png" }
     when :both
-      [ {renderable: infos[:renderable], filename: File.join(logo_folder, "#{infos[:name]}_direct.png") },
-        {renderable: infos[:renderable].revcomp, filename: File.join(logo_folder, "#{infos[:name]}_revcomp.png") } ]
+      [ {renderable: infos[:renderable], filename: "#{infos[:name]}_direct.png" },
+        {renderable: infos[:renderable].revcomp, filename: "#{infos[:name]}_revcomp.png" } ]
     end
   end.flatten
 end
@@ -104,12 +104,13 @@ begin
                                         icd_mode: options[:icd_mode],
                                         words_count: options[:words_count],
                                         enable_threshold_lines: options[:threshold_lines])
-      objects_to_render << {renderable: logo, name: File.join(logo_folder, File.basename_wo_extname(filename))}
+      objects_to_render << {renderable: logo, name: File.basename_wo_extname(filename)}
     end
   end
 
   in_necessary_orientations(objects_to_render, options[:orientation], logo_folder).each do |infos|
-    infos[:renderable].render(canvas_factory).write("PNG:#{infos[:filename]}")
+    filename = File.join(logo_folder, infos[:filename])
+    infos[:renderable].render(canvas_factory).write("PNG:#{filename}")
   end
 rescue => err
   $stderr.puts "\n#{err}\n#{err.backtrace.first(5).join("\n")}\n\nUse --help option for help\n\n#{doc}"

data/lib/sequence_logo/version.rb

@@ -1,3 +1,3 @@
 module SequenceLogo
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequence_logo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ilya Vorontsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -53,6 +53,10 @@ files:
 - lib/sequence_logo/assets/nucl_simpa_bw/c.png
 - lib/sequence_logo/assets/nucl_simpa_bw/g.png
 - lib/sequence_logo/assets/nucl_simpa_bw/t.png
+- lib/sequence_logo/assets/nucl_weblogo/a.png
+- lib/sequence_logo/assets/nucl_weblogo/c.png
+- lib/sequence_logo/assets/nucl_weblogo/g.png
+- lib/sequence_logo/assets/nucl_weblogo/t.png
 - lib/sequence_logo/canvas_factory.rb
 - lib/sequence_logo/canvases.rb
 - lib/sequence_logo/canvases/gluing_canvas.rb