photish 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f8a0b8f1e4161d340f6021e13870235e33f6023
-  data.tar.gz: 957653b7e8c8c17beafbc7dfebf6dd6e1ed6fde6
+  metadata.gz: 10d4377b58ca8abfc533f024d63b08ac42ad2843
+  data.tar.gz: bbc4d59536dfcfe2bc92880963a32a9f77988b3e
 SHA512:
-  metadata.gz: 47e2ba13affb3eb5598f1c5d88f4d593ebb9282aaed27b45e195ebf611fa38a12d8b7c5d9720e3c215371814fc9ee2a6c22a51d75fa0925f896003e2f24cb3ae
-  data.tar.gz: 876a3d8d56247e9e210c9f91cc43f275c71215d24d7c83b869ec815c9bcaf5972b09c21211c46e002cad079a021d1de053c7ec371fc63fede584232a96a20e1e
+  metadata.gz: e1a165687012458bda29b180ea140faca11d1978d7eb9f8353c1863c95cd9aa7d761959e4c1a46c6a637e2c62e98adf860a33c6ce2ae98e0fe33f716cb180d75
+  data.tar.gz: b83864d828fac5f6878df88cd99061c585ba286f1b5fb809af1fc7a3ceb8486bcbd81da73c787a83090d470f1b7c2304235a1e4213892f15897b5ea22549a1d3

data/README.md

@@ -32,7 +32,7 @@ and running:
    [Nokogiri](http://www.nokogiri.org/tutorials/installing_nokogiri.html) are
    installed (see [Dependencies](#dependencies))
 1. Install Photish `gem install photish`
-1. Create a base project with `photish init`
+1. Create a base project with `photish init --example`
 1. Generate the HTML using `photish generate`
 1. Run a local HTTP server to view the site with `photish host`
 1. View your photo site at [http://localhost:9876](http://localhost:9876/)
@@ -206,6 +206,10 @@ Once you have photish installed. Get started with the following commands:
 A skeleton site can be created by running the below command inside the
 `my_new_photo_site` folder:
 
+    $ photish init --example
+
+A barebones site can be created with:
+
     $ photish init
 
 #### Basic Photish Structure
@@ -567,10 +571,10 @@ To develop:
 
 To release:
 
+    $ vim lib/photish/version.rb      # update version
     $ git add -p                      # add in changed files
     $ git commit -m 'Final commit'    # finish up changes
     $ rake                            # ensure all tests pass
-    $ vim lib/photish/version.rb      # update version
     $ rake release                    # release to rubygems
 
 ## Contributing

data/TODO.md

@@ -2,8 +2,6 @@
 
 ## In Progress
 
-1. Add feature test for change and regenerate
-
 ## Backlog
 
 1. Plugin as a gem to deploy to github pages, netlify, amazon s3

data/lib/photish/gallery/collection.rb

@@ -29,6 +29,13 @@ module Photish
         Photish::Plugin::Type::Collection
       end
 
+      def all_url_paths
+        [url_path,
+         all_albums.map(&:url_path),
+         all_photos.map(&:url_path),
+         all_images.map(&:url_path)].flatten
+      end
+
       private
 
       attr_reader :path

data/lib/photish/gallery/traits/urlable.rb

@@ -6,6 +6,10 @@ module Photish
           [host, url_parts].flatten.join('/')
         end
 
+        def url_path
+          url_parts.join('/')
+        end
+
         def url_parts
           base_url_parts + [url_end]
         end

data/lib/photish/render/change_manifest.rb

@@ -6,9 +6,7 @@ module Photish
       end
 
       def record(key, file_path = nil)
-        update do |db|
-          db[key] = md5_of_file(file_path || key)
-        end
+        db[key] = md5_of_file(file_path || key)
       end
 
       def changed?(key, file_path = nil)
@@ -16,7 +14,7 @@ module Photish
       end
 
       def flush_to_disk
-        File.open(db_file, 'w') { |f| f.write((@db || {}).to_yaml) }
+        File.open(db_file, 'w') { |f| f.write((db || {}).to_yaml) }
       end
 
       private
@@ -28,23 +26,13 @@ module Photish
       end
       
       def old_md5_of_file(file_path)
-        read_from_file[file_path]
+        db[file_path]
       end
 
-      def update
-        db = read_from_file
-        yield(db)
-        write_to_file(db)
-      end
-
-      def read_from_file
+      def db
         @db ||= File.exist?(db_file) ? YAML.load_file(db_file) : {}
       end
 
-      def write_to_file(db)
-        @db = db
-      end
-
       def db_file
         File.join(output_dir, '.changes.yml')
       end

data/lib/photish/render/image_conversion.rb

@@ -16,7 +16,7 @@ module Photish
           Thread.new do
             begin
               while image = image_queue.pop(true)
-                convert(image) if changed?(output_path(image), image.path)
+                convert(image) if changed?(image.url_path, image.path)
               end
             rescue ThreadError => e
               log.info "Expected exception, queue is empty #{e.class} \"#{e.message}\" #{e.backtrace.join("\n")}"
@@ -47,7 +47,7 @@ module Photish
       def convert(image)
         create_parent_directories(image)
         convert_with_imagemagick(image)
-        record(output_path(image), image.path)
+        record(image.url_path, image.path)
       end
 
       def convert_with_imagemagick(image)

data/lib/photish/render/site.rb

@@ -9,6 +9,7 @@ module Photish
       end
 
       def all_for(collection)
+        delete_unknown_files(collection.all_url_paths)
         move_non_ignored_site_contents
 
         collection_template.render(collection)
@@ -25,6 +26,14 @@ module Photish
                   :output_dir,
                   :max_workers
 
+      def delete_unknown_files(expected_url_paths)
+        files_to_delete = Dir["#{output_dir}/**/*"].select do |f|
+          relative_file_path = f.gsub(/#{output_dir}\/?/, '')
+          File.file?(f) && expected_url_paths.exclude?(relative_file_path)
+        end
+        FileUtils.rm_rf(files_to_delete)
+      end
+
       def move_non_ignored_site_contents
         FileUtils.mkdir_p(output_dir)
         FileUtils.cp_r(non_ignored_site_contents, output_dir)

data/lib/photish/version.rb

@@ -1,3 +1,3 @@
 module Photish
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Henry Lawson