middleman-social_image 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e367633b01f5990facae751ae7f5c615c240dfec330167cc5d632b726903c3ce
-  data.tar.gz: aeaf53cf8ac3b9bf8f3d36908d504038f31c2d070d6c4780a35454b57098797b
+  metadata.gz: f46e2e521dcd3e3860d9a150e0d466b089819d4a7403f3e5a007ba12b4dc609a
+  data.tar.gz: 0b319ab37bbd2b8208bb89dc82e731d630068d4e782124c11bcbb2794f17503d
 SHA512:
-  metadata.gz: 5d5eae315f60e07165afa0ee33c2e7e9bcea9909a664c47f609654619c3251dbbb192a99c06285a4a8b7f20219fe49230711ecadb1ea767fed164a6c4bcf3899
-  data.tar.gz: 8ffab1b034b3d31b8296db23547d27c5753e69fd534634958efe67b0cb22ea9ceb4487b3a96bea65debfbd767124c76ea30bb0eb9ebd158bef3fe29c057ffa4f
+  metadata.gz: 2969d71e7d9d4d55cf5ea6fc4ac1f977da8e2aca3d75eac4dabea975e1645bc92fb9436b3bf11bd77ba4a8e35d79057edf9b92aac9143cd5afe5ce2104acec4c
+  data.tar.gz: b821e5d978da93de9a846b8c9de40cc215740d448164f70febe53686f618659c34d6baa418114f8a0ea2317fe915f9b5dc389ef973016be93d836788707bc62e

data/README.md

@@ -25,18 +25,20 @@ Optionally, you can configure this extension with the following (defaults are sh
 ```ruby
 activate :social_image do |social_image|
   social_image.window_size = '1200,600' # The size of the screenshot
-  social_image.base_url = 'http://localhost:4567/' # Base URL of running middleman server
-  social_image.base_asset_dir = 'assets/images/social-images' # Where to save the generated images
-  social_image.social_image_url_pattern = %r{(/social-image)/$}  # Screenshot URLs matching this pattern
-  social_image.social_image_url_substitution = '\1.png' # When generating screenshots, replace URLs matching social_image_url_pattern with this
   social_image.selector = 'body > *' # Used to test that the social image url has loaded properly. The more specific this is, the better the chance of catching errors.
+  social_image.always_generate = true # Always regenerate images. Takes a long time, but ensures any changes are reflected.
+  social_image.parallel = true # Generate images in parallel.
 end
 ```
 
-Create a HTML page in your middleman app that contains the HTML you want to be rendered. The URL for this should match the social_image_url_pattern (so by default, ending with `/social-image/`).
+Create a HTML page in your middleman app that contains the HTML you want to be rendered. Add `social_image: true` to the page's front matter to indicate it is the source for a social image. You can also add it as an option if you're using a proxy page like the following.
 
-Start up the middleman server with `bundle exec middleman server`
-
-Run the `bundle exec middleman social_image` command to generate images from any URLs matching social_image_url_pattern. The image will be saved to a location matching the URL of the resource used to generate it, with the social_image_url_substitution applied, in the base_asset_dir. So with the default settings, if for instance you had created a page at `/examples/social-image/`, this image would be saved at `assets/images/social-images/examples/social-image.png`.
+``` ruby
+["tom", "dick", "harry"].each do |name|
+  proxy "/social-image/#{name}.html", "/templates/social-image.html", social_image: true, locals: { name: name }
+end
+```
 
 You can now refer to this image as normal within your middleman application.
+
+In preview mode, you don't need any other special setup. However, to generate the images in build, you also need to be running the preview server with `bundle exec middleman server`.

data/lib/middleman-social_image/capybara.rb

@@ -0,0 +1,12 @@
+require "capybara"
+Capybara.server = :webrick
+Capybara.register_driver :selenium_chrome_headless do |app|
+  Capybara::Selenium::Driver.load_selenium
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+    opts.args << '--headless'
+    opts.args << '--disable-gpu' if Gem.win_platform?
+    opts.args << '--disable-site-isolation-trials'
+    opts.args << '--hide-scrollbars'
+  end
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end

data/lib/middleman-social_image/converter.rb

@@ -0,0 +1,43 @@
+require "middleman-social_image/capybara"
+class Middleman::SocialImage::Converter
+  def initialize(app, window_size, selector, always_generate)
+    @app = app
+    @window_size = window_size
+    @selector = selector
+    @always_generate = always_generate
+  end
+
+  def image_path(resource)
+    File.join(@app.root, "tmp/middleman-social_image", resource.path.sub(".html", ".png"))
+  end
+
+  def convert(resource)
+    image_path = image_path(resource)
+    if File.exist?(image_path) && !@always_generate
+      @app.logger.debug "== social_image: skipping #{resource.path} as already in cache"
+    else
+      @app.logger.debug "== social_image: converting #{resource.path}"
+      session.visit(resource.url)
+      raise "#{resource.url} did not contain '#{@selector}'." unless session.has_selector?(@selector)
+      FileUtils.mkdir_p(File.dirname(image_path))
+      session.save_screenshot(image_path)
+    end
+  end
+
+  private
+
+  def session
+    @session ||= begin
+      if @app.server?
+        rack_app = ::Middleman::Rack.new(@app).to_app
+        session = Capybara::Session.new(:selenium_chrome_headless, rack_app)
+      else
+        protocol = @app.config.https ? "https" : "http"
+        Capybara.app_host = "#{protocol}://localhost:#{@app.config.port}/"
+        session = Capybara::Session.new(:selenium_chrome_headless)
+      end
+      session.current_window.resize_to(*@window_size.split(","))
+      session
+    end
+  end
+end

data/lib/middleman-social_image/extension.rb

@@ -1,11 +1,63 @@
 require 'middleman-core'
-require 'middleman-social_image/commands'
 
 class Middleman::SocialImage::Extension < ::Middleman::Extension
   option :window_size, '1200,600'
-  option :base_url, 'http://localhost:4567/'
-  option :base_asset_dir, 'assets/images/social-images'
-  option :social_image_url_pattern, %r{(/social-image)/$}
-  option :social_image_url_substitution, '\1.png'
   option :selector, "body > *"
+  option :always_generate, true
+  option :parallel, true
+
+  def initialize(app, options_hash={}, &block)
+    super
+    require "middleman-social_image/converter"
+    require "middleman-social_image/resource"
+    @converter = Middleman::SocialImage::Converter.new(app, options.window_size, options.selector, options.always_generate)
+  end
+
+  def manipulate_resource_list(resources)
+    if app.build?
+      manipulate_resource_list_for_build(resources)
+    else
+      manipulate_resource_list_for_preview(resources)
+    end
+  end
+
+  private
+
+  def social_image_source_resources
+    app.sitemap.resources.select {|resource| resource.options[:social_image] || resource.data[:social_image] }
+  end
+
+  def path_for_source_resource(resource)
+    resource.path.sub(".html", ".png")
+  end
+
+  def manipulate_resource_list_for_build(resources)
+    convert_resource = proc do |resource|
+      @converter.convert(resource)
+    end
+    if options.parallel
+      ::Parallel.each(social_image_source_resources, &convert_resource)
+    else
+      social_image_source_resources.each(&convert_resource)
+    end
+    social_image_resources = social_image_source_resources.map do |resource|
+      Middleman::Sitemap::Resource.new(
+        @app.sitemap,
+        path_for_source_resource(resource),
+        @converter.image_path(resource)
+      )
+    end
+    resources + social_image_resources - social_image_source_resources
+  end
+
+  def manipulate_resource_list_for_preview(resources)
+    resources + social_image_source_resources.map do |resource|
+      Middleman::SocialImage::Resource.new(
+        @app.sitemap,
+        path_for_source_resource(resource),
+        @converter,
+        resource
+      )
+    end
+  end
 end

data/lib/middleman-social_image/resource.rb

@@ -0,0 +1,12 @@
+class Middleman::SocialImage::Resource < ::Middleman::Sitemap::Resource
+  def initialize(store, path, converter, base_resource)
+    super(store, path)
+    @converter = converter
+    @base_resource = base_resource
+  end
+
+  def render(*)
+    @converter.convert(@base_resource)
+    File.read(@converter.image_path(@base_resource))
+  end
+end

data/lib/middleman-social_image/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module SocialImage
-    VERSION = '0.0.3'.freeze
+    VERSION = '0.0.4'.freeze
   end
 end

data/lib/middleman-social_image.rb

@@ -3,6 +3,5 @@ require 'middleman-social_image/version'
 
 Middleman::Extensions.register :social_image do
   require "middleman-social_image/extension"
-  require 'middleman-social_image/commands'
   Middleman::SocialImage::Extension
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-social_image
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Paul McMahon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -67,8 +67,10 @@ files:
 - bin/console
 - bin/setup
 - lib/middleman-social_image.rb
-- lib/middleman-social_image/commands.rb
+- lib/middleman-social_image/capybara.rb
+- lib/middleman-social_image/converter.rb
 - lib/middleman-social_image/extension.rb
+- lib/middleman-social_image/resource.rb
 - lib/middleman-social_image/version.rb
 - middleman-social_image.gemspec
 homepage: https://github.com/pwim/middleman-social_image

data/lib/middleman-social_image/commands.rb

@@ -1,60 +0,0 @@
-require 'middleman-cli'
-
-module Middleman
-  module Cli
-    class SocialImage < Thor::Group
-      include Thor::Actions
-
-      check_unknown_options!
-
-      namespace :social_image
-
-      def self.exit_on_failure?
-        true
-      end
-
-      def social_image
-        require "capybara"
-        app = ::Middleman::Application.new do
-          config[:mode]              = :config
-          config[:watcher_disable]   = true
-        end
-        options = app.extensions[:social_image].options
-        Capybara.register_driver :selenium_chrome_headless do |app|
-          Capybara::Selenium::Driver.load_selenium
-          browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
-            opts.args << "--window-size=#{options.window_size}"
-            opts.args << '--headless'
-            opts.args << '--disable-gpu' if Gem.win_platform?
-            opts.args << '--disable-site-isolation-trials'
-            opts.args << '--hide-scrollbars'
-          end
-          Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-        end
-        session = Capybara::Session.new(:selenium_chrome_headless)
-
-        app.sitemap.resources.each do |resource|
-          if resource.url =~ options.social_image_url_pattern
-            image_path = File.join(app.source_dir, options.base_asset_dir, resource.url.sub(options.social_image_url_pattern, options.social_image_url_substitution))
-            if File.exists?(image_path)
-              say "Skipping #{image_path} as already generated"
-            else
-              say "Generating #{image_path}"
-              FileUtils.mkdir_p(File.dirname(image_path))
-              url = File.join(options.base_url, resource.url)
-              session.visit(url)
-              if session.has_selector?(options.selector)
-                session.save_screenshot(image_path)
-              else
-                say "Aborting. #{image_path} did not contain '#{options.selector}'. Is the preview server running?"
-                exit
-              end
-            end
-          end
-        end
-      end
-    end
-
-    Base.register(Middleman::Cli::SocialImage, 'social_image', 'social_image [options]', 'Generates social images.')
-  end
-end