gallerize-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc69d889c2a6a376cc872a33e4b6bd60637a49a7
-  data.tar.gz: b3d1c67446924666c5d0bafe39e52dbadc04f08a
+  metadata.gz: 8e1ee1d0eda7806f452b027a8c96e4a1c6e85572
+  data.tar.gz: 3375075451bcf27df22dc5ab0fe88f01e82a8e56
 SHA512:
-  metadata.gz: e9f3ee1e12f19706935e26052da9d640e479864154d6957547975c20f7d97082e3f0c847a62be699e04860ee22f141875ee73e35dd06cf53d26f2d07721efdbb
-  data.tar.gz: 805f18c473d8c70de3c8053729581a153d9ae347d8fe33d2cde9f22f095443c5ae2452460afb6ba14b0b09fda586139b946fada42098f1f1d91b6cc9097215cf
+  metadata.gz: 7782b81aabc2d716baa258a2c0726798cffca3ca1d07502ee6554da43e329c7061de63ec41a405efba5929cb8f8d96a108825a46ab6751291faf9c4c8c6eef8a
+  data.tar.gz: 74f6c2d79f571219728a868936697a7a37bc3332342d8ce136e69936a842f4b66b4a83d315a211311a6a0fabd08480b3587a805ae1cef11ced2a7bf918b10a90

data/bin/gallerize

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
+require "pathname"
 
-require_relative '../lib/gallerize.rb'
+bin_file = Pathname.new(__FILE__).realpath
+$:.unshift File.expand_path("../../lib", bin_file)
+
+require 'gallerize'

data/lib/gallerize/output_dir.rb

@@ -0,0 +1,44 @@
+class Gallerize
+  class OutputDir
+  
+    attr_accessor :root
+  
+    def initialize(path)
+      self.root = path
+    end
+  
+    def root=(value)
+      @root = File.join( File.expand_path('.'), (value || 'gallerize') )
+    end
+  
+    def relative_root
+      @relative_root ||= root.gsub(File.expand_path('.').to_s + "/", './')
+    end
+  
+    def html_file(name)
+      name = name.to_s
+      name = "#{name}.html" unless name =~ /\.html/
+      File.join(root, name)
+    end
+  
+    def images
+      File.join( root, 'images' )
+    end
+  
+    def html_files
+      File.join( root, '*.html')
+    end
+  
+    def copy_from_gem_source(*folders)
+      folders.each do |folder|
+        outdir = File.join( root, folder )
+        unless Dir.exists?(outdir)
+          puts "copy ./#{folder} #{outdir}"
+          FileUtils.mkdir_p( File.expand_path(File.join(outdir, '..')) )
+          FileUtils.cp_r( File.join( ROOT, folder ), outdir )
+        end
+      end
+    end
+
+  end
+end

data/lib/gallerize/source_dir.rb

@@ -0,0 +1,17 @@
+class Gallerize
+  class SourceDir
+  
+    def config?
+      File.exists?(config)
+    end
+  
+    def config
+      File.join( root, '.gallerize')
+    end
+  
+    def root
+      @root ||= File.expand_path('.')
+    end
+  
+  end
+end

data/lib/gallerize.rb

@@ -6,6 +6,10 @@ require 'mini_magick'
 require 'pry'
 require 'fileutils'
 require 'exifr'
+require 'erb'
+
+require 'gallerize/output_dir'
+require 'gallerize/source_dir'
 
 ROOT = File.expand_path( File.join(__FILE__, '../../') )
 
@@ -13,7 +17,7 @@ class Gallerize
   
   attr_accessor :image_paths
   
-  VERSION='0.2.0'
+  VERSION='0.2.1'
   
   def self.generate
     new.perform
@@ -42,7 +46,7 @@ class Gallerize
     # ensure output/images directory
     FileUtils.mkdir( output_dir.images ) unless File.exists?( output_dir.images )
     # copy css and js from gem to output
-    output_dir.copy_from_gem_source( 'css', 'js' )
+    output_dir.copy_from_gem_source( 'assets/css', 'assets/js' )
   end
   
   def generate_images
@@ -66,17 +70,12 @@ class Gallerize
     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>} : ""
-    html = %Q{
-      #{body}
-      #{navigation}
-      <div id="images-container" class="images">
-      #{some_images.join("\n")}
-      </div>
-      #{navigation}
-      #{footer}
-    }
+    
+    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}"
+    puts "generate #{name.gsub(output_dir.root, output_dir.relative_root)}"
     File.write(name, html)
   end
   
@@ -117,77 +116,10 @@ class Gallerize
     }
   end
   
-  def body
-    %Q{
-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-        <head>
-        <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="js/jquery-1.10.1.min.js"></script>
-        <script type="text/javascript" src="js/jquery.fancybox.js"></script>
-        <script type="text/javascript" src="js/imagesloaded.js"></script>
-        <script type="text/javascript" src="js/jquery.masonry.js"></script>
-        
-        <link rel="stylesheet" type="text/css" href="css/styles.css" media="screen" />
-        <link rel="stylesheet" type="text/css" href="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();
-            });
-          });
-        </script>
-        
-        #{tracking_js}
-        
-        <title>#{title}</title>
-        <link rel="stylesheet" href="css/styles.css" />
-        </head>
-        <body>
-        <h1 class="page-title">#{title}</h1>
-      }
-  end
-  
-  def footer
-    %Q{
-      </body>
-      </html>
-    }
-  end
-  
   def per_page
     config.per_page
   end
   
-  def tracking_js
-    return if config.tracking.blank?
-    %Q{
-      <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');
-
-      </script>
-    }
-  end
-  
   def generate_fullsize(source_path)
     image = extract_image_extension(source_path)
     output_path = File.join(output_dir.images, "#{image[:basename]}.#{image[:extension]}")
@@ -230,7 +162,7 @@ class Gallerize
   end
   
   def title
-    File.basename(File.expand_path('.')).titleize
+    config.to_h.has_key?(:title) ? config.title : File.basename(File.expand_path('.')).titleize
   end
   
   def output_dir
@@ -249,67 +181,18 @@ 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
-    OpenStruct.new(YAML.load(File.read(global_config)).merge(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
   
   def source_dir
     @source_dir ||= SourceDir.new
   end
   
-  class SourceDir
-    
-    def config?
-      File.exists?(config)
-    end
-    
-    def config
-      File.join( root, '.gallerize')
-    end
-    
-    def root
-      @root ||= File.expand_path('.')
-    end
-    
-  end
-  
-  class OutputDir
-    
-    attr_accessor :root
-    
-    def initialize(path)
-      self.root = path
-    end
-    
-    def root=(value)
-      @root = File.join( File.expand_path('.'), (value || 'gallerize') )
-    end
-    
-    def html_file(name)
-      name = name.to_s
-      name = "#{name}.html" unless name =~ /\.html/
-      File.join(root, name)
-    end
-    
-    def images
-      File.join( root, 'images' )
-    end
-    
-    def html_files
-      File.join( root, '*.html')
-    end
-    
-    def copy_from_gem_source(*folders)
-      folders.each do |folder|
-        outdir = File.join( root, folder )
-        puts "copy ./#{folder} #{outdir}"
-        FileUtils.rm_rf( outdir )
-        FileUtils.cp_r( File.join( ROOT, folder ), outdir )
-      end
-    end
-  
-    
-  end
-  
 end
 
 Gallerize.generate

data/templates/layout.html.erb

@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <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();
+    });
+  });
+  </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');
+
+  ga('create', '<%= config.tracking %>', 'auto');
+  ga('send', 'pageview');
+
+  </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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gallerize-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -92,22 +92,25 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- assets/css/blank.gif
+- assets/css/fancybox_loading.gif
+- assets/css/fancybox_loading@2x.gif
+- assets/css/fancybox_overlay.png
+- assets/css/fancybox_sprite.png
+- assets/css/fancybox_sprite@2x.png
+- assets/css/jquery.fancybox.css
+- assets/css/styles.css
+- assets/js/imagesloaded.js
+- assets/js/jquery-1.10.1.min.js
+- assets/js/jquery.fancybox.js
+- assets/js/jquery.masonry.js
 - bin/gallerize
 - config/global.yml.example
-- css/blank.gif
-- css/fancybox_loading.gif
-- css/fancybox_loading@2x.gif
-- css/fancybox_overlay.png
-- css/fancybox_sprite.png
-- css/fancybox_sprite@2x.png
-- css/jquery.fancybox.css
-- css/styles.css
 - gallerize-cli.gemspec
-- js/imagesloaded.js
-- js/jquery-1.10.1.min.js
-- js/jquery.fancybox.js
-- js/jquery.masonry.js
 - lib/gallerize.rb
+- lib/gallerize/output_dir.rb
+- lib/gallerize/source_dir.rb
+- templates/layout.html.erb
 homepage: http://blake.hilscher.ca/
 licenses:
 - MIT