middleman-galley 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 441fc879469c42cbec011f465257a0ceeac8ad31
-  data.tar.gz: 22f615b2fb1f31eecef23cab7c4a7e7b79e18538
+  metadata.gz: 10752cd763741094cdbd6a501e81d2ce44e7fb6f
+  data.tar.gz: 728e6ab302b4b9d457298ab3d65a9b2763ff3fce
 SHA512:
-  metadata.gz: 072aad4f8c14ff2f2e0e691d0c8af3733685773d57913a699a2fb8eb2c2b9cc5b67aeb18c3f2b971db4a7ab0a6d94e64e337b33996dcd962840d68d995b2c9c8
-  data.tar.gz: e47135cb19c48b5de2efd39ec860d7cd3bfdf6eebba3317690abf3181d323da436218e777728b52fab4e5117a5b66fba9e3c6ee516615e8aeeb67532d1c68ff7
+  metadata.gz: aefcb04fb033bac2a95047eaf4d0877ef04a6e1f839cd368c2bbb65a4e0f322c7cca653fc43aec397532040d8b989a689d36e2c2332f9c7dbb0effab1734641b
+  data.tar.gz: 85208cee122766098e57c876a2b71b21ffe80d74b9b01854c600b1ae61f34fa25502630562d4f2a5a04484066909bac3ea33a45b0c8c02fed84923754b050223

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm: [ 2.0.0 ]
+
+bundler_args: --without guard
+script: rake
+
+notifications:
+  email: false

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in middleman-galley.gemspec
 gemspec
+
+gem 'guard-cucumber', group: :guard

data/README.md

@@ -1,5 +1,11 @@
 # Middleman::Galley
 
+[![Gem Version](https://badge.fury.io/rb/middleman-galley.png)](http://badge.fury.io/rb/middleman-galley)
+[![Build Status](https://travis-ci.org/sowcow/middleman-galley.png?branch=master)](https://travis-ci.org/sowcow/middleman-galley)
+[![Dependency Status](https://gemnasium.com/sowcow/middleman-galley.png)](https://gemnasium.com/sowcow/middleman-galley)
+[![Code Climate](https://codeclimate.com/github/sowcow/middleman-galley.png)](https://codeclimate.com/github/sowcow/middleman-galley)
+[![Coverage Status](https://coveralls.io/repos/sowcow/middleman-galley/badge.png?branch=master)](https://coveralls.io/r/sowcow/middleman-galley?branch=master)
+
 TODO: Write a gem description
 
 ## Installation
@@ -18,7 +24,8 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+1. https://github.com/sowcow/middleman-galley/blob/master/features/usage.feature
+2. https://github.com/sowcow/middleman-galley/issues/new
 
 ## Contributing
 

data/features/step_definitions/usage_steps.rb

@@ -36,3 +36,13 @@ end
 And /^the file "(.*?)" has no images$/ do |file|
   assert_images file, []
 end
+
+And /^document "(.*?)" has (\d+) "(.*?)"$/ do \
+  |file, count, selector|
+  count = count.to_i
+  select(file, selector).count.should == count
+end
+
+def select file, selector
+  parse_html(file).css selector
+end

data/features/support/env.rb

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

data/features/usage.feature

@@ -15,7 +15,7 @@ Feature: Usage
     Given I successfully run `middleman init my-site`
     And I cd to "my-site"
 
-    # images for gallery
+    # images for the gallery
     And I prepare following files:
       | source/gallery/cards/one/01.png |
       | source/gallery/cards/one/02.png |
@@ -37,8 +37,8 @@ Feature: Usage
       # by default uses `gallery` dir inside `source` dir
       activate :galley
 
-      # made with relative paths in mind anyway
-      # activate :directory_indexes
+      # todo: test non relative paths?
+      set :relative_links, true
       """
     # verbose option is optional
     And I successfully run `middleman build --verbose`
@@ -62,10 +62,10 @@ Feature: Usage
       | build/gallery/other/01.png |
       | build/gallery/other/02.png |
 
-    # pages are linked
+    # pages are linked (links sorted by name?) distinct feature?
     And the file "build/gallery/index.html" has links:
-      | other | other/ |
       | cards | cards/ |
+      | other | other/ |
 
     And the file "build/gallery/cards/index.html" has links:
       | one | one/ |
@@ -87,3 +87,10 @@ Feature: Usage
       | 02.png |
     And the file "build/gallery/index.html" has no images
     And the file "build/gallery/cards/index.html" has no images
+
+    # with fotorama template by default:
+    And document "build/gallery/index.html" has 0 ".fotorama > img"
+    And document "build/gallery/cards/index.html" has 0 ".fotorama > img"
+    And document "build/gallery/cards/one/index.html" has 2 ".fotorama > img"
+    And document "build/gallery/cards/two/index.html" has 2 ".fotorama > img"
+    And document "build/gallery/other/index.html" has 2 ".fotorama > img"

data/lib/middleman/galley/gallery_template.rb

@@ -0,0 +1,78 @@
+module Middleman
+  module Galley
+    class GalleryTemplate
+      @@known = {}
+      def self.[] name
+        name = name.to_sym
+        @@known[name]
+      end
+
+      def self.register name
+        name = name.to_sym
+        @@known[name] = self
+      end
+
+      def self.build context
+        new(context).build
+      end
+
+      def initialize context
+        @context = context
+      end
+
+      private
+      def a
+        @context
+      end
+
+      def children
+        @context.current_page.children
+      end
+
+      def image_tags
+        children.sort_by(&:url).map { |x| image x }.compact
+      end
+
+      def image res
+        return nil unless image? res
+        url = if a.relative_links
+                relative res.url
+              else
+                res.url
+              end
+        a.tag :img, src: url
+      end
+
+      IMG = /\.(png|jpg|jpeg|gif|svg|bmp)$/
+      def image? res
+        res.source_file =~ IMG
+      end
+
+      def relative url
+        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/helper.rb

@@ -1,4 +1,4 @@
-#require 'delegate' #< SimpleDelegator
+require 'middleman/galley/gallery_template'
 
 module Middleman
   module Galley
@@ -11,16 +11,18 @@ module Middleman
       # to extract as a partial?...
       def nested
         a.current_page.children.select { |x| nested? x }
+         .sort_by { |x| name x }
          .map { |x| link x }
          .join
       end
 
       # to extract as a partial?...
-      def images
-        a.current_page.children.select { |x| image? x }
-         .sort_by { |x| x.url }
-         .map { |x| image x }
-         .join
+      def images gallery_template = :default
+        if gallery_template == :default
+          gallery_template = a.galley!
+                              .options.default_template
+        end
+        GalleryTemplate[gallery_template].build a
       end
 
       private
@@ -33,24 +35,12 @@ module Middleman
         res.path =~ /\/index\.html$/
       end
 
-      def image res
-        #return nil unless image? res #+optional compact ?
-        #raise [a.current_page.url, res.url].inspect
-        #raise [a.current_page.url, res.url,
-        #       relative(res.url),
-        #       a.image_tag(relative res.url) ].inspect
-        #a.image_tag relative(res.url)
-        '<img src="%s" />' % relative(res.url)
+      def name res
+        Pathname(res.url).basename.to_s
       end
 
       def link res
-        name = Pathname(res.url).basename.to_s
-        a.link_to name, relative(res.url)
-      end
-
-      # middleman dont want to do that...
-      def relative url
-        url.sub a.current_page.url, ''
+        a.link_to name(res), res
       end
     end
   end

data/lib/middleman/galley/version.rb

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

data/lib/middleman/galley.rb

@@ -8,9 +8,20 @@ require 'fileutils'
 module Middleman
   module Galley
 
+    module Method
+      def galley!
+        extensions[:galley].values.find { |x|
+          x.has? current_page
+        }
+      end
+    end
+
     class Ext < Extension
       extend GemStuff
 
+      self.option :default_template, 'fotorama',
+        'default gallery template'
+
       self.option :at, 'gallery',
         'gallery directory'
 
@@ -23,7 +34,13 @@ module Middleman
       self.option :template, template,
         'template for missing pages'
 
+      def self.supports_multiple_instances?
+        true
+      end
+
       def initialize app, options_hash={}, &block
+        app.send :include, Galley::Method
+
         super
 
         missing.each { |dir|
@@ -33,6 +50,12 @@ module Middleman
         }
       end
 
+      def has? page
+        at = options.at
+        at = at[0] == ?/ ? at : "/#{at}"
+        page.url.index(at) == 0
+      end
+
       helpers do
         def galley
           ::Middleman::Galley::Helper.new self

data/middleman-galley.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'aruba'
   spec.add_development_dependency 'nokogiri'
-  spec.add_development_dependency 'guard-cucumber'
-  spec.add_runtime_dependency 'middleman'
+  spec.add_development_dependency 'coveralls'
+  # moved to Gemfile:
+  #spec.add_development_dependency 'guard-cucumber', group: :guard
+  spec.add_runtime_dependency 'middleman', '~> 3.1'
 end

data/templates/index.erb

@@ -1,2 +1,6 @@
+---
+default: default
+---
+
 <%= galley.nested %>
-<%= galley.images %>
+<%= galley.images :default %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-galley
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander K
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-cucumber
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -84,16 +84,16 @@ dependencies:
   name: middleman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 description: 'convenient and simplistic image gallery for middleman '
 email:
 - xpyro@ya.ru
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -111,6 +112,7 @@ files:
 - 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/version.rb