has_attachable 0.0.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97e43af2f9f77bf6a8969996b4ca3d1981c86d33
-  data.tar.gz: 1e2eda1b3e2679a86d93ae0ec8faa94b3456ff98
+  metadata.gz: ea0572bb3ba8eaf54004181bd351c5fc2d48da99
+  data.tar.gz: 1161f64906a00b44ebecefd45d8852caeffc46f8
 SHA512:
-  metadata.gz: dd9d3d43243fed145d0155ff2eba3b6d875e3631245f0d3c96becf50fbc41e2b53f866d554f8e0f7dcbaddb3133407fad62cb96ea7c4afa94c8ec5784821722f
-  data.tar.gz: 491227dec20ea95eaa48e9be20ac9090e5553327361f0d4672dead7b3c975cb563a5e22cf037f53d30d9df7dcabdcb1f6a4fbadf31c864e02113e923955db9cc
+  metadata.gz: 08a2b3ce42eb0141939ea82866bedd400f88afc4afce426067d8072d79a4515fd53c2817b8517d636adb456b6b433152a3666cea8737b288d2af1f226e43a047
+  data.tar.gz: 5b5130f7dba9efba4e799b0c0c711014b844a117527208a3fddb6f6fc9a076b8d18ddfc6f7896816d1ac291f9f232c08ebd4e442c497c878342b6625dba0f008

data/has_attachable.gemspec

@@ -20,4 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+
+  spec.add_dependency 'sidekiq'
+  spec.add_dependency 'sidekiq-status'
+  spec.add_dependency 'carrierwave'
+  spec.add_dependency 'rails', '~> 4.0.0'
 end

data/lib/has_attachable.rb

@@ -1,5 +1,6 @@
 require "has_attachable/version"
 require "has_attachable/processing"
+require "has_attachable/worker"
 
 module HasAttachable
   extend ActiveSupport::Concern
@@ -11,15 +12,10 @@ module HasAttachable
   end
 
   included do 
-    after_update -> {
-      AttachableWorker.
-        perform_async('process', 
-                       processing_options) if process_attachable?
-      AttachableWorker.
-        perform_async('remove', 
-                       processing_options) if remove_attachable?
-    }
-    include Attachable::Processing
+    after_update :run_process_attachable, if: :process_attachable?
+    after_update :run_remove_attachable,  if: :remove_attachable?
+    
+    include HasAttachable::Processing
   end
 
   module ClassMethods
@@ -46,9 +42,16 @@ module HasAttachable
       
 
       class_eval do 
-        attr_accessible "async_remove_#{field}".to_sym, "#{field}_name".to_sym
         attr_accessor "async_remove_#{field}".to_sym
 
+        define_method("#{field}_processing?") { 
+          if self.send("#{field}_job_id").present? 
+            not Sidekiq::Status::complete? self.send("#{field}_job_id")
+          else
+            false
+          end
+        }
+
         mount_uploader field, 
                        attachable_options[field][:uploader], 
                        mount_on: "#{field}_name"

data/lib/has_attachable/processing.rb

@@ -2,11 +2,6 @@ module HasAttachable
   module Processing
     extend ActiveSupport::Concern
 
-    def attachable_job
-      JobStatus.new(AttachableWorker.sidekiq_options["queue"].to_s, 
-                        self.class.name.downcase, self.id)
-    end
-
     def process_attachable?
       field = get_changed_attachable
       return false if field.nil?
@@ -19,6 +14,30 @@ module HasAttachable
       end
     end
 
+    def run_process_attachable
+      job_id = HasAttachable::Worker.perform_async('process', processing_options)
+      track_job_id(job_id) if self.respond_to?("#{attachable_field}_job_id")
+    end
+
+    def run_remove_attachable
+      self.update_attribute("#{get_remove_attachable}_name", nil)
+      job_id = HasAttachable::Worker.perform_async('remove', processing_options)
+      track_job_id(job_id) if self.respond_to?("#{attachable_field}_job_id")
+    end
+
+    def track_job_id(job_id)
+      self.update_column "#{attachable_field}_job_id", job_id
+    end
+
+    def untrack_job_id(context)
+      self.update_column "#{context}_job_id", nil
+    end
+
+    def attachable_field
+      get_changed_attachable || get_remove_attachable
+    end
+
+
     def remove_attachable?
       field = get_remove_attachable
       return false if field.nil? 
@@ -43,9 +62,6 @@ module HasAttachable
       remove_attachable
     end
 
-    def attachable_status_path
-      "/monitor/#{AttachableWorker.sidekiq_options['queue'].to_s}/#{self.class.name.downcase}/#{self.id}"
-    end
 
     def processing_options
       {

data/lib/has_attachable/version.rb

@@ -1,3 +1,3 @@
 module HasAttachable
-  VERSION = "0.0.1"
+  VERSION = "0.9.0"
 end

data/lib/has_attachable/worker.rb

@@ -0,0 +1,29 @@
+require 'sidekiq'
+require 'sidekiq-status'
+
+module HasAttachable
+  class Worker
+    include Sidekiq::Worker
+    include Sidekiq::Status::Worker
+
+    sidekiq_options queue: :has_attachable
+    
+    def perform(method, options)
+      send("#{method}", Hash[options.map{ |k, v| [k.to_sym, v] }])
+    end
+
+    def process(options)
+      object = options[:klass].classify.constantize.unscoped.where(id: options[:id]).first
+      object.send(options[:context]).cache_stored_file! 
+      object.send(options[:context]).retrieve_from_cache!(object.send(options[:context]).cache_name)
+      object.send(options[:context]).recreate_versions!
+      object.untrack_job_id(options[:context])
+    end
+
+    def remove(options)
+      object = options[:klass].classify.constantize.unscoped.where(id: options[:id]).first
+      object.send("remove_#{options[:context]}!")
+      object.untrack_job_id(options[:context])
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_attachable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Zack Siri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,62 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq-status
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: gem for managing async uploading to S3 and background processing with
   sidekiq
 email:
@@ -56,6 +112,7 @@ files:
 - lib/has_attachable.rb
 - lib/has_attachable/processing.rb
 - lib/has_attachable/version.rb
+- lib/has_attachable/worker.rb
 homepage: ''
 licenses:
 - MIT