carrierwave-processor 0.0.1.pre → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b477ba217d1235ada6e864ecbeb8148df8ee6d
-  data.tar.gz: 6beeca6c3a3541c60c2dc3ebbb588bf046fe139b
+  metadata.gz: 8888e33817df6e28e43e63a5d26aadff0ef72df2
+  data.tar.gz: 69fd491bd8ffdf034c9ad4561a2600e8422b73f7
 SHA512:
-  metadata.gz: 4de4ca8e40e2dfa36c271d7e2989420ef54ffd3cf13ca5d47d8ac32d1a03babbe95a43a01d355bfa0292cc9bd597c01d21033016cb0787fc01be8149627994e6
-  data.tar.gz: fdee6a44fba1ab78fdd8eb683505276eff764a54e24cb1f77260c9640391c50cccb978a65c2bacffa7f7307c409abb6bec6d0e6d025340ddfa945ca142e71190
+  metadata.gz: 9cd9c75be3ed190a8e7e2879940bff4898d85c7bd327c15eeb7a27a9ab2e31e38c14230fb13c9b72cdc52407ec2b5484492cf6146a0173d3b036d50f436e626a
+  data.tar.gz: 068140e6335488f2a67ea7be347987e85dd7934f777cf9e0ce3d2ccfb4c626e0e4861acb526a907166be0643a5aac53e6e3533e01ae9be6f02e11e3908f9a11a

data/lib/carrierwave/processor/uploader_dsl.rb

@@ -32,25 +32,25 @@ module CarrierWave
         end
 
         def load_cw_versions processor, options = {}
-          conditions = options[:conditions] || []
-          processor.processors.each do |name, version|
-            new_conditions = (conditions + [version.options[:if]]).compact
+          conditions = options.delete(:conditions) || []
+          processor.processors.each do |name, v|
+            new_conditions = (conditions + [v.options[:if]]).compact
             condition = ::CarrierWave::Processor.conditions_merge(*new_conditions) unless new_conditions.empty?
-            version_options = version.options
+            version_options = v.options
             version_options.merge! options if options
             version_options.merge!(:if => condition) if condition
             if version_options.empty?
               version name do
-                load_cw_processors version
+                load_cw_processors v
               end
             else
               version name, version_options do
-                load_cw_processors version
+                load_cw_processors v
               end
             end
-            next_level_options = {:from_version => version.name}
+            next_level_options = {:from_version => name}
             next_level_options.merge!(:conditions => new_conditions) unless conditions.empty?
-            load_cw_versions version, next_level_options
+            load_cw_versions v, next_level_options
           end
         end
     end

data/lib/carrierwave/processor/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Processor
-    VERSION = "0.0.1.pre"
+    VERSION = "1.0"
   end
 end

data/lib/carrierwave/processor.rb

@@ -17,6 +17,7 @@ module CarrierWave
     def self.conditions_merge *args
       args.compact!
       return nil if args.empty?
+      return args.first if args.length == 1
       lambda do |uploader, options|
         args.inject(true) do |accum, condition|
           break false unless accum

data/spec/uploader_dsl_spec.rb

@@ -1,6 +1,17 @@
 require 'spec_helper'
 
 describe CarrierWave::Processor::UploaderDsl do
+  before :each do 
+    CarrierWave::Processor.stub(:conditions_merge) do |*args|
+      if args.empty?
+        nil
+      elsif (args.length == 1)
+        args.first
+      else
+        args
+      end
+    end
+  end
   before :each do
     if Object.constants.include?(:FooUploader)
       Object.send(:remove_const, :FooUploader)
@@ -68,11 +79,61 @@ describe CarrierWave::Processor::UploaderDsl do
 
   it "calls inner version processors without if option merge" do
     carrierwave_processor :some_processor do
-      version :some_version do
-        process :another_version, :if => :abrakadabra
+      version :some_version, :if => :nyasha do
+        process :processing, :if => :abrakadabra
       end
     end
-    FooUploader.should_receive(:version).with(:some_version)
+    FooUploader.should_receive(:process).with(:processing => [], :if => :abrakadabra)
+    FooUploader.send(:use_processor, :some_processor, :if => :kuku)
+  end
+
+  it 'multiple versions merges correctly' do
+    
+    carrierwave_processor :some_processor do
+      process :root_process, :if => :e
+      process :root2_process
+      version :a2_version do
+        process :a3_process
+        process :a4_process, :if => :a4
+      end
+      version :a_version, :if => :b do
+        process :a_process, :if => :f
+        process :a2_process
+        version :b_version do
+          process :b_process, :if => :e
+          process :b2_process
+          version :c_version, :if => :c do
+            process :c_process, :if => :d
+            process :c2_process
+            version :d_version do
+              process :d_process, :if => :e
+              process :d2_process
+            end
+          end
+        end
+      end
+    end
+
+    FooUploader.should_receive(:version).with(:a2_version, :if => :root).and_call_original
+    FooUploader.should_receive(:version).with(:a_version, :if => [:root, :b]).and_call_original
+    FooUploader.should_receive(:version).with(:b_version, :from_version => :a_version, :if => [:root, :b]).and_call_original
+    FooUploader.should_receive(:version).with(:c_version, :from_version => :b_version, :if => [:root, :b, :c]).and_call_original
+    FooUploader.should_receive(:version).with(:d_version, :from_version => :c_version, :if => [:root, :b, :c]).and_call_original
+
+    FooUploader.should_receive(:process).with(:root_process => [], :if => [:root, :e])
+    FooUploader.should_receive(:process).with(:root2_process => [], :if => :root)
+    FooUploader.should_receive(:process).with(:a3_process => [])
+    FooUploader.should_receive(:process).with(:a4_process => [], :if => :a4)
+    FooUploader.should_receive(:process).with(:a_process => [], :if => :f)
+    FooUploader.should_receive(:process).with(:a2_process => [])
+    FooUploader.should_receive(:process).with(:b_process => [], :if => :e)
+    FooUploader.should_receive(:process).with(:b2_process => [])
+    FooUploader.should_receive(:process).with(:c_process => [], :if => :d)
+    FooUploader.should_receive(:process).with(:c2_process => [])
+    FooUploader.should_receive(:process).with(:d_process => [], :if => :e)
+    FooUploader.should_receive(:process).with(:d2_process => [])
+
+    FooUploader.send(:use_processor, :some_processor, :if => :root)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-processor
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: '1.0'
 platform: ruby
 authors:
 - Alexander Kostrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -119,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11