gallerize-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1ee1d0eda7806f452b027a8c96e4a1c6e85572
-  data.tar.gz: 3375075451bcf27df22dc5ab0fe88f01e82a8e56
+  metadata.gz: c575c4f467f417894f8475e42c28bf890d089d8c
+  data.tar.gz: 6dc46814ef69a1af69100cf828539f3661ec0b89
 SHA512:
-  metadata.gz: 7782b81aabc2d716baa258a2c0726798cffca3ca1d07502ee6554da43e329c7061de63ec41a405efba5929cb8f8d96a108825a46ab6751291faf9c4c8c6eef8a
-  data.tar.gz: 74f6c2d79f571219728a868936697a7a37bc3332342d8ce136e69936a842f4b66b4a83d315a211311a6a0fabd08480b3587a805ae1cef11ced2a7bf918b10a90
+  metadata.gz: a4be71dd19582f8899e51fa7c16028602bdcd7d90392d62628e14eb892455e066693270b243633722bf7ad5f7b4fc87ebd8f2c82c40455cffa2d465067c9a19e
+  data.tar.gz: 16612b0a0913f925af688472921c98ff1a1c0de1b883370cf340262fb9705b1e50f8d52ee3222dd81ed47206ae0b3a73ae026f1d9ab2ec9d15d491b4cb5f5786

data/config/global.yml.example

@@ -6,4 +6,5 @@ image_width: 1200
 image_height: 800
 thumb_width: 400
 thumb_height: 300
-output_name: gallerize
+output_name: gallerize
+titles: false

data/lib/gallerize.rb

@@ -14,15 +14,15 @@ require 'gallerize/source_dir'
 ROOT = File.expand_path( File.join(__FILE__, '../../') )
 
 class Gallerize
-  
+
   attr_accessor :image_paths
-  
-  VERSION='0.2.1'
-  
+
+  VERSION='0.2.2'
+
   def self.generate
     new.perform
   end
-  
+
   def perform
     if image_paths.blank?
       puts "no images found in #{source_dir.root} matching #{config.image_types}"
@@ -36,8 +36,8 @@ class Gallerize
         ticker = ticker + 1
       end
     end
-  end 
-  
+  end
+
   def prepare_output_directory
     # remove html files
     Dir.glob( output_dir.html_files ){|f| FileUtils.rm(f) }
@@ -48,7 +48,7 @@ class Gallerize
     # copy css and js from gem to output
     output_dir.copy_from_gem_source( 'assets/css', 'assets/js' )
   end
-  
+
   def generate_images
     generated = []
     # generate images and skip any that fail
@@ -65,32 +65,33 @@ class Gallerize
     end
     generated
   end
-  
+
   def images_to_html(some_images, ticker=0, name=nil)
     some_images ||= []
     navigation = (images.count / per_page.to_f).ceil.times.collect{|r| %Q{<a class="#{'active' if r == ticker}" href="images-#{r}.html">#{r}</a>} }.join("\n")
     navigation = (images.count > some_images.count) ? %Q{<div class="navigation">#{navigation}</div>} : ""
-    
+
     template = ERB.new(File.read(File.join(ROOT, 'templates/layout.html.erb')))
     html = template.result(binding)
-    
+
     name ||= output_dir.html_file("images-#{ticker}")
     puts "generate #{name.gsub(output_dir.root, output_dir.relative_root)}"
     File.write(name, html)
   end
-  
+
   def images
     ticker = 0
-    image_paths.collect do |f| 
+    image_paths.collect do |f|
       image_fullsize = generate_fullsize(f)
       image_thumbnail = generate_thumbnail(f)
       even = (ticker % 2 == 0) ? 'image-even' : 'image-odd'
       third = (ticker % 3 == 0) ? 'image-third' : ''
       fourth = (ticker % 4 == 0) ? 'image-fourth' : ''
+      fancybox_attributes = get_fancybox_attributes(ticker)
       src = %Q{
         <div class="image #{even} #{fourth} #{third} image-#{ticker}">
           <div class="inner-image">
-            <a href="./#{image_fullsize}" class="fancybox" rel="group" target="_blank"><img src="./#{image_thumbnail}" alt="" /></a>
+            <a href="./#{image_fullsize}" #{fancybox_attributes}><img src="./#{image_thumbnail}" alt="" /></a>
           </div>
         </div>
       }
@@ -98,12 +99,12 @@ class Gallerize
       src
     end
   end
-  
+
   def image_paths
-    @image_paths ||= Dir.glob("*.{#{config.image_types}}").reject{|f| 
+    @image_paths ||= Dir.glob("*.{#{config.image_types}}").reject{|f|
       # reject thumbnails
       f =~ /thumbnail/
-    }.reject{|f| 
+    }.reject{|f|
       begin
         EXIFR::JPEG.new(f).date_time
         false
@@ -115,25 +116,25 @@ class Gallerize
       EXIFR::JPEG.new(f).date_time || Time.parse('3000-01-01')
     }
   end
-  
+
   def per_page
     config.per_page
   end
-  
+
   def generate_fullsize(source_path)
     image = extract_image_extension(source_path)
     output_path = File.join(output_dir.images, "#{image[:basename]}.#{image[:extension]}")
     # generate the thumbnail
     generate_image(source_path, output_path, config.image_width, config.image_height)
   end
-  
+
   def generate_thumbnail(source_path)
     image = extract_image_extension(source_path)
     output_path = File.join(output_dir.images, "#{image[:basename]}-thumbnail.#{image[:extension]}")
     # generate the thumbnail
     generate_image(source_path, output_path, config.thumb_width, config.thumb_height)
   end
-  
+
   def generate_image(source_path, output_path, width, height)
     # ensure correct types
     width, height = width.to_i, height.to_i
@@ -143,7 +144,7 @@ class Gallerize
       image = MiniMagick::Image.open(source_path)
       image.auto_orient
       # landscape?
-      if image['width'] > image['height']
+      if image[:width] > image[:height]
         image.resize "#{width}x#{height}"
       else
         image.resize "#{height}x#{width.to_i * 1.25}"
@@ -153,26 +154,26 @@ class Gallerize
     # strip the output_dir.root from the path so that the returned path is relative
     output_path.gsub( output_dir.root, '' )
   end
-  
+
   def extract_image_extension(image_path)
     basename = image_path.split(".")
     extension = basename.pop.downcase
     basename = basename.join('.')
     return { basename: basename, extension: extension }
   end
-  
+
   def title
-    config.to_h.has_key?(:title) ? config.title : File.basename(File.expand_path('.')).titleize
+    File.basename(File.expand_path('.')).titleize
   end
-  
+
   def output_dir
     @output_dir ||= OutputDir.new( config.output_name )
   end
-  
+
   def config
     @config ||= load_config
   end
-  
+
   def load_config
     config = {}
     # load config from output directory if present
@@ -181,18 +182,29 @@ class Gallerize
     global_config = File.join(ROOT,'config/global.yml')
     FileUtils.cp( "#{global_config}.example", global_config ) unless File.exists?( global_config )
     # load global_config and merge with source config
-    result = YAML.load(File.read(global_config)).merge(config)
-    result['to_h'] = result
-    # write to source_dir if not exists
-    File.write(source_dir.config, YAML.dump(result)) unless source_dir.config?
-    # onwards
-    OpenStruct.new(result)
-  end
-  
+    OpenStruct.new(YAML.load(File.read(global_config)).merge(config))
+  end
+
   def source_dir
     @source_dir ||= SourceDir.new
   end
-  
+
+  def get_fancybox_attributes(ticker)
+    attributes = {
+      class: 'fancybox',
+      rel: 'group',
+    }
+    attributes["title"] = "IMG_#{ticker}" if config.titles
+    attributes.map{|k,v| "#{k}='#{v}'"}.join(' ')
+  end
+
+  def fancybox_options
+    options = {}
+    if config.titles
+      options["helpers"] = {title: {type: 'inside',position: 'bottom'}}
+    end
+    JSON.dump(options)
+  end
 end
 
-Gallerize.generate
+Gallerize.generate

data/templates/layout.html.erb

@@ -4,58 +4,56 @@
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
   <meta name="robots" content="noindex">
   <meta name="googlebot" content="noindex">
-        
+
   <script type="text/javascript" src="assets/js/jquery-1.10.1.min.js"></script>
   <script type="text/javascript" src="assets/js/jquery.fancybox.js"></script>
   <script type="text/javascript" src="assets/js/imagesloaded.js"></script>
   <script type="text/javascript" src="assets/js/jquery.masonry.js"></script>
-        
+
   <link rel="stylesheet" type="text/css" href="assets/css/styles.css" media="screen" />
   <link rel="stylesheet" type="text/css" href="assets/css/jquery.fancybox.css" media="screen" />
   <meta name="viewport" content="width=device-width, user-scalable=no">
-        
+
   <script type="text/javascript">
   $(document).ready(function(){
     $('#images-container').imagesLoaded( function() {
       $('.images').show();
-            
+
       var container = document.querySelector('#images-container');
       var msnry = new Masonry( container, {
 
         itemSelector: '.image'
       });
 
-      $('.fancybox').fancybox();
+      $('.fancybox').fancybox(<%= fancybox_options %>);
     });
   });
   </script>
-        
+
   <% if config.tracking.present? %>
-  <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  ga('create', '<%= config.tracking %>', 'auto');
-  ga('send', 'pageview');
+    ga('create', '<%= config.tracking %>', 'auto');
+    ga('send', 'pageview');
 
-  </script>
+    </script>
   <% end %>
-        
+
   <title><%= title %></title>
   <link rel="stylesheet" href="css/styles.css" />
 </head>
 <body>
-  <% if title.present? %>
   <h1 class="page-title"><%= title %></h1>
-  <% end %>
-  
+
   <%= navigation %>
   <div id="images-container" class="images">
     <%= some_images.join("\n") %>
   </div>
   <%= navigation %>
-  
+
 </body>
-</html>
+</html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gallerize-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick