middleman-targets 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee95c10f2530dd03ea7f1428b185accde9e8a45a
-  data.tar.gz: 1dfd55d909500130f6d2fd21b0665e36413a319d
+  metadata.gz: 538cbe8f9ebafb3d881145f28ba6a0d8f80e362c
+  data.tar.gz: 971d1152ee7fd0fd2f875ebfaebc2727fc09ac51
 SHA512:
-  metadata.gz: 70b93a97be27e6ada1c5912e5a9f8ba799efbdd3730297858b319394811fc316babfe67903d8a76dd0e255220a35478f4d52919b06ca25604053008a919e7fce
-  data.tar.gz: d21db734b1b0c8b6484b8c4384da01931326f5452325706770eb69b1513b6c58fb49b8bce62585f817754aefed2f231608f98ce5ccb0666bf0fb54a2e4143cfe
+  metadata.gz: 843728b544dec1b827acf71cc75746f2d215a4ab37dc77328060a7a7e259964a18c0185a4e56f4030e9622fb45bf8de50a072e2b29d59c83c4d0c58fe3e77c34
+  data.tar.gz: 0a475c0233be66cdc15b41ef43df05793205fb8635a872bd9259c854d3badb17dc24fb4fa194cfe8b8f2ac3d994adfa5770237884b104607dac4765f40b789d2

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 middleman-targets change log
 ============================
 
+- Version 1.0.3 / 2016-April-08
+
+  - A bit of internal refactoring in order for related gems to be able
+    to use a bit of our features.
+
 - Version 1.0.2 / 2016-April-07
 
   - Fixed another git issue that introduced a filler page.

data/documentation_project/Gemfile

@@ -9,6 +9,6 @@ gem 'wdm', '~> 0.1.0', platforms: [:mswin, :mingw]
 gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
 
 # Middleman Gems
-gem 'middleman-targets', '~>1.0.2'
+gem 'middleman-targets', '~>1.0.3'
 gem 'middleman', '~> 4.1.6'
 gem 'middleman-syntax'

data/documentation_project/config.rb

@@ -103,7 +103,7 @@ helpers do
   end
 
   def product_version
-    '1.0.2'
+    '1.0.3'
   end
 
   def product_uri

data/lib/middleman-targets/extension.rb

@@ -221,33 +221,17 @@ class MiddlemanTargets < ::Middleman::Extension
 
       # Let's try to find a substitutable file if the current image name
       # begins with the :target_magic_word
-      if @app.config[:target_magic_images] && File.basename(path).start_with?( @app.config[:target_magic_word])
-        real_path = path.dup
-
-        # Enable absolute paths, too.
-        real_path = if path.start_with?('/')
-                      File.expand_path(File.join(@app.config[:source], real_path))
-                    else
-                      File.expand_path(File.join(@app.config[:source], @app.config[:images_dir], real_path))
-                    end
-
-        proposed_file = real_path.sub( "#{@app.config[:target_magic_word]}-", "#{app.config[:target]}-" )
-        file = app.files.find(:source, proposed_file)
-
-        # Now, only make the change *if* the file exists on disk.
-        if file && file[:full_path].exist?
-          path = path.dup.sub("#{@app.config[:target_magic_word]}-", "#{app.config[:target]}-")
-
-          # Support automatic alt tags for absolute locations, too. Only do
-          # this for absolute paths; let the extension do its own thing
-          # otherwise.
-          if @app.extensions[:automatic_alt_tags] && path.start_with?('/')
-            alt_text = File.basename(file[:full_path].to_s, '.*')
-            alt_text.capitalize!
-            params[:alt] ||= alt_text
-          end
-
-        end
+      if @app.config[:target_magic_images]
+        path = extensions[:MiddlemanTargets].target_specific_proposal( path )
+      end
+      
+      # Support automatic alt tags for absolute locations, too. Only do
+      # this for absolute paths; let the extension do its own thing
+      # otherwise.
+      if @app.extensions[:automatic_alt_tags] && path.start_with?('/')
+        alt_text = File.basename(file[:full_path].to_s, '.*')
+        alt_text.capitalize!
+        params[:alt] ||= alt_text
       end
 
       super(path, params)
@@ -258,9 +242,46 @@ class MiddlemanTargets < ::Middleman::Extension
 
 
   ############################################################
+  # Instance Methods
+  ############################################################
+
+
+  #--------------------------------------------------------
+  # target_specific_proposal( file )
+  #  Returns a target-specific proposed file when given
+  #  a user-specified file, and will return the same file
+  #  if not enabled or doesn't begin with the magic word.
+  #--------------------------------------------------------
+  def target_specific_proposal( path )
+    return path unless @app.config[:target_magic_images] && File.basename(path).start_with?( @app.config[:target_magic_word])
+
+    real_path = path.dup
+    magic_prefix = "#{app.config[:target_magic_word]}-"
+    wanted_prefix = "#{app.config[:target]}-"
+
+    # Enable absolute paths, too.
+    real_path = if path.start_with?('/')
+                  File.expand_path(File.join(app.config[:source], real_path))
+                else
+                  File.expand_path(File.join(app.config[:source], app.config[:images_dir], real_path))
+                end
+
+    proposed_path = real_path.sub( magic_prefix, wanted_prefix )
+    file = app.files.find(:source, proposed_path)
+    
+    if file && file[:full_path].exist?
+      path.sub( magic_prefix, wanted_prefix )
+    else
+      path
+    end
+
+  end
+ 
+ 
+  #--------------------------------------------------------
   # say
   #  Output colored messages using ANSI codes.
-  ############################################################
+  #--------------------------------------------------------
   def say(message = '', color = :reset)
     colors = { :blue   => "\033[34m",
                :cyan   => "\033[36m",

data/lib/middleman-targets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
     module MiddlemanTargets
-        VERSION = '1.0.2'
+        VERSION = '1.0.3'
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-targets
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jim Derry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core