middleman-automatic-clowncar 0.0.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d89dafa2bff458ff5a70f1eba877d3075e4d1309
-  data.tar.gz: c20c51ec82da48d292bf55fd3162eeaaad94f695
+SHA256:
+  metadata.gz: 521f4d750e09f11d5dfbcb610cddce713f88b26ecf1bb36d083bee6a4604f72a
+  data.tar.gz: 3cd1edd638d3d4d94e7e3e6935a9c39c418ba93125d6c8829114e8ab5b8bae3e
 SHA512:
-  metadata.gz: c33018469c8c46fb6896bada8868784cefca57b96380d4b95b7ecda9608496e67bc350d2a5f2c32de9ff5d50a7fd236849558b7de9edc837d45da713bb551d8e
-  data.tar.gz: 0d1f00b7dbd72fb91a77b72c7e37124faa47e711cdc3e9cab41e410c0f547749bf1fe37d31b8e5bbac88b12c4f42b2d85c348cd5dd52492634b09045e3635348
+  metadata.gz: 7febf2daebd50e101f53088343ddbde2c60d631d6efd92be79e77a3225fbe951765ef8e3796723b6bcf48a63281c1076f4ff9e68396564f51b4f98a9d236aece
+  data.tar.gz: 1b993e4f93f1f367adab19e06f8da9fc81ee10ff424d64142ec6ee9103bf17274803bebac0c5d52e9bed84393b608188191560e37fc4dcf4d77c9837aacbdb61

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 fixtures/*/build
+.byebug_history

data/.ruby-version

@@ -0,0 +1 @@
+2.6.1

data/features/clowncar_tag_build.feature

@@ -175,6 +175,6 @@ Feature: Generating SVG clowncars during preview mode
     And the file "testfile.html" should contain "@media%20screen%20and%20(max-width:200px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/test-image-small.jpg);%7D%7D"
     And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:201px)%20and%20(max-width:400px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/test-image-medium.jpg);%7D%7D"
     And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:401px)%20and%20(max-width:600px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/test-image-large.jpg);%7D%7D"
-    And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:601px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/../test-image.jpg);%7D%7D"
+    And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:601px)%7Bsvg%7Bbackground-image:url(/photos/test-image/../test-image.jpg);%7D%7D"
 
 

data/features/support/step_definitions.rb

@@ -1,5 +1,5 @@
 Given(/^the file "(.*?)" has been overwritten with "(.*?)"$/) do |file1,file2|
-  FileUtils.cp File.join(current_dir,file2), File.join(current_dir,file1)
+  FileUtils.cp File.join(expand_path('.'),file2), File.join(expand_path('.'),file1)
 end
 
 Given(/^some time has passed$/) do
@@ -7,8 +7,8 @@ Given(/^some time has passed$/) do
 end
 
 Then(/^we should write some stuff to the console$/) do
-  puts "here's index.html"
-  puts File.open(File.join(current_dir,"index.html")).read
-  puts "------"
-  puts File.open(File.join(current_dir,"photos/test-image/test-image-small.jpg"),'rb').read
+  puts "here's testfile.html"
+  puts File.open(File.join(expand_path('.'),"testfile.html")).read
+  #puts "------"
+  #puts File.open(File.join(expand_path('.'),"photos/test-image/test-image-small.jpg"),'rb').read
 end

data/features/thumbnail_generation.feature

@@ -14,6 +14,7 @@ Feature: Generating thumbnails
   Scenario: Basic useage during preview
     Given a fixture app "automatic-clowncar-app"
     And the Server is running at "automatic-clowncar-app"
+    Given the Server is running at "automatic-clowncar-app"
     When I go to "/photos/test-image/test-image-small.jpg"
     Then the content type should be "image/jpeg"
     When I go to "/photos/test-image/test-image-medium.jpg"

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

@@ -11,9 +11,9 @@ 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 that should be clowncared. (Outside of the sprockets images dir.)"
       option :filetypes, [:jpg, :jpeg, :png], "The types of files to use for automatic clowncaring."
@@ -33,31 +33,21 @@ module Middleman
         app.after_configuration do
 
           #stash the source images dir in options for the Rack middleware
-          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(source_dir)
+          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|
-            #puts "Generating automatic clowncar images"
-            #files.each do |file|
-              #path = file.gsub(source_dir, '')
-              #specs = ThumbnailGenerator.specs(path, sizes, source_dir)
-              #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
@@ -74,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
@@ -85,14 +75,15 @@ 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)
-            url = url.sub("/#{app.images_dir}/",'/')
-            
-            if fallback_host &&is_relative_url?(url)
+            # TODO : Previously the images_dir could be configured. Now it seems to be hard coded by middleman?
+            images_dir = 'images' # app.images_dir
+            url = url.sub("/#{images_dir}/",'/')
+            if fallback_host && is_relative_url?(url)
               File.join(fallback_host, url)
             else
               url
@@ -150,7 +141,7 @@ module Middleman
 
         width, height = ::FastImage.size(main_abs_path, :raise_on_failure => true)
 
-        
+
         sizes = {}
         Extension.options_hash[:sizes].each_pair do |sname,swidth|
           next if swidth > width
@@ -171,9 +162,9 @@ module Middleman
         #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)
@@ -197,17 +188,12 @@ 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]-->}
@@ -220,7 +206,7 @@ module Middleman
             #else
             #  width = extensions[:automatic_clowncar].options.sizes.map{|k,v| v }.sort.last
             #end
-            
+
             object_style = "max-width:#{width}px;"
           end
 
@@ -235,7 +221,7 @@ module Middleman
 
         def thumbnail_specs(image, name)
           sizes = Extension.options_hash[:sizes]
-          ThumbnailGenerator.specs(image, sizes, source_dir)
+          ThumbnailGenerator.specs(image, sizes, app.source_dir)
         end
 
         def thumbnail_url(image, name, options = {})

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

@@ -2,8 +2,9 @@ module Middleman
   module AutomaticClowncar
     class SitemapExtension
 
-      def initialize(app)
-        @app = app
+      def initialize(extension)
+        @extension = extension
+        @app = extension.app
       end
 
       # Add sitemap resource for every image in the sprockets load path
@@ -24,9 +25,9 @@ module Middleman
               default_resource = resources.select{|r| r.destination_path == spec[:name]}
               resources = resources - default_resource
             end
-            dest_path = File.join(@app.root_path,@app.build_dir, spec[:name])
+            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,@app.build_dir,@app.source_dir)
+            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]

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

@@ -1,7 +1,7 @@
 module Middleman
   module AutomaticClowncar
     class ThumbnailResource < ::Middleman::Sitemap::Resource
-     
+
       require 'mini_magick'
 
       attr_accessor :output
@@ -12,7 +12,7 @@ module Middleman
         @root_path = root_path
         @build_dir = build_dir
         @source_dir = source_dir
-        super(store, path)
+        super(store, path, source_dir.to_s)
       end
 
       def template?
@@ -22,21 +22,10 @@ module Middleman
       def source_file
         nil
       end
-      #def source_file
-        #output_dir = File.join(@root_path,@build_dir)
-        #dest_path = File.join(output_dir,@path)
-        #source_path = File.join(@root_path,@source_dir)
-        #if Utils.timestamp_current?(@source_dir,@build_dir,@origin) && File.exist?(dest_path)
-          #File.join(@build_dir,@path)
-        #else
-          #@origin
-        #end
-      #end
 
       def render(*args, &block)
         output_dir = File.join(@root_path,@build_dir)
         dest_path = File.join(output_dir,@path)
-        source_path = File.join(@source_dir,@origin)
         img = nil
         if Utils.timestamp_current?(@source_dir,@build_dir,@origin) && File.exist?(dest_path)
           img = MiniMagick::Image.open(dest_path)
@@ -47,10 +36,6 @@ module Middleman
         img.to_blob
       end
 
-      # def request_path
-      #   @request_path
-      # end
-
       def binary?
         false
       end
@@ -63,10 +48,6 @@ module Middleman
         false
       end
 
-      def metadata
-        @local_metadata.dup
-      end
-
     end
   end
 end

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

@@ -1,13 +1,13 @@
 module Middleman
   module AutomaticClowncar
     class TimestampResource < ::Middleman::Sitemap::Resource
-      
+
       attr_accessor :output
 
       def initialize(store, path, origin, source_dir)
         @source_dir = source_dir
         @origin = origin
-        super(store, path)
+        super(store, path, source_dir.to_s)
       end
 
       def template?
@@ -37,11 +37,6 @@ module Middleman
         false
       end
 
-      def metadata
-        @local_metadata.dup
-      end
-
-
     end
   end
 end

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

@@ -30,7 +30,7 @@ module Middleman
 
       # strip the source_dir and any leading slashes
       def self.naked_origin(source_dir,origin)
-        origin.gsub(source_dir + File::SEPARATOR, '')
+        origin.gsub(source_dir.to_s + File::SEPARATOR, '')
       end
 
     end

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

@@ -1,3 +1,3 @@
 module MiddlemanAutomaticClowncar
-  VERSION = "0.0.4"
+  VERSION = "4.0.0"
 end

data/middleman-automatic-clowncar.gemspec

@@ -18,18 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "middleman-core", "> 3.2.2"
+  spec.add_dependency "middleman-core", "~> 4.3.0"
 
   spec.add_dependency("mini_magick", ["~> 3.7.0"])
-  spec.add_dependency "fastimage", "~> 1.6.0"
+  spec.add_dependency "fastimage", "~> 2.0"
 
   # These are here to make sure that we don't have any collisions with sprockets
-  spec.add_dependency "middleman-sprockets", "> 3.2.0"
-  spec.add_dependency "sass", "~> 3.4.0"
+  spec.add_dependency "middleman-sprockets", "~> 4.1.0"
+  #spec.add_dependency "sass", "~> 3.4.0"
 
+  spec.add_development_dependency "middleman", "~> 4.3.0"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "cucumber", "~> 1.3.10"
-  spec.add_development_dependency "aruba",    "~> 0.5.1"
+  spec.add_development_dependency "capybara", "~> 2.5.0"
+  spec.add_development_dependency "cucumber", "~> 2.0"
+  spec.add_development_dependency "aruba",    "~> 0.14.0"
+  spec.add_development_dependency "byebug"
   #spec.add_development_dependency "simplecov", "~> 0.8.2"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: middleman-automatic-clowncar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Jeremy Green
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: middleman-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :runtime
+        version: 4.3.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,34 +108,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: Automatically generated responsive images for middleman.
 email:
 - jeremy@octolabs.com
@@ -144,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -175,7 +204,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,9 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.0.1
+signing_key:
 specification_version: 4
 summary: Automatically generated responsive images for middleman.
 test_files: