rails-gallery 0.2.1 → 0.3.0

data/lib/rails-gallery/rgallery/photo.rb

@@ -1,12 +1,41 @@
 module RGallery
   class Photo
-    attr_reader :id, :options
+    attr_reader :id, :sizing, :sources, :options
 
     def initialize id, options = {}
       @id = id
+      self.sources = options.delete :sources
+      @sizing = options.delete :sizing
       @options = options
     end
 
+    # map [{src: 'banner-HD.jpeg', sizing: '2x'}, {src: 'banner-phone.jpeg', sizing: '100w'}]
+    # into -> "banner-HD.jpeg 2x, banner-phone.jpeg 100w
+    def srcset
+      return '' unless sources_photos.kind_of? Array
+      @srcset ||= source_photos.inject([]) do |res, photo| 
+        res << [photo.id, photo.sizing].join(' ')
+      end.join(',')
+    end
+
+    def srcset?
+      !srcset.blank?
+    end
+
+    # A photo can contain a source set of other photos!
+    def source_photos
+      return [] unless sources.kind_of? Array
+      @source_photos ||= sources.map do |source| 
+        RGallery::Photo.new source.src, options.merge(:sizing => source.sizing)
+      end
+    end
+
+    # make sure that sources are wrapped as Hashies to allow method access
+    def sources= sources = []
+      return unless sources.kind_of? Array
+      @sources = sources.map{|source| Hashie::Mash.new source }
+    end
+
     def filename
       id
     end

data/lib/rails-gallery/rgallery/photo_config.rb

@@ -12,7 +12,7 @@ module RGallery
     protected
 
     def photo_class
-      @photo_class ||= Photos::Photo
+      @photo_class ||= RGallery::Photo
     end  
   end
 end

data/lib/rails-gallery/view_helper.rb

@@ -1,7 +1,16 @@
 module RailsGallery
+  class ConfigurationError < StandardError
+  end
+
   module ViewHelper
+    include RailsGallery::PhotoValidation
+
     def self.galleries
-      %w{galleria responsive slideshow}
+      %w{galleria responsive slideshow touch_touch}
+    end
+
+    def self.version
+      '0.2.2'
     end
 
     # autoload all galleries when references
@@ -11,12 +20,22 @@ module RailsGallery
 
     def gallery_image type, photo
       meth_name = "#{type}_gallery_image"
+      validate_gallery_photo! photo
       unless respond_to? meth_name
         raise ArgumentError, "Gallery #{type} is not yet supported. Please add a View helper module for this gallery using the convention followed by the other galleries..." 
       end
       send(meth_name, photo)
     end
 
+    def gallery_imageset type, imageset
+      meth_name = "#{type}_gallery_imageset"
+      # validate_gallery_imageset! imageset
+      unless respond_to? meth_name
+        raise ArgumentError, "Gallery #{type} is not yet supported for imageset. Please add a View helper module for this gallery using the convention followed by the other galleries..." 
+      end
+      send(meth_name, imageset)
+    end
+
     protected
 
     # include view helper modules for all galleries :)

data/lib/rails-gallery/view_helper/galleria.rb

@@ -1,11 +1,22 @@
 module RailsGallery
   module ViewHelper
     module Galleria
-      def galleria_gallery_image photo
-        content_tag :a, href: "/assets/#{photo.path}" do
-          image_tag photo.path, :"data-title" => photo.title, :"data-description" => photo.description
+      def riagal_image photo, options = {}
+        content_tag :a, href: photo.path do
+          options.merge! :"data-title" => photo.title, :"data-description" => photo.description
+          image_tag photo.path, options
         end
       end
+
+      def riagal_imageset photo, options = {}
+        content_tag :a, href: photo.path do
+          options.merge! :"data-title" => photo.title, :"data-description" => photo.description
+          options.merge! :srcset => photo.srcset if photo.srcset?
+          image_tag photo.path, options
+        end
+      end
+      alias_method :galleria_gallery_image, :riagal_image
+      alias_method :galleria_gallery_imageset, :riagal_imageset      
     end
   end
 end

data/lib/rails-gallery/view_helper/responsive.rb

@@ -1,9 +1,32 @@
 module RailsGallery
   module ViewHelper
     module Responsive
-      def responsive_gallery_image photo
-        image_tag photo.thumb, :"data-large" => "/assets/#{photo.path}", :alt => photo.alt, :"data-description" => photo.title
+      def respgal_image photo, options = {}
+        options.merge! :alt => photo.alt
+        options.merge! :"data-large" => photo.path, :"data-description" => photo.title
+        return image_tag photo.thumb, options unless options.delete :wrap
+        
+        content_tag :li do
+          content_tag :a, href: '#' do
+            image_tag(photo.thumb, options)
+          end
+        end          
       end      
+
+      def respgal_imageset photo, options = {}
+        options.merge! :alt => photo.alt
+        options.merge! :"data-large" => photo.path, :"data-description" => photo.title
+        options.merge! :srcset => srcset if photo.srcset?
+        return imageset_tag photo.thumb, options unless options.delete :wrap
+        
+        content_tag :li do
+          content_tag :a, href: '#' do
+            imageset_tag(photo.thumb, options)
+          end
+        end
+      end
+      alias_method :responsive_gallery_image, :respgal_image
+      alias_method :responsive_gallery_imageset, :respgal_imageset
     end
   end
 end

data/lib/rails-gallery/view_helper/slideshow.rb

@@ -1,9 +1,19 @@
 module RailsGallery
   module ViewHelper
     module Slideshow
-      def slideshow_gallery_image photo
-        image_tag photo.thumb, alt: "/assets/#{photo.path}"
+      def slidegal_image photo, options = {}
+        options.merge! alt: photo.path
+        image_tag photo.thumb, options
       end
+
+      def slidegal_imageset photo, options = {}
+        options.merge! alt: photo.path
+        options.merge! :srcset => photo.srcset if photo.srcset?
+        imageset_tag photo.thumb, options
+      end
+
+      alias_method :slideshow_gallery_image, :slidegal_image
+      alias_method :slideshow_gallery_imageset, :slidegal_imageset
     end
   end
 end

data/lib/rails-gallery/view_helper/touch_touch.rb

@@ -0,0 +1,10 @@
+module RailsGallery
+  module ViewHelper
+    module TouchTouch
+      def touchgal_image photo, options = {}
+        content_tag :a, nil, options.merge(href: photo.path, title: photo.title)
+      end
+      alias_method :touch_gallery_image, :touchgal_image
+    end
+  end
+end

data/rails-gallery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails-gallery"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-08-26"
+  s.date = "2012-12-06"
   s.description = "Adds popular javascript galleries to asset pipeline and includes a few Rails Gallery utils and helpers"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "config/locales/rails_gallery.yml",
     "lib/rails-gallery.rb",
     "lib/rails-gallery/engine.rb",
+    "lib/rails-gallery/photo_validation.rb",
     "lib/rails-gallery/rgallery.rb",
     "lib/rails-gallery/rgallery/page.rb",
     "lib/rails-gallery/rgallery/pages.rb",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/rails-gallery/view_helper/galleria.rb",
     "lib/rails-gallery/view_helper/responsive.rb",
     "lib/rails-gallery/view_helper/slideshow.rb",
+    "lib/rails-gallery/view_helper/touch_touch.rb",
     "rails-gallery.gemspec",
     "spec/galleria_snippet.html",
     "spec/galleria_snippet.html.haml",
@@ -151,7 +153,9 @@ Gem::Specification.new do |s|
     "spec/images/responsive-gallery/images/thumbs/7.jpg",
     "spec/images/responsive-gallery/images/thumbs/8.jpg",
     "spec/images/responsive-gallery/images/thumbs/9.jpg",
-    "spec/rails-gallery_spec.rb",
+    "spec/rails-gallery/view_helper_spec.rb",
+    "spec/rgallery/photos_spec.rb",
+    "spec/rgallery/property_photo.rb",
     "spec/spec_helper.rb",
     "vendor/assets/images/gallery/galleria/classic/loader.gif",
     "vendor/assets/images/gallery/galleria/classic/map.png",
@@ -174,6 +178,7 @@ Gem::Specification.new do |s|
     "vendor/assets/images/gallery/touch_touch/preloader.gif",
     "vendor/assets/javascripts/gallery/galleria-1.2.8.js",
     "vendor/assets/javascripts/gallery/galleria-1.2.8.min.js",
+    "vendor/assets/javascripts/gallery/galleria.js",
     "vendor/assets/javascripts/gallery/galleria/classic.js",
     "vendor/assets/javascripts/gallery/galleria/classic.min.js",
     "vendor/assets/javascripts/gallery/responsive.js",
@@ -186,7 +191,7 @@ Gem::Specification.new do |s|
     "vendor/assets/stylesheets/gallery/responsive.css",
     "vendor/assets/stylesheets/gallery/responsive/elastislide.css",
     "vendor/assets/stylesheets/gallery/slideshow.css",
-    "vendor/assets/stylesheets/touch_touch.css"
+    "vendor/assets/stylesheets/gallery/touch_touch.css"
   ]
   s.homepage = "http://github.com/kristianmandrup/rails-gallery"
   s.licenses = ["MIT"]
@@ -198,12 +203,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, ["~> 1.2.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
+      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<hashie>, ["~> 1.2.0"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -211,6 +220,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0.5"])
     end
   else
+    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<hashie>, ["~> 1.2.0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/spec/rails-gallery/view_helper_spec.rb

@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+class NoPathPhoto < RGallery::Photo
+  def path
+    nil
+  end
+end
+
+class BadFilenamePhoto < RGallery::Photo
+  def title
+    'my title'
+  end
+
+  # blip method unknown!
+  def filename
+    blip
+  end
+end
+
+class NoTitlePhoto < RGallery::Photo
+  def path
+    'abc'
+  end
+
+  def title
+    nil
+  end
+end
+
+class ValidPhoto < RGallery::Photo
+  def path
+    'abc'
+  end
+
+  def title
+    'sdgds'
+  end
+end
+
+describe RailsGallery::ConfigurationError do
+  specify { RailsGallery::ConfigurationError.new.should be_a StandardError }
+end
+
+describe RailsGallery::ViewHelper do
+  include ControllerTestHelpers,  
+          RailsGallery::ViewHelper
+  
+  let(:no_path_photo)       { NoPathPhoto.new 1 }
+  let(:no_title_photo)      { NoTitlePhoto.new 2 }
+  let(:bad_filename_photo)  { BadFilenamePhoto.new 2 }
+  let(:valid_photo)         { ValidPhoto.new 2 }
+
+  describe 'validate_gallery_photo! photo' do          
+    it 'should raise error on nil' do
+      expect { validate_gallery_photo!(nil) }.to raise_error(ArgumentError)        
+    end
+
+    it 'should raise error on no #path method' do
+      expect { validate_gallery_photo!(no_path_photo) }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise error on no #title method' do
+      expect { validate_gallery_photo!(no_title_photo) }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise error on bad filename method' do
+      expect { validate_gallery_photo!(bad_filename_photo) }.to raise_error(::RailsGallery::ConfigurationError)
+    end
+  end
+
+  describe 'validate_gallery_photo photo' do          
+    it 'should return nil error msg' do
+      validate_gallery_photo(nil).should == "Photo must be a kind of RGallery::Photo, was: "
+    end
+
+    it 'should return no path error msg' do
+      validate_gallery_photo(no_path_photo).should match /Photo must have a path:/
+    end
+
+    it 'should return no title error msg' do
+      validate_gallery_photo(no_title_photo).should match /Photo must have a title:/
+    end
+
+    it 'should return bad filename method error' do
+      validate_gallery_photo(bad_filename_photo).should match /filename or file_path could not be resolved for:/
+    end
+  end
+
+  describe 'gallery_image photo' do          
+    it 'should raise error on nil' do
+      expect { gallery_image(nil) }.to raise_error(ArgumentError)
+    end
+
+    it 'should return error if valid type but nil photo' do
+      expect { gallery_image(:galleria, nil) }.to raise_error(ArgumentError)
+    end
+
+    it 'should return error if invalid type and valid photo' do
+      expect { gallery_image(:invalid, valid_photo) }.to raise_error(ArgumentError)
+    end
+
+    it "should no raise error for galleria image" do
+      expect { gallery_image(:galleria, valid_photo) }.to_not raise_error
+    end
+
+    it "should render the image for galleria image" do
+      gallery_image(:galleria, valid_photo).should == "<a href=\"abc\"><img data-description=\"no description\" data-title=\"sdgds\" src=\"abc\"></img></a>"
+    end
+
+    %w{slideshow responsive}.each do |gallery_type|
+      it "should not raise error for type: #{gallery_type}" do
+        expect { gallery_image(gallery_type, valid_photo) }.to_not raise_error
+      end
+
+      it "should render the image for galleria image" do
+        gallery_image(gallery_type, valid_photo).should match /img.*alt=.*src="\w+"/
+      end
+    end
+  end
+end

data/spec/rgallery/photos_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'rgallery/property_photo'
+
+describe RGallery::Photos do
+  context 'New empty RGallery::Photos collection' do
+    subject { RGallery::Photos.new }
+
+    its(:pages) { should be_empty }
+    its(:pages) { should be_a RGallery::Pages }
+
+    describe '.page :first' do
+      specify { subject.page(:first).should be_empty }
+    end
+
+    describe '.page :remainder' do
+      specify { subject.pages.remainder.should be_empty }
+    end
+  end
+
+  context 'Photos with one page' do
+    subject { RGallery::Photos.new ['0'] }
+
+    its(:pages) { should_not be_empty }
+    its(:pages) { should be_a RGallery::Pages }
+
+    describe '.page' do
+      describe ':first' do
+        specify { subject.page(:first).should_not be_empty }
+      end
+
+      describe ':remainder' do
+        specify { subject.pages.remainder.should be_empty }
+      end
+    end
+
+    describe '.all' do
+      specify { subject.all.first.should be_a RGallery::Photo }      
+
+      specify { subject.all.first.id.should == '0' }            
+
+      specify { subject.all.first.path.should == '0.png' }            
+    end
+  end
+
+  context 'configure with custom Photo class' do
+    subject { RGallery::Photos.new ['0'], photo_class: Property::Photo }
+
+    specify { subject.all.first.should be_a Property::Photo }            
+  end
+end

data/spec/rgallery/property_photo.rb

@@ -0,0 +1,32 @@
+class Property
+  class Photo < RGallery::Photo
+    def path
+      File.join folder, super
+    end
+
+    # mogrify -path fullpathto/temp2 -resize 60x60% -quality 60 -format jpg *.png
+
+    # this will take all png files in your current directory (temp), 
+    # resize to 60% (of largest dimension and keep aspect ratio), 
+    # set jpg quality to 60 and convert to jpg.
+    def thumb
+      File.join folder, 'thumbs', file_path
+    end
+
+    def folder
+      'responsive-gallery/images'
+    end
+
+    def title
+      'property title'
+    end
+
+    def alt
+      'property alt'
+    end
+    
+    def self.extension
+      :jpg
+    end
+  end
+end