middleman-automatic-clowncar 0.0.1 → 4.0.1

data/fixtures/automatic-clowncar-app/source/tag.html.erb

@@ -1 +1 @@
-<%= automatic_clowncar_tag "photos/test-image.jpg", :host => "http://localhost:4567/" %>
+<%= automatic_clowncar_tag "photos/test-image.jpg", :host => "http://localhost:4567/", :include_original => true, :prevent_upscaling => true %>

data/fixtures/automatic-clowncar-app/source/thumbnail.html.erb

@@ -0,0 +1 @@
+<%= thumbnail_url "photos/test-image.jpg", :medium %>

data/lib/middleman-automatic-clowncar/extension.rb

@@ -1,19 +1,23 @@
 require 'middleman-core'
 
 require 'middleman-automatic-clowncar/thumbnail-generator'
+require 'middleman-automatic-clowncar/timestamp-resource'
+require 'middleman-automatic-clowncar/thumbnail-resource'
+require 'middleman-automatic-clowncar/sitemap-extension'
+require 'middleman-automatic-clowncar/utils'
 
 require 'fastimage'
 
 module Middleman
   module AutomaticClowncar
     class Extension < Middleman::Extension
-      
+
       SVG_TEMPLATE = "<svg viewBox='0 0 ::width:: ::height::' preserveAspectRatio='xMidYMid meet' xmlns='http://www.w3.org/2000/svg'><style>svg{background-size:100% 100%;background-repeat:no-repeat;}::media_queries::</style></svg>"
-      
+
       option :sizes, {}, "The sizes of thumbnails to generate"
-      option :namespace_directory, ["**"], "The directories inside of images that should be clowncared."
+      option :namespace_directory, ["**"], "The directories that should be clowncared. (Outside of the sprockets images dir.)"
       option :filetypes, [:jpg, :jpeg, :png], "The types of files to use for automatic clowncaring."
-
+      option :include_originals, false, "Always include original images. (Or not.)"
       cattr_accessor :options_hash
 
       def initialize(app, options_hash={}, &block)
@@ -29,31 +33,21 @@ module Middleman
         app.after_configuration do
 
           #stash the source images dir in options for the Rack middleware
-          Extension.options_hash[:images_source_dir] = File.join(source_dir, images_dir)
-          Extension.options_hash[:source_dir] = source_dir
+          Extension.options_hash[:source_dir] = app.source_dir
 
           sizes = Extension.options_hash[:sizes]
           namespace = Extension.options_hash[:namespace_directory].join(',')
 
-          dir = Pathname.new(File.join(source_dir, images_dir))
-          glob = "#{dir}/#{namespace}/*.{#{Extension.options_hash[:filetypes].join(',')}}"
+          dir = Pathname.new(app.source_dir)
+          glob = "#{dir}/{#{namespace}}/*.{#{Extension.options_hash[:filetypes].join(',')}}"
           files = Dir[glob]
-
-          # don't build the files until after build
-          after_build do |builder|
-            files.each do |file|
-              path = file.gsub(source_dir, '')
-              specs = ThumbnailGenerator.specs(path, sizes)
-              ThumbnailGenerator.generate(source_dir, File.join(root, build_dir), path, specs)
-            end
-          end
-
-          sitemap.register_resource_list_manipulator(:thumbnailer, SitemapExtension.new(self), true)
-
-          app.use Rack, Extension.options_hash
         end
       end
-      
+
+      def manipulate_resource_list(resources)
+        SitemapExtension.new(self).manipulate_resource_list(resources)
+      end
+
       def after_configuration
         @ready = true
       end
@@ -70,7 +64,7 @@ module Middleman
       end
 
       def get_image_path(name, path, is_relative, fallback_host)
-        puts "@@@@@@@ calling get_image_path for #{path}"
+        #puts "@@@@@@@ calling get_image_path for name:#{name} path:#{path}, is_relative:#{is_relative}, fallback_host:#{fallback_host}"
         begin
           uri = URI(path)
         rescue URI::InvalidURIError
@@ -81,13 +75,14 @@ module Middleman
         if uri.host
           path
         else
-          
+
           svg_path = File.join(File.dirname(name),File.basename(name,".*"), path)
 
           if is_relative
             url = app.asset_path(:images, svg_path)
-
-            if fallback_host &&is_relative_url?(url)
+            images_dir = app.config[:images_dir] || 'images'
+            url = url.sub("/#{images_dir}/",'/')
+            if fallback_host && is_relative_url?(url)
               File.join(fallback_host, url)
             else
               url
@@ -128,11 +123,15 @@ module Middleman
         output.join("")
       end
 
+      def get_physical_image_size(name)
+        main_abs_path = File.join(app.source_dir,name)
+        FastImage.size(main_abs_path, :raise_on_failure => true)
+      end
+
       def get_image_sizes(name, options)
-        puts "getting images sizes for #{name}"
+        #puts "getting images sizes for #{name}"
 
-        main_path = File.join(app.images_dir,name)
-        main_abs_path = File.join(app.source_dir,main_path)
+        main_abs_path = File.join(app.source_dir,name)
 
         extname = File.extname(name)
         basename = File.basename(name, ".*")
@@ -141,29 +140,36 @@ module Middleman
 
         width, height = ::FastImage.size(main_abs_path, :raise_on_failure => true)
 
-        
+
         sizes = {}
-        Extension.options_hash[:sizes].each_pair do |sname,width|
-          sizes[width] = "#{basename}-#{sname}#{extname}"
+        Extension.options_hash[:sizes].each_pair do |sname,swidth|
+          next if swidth > width
+          sizes[swidth] = "#{basename}-#{sname}#{extname}"
+        end
+
+        if options[:include_original] || Extension.options_hash[:include_originals]
+          sizes[width] = "../#{basename}#{extname}"
         end
 
-        puts "-"*30
-        puts [sizes, width, height]
+        #puts "-"*30
+        #puts [sizes, width, height]
         [sizes, width, height]
       end
 
 
       def generate_svg(name, is_relative, options)
-        puts "name for generate_svg = #{name}"
-        puts "options for generate_svg = #{options}"
+        #puts "name for generate_svg = #{name}"
+        #puts "options for generate_svg = #{options}"
         sizes, width, height = get_image_sizes(name, options)
-        
+
         fallback_host = false
-        if is_relative 
+        if is_relative
           test_path = app.asset_path(:images, "#{name}.svg")
           if is_relative_url?(test_path)
             if options.has_key?(:host)
               fallback_host = options[:host]
+            elsif app.config[:asset_host]
+              fallback_host = app.config[:asset_host]
             else
               warn "WARNING: Inline clowncar images require absolute paths. Please set a :host value"
             end
@@ -183,131 +189,53 @@ module Middleman
         Extension.svg_files_to_generate << [name, options]
       end
 
-      
-
-
 
-      
       helpers do
         def automatic_clowncar_tag(name, options={})
           internal = ""
 
           if options[:fallback]
-            
             fallback = File.basename thumbnail_url(name,:small)
             fallback_path = extensions[:automatic_clowncar].get_image_path(name, fallback, true, false)
             internal = %{<!--[if lte IE 8]><img src="#{fallback_path}"><![endif]-->}
           end
 
+          width, height = extensions[:automatic_clowncar].get_physical_image_size(name)
+          object_style = ""
+          if options.has_key?(:prevent_upscaling) && options[:prevent_upscaling]
+            #if options.has_key?(:include_original) && options[:include_original]
+            #else
+            #  width = extensions[:automatic_clowncar].options.sizes.map{|k,v| v }.sort.last
+            #end
+
+            object_style = "max-width:#{width}px;"
+          end
+
           if options.has_key?(:inline) && (options[:inline] === false)
             url = asset_path(:images, "#{name}.svg")
-            %Q{<object type="image/svg+xml" data="#{url}">#{internal}</object>}
+            %Q{<object type="image/svg+xml" style="#{object_style}" data-aspect-ratio="#{width.to_f/height.to_f}" data="#{url}">#{internal}</object>}
           else
             data = extensions[:automatic_clowncar].generate_svg(name, true, options)
-            %Q{<object type="image/svg+xml" data="data:image/svg+xml,#{::URI.escape(data)}">#{internal}</object>}
+            %Q{<object type="image/svg+xml" style="#{object_style}" data-aspect-ratio="#{width.to_f/height.to_f}" data="data:image/svg+xml,#{::URI.escape(data)}">#{internal}</object>}
           end
         end
 
         def thumbnail_specs(image, name)
           sizes = Extension.options_hash[:sizes]
-          ThumbnailGenerator.specs(image, sizes)
+          ThumbnailGenerator.specs(image, sizes, app.source_dir)
         end
 
         def thumbnail_url(image, name, options = {})
           include_images_dir = options.delete :include_images_dir
 
           url = thumbnail_specs(image, name)[name][:name]
-          url = File.join(images_dir, url) if include_images_dir
+          url = File.join(url) if include_images_dir
 
           url
         end
 
       end # helpers
 
-      class SitemapExtension
-        def initialize(app)
-          @app = app
-        end
-
-        # Add sitemap resource for every image in the sprockets load path
-        def manipulate_resource_list(resources)
-
-          images_dir_abs = File.join(@app.source_dir, @app.images_dir)
-
-          images_dir = @app.images_dir
-
-          options = Extension.options_hash
-          sizes = options[:sizes]
-          namespace = options[:namespace_directory].join(',')
-
-          files = Dir["#{images_dir_abs}/#{namespace}/*.{#{Extension.options_hash[:filetypes].join(',')}}"]
-
-          resource_list = files.map do |file|
-            path = file.gsub(@app.source_dir + File::SEPARATOR, '')
-            specs = ::Middleman::AutomaticClowncar::ThumbnailGenerator.specs(path, sizes)
-            specs.map do |name, spec|
-              resource = nil
-              # puts "#{path}: #{spec[:name]}: #{file}"
-              resource = Middleman::Sitemap::Resource.new(@app.sitemap, spec[:name], file) unless name == :original
-            end
-          end.flatten.reject {|resource| resource.nil? }
-
-          resources + resource_list
-        end
-      end # SitemapExtension
-
-
-      # Rack middleware to convert images on the fly
-      class Rack
-
-        # Init
-        # @param [Class] app
-        # @param [Hash] options
-        def initialize(app, options={})
-          @app = app
-          @options = options
-
-          files = Dir["#{options[:images_source_dir]}/**/*.{#{options[:filetypes].join(',')}}"]
-
-          @original_map = ThumbnailGenerator.original_map_for_files(files, options[:sizes])
-
-        end
-
-        # Rack interface
-        # @param [Rack::Environmemt] env
-        # @return [Array]
-        def call(env)
-          status, headers, response = @app.call(env)
-
-          path = env["PATH_INFO"]
-
-          path_on_disk = File.join(@options[:source_dir], path)
-
-          #TODO: caching
-          if original_specs = @original_map[path_on_disk]
-            original_file = original_specs[:original]
-            spec = original_specs[:spec]
-            if spec.has_key? :sizes
-              image = ::Magick::Image.read(original_file).first
-              blob = nil
-              image.change_geometry(spec[:sizes]) do |cols, rows, img|
-                img = img.resize(cols, rows)
-                img = img.sharpen(0.5, 0.5)
-                blob = img.to_blob
-              end
-
-              unless blob.nil?
-                status = 200
-                headers["Content-Length"] = ::Rack::Utils.bytesize(blob).to_s
-                headers["Content-Type"] = image.mime_type
-                response = [blob]
-              end
-            end
-          end
-
-          [status, headers, response]
-        end
-      end
 
 
 

data/lib/middleman-automatic-clowncar/sitemap-extension.rb

@@ -0,0 +1,45 @@
+module Middleman
+  module AutomaticClowncar
+    class SitemapExtension
+
+      def initialize(extension)
+        @extension = extension
+        @app = extension.app
+      end
+
+      # Add sitemap resource for every image in the sprockets load path
+      def manipulate_resource_list(resources)
+        puts "resources = #{resources.class}"
+        options = Extension.options_hash
+        sizes = options[:sizes]
+        namespace = options[:namespace_directory].join(',')
+        glob = "#{@app.source_dir}/{#{namespace}}/*.{#{Extension.options_hash[:filetypes].join(',')}}"
+        files = Dir[glob]
+        resource_list = []
+        files.each do |file|
+          path = Utils.naked_origin(@app.source_dir,file)
+          specs = ::Middleman::AutomaticClowncar::ThumbnailGenerator.specs(path, sizes,@app.source_dir)
+          specs.each_pair do |name, spec|
+            # Remove the default resource and use a ThumbnailResource that will avoid repeat imgoptim
+            if name == :original
+              default_resource = resources.select{|r| r.destination_path == spec[:name]}
+              resources = resources - default_resource
+            end
+            dest_path = File.join(@app.root_path,'build', spec[:name])
+            source = File.exists?(dest_path) ? dest_path : file
+            resource_list << Middleman::AutomaticClowncar::ThumbnailResource.new(@app.sitemap,spec[:name],spec[:dimensions],file,@app.root_path,'build',@app.source_dir)
+            #resource_list << Middleman::Sitemap::Resource.new(@app.sitemap, spec[:name], source) unless name == :original
+          end
+          fname = specs.first[1][:name]
+          timestampDir = File.join(File.dirname(fname),File.basename(fname,'.*'))
+          timestampPath = File.join(timestampDir,'timestamp.txt')
+          resource_list << Middleman::AutomaticClowncar::TimestampResource.new(@app.sitemap, timestampPath, path, @app.source_dir)
+        end
+        resource_list.flatten.reject {|resource| resource.nil? }
+
+        resources + resource_list
+      end
+
+    end # SitemapExtension
+  end
+end

data/lib/middleman-automatic-clowncar/thumbnail-generator.rb

@@ -1,4 +1,3 @@
-require 'RMagick'
 
 module Middleman
   module AutomaticClowncar
@@ -6,7 +5,12 @@ module Middleman
   class ThumbnailGenerator
     class << self
 
-      def specs(origin, dimensions)
+      def specs(origin, dimensions, source_dir)
+        #puts "origin = #{origin}"
+        #puts "source_dir = #{source_dir}"
+        origin = Utils.naked_origin(source_dir,origin) # just in case
+        width, height = FastImage.size(File.join(source_dir,origin))
+
         dir = File.dirname(origin)
         filename = File.basename(origin,'.*')
         ext = File.extname(origin)
@@ -16,35 +20,14 @@ module Middleman
         ret = {original: {name: origin}}
 
         dimensions.each do |name, dimension|
+          next if dimension > width
           location = File.join(dir,"#{filename}-#{name}#{ext}")
           ret[name] = {name:location , dimensions: dimension}
         end
-
         ret
       end
-
-      def generate(source_dir, output_dir, origin, specs)
-        image = ::Magick::Image.read(File.join(source_dir, origin)).first
-        specs.each do |name, spec|
-          if spec.has_key? :dimensions then
-            image.change_geometry(spec[:dimensions]) do |cols, rows, img|
-              img = img.resize(cols, rows)
-              img = img.sharpen(0.5, 0.5)
-              img.write File.join(output_dir, spec[:name])
-            end
-          end
-        end
-      end
-
-      def original_map_for_files(files, specs)
-        map = files.inject({}) do |memo, file|
-          generated_specs = self.specs(file, specs)
-          generated_specs.each do |name, spec|
-            memo[spec[:name]] = {:original => generated_specs[:original][:name], :spec => spec}
-          end
-          memo
-        end
-      end
+    
+    
     end
   end
   end

data/lib/middleman-automatic-clowncar/thumbnail-resource.rb

@@ -0,0 +1,54 @@
+module Middleman
+  module AutomaticClowncar
+    class ThumbnailResource < ::Middleman::Sitemap::Resource
+
+      require 'mini_magick'
+
+      attr_accessor :output
+
+      def initialize(store, path, dimensions, origin, root_path, build_dir, source_dir)
+        @dimensions = dimensions
+        @origin = origin
+        @root_path = root_path
+        @build_dir = build_dir
+        @source_dir = source_dir
+        super(store, path, source_dir.to_s)
+      end
+
+      def template?
+        false
+      end
+
+      def source_file
+        nil
+      end
+
+      def render(*args, &block)
+        output_dir = File.join(@root_path,@build_dir)
+        dest_path = File.join(output_dir,@path)
+        img = nil
+        if Utils.timestamp_current?(@source_dir,@build_dir,@origin) && File.exist?(dest_path)
+          img = MiniMagick::Image.open(dest_path)
+        else
+          img = MiniMagick::Image.open(@origin)
+          img.resize(@dimensions) unless @dimensions.blank?
+        end
+        img.to_blob
+      end
+
+      def binary?
+        false
+      end
+
+      def raw_data
+        {}
+      end
+
+      def ignored?
+        false
+      end
+
+    end
+  end
+end
+