zooniverse_data 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7fad0328799e864d6969d8b8dff3bbf63027bf
-  data.tar.gz: 561683b823a9fb7a8909d71261c7b2b6a0db7d76
+  metadata.gz: a73655436923b23c1271dd3a779b0c4391aefdfe
+  data.tar.gz: 107d49c5c3183d4f5d9efd27f0b3ab15733a3aff
 SHA512:
-  metadata.gz: 6a99e17fccb401d74149638524979b579b87b848153374248de025b94d1084099b4c3285c06123982da811a3e353798342a6bcfa0da6e9d86728afe2591aedcb
-  data.tar.gz: 14281775a0b77af3c13b8976895dbb6f6ea83a7d96fc167e0233ccdccc32f7abdf9dee3832f007dc74d5da6d8ed3b8f7884ac3f6df2b2292429682b68f821ef5
+  metadata.gz: e84d60b607e71bd17aeaf0e6df1241443124308c5751830e8abf93e28212480953c02d4a548d878da980a3db8861feae3b7f868c949c010ca1163ebd46c1c260
+  data.tar.gz: f4a18bbc0fc648225ef2e72346a90dbe2e681b705cf8f09918fac32de22a8a91aaa21e162276de18340553b15d1a78adacf78e7cb3fd5fdc84acfdee4d01ffa7

data/lib/zooniverse_data/helpers/images.rb

@@ -6,82 +6,94 @@ module ZooniverseData
     module Images
       class ImageConversionError < StandardError; end
       class ImageOptimizationError < StandardError; end
-      
+
       class Image
         attr_accessor :path, :raise_exceptions
-        
+
         def initialize(path: path, raise_exceptions: true)
           self.path = path
           self.raise_exceptions = raise_exceptions
         end
-        
+
         def size
           width, height = info.size
           OpenStruct.new width: width, height: height
         end
-        
+
         def type
           info.type
         end
-        
+
         def info
           @info ||= FastImage.new(path, raise_on_failure: raise_exceptions)
         end
-        
+
         def optimize
           tap do
             case type
             when :jpeg
               _run_optimization "jpegtran -copy none -optimize -progressive -outfile '#{ tempfile.path }' '#{ path }'"
             when :png, :bmp, :gif, :tiff
-              _run_optimization "optipng -strip all -o2 -quiet '#{ path }'"
+              _run_optimization "optipng #{optipng_options} '#{ path }'"
             end
           end
         end
-        
+
         def tempfile
           return @tempfile if @tempfile
           @tempfile = Tempfile.new File.basename path
         end
-        
+
         def remove_tempfile
           tempfile.delete
           @tempfile = nil
         end
-        
+
         def replace_with_tempfile
           `cp '#{ tempfile.path }' '#{ path }'`
           remove_tempfile
         end
-        
+
+        # -strip all only available after 0.7.0
+        # http://sourceforge.net/p/optipng/bugs/44/
+        def optipng_options
+          [ "-o2" , "-quiet" ].tap do |optipng_options|
+            if optipng_version = `optipng -v | sed -n 1p`.strip.match(/\s(\d.+):/)
+              if optipng_version[1].gsub(".", "").to_i > 70
+                optipng_options.unshift("-strip all")
+              end
+            end
+          end.join(" ")
+        end
+
         def _run_optimization(command)
           success = system command
           raise ImageOptimizationError.new('Image optimization failed') unless success
           replace_with_tempfile if @tempfile
         end
       end
-      
+
       class Converter
         attr_accessor :input_image, :output_image, :flags
         attr_accessor :raise_exceptions, :remove_original, :optimize
-        
+
         def initialize(path: path, raise_exceptions: true, remove_original: true, optimize: true)
           self.input_image = Image.new path: path, raise_exceptions: raise_exceptions
           self.remove_original = remove_original
           self.optimize = optimize
           self.flags = []
         end
-        
+
         def command(string)
           tap do
             self.flags << string
           end
         end
-        
+
         def resize(width: nil, height: nil, force: true, type: nil)
           tap do
             resize_type = type ? "#{ type }-resize" : 'resize'
-            
+
             if width && height
               self.flags << "-#{ resize_type } #{ width }x#{ height }#{ force ? '\!' : '' }"
             elsif width || height
@@ -89,51 +101,51 @@ module ZooniverseData
             end
           end
         end
-        
+
         def adaptive_resize(width: width, height: height, force: true)
           resize width: width, height: height, type: 'adaptive', force: force
         end
-        
+
         def percentage_resize(percentage, type: nil)
           tap do
             resize_type = type ? "#{ type }-resize" : 'resize'
             self.flags << "-#{ resize_type } #{ percentage }% +repage"
           end
         end
-        
+
         def adaptive_percentage_resize(percentage)
           percentage_resize percentage, type: 'adaptive'
         end
-        
+
         def quality(percentage)
           tap do
             self.flags << "-quality #{ percentage }%"
           end
         end
-        
+
         def crop(width: width, height: height, top: top, left: left)
           tap do
             self.flags << "-crop #{ width }x#{ height }+#{ left }+#{ top } +repage"
           end
         end
-        
+
         def crop_center(width: width, height: height, top: 0, left: 0)
           tap do
             self.flags << "-gravity Center -crop #{ width }x#{ height }+#{ left }+#{ top } +repage"
           end
         end
-        
+
         def negate
           tap do
             self.flags << "-negate"
           end
         end
         alias_method :invert, :negate
-        
+
         def write_to(path: nil, prefix: nil, postfix: nil)
           to(path: path, prefix: prefix, postfix: postfix).write
         end
-        
+
         def to(path: nil, prefix: nil, postfix: nil)
           raise ImageConversionError.new('Cannot convert an image without an output path') unless path || prefix || postfix
           tap do
@@ -142,19 +154,19 @@ module ZooniverseData
               input_path = File.dirname input_file
               input_ext = File.extname input_file
               input_name = File.basename(input_file).sub input_ext, ''
-              
+
               input_name = "#{ prefix }_#{ input_name }" if prefix
               input_name = "#{ input_name }_#{ postfix }" if postfix
               path = "#{ input_path }/#{ input_name }#{ input_ext }"
             end
-            
+
             self.output_image = Image.new path: path, raise_exceptions: raise_exceptions
           end
         end
-        
+
         def write
           raise ImageConversionError.new('Cannot convert an image without an output path') unless output_image
-          
+
           output_image.tap do
             success = system "convert #{ input_image.path } #{ flags.join(' ') } #{ output_image.path }"
             raise ImageConversionError.new('Image conversion failed') unless success
@@ -163,23 +175,23 @@ module ZooniverseData
           end
         end
       end
-      
+
       def convert_image(path, remove_original: true, optimize: true)
         Converter.new path: path, remove_original: remove_original, optimize: optimize
       end
-      
+
       def invert_image(path, remove_original: false, optimize: true)
         convert_image(path, remove_original: remove_original).invert.write_to prefix: 'inverted'
       end
-      
+
       def convert_to_jpeg(path, remove_original: true, optimize: true)
         _simple_convert path, 'jpg', remove_original: remove_original, optimize: optimize
       end
-      
+
       def convert_to_png(path, remove_original: true, optimize: true)
         _simple_convert path, 'png', remove_original: remove_original, optimize: optimize
       end
-      
+
       def _simple_convert(path, extension, remove_original: true, optimize: true)
         out_path = path.sub(/#{ File.extname(path) }$/, ".#{ extension }")
         convert_image(path, remove_original: remove_original, optimize: optimize).to(path: out_path).write

data/lib/zooniverse_data/projects/higgs_hunter.rb

@@ -0,0 +1,42 @@
+module ZooniverseData
+  module Projects
+    class HiggsHunter
+      include Helpers
+
+      def customize_subject
+        new_locations = default_empty_locations
+        entry.location['standard'].each do |image_path|
+          standard_image = standard_image(image_path)
+          new_locations['standard'] << standard_image
+          thumbnail_image = converter_for(standard_image, type: 'thumbnail', max_size: 400)
+          new_locations['thumbnail'] << thumbnail_image
+        end
+        set_location new_locations
+      end
+
+      private
+
+      def standard_image(path)
+        convert_image(path)
+          .write_to(prefix: 'standard')
+          .path
+      end
+
+      def converter_for(path, type: type, max_size: max_size)
+        convert_image(path, remove_original: false)
+          .resize(width: max_size, height: max_size, force: false)
+          .quality(80)
+          .write_to(prefix: type)
+          .path
+      end
+
+
+      def default_empty_locations
+        {
+          'standard' => [],
+          'thumbnail' => []
+        }
+      end
+    end
+  end
+end

data/lib/zooniverse_data/projects.rb

@@ -3,9 +3,10 @@ module ZooniverseData
     require 'zooniverse_data/projects/default'
     require 'zooniverse_data/projects/asteroid'
     require 'zooniverse_data/projects/condor'
+    require 'zooniverse_data/projects/higgs_hunter'
     require 'zooniverse_data/projects/milky_way'
+    require 'zooniverse_data/projects/penguin'
     require 'zooniverse_data/projects/serengeti'
     require 'zooniverse_data/projects/sunspot'
-    require 'zooniverse_data/projects/penguin'
   end
 end

data/lib/zooniverse_data/version.rb

@@ -1,3 +1,3 @@
 module ZooniverseData
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zooniverse_data
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Michael Parrish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - lib/zooniverse_data/projects/asteroid.rb
 - lib/zooniverse_data/projects/condor.rb
 - lib/zooniverse_data/projects/default.rb
+- lib/zooniverse_data/projects/higgs_hunter.rb
 - lib/zooniverse_data/projects/milky_way.rb
 - lib/zooniverse_data/projects/penguin.rb
 - lib/zooniverse_data/projects/serengeti.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Zooniverse data library