middleman-galley 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10752cd763741094cdbd6a501e81d2ce44e7fb6f
-  data.tar.gz: 728e6ab302b4b9d457298ab3d65a9b2763ff3fce
+  metadata.gz: bc0d801d89dc81d43ba264f054f246a6290ba7f6
+  data.tar.gz: 25fc2db28a67d225b54c1dfc458cf1cf6e4fa80f
 SHA512:
-  metadata.gz: aefcb04fb033bac2a95047eaf4d0877ef04a6e1f839cd368c2bbb65a4e0f322c7cca653fc43aec397532040d8b989a689d36e2c2332f9c7dbb0effab1734641b
-  data.tar.gz: 85208cee122766098e57c876a2b71b21ffe80d74b9b01854c600b1ae61f34fa25502630562d4f2a5a04484066909bac3ea33a45b0c8c02fed84923754b050223
+  metadata.gz: e048802b007b94abdf19a5c7d4179e455409396e0cb1d026c6236230e32c91810bc81280b2146f5b3a775008d07428ceaf2b7c88eadc625550ece835b88df839
+  data.tar.gz: 438544e8d0756e561e0cfae667018cbe98defaff921ce4c20968ac2471bf811b3e612d1d9dfa07974e86151c51551e135eb87da473e9c763eabeaace063ca495

data/features/change_view.feature

@@ -0,0 +1,63 @@
+Feature: Specify view
+  In order to have fun
+  As a human
+  I want to select another view for gallery
+
+  Background: * basic setup *
+    Given I successfully run `middleman init my-site`
+    And I cd to "my-site"
+
+    # images for the gallery
+    And I put in my images:
+      | source/gallery/cards/one/01.png |
+      | source/gallery/cards/one/02.png |
+      | source/gallery/cards/two/a1.png |
+      | source/gallery/cards/two/a2.png |
+      | source/gallery/other/01.png |
+      | source/gallery/other/02.png |
+
+    And I append to "Gemfile" with:
+      """
+
+      gem 'middleman-galley'
+      """
+    And I successfully run `bundle`
+
+    And I append to "config.rb" with:
+      """
+
+      set :relative_links, true
+      """
+
+  Scenario: * use default template *
+    When I append to "config.rb" with:
+      """
+
+      activate :galley
+      """
+    And I successfully run `middleman build --verbose`
+
+    Then document "build/gallery/other/index.html" has 2 ".fotorama > img"
+    Then document "build/gallery/other/index.html" has 0 ".Collage > img"
+
+  Scenario: * set collage view *
+    When I append to "config.rb" with:
+      """
+
+      activate :galley, view: :collage
+      """
+    And I successfully run `middleman build --verbose`
+
+    Then document "build/gallery/other/index.html" has 0 ".fotorama > img"
+    Then document "build/gallery/other/index.html" has 2 ".Collage > img"
+
+  Scenario: * set fotorama view (it is default anyway) *
+    When I append to "config.rb" with:
+      """
+
+      activate :galley, view: :fotorama
+      """
+    And I successfully run `middleman build --verbose`
+
+    Then document "build/gallery/other/index.html" has 2 ".fotorama > img"
+    Then document "build/gallery/other/index.html" has 0 ".Collage > img"

data/features/step_definitions/put_in_my_images_steps.rb

@@ -0,0 +1,21 @@
+require 'chunky_png'
+require 'pathname'
+
+def random_image
+  w, h = 2.times.map { rand 100..200 }
+  color = ChunkyPNG::Color.rgb *3.times.map { rand 0..255 }
+  ChunkyPNG::Image.new w, h, color
+end
+
+And 'I put in my images:' do |table|
+  files = table.raw.map &:first
+  files.each { |file|
+    in_current_dir {
+      dir = Pathname(file).parent
+      dir.mkpath unless dir.exist?
+      random_image.save file, :fast_rgba
+    }
+    #file = file[0]
+    #step "an empty file named \"#{file}\""
+  }
+end

data/features/step_definitions/usage_steps.rb

@@ -1,12 +1,12 @@
 require 'nokogiri'
   
-Given 'I prepare following files:' do |table|
-  files = table.raw
-  files.each { |file|
-    file = file[0]
-    step "an empty file named \"#{file}\""
-  }
-end
+#Given 'I prepare following files:' do |table|
+#  files = table.raw
+#  files.each { |file|
+#    file = file[0]
+#    step "an empty file named \"#{file}\""
+#  }
+#end
 
 And /^the file "(.*?)" has links:$/ do |file, table|
   names, links = table.raw.transpose

data/features/support/env.rb

@@ -1,4 +1,4 @@
-require 'aruba/cucumber'
-
 require 'coveralls'
 Coveralls.wear!
+
+require 'aruba/cucumber'

data/features/usage.feature

@@ -1,4 +1,4 @@
-Feature: Usage
+Feature: Basic usage
   In order to have fun
   As a human
   I want my images in the browser
@@ -16,7 +16,7 @@ Feature: Usage
     And I cd to "my-site"
 
     # images for the gallery
-    And I prepare following files:
+    And I put in my images:
       | source/gallery/cards/one/01.png |
       | source/gallery/cards/one/02.png |
       | source/gallery/cards/two/a1.png |

data/lib/middleman/galley.rb

@@ -19,7 +19,7 @@ module Middleman
     class Ext < Extension
       extend GemStuff
 
-      self.option :default_template, 'fotorama',
+      self.option :view, 'fotorama',
         'default gallery template'
 
       self.option :at, 'gallery',
@@ -40,6 +40,7 @@ module Middleman
 
       def initialize app, options_hash={}, &block
         app.send :include, Galley::Method
+        # kinda explicitness
 
         super
 
@@ -58,7 +59,8 @@ module Middleman
 
       helpers do
         def galley
-          ::Middleman::Galley::Helper.new self
+          Galley::Helper.new self
+          # kinda explicitness
         end
       end
 

data/lib/middleman/galley/helper.rb

@@ -1,7 +1,7 @@
-require 'middleman/galley/gallery_template'
+require 'middleman/galley/templates'
+
+module Middleman::Galley
 
-module Middleman
-  module Galley
     class Helper
       def initialize context
         @a = context
@@ -20,9 +20,9 @@ module Middleman
       def images gallery_template = :default
         if gallery_template == :default
           gallery_template = a.galley!
-                              .options.default_template
+                              .options.view
         end
-        GalleryTemplate[gallery_template].build a
+        Template[gallery_template].build a
       end
 
       private
@@ -43,5 +43,5 @@ module Middleman
         a.link_to name(res), res
       end
     end
-  end
+
 end

data/lib/middleman/galley/{gallery_template.rb → template.rb}

@@ -1,6 +1,9 @@
-module Middleman
-  module Galley
-    class GalleryTemplate
+require 'forwardable'
+require 'fastimage'
+
+module Middleman::Galley
+
+    class Template
       @@known = {}
       def self.[] name
         name = name.to_sym
@@ -21,7 +24,9 @@ module Middleman
       end
 
       private
-      def a
+      delegate :content_tag, to: :a
+
+      def a # rid?
         @context
       end
 
@@ -40,7 +45,8 @@ module Middleman
               else
                 res.url
               end
-        a.tag :img, src: url
+        w, h = FastImage.size res.source_file
+        a.tag :img, src: url, width: w, height: h
       end
 
       IMG = /\.(png|jpg|jpeg|gif|svg|bmp)$/
@@ -52,27 +58,4 @@ module Middleman
         url.sub a.current_page.url, ''
       end
     end
-
-    # todo extract:
-
-    class Fotorama < GalleryTemplate
-      register :fotorama
-
-      def build
-        a.content_tag(:script, src:
-                      "http://code.jquery.com/jquery-1.10.2.min.js"){''}
-        a.content_tag(:script, src:
-                      "http://fotorama.s3.amazonaws.com/4.4.6/fotorama.js"){''}
-        style = a.content_tag(:script) do <<tag
-$("head").append("<link rel='stylesheet' href='http://fotorama.s3.amazonaws.com/4.4.6/fotorama.css' />");
-tag
-        end
-        images = a.content_tag(:div, class: 'fotorama') do
-          image_tags.join
-        end
-
-        nil
-      end
-    end
-  end
 end

data/lib/middleman/galley/templates.rb

@@ -0,0 +1,6 @@
+require_relative 'template'
+require 'pathname'
+here = Pathname(__FILE__).parent
+Pathname.glob(here + 'templates/*.rb').each { |file|
+  require_relative file.to_s
+}

data/lib/middleman/galley/templates/collage_plus.rb

@@ -0,0 +1,44 @@
+module Middleman::Galley
+  class CollagePlus < Template
+    register :collage
+    register :collage_plus
+
+    def build
+      content_tag :div, class: 'Collage' do
+        image_tags.join
+      end
+
+      content_tag :script, src: 
+        'http://code.jquery.com/jquery-latest.min.js' do
+        nil
+      end
+
+      content_tag(:script) { JS }
+
+      content_tag :script do
+        " $('.Collage').collagePlus();"
+      end
+
+      nil # just in case
+    end
+
+    # todo: extract
+    JS = <<js
+/*!
+ *
+ * jQuery collagePlus Plugin v0.3.2
+ * https://github.com/ed-lea/jquery-collagePlus
+ *
+ * Copyright 2012, Ed Lea twitter.com/ed_lea
+ *
+ * built for http://qiip.me
+ *
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.opensource.org/licenses/GPL-2.0
+ *
+ */
+;(function(e){e.fn.collagePlus=function(t){function i(t,n,r,i){var o=r.padding*(t.length-1)+t.length*t[0][3],u=r.albumWidth-o,a=u/(n-o),f=o,l=n<r.albumWidth?true:false;for(var c=0;c<t.length;c++){var h=e(t[c][0]),p=Math.floor(t[c][1]*a),d=Math.floor(t[c][2]*a),v=!!(c<t.length-1);if(r.allowPartialLastRow===true&&l===true){p=t[c][1];d=t[c][2]}f+=p;if(!v&&f<r.albumWidth){if(r.allowPartialLastRow===true&&l===true){p=p}else{p=p+(r.albumWidth-f)}}var m=h.is("img")?h:h.find("img");m.width(p);if(!h.is("img")){h.width(p+t[c][3])}m.height(d);if(!h.is("img")){h.height(d+t[c][4])}s(h,v,r);m.load(function(e){return function(){if(r.effect=="default"){e.animate({opacity:"1"},{duration:r.fadeSpeed})}else{if(r.direction=="vertical"){var t=i<=10?i:10}else{var t=c<=9?c+1:10}e.addClass(r.effect);e.addClass("effect-duration-"+t)}}}(h)).each(function(){if(this.complete)e(this).trigger("load")})}}function s(e,t,n){var r={"margin-bottom":n.padding+"px","margin-right":t?n.padding+"px":"0px",display:n.display,"vertical-align":"bottom",overflow:"hidden"};return e.css(r)}function o(t){$img=e(t);var n=new Array;n["w"]=parseFloat($img.css("border-left-width"))+parseFloat($img.css("border-right-width"));n["h"]=parseFloat($img.css("border-top-width"))+parseFloat($img.css("border-bottom-width"));return n}var n={targetHeight:400,albumWidth:this.width(),padding:parseFloat(this.css("padding-left")),images:this.children(),fadeSpeed:"fast",display:"inline-block",effect:"default",direction:"vertical",allowPartialLastRow:false};var r=e.extend({},n,t);return this.each(function(){var t=0,n=[],s=1;r.images.each(function(u){var a=e(this),f=a.is("img")?a:e(this).find("img");var l=typeof f.data("width")!="undefined"?f.data("width"):f.width(),c=typeof f.data("height")!="undefined"?f.data("height"):f.height();var h=o(f);f.data("width",l);f.data("height",c);var p=Math.ceil(l/c*r.targetHeight),d=Math.ceil(r.targetHeight);n.push([this,p,d,h["w"],h["h"]]);t+=p+h["w"]+r.padding;if(t>r.albumWidth&&n.length!=0){i(n,t-r.padding,r,s);delete t;delete n;t=0;n=[];s+=1}if(r.images.length-1==u&&n.length!=0){i(n,t,r,s);delete t;delete n;t=0;n=[];s+=1}})})}})(jQuery);
+js
+  end
+end

data/lib/middleman/galley/templates/fotorama.rb

@@ -0,0 +1,23 @@
+module Middleman::Galley
+
+    class Fotorama < Template
+      register :fotorama
+
+      def build
+        content_tag(:script, src:
+                      "http://code.jquery.com/jquery-1.10.2.min.js"){''}
+        content_tag(:script, src:
+                      "http://fotorama.s3.amazonaws.com/4.4.6/fotorama.js"){''}
+        content_tag(:script) do <<tag
+$("head").append("<link rel='stylesheet' href='http://fotorama.s3.amazonaws.com/4.4.6/fotorama.css' />");
+tag
+        end
+
+        content_tag(:div, class: 'fotorama') do
+          image_tags.join
+        end
+
+        nil
+      end
+    end
+end

data/lib/middleman/galley/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Galley
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/middleman-galley.gemspec

@@ -24,7 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'aruba'
   spec.add_development_dependency 'nokogiri'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'chunky_png'
   # moved to Gemfile:
   #spec.add_development_dependency 'guard-cucumber', group: :guard
   spec.add_runtime_dependency 'middleman', '~> 3.1'
+  spec.add_runtime_dependency 'fastimage'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-galley
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alexander K
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  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: middleman
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: fastimage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'convenient and simplistic image gallery for middleman '
 email:
 - xpyro@ya.ru
@@ -108,13 +136,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- features/change_view.feature
+- features/step_definitions/put_in_my_images_steps.rb
 - features/step_definitions/usage_steps.rb
 - features/support/env.rb
 - features/usage.feature
 - lib/middleman/galley.rb
-- lib/middleman/galley/gallery_template.rb
 - lib/middleman/galley/gem_stuff.rb
 - lib/middleman/galley/helper.rb
+- lib/middleman/galley/template.rb
+- lib/middleman/galley/templates.rb
+- lib/middleman/galley/templates/collage_plus.rb
+- lib/middleman/galley/templates/fotorama.rb
 - lib/middleman/galley/version.rb
 - middleman-galley.gemspec
 - templates/index.erb
@@ -143,6 +176,8 @@ signing_key:
 specification_version: 4
 summary: image gallery for middleman
 test_files:
+- features/change_view.feature
+- features/step_definitions/put_in_my_images_steps.rb
 - features/step_definitions/usage_steps.rb
 - features/support/env.rb
 - features/usage.feature