has_moderated 1.1.5 → 1.1.6

data/lib/has_moderated/associations/base.rb

@@ -69,7 +69,7 @@ module HasModerated
           end
         end
 
-        def self.apply_add_association(to, reflection, attrs)
+        def self.apply_add_association(to, reflection, attrs, save_opts = Hash.new)
           preview_mode = to.instance_variable_get(:@has_moderated_preview)
           klass = reflection.class_name.constantize
           fk = HasModerated::ActiveRecordHelpers::foreign_key(reflection)
@@ -100,14 +100,13 @@ module HasModerated
                 arec.send(key.to_s+"=", val)
               end
               # recursive, used for has_many :through
-              apply(arec, attrs, preview_mode) if attrs[:associations].present?
+              apply(arec, attrs, save_opts, preview_mode) if attrs[:associations].present?
             else
               raise "don't know how to parse #{attrs.class}"
             end
             if arec
               try_without_moderation(arec) do
-                arec.save(:validate => false) # don't run validations
-                # TODO: validations? sup?
+                arec.save(save_opts)
               end
               if reflection.collection?
                 rec = rec.reload
@@ -134,7 +133,7 @@ module HasModerated
         end
 
         # add/delete associations to a record
-        def self.apply(record, data, preview_mode = false)
+        def self.apply(record, data, save_opts = Hash.new, preview_mode = false)
           record.instance_variable_set(:@has_moderated_preview, true) if preview_mode
           associations = data[:associations]
           delete_associations = data[:delete_associations]
@@ -143,7 +142,7 @@ module HasModerated
             reflection = record.class.reflections[assoc_name.to_sym]
 
             assoc_records.each do |attrs|
-              apply_add_association(record, reflection, attrs) if attrs.present?
+              apply_add_association(record, reflection, attrs, save_opts) if attrs.present?
             end
           end
 

data/lib/has_moderated/associations/has_one.rb

@@ -16,7 +16,7 @@ module HasModerated
           end
         end
       end
-      
+
       module ClassMethods
         protected
           def has_moderated_has_one_association(reflection)
@@ -41,13 +41,13 @@ module HasModerated
             end
           end
       end
-      
+
       module AssociationHelpers
         def self.add_assoc_to_record(*args)
           # same as HasMany
           HasModerated::Associations::Collection::AssociationHelpers::add_assoc_to_record(*args)
         end
-      
+
         def self.delete_assoc_from_record(from, assoc_id, reflection)
           from.send("#{reflection.name}=", nil)
           from.save # TODO necessary?
@@ -55,4 +55,4 @@ module HasModerated
       end
     end
   end
-end
+end

data/lib/has_moderated/carrier_wave.rb

@@ -1,4 +1,40 @@
 require 'fileutils'
+require 'carrierwave'
+module ::CarrierWave
+  class HasModeratedTempFile < SanitizedFile
+    def initialize(file)
+      super(file)
+    end
+
+    def move_to(*args)
+      self
+    end
+
+    def copy_to(*args)
+      self
+    end
+
+    def delete(*args)
+      false
+    end
+  end
+
+  module Storage
+    class File
+      def retrieve_with_moderation_preview!(identifier)
+        tmp_path = Pathname.new(Rails.public_path).join(@uploader.class.store_dir).join("tmp").to_s
+
+        if identifier.try(:start_with?, tmp_path)
+          ::CarrierWave::HasModeratedTempFile.new(identifier)
+        else
+          retrieve_without_moderation_preview!(identifier)
+        end
+      end
+      alias_method_chain :retrieve!, :moderation_preview
+    end
+  end
+end
+
 module HasModerated
   module CarrierWave
 
@@ -38,34 +74,18 @@ module HasModerated
           self.moderated_carrierwave_fields ||= []
           self.moderated_carrierwave_fields.push(field_name)
 
-          base.send :define_method, "#{field_name}_tmp_file=" do |tmp_filename|
-            if @has_moderated_preview != true
-              self.send("#{field_name}=", File.open(tmp_filename))
-              HasModerated::CarrierWave::photo_tmp_delete(tmp_filename)
-            elsif tmp_filename.present?
-              # preview
-              self.singleton_class.class_eval do
-                define_method :"#{field_name}_with_preview" do |*args, &block|
-                  uploader = send(:"#{field_name}_without_preview", *args, &block)
-                  unless uploader.frozen?
-                    uploader.instance_variable_set(:@file,
-                      ::CarrierWave::SanitizedFile.new(
-                        File.open(tmp_filename, "rb")))
-                    uploader.freeze
-                  end
-                  uploader
-                end
-                define_method :"#{field_name}?" do
-                  true
-                end
-                define_method :"#{field_name}_url" do
-                  send("#{field_name}").url
-                end
-                alias_method_chain :"#{field_name}", :preview
+          base.send :define_method, :"#{field_name}_tmp_file=" do |tmp_filename|
+            if tmp_filename.is_a? String
+              if @has_moderated_preview
+                write_attribute field_name.to_s, tmp_filename
+              else
+                tmp_filename =~ /\/([^\/]+\/[^\/]+)\z/
+                send(field_name).retrieve_from_cache!($1)
               end
+            else
+              send(:"#{field_name}=", tmp_filename)
             end
           end
-
           base.send :define_method, "store_#{field_name}_with_moderation!" do
             is_moderated = self.class.respond_to?(:moderated_attributes) &&
               self.class.moderated_attributes.include?(field_name)

data/lib/has_moderated/moderated_create.rb

@@ -16,7 +16,7 @@ module HasModerated
     end
 
     module ApplyModeration
-      def self.apply(klass, value, preview_mode = false)
+      def self.apply(klass, value, save_opts = Hash.new, preview_mode = false)
         rec = nil
         if value[:create].present?
           # create the main record
@@ -26,8 +26,8 @@ module HasModerated
           attrs && attrs.each_pair do |key, val|
             rec.send(key.to_s+"=", val) unless key.to_s == 'id'
           end
-          Moderation.without_moderation { rec.save(:validate => false) }
-          HasModerated::Associations::Base::ApplyModeration::apply(rec, value[:create], preview_mode)
+          Moderation.without_moderation { rec.save(save_opts) }
+          HasModerated::Associations::Base::ApplyModeration::apply(rec, value[:create], save_opts, preview_mode)
         end
         rec
       end

data/lib/has_moderated/moderation_model.rb

@@ -23,14 +23,14 @@ module HasModerated
       @parsed_data ||= YAML::load(data)
     end
 
-    def apply(preview_mode = false)
+    def apply(save_opts = Hash.new, preview_mode = false)
       if create?
-        record = HasModerated::ModeratedCreate::ApplyModeration::apply(moderatable_type.constantize, parsed_data, preview_mode)
+        record = HasModerated::ModeratedCreate::ApplyModeration::apply(moderatable_type.constantize, parsed_data, save_opts, preview_mode)
       else
         record = moderatable
         if record
           record = HasModerated::ModeratedAttributes::ApplyModeration::apply(record, parsed_data, preview_mode)
-          record = HasModerated::Associations::Base::ApplyModeration::apply(record, parsed_data, preview_mode)
+          record = HasModerated::Associations::Base::ApplyModeration::apply(record, parsed_data, save_opts, preview_mode)
           record = HasModerated::ModeratedDestroy::ApplyModeration::apply(record, parsed_data)
         end
       end
@@ -48,7 +48,7 @@ module HasModerated
     end
 
     def accept!(save_opts = Hash.new, preview_mode = false)
-      record = apply(preview_mode)
+      record = apply(save_opts, preview_mode)
       accept_changes(record, save_opts)
       self.destroy(:preview_mode => preview_mode)
       record

data/lib/has_moderated/moderation_preview.rb

@@ -5,7 +5,7 @@ module HasModerated
       def update_moderation
         if @based_on_moderation.present?
           data = @based_on_moderation.parsed_data
-        
+
           # attributes
           data[:attributes] ||= Hash.new
           @has_moderated_fake_attributes.each_pair do |key, value|
@@ -13,13 +13,13 @@ module HasModerated
               data[:attributes][key.to_s] = value
             end
           end
-          
+
           @based_on_moderation.data = data
           @based_on_moderation.save
         end
       end
     end
-    
+
     module FakeRecord
       def fake!(based_on_model, based_on_moderation)
         @based_on_model = based_on_model
@@ -27,7 +27,7 @@ module HasModerated
         freeze
       end
     end
-    
+
     def self.resolve_record(record, cache)
       return nil if record.blank?
       idx = cache.index(record)
@@ -38,20 +38,20 @@ module HasModerated
         cache.last
       end
     end
-    
+
     def self.from_live(record, moderation = nil, saveable = false, object_cache = [])
       return nil if record.blank?
       obj = record
       eigenclass = (class << obj ; include FakeRecord ; self ; end)
       obj.fake!(record.class, moderation)
-      
+
       # attributes
       changed_attributes = Hash.new
       record.previous_changes.each_pair do |attr_name, values|
         changed_attributes[attr_name] = values[0]
       end
       obj.instance_variable_set(:@changed_attributes, changed_attributes)
-      
+
       # saveable
       if saveable
         obj.instance_variable_set(:@attributes_initial, obj.instance_variable_get(:@attributes).dup)
@@ -63,7 +63,7 @@ module HasModerated
           end
         end
       end
-      
+
       # associations
       object_cache.push(obj)
       has_moderated_fake_associations = HashWithIndifferentAccess.new
@@ -74,15 +74,15 @@ module HasModerated
           has_moderated_fake_associations[reflection.name] = record.send(reflection.name).map{|r| resolve_record(r, object_cache)}
         end
       end
-      
+
       obj.instance_variable_set(:@has_moderated_fake_associations, has_moderated_fake_associations.freeze)
       eigenclass.class_eval do
         def association(name)
           OpenStruct.new(:reader => @has_moderated_fake_associations[name].freeze)
         end
       end
-      
+
       obj
     end
   end
-end
+end

data/lib/has_moderated/version.rb

@@ -1,3 +1,3 @@
 module HasModerated
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end