octopress-image-caption-tag 0.0.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 881fc86da2b6e9eea5d48c5df0cc6a449faa43ee
-  data.tar.gz: 2fcb19fc4fbb72de99af758e5f3d2f377176b153
+  metadata.gz: 9c655d35e300a5da18f87e18f518bc27fc1b346b
+  data.tar.gz: 0aebbb4402551733b6c3c805842207451a3020e0
 SHA512:
-  metadata.gz: 4879a1467bc1f3d68fab416dfd5f213f3e7388bdc87e110c15c7d617af55ab6ae1950107b31a51df9910b457ae52042ba1ba319e1af94aa556828d463b8dbb9f
-  data.tar.gz: 5f864d36fde29c79833eff40aa95d27b1dcb0639d6bee7766aea7f379f3dbd97ffa8d1f57b58a16e1f27cd8fddaf6470d70a94d1c61eb7d35719a95445347d97
+  metadata.gz: b4f458c9899a1e275073512d655762d1e42a05275c85384064681ea659cc37ce0bb74071e7413c90b68e746eb4b3521cc787546f3d90e9c4d352e65df01b1801
+  data.tar.gz: c9c98d2e03c18c2f05d032eee0934d9e0147f73840eefe92629daccfcd947cec258d66bcf2878ed16ef36893363eb18407e7508d4b48b074bab0c48cb0770956

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 # Changelog
+### 0.9.0 (2016-05-18)
+- Add support for absolute sizing in ems
+- Confident enough to consider this a pre-release rather than pre-alpha
+### 0.0.6 (2016-05-16)
+- Removed superfluous inline styling
+- Explicit tests for additional classes
+### 0.0.5 (2016-04-17)
+- Updated for Jekyll 3
+- Major refactoring
 ### 0.0.3 (2015-11-14)
 - Added README and tests
 ### 0.0.2 (2015-11-13)

data/lib/octopress-image-caption-tag.rb

@@ -12,7 +12,7 @@ module Octopress
     module ImageCaptionTag
       module ImageCaptionFunctions
         def parse_sizes(raw_size)
-          if /\s*(?<w>\d+%?)\s+(?<h>\d+%?)/ =~ raw_size
+          if /\s*(?<w>\d+%?(em)?)\s+(?<h>\d+%?(em)?)/ =~ raw_size
             @width = w
             @height = h
           elsif @class.rstrip == 'right' || @class.rstrip == 'left'
@@ -46,6 +46,19 @@ module Octopress
           EOS
         end
 
+        def em_sized_figure
+          <<-EOS.gsub(/^ {10}/, '') # gsubm is to pretty up source by indenting
+          <figure class='image-caption image-caption-absolute #{@class.rstrip}'>
+            <a class='image-popup' href='#{@img}'>
+              <img class='caption' src='#{@img}' style='width:#{@width};height:#{@height};' title='#{@title}' alt='#{@alt}'>
+            </a>
+            <figcaption class='caption-text'>
+              #{@caption}
+            </figcaption>
+          </figure>
+          EOS
+        end
+
         def relative_sized_figure
           <<-EOS.gsub(/^ {10}/, '') # gsubm is to pretty up source by indenting
           <figure class='image-caption #{@class.rstrip}'>
@@ -69,7 +82,7 @@ module Octopress
         @height = ''
 
         def initialize(tag_name, markup, tokens)
-          if %r{(?<classname>\S.*\s+)?(?<protocol>https?://|/)(?<url>\S+)(?<sizes>\s+\d+%?\s+\d+%?)?(?<title>\s+.+)?} =~ markup
+          if %r{(?<classname>\S.*\s+)?(?<protocol>https?://|/)(?<url>\S+)(?<sizes>\s+\d+%?(em)?\s+\d+%?(em)?)?(?<title>\s+.+)?} =~ markup
             @class = classname || 'center'
             @img = "#{protocol}#{url}"
             @title = title.strip if title
@@ -84,6 +97,8 @@ module Octopress
           @caption = @title
           if @img && @width[-1] == '%' # Relative width, so width goes on outer span
             relative_sized_figure
+          elsif @img && @width[-2..-1] == 'em' # Absolute size in ems
+            em_sized_figure
           elsif @img # Absolute width, so width goes on the img tag and text span gets sytle-width:@width-15;
             absolute_sized_figure
           else
@@ -101,7 +116,7 @@ module Octopress
         @height = ''
 
         def initialize(tag_name, markup, tokens)
-          if %r{(?<classname>\S.*\s+)?(?<protocol>https?://|/)(?<url>\S+)(?<sizes>\s+\d+%?\s+\d+%?)?(?<title>\s+.+)?} =~ markup
+          if %r{(?<classname>\S.*\s+)?(?<protocol>https?://|/)(?<url>\S+)(?<sizes>\s+\d+%?(em)?\s+\d+%?(em)?)?(?<title>\s+.+)?} =~ markup
             @class = classname || 'center'
             @img = "#{protocol}#{url}"
             @title = title.strip if title
@@ -117,6 +132,8 @@ module Octopress
           @caption = converter.convert(super).lstrip.rstrip
           if @img && @width[-1] == '%' # Relative width, so width goes on outer span
             relative_sized_figure
+          elsif @img && @width[-2..-1] == 'em'
+            em_sized_figure
           elsif @img # Absolute width, so width goes on the img tag and text span gets sytle-width:@width-15;
             absolute_sized_figure
           else

data/lib/octopress-image-caption-tag/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module ImageCaptionTag
-      VERSION = '0.0.6'
+      VERSION = '0.9.0'
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: octopress-image-caption-tag
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Charles Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,46 +56,51 @@ dependencies:
   name: clash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   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'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A tag to create images with pretty captions for Jekyll and Octopress
-  blogs.
+        version: '3.3'
+description: |2
+      Octopress Image Caption Tag is a major expansion on the feature set of
+      Octopress Image Tag, adding support to Jekyll and Octopress for rich
+      image figures with figcaptions. There are both tag and a new block version
+      provided, with the block version allowing for full markdown foratting
+      within the captions for your images. Figures and images can be sized based
+      on css classes, or absolutely in either pxs or ems.
 email:
 - eToThePiIPower@gmail.com
 executables: []