writefully 0.5.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2543752436eb5338c777cea97ad0d3fdfc8cb1e
-  data.tar.gz: eee8670891fe7404fb6db2f7353fb8e857eeb128
+  metadata.gz: 149f326e3911550cb5ef5cac21138f9129eaf526
+  data.tar.gz: aae249683286ce662929eaf6334565719f5957cb
 SHA512:
-  metadata.gz: 72b0ecf4fb74a52159741d087e2fa65ed42b7931d29c6c99e4e8ce8798b2ad5e0c5ebbe07be8ec189133936012b65ac9ded303a64302af3f5d2653512cba62d4
-  data.tar.gz: fbb202ff48a59cb0674c31367afeb8db30fdf685a8ff77e3d7ec0f9c5816d352bd084fe5ef1ed0d353eda9fb57f8f46d0b07c9643594fe45e61510685fc0df82
+  metadata.gz: 3670fca4f1caa0f244503c7bdcc11d7154b2f30a6698e863bd4ff61a17bad28ad8ec87692083e6d2dff443d5300f7ca3a8f3f2e308ece6417e96d9ee2c199079
+  data.tar.gz: 7994231c1257090ee029832060471dec9dd58c14f0d1b1fc6b2d87a01c05f04d1d63389971c64c9e5c2c5b7969c4f41c24d1bfa7aa95bd3b66084a77ff8da72d

data/lib/writefully/indices.rb

@@ -2,7 +2,7 @@ module Writefully
   module Indices
     def self.build_from(modified)
       modified.map do |file_name|
-        index_hash_from(index_name_from(remove_content_path(file_name)))
+        index_hash_from(index_name_from(remove_content_path(file_name)))       
       end
     end
 

data/lib/writefully/postable.rb

@@ -25,7 +25,7 @@ module Writefully
     end
 
     def publish_resource
-      if publish
+      if publish and published_at.nil?
         self.published_at = Time.now
       else
         self.published_at = nil

data/lib/writefully/process.rb

@@ -78,7 +78,7 @@ module Writefully
       Proc.new do |modified, added, removed|
         queue_jobs(Indices.build_from(modified), :write)
         queue_jobs(Indices.build_from(added),    :write)
-        # queue_jobs(Indices.build_from(removed),  :remove)
+        queue_jobs(Indices.build_from(removed),  :remove)
       end
     end
 
@@ -94,7 +94,7 @@ module Writefully
 
     JOBS = { 
       write:  -> (index) { Writefully.add_job :journalists, index.merge({task: :publish}) },
-      remove: -> (index) { Writefully.add_job :journalists, index.merge({task: :remove}), :top  }
+      remove: -> (index) { Writefully.add_job :journalists, index.merge({task: :remove})  }
     }
 
     def queue_jobs indices, action

data/lib/writefully/storage.rb

@@ -13,6 +13,10 @@ module Writefully
         })
       end
 
+      def remove_file(key)
+        directory.files.get(key).destroy
+      end
+
       def endpoint
         Writefully.options[:assets_host] || provider_endpoints[Writefully.options[:storage_provider].downcase.to_sym]
       end

data/lib/writefully/tools/eraser.rb

@@ -3,14 +3,34 @@ module Writefully
     class Eraser  < Stationery
 
       def use
-        destroy
+        trash 
+        remove_assets
+        destroyed = future.destroy
+        terminate if destroyed.value
       end
 
-      def destroy
+      def trash
         compute_type.by_site(site_id)
                       .where(slug: content.slug)
                         .first.update_attributes(trashed: true)
       end
+
+      def remove_assets
+        Writefully::Storage.directory.files.map do |file| 
+          file.key if file.key.match(::Regexp.new(index[:slug])) 
+        end.compact.each do |key|
+          Celluloid::Actor[:pigeons].future.remove(key)
+        end
+      end
+
+      def destroy
+        compute_type.by_site(site_id).where(slug: content.slug).first.destroy
+      end
+
+      def directory_exists?
+        File.directory?(File.join(Writefully.options[:content], 
+                                  index[:site], index[:resource], index[:slug]))
+      end
     end
   end
 end

data/lib/writefully/tools/pigeon.rb

@@ -10,8 +10,10 @@ module Writefully
         nil
       end
 
-      def remove endpoint, path, name
-        
+      def remove key
+        Writefully::Storage.remove_file(key)
+      rescue StandardError => e
+        nil
       end
     end
   end

data/lib/writefully/tools/stationery.rb

@@ -7,6 +7,7 @@ module Writefully
 
       class ContentModelNotFound < StandardError; end
       class SomeAssetsNotUploaded < StandardError; end
+      class SomeAssetsNotRemoved < StandardError; end
 
       def initialize(index)
         @site_id  = Site.where(slug: index[:site]).first.id

data/lib/writefully/version.rb

@@ -1,3 +1,3 @@
 module Writefully
-  VERSION = "0.5.1"
+  VERSION = "0.6.2"
 end

data/lib/writefully/workers/journalist.rb

@@ -8,9 +8,13 @@ module Writefully
       end
 
       def remove
-        Writefully.logger.info "Removing #{message[:resource]} #{message[:slug]}"
         eraser = Tools::Eraser.new_link(message)
-        eraser.perform
+        unless eraser.directory_exists?
+          Writefully.logger.info "Removing #{message[:resource]} #{message[:slug]}"
+          eraser.perform
+        else
+          eraser.terminate
+        end
       end
 
       def message_with_tries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: writefully
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Zack Siri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails