carrierwave-processor 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd48afff42e5cf9328e2c5f58c59066e89522bc1
-  data.tar.gz: 5ac5d20101f1d9fded1066248db67c4ea18a7548
+  metadata.gz: 2939328ae65e5281e71838e54b9c6fa23682c00b
+  data.tar.gz: 854548f35fd7461d63069d0618866b072226a07d
 SHA512:
-  metadata.gz: b98fae5d89e75817a44fcb29265563a1c1efdbf11f58318f70c91af24132de924120838dd286aea0e4a912b695ad034b149f3aef5950e23a9878c186da20ad7b
-  data.tar.gz: 5cf9146bc008d34c8f0475c2123417968d41d1ad1b174e5c80605854366b5f601c19f9d2f023860ec361eda924d303950e675d4930ba42eb0d1f927ccfba1ea3
+  metadata.gz: 8f07d2dd154a5106d18c30d55da9ac9e7347d5dd78c7b3e0d75041b19602840898593a944a8525de89b38081e126d18e1bf0812ff6095794f67a7b0ab96e9e51
+  data.tar.gz: f2f263b44b5fe4030c8ab81497e0d4653111017506f2b33232652f23632505f40609bb3c009280ce5f8630ba024d285d752db91b755a8031189c852f042b7182

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rails', :git => "git@github.com:rails/rails.git", :branch => "4-0-stable"
+
 # Specify your gem's dependencies in carrierwave-processing.gemspec
 gemspec

data/lib/carrierwave/processor/dsl.rb

@@ -1,30 +1,12 @@
 module CarrierWave
   module Processor
     module Dsl
-      def carrierwave_processor *args, &block
-        options = args.extract_options!
-        name = args.first
+      def carrierwave_processor name, options={}, &block
         if name
-          processor = Node.new options
-          processor.name = name
-          processor.instance_eval &block if block
-          if self.kind_of? CarrierWave::Processor::Node
-            self.processors ||= {}
-            self.processors[name] = processor
-          else
-            ::CarrierWave::Processor.processors ||= {}
-            ::CarrierWave::Processor.processors[name] = processor
-          end
-          return processor
-        end
-      end
-
-      def find_carrierwave_processor name
-        if self.kind_of? CarrierWave::Processor::Node
-          self.processors && self.processors[name.to_sym]
-        else
-          CarrierWave::Processor.processors && CarrierWave::Processor.processors[name.to_sym]
+          ::CarrierWave::Processor.processors ||= {}
+          return ::CarrierWave::Processor.processors[name] = {:block => block, :options => options}
         end
+        nil
       end
     end
   end

data/lib/carrierwave/processor/injector.rb

@@ -0,0 +1,46 @@
+require 'delegate'
+require 'active_support/core_ext/class'
+
+class Injector < Module
+
+  def initialize uploader, opts = {}, &block
+    @uploader = uploader
+    @outer_version = opts.delete(:outer_version)
+    @options = opts
+    self.class_eval &block
+    @uploader.prepend self
+  end
+
+  def process *args, &block
+    processed_options = ::CarrierWave::Processor.arguments_merge *args
+    unless @outer_version
+      new_if = ::CarrierWave::Processor.conditions_merge(@options[:if], processed_options[:if])
+      processed_options[:if] = new_if if new_if
+    end
+    @uploader.process processed_options, &block
+  end
+
+  def version *args, &block
+    options = args.extract_options! || {}
+    version_options = @options.merge options
+    ifs_array = [@options[:if], options[:if]]
+    new_if = ::CarrierWave::Processor.conditions_merge *ifs_array
+    version_options[:if] = new_if
+    version_options.delete :if if version_options[:if].nil?
+    version_options[:from_version] = @outer_version if @outer_version
+    passing_options = {:if => ifs_array}
+    passing_options[:outer_version] = args.first if args.first
+    version_args = version_options.empty? ? args : (args + [version_options])
+    @uploader.version *version_args do
+      Injector.new(self, passing_options, &block)
+    end
+  end
+
+  def method_missing *args, &block
+    @uploader.send *args, &block
+  end
+
+  def delay *args, &block
+  end
+
+end

data/lib/carrierwave/processor/uploader_dsl.rb

@@ -6,53 +6,20 @@ module CarrierWave
 
       def use_processor *args
         options = args.extract_options!
-        conditions = [options.delete(:conditions) || options[:if]].flatten.compact
         args.each do |processor|
-          passing_in_options = {}
-          passing_in_options.merge!(:conditions => conditions) unless conditions.empty?
-          if processor and processor = find_carrierwave_processor(processor)
-            load_cw_processors processor, passing_in_options
-            load_cw_versions processor, passing_in_options
+          if processor and not ::CarrierWave::Processor.processors.blank? and real_processor = ::CarrierWave::Processor.processors[processor] and real_processor[:block]
+            new_if = [options[:if], real_processor[:options][:if]]
+            merged_options = real_processor[:options].merge options
+            merged_options[:if] = new_if if new_if
+            Injector.new(self, merged_options, &real_processor[:block])
           else
             raise ProcessorNotFoundError, processor
           end
         end
       end
 
-      private
+      alias_method :use_processors, :use_processor
 
-        def load_cw_processors processor, options = {}
-          conditions = options[:conditions] || []
-          processor.cw_processors.each do |cw_processor|
-            new_processors = ::CarrierWave::Processor.arguments_merge *cw_processor[:args]
-            new_conditions = (conditions + [new_processors[:if]]).compact
-            new_processors[:if] = ::CarrierWave::Processor.conditions_merge(*new_conditions) unless new_conditions.empty?
-            process new_processors
-          end
-        end
-
-        def load_cw_versions processor, options = {}
-          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 = 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 v
-              end
-            else
-              version name, version_options do
-                load_cw_processors v
-              end
-            end
-            next_level_options = {:from_version => name}
-            next_level_options.merge!(:conditions => new_conditions) unless conditions.empty?
-            load_cw_versions v, next_level_options
-          end
-        end
     end
   end
 end

data/lib/carrierwave/processor/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Processor
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/carrierwave/processor.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'carrierwave'
 require "carrierwave/processor/version"
-require 'carrierwave/processor/node'
+require "carrierwave/processor/injector"
 require 'carrierwave/processor/uploader_dsl'
 
 module CarrierWave
@@ -15,9 +15,14 @@ module CarrierWave
     end
 
     def self.conditions_merge *args
+      args.flatten!
       args.compact!
       return nil if args.empty?
       return args.first if args.length == 1
+      self.merge_multiple_conditions *args
+    end
+
+    def self.merge_multiple_conditions *args
       lambda do |uploader, options|
         args.inject(true) do |accum, condition|
           break false unless accum

data/spec/active_support_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'active_support/core_ext/class'
+
+describe "ActiveSupport::Concern" do
+  it "prepending module does not break class_attribute" do
+
+    class SomeClass
+      prepend Module.new
+
+      def tester
+        "instance"
+      end
+
+      class_attribute :tester, :instance_reader => false, :instance_writer => false
+      self.tester = "class attribute"
+    end
+
+    expect(SomeClass.send :singleton_class?).to eq(false)
+
+    expect(SomeClass.new.tester).to eq("instance")
+  end
+
+  it "prepending module does not break singleton_class check" do
+    class Ana
+    end
+
+    Ana.prepend Module.new
+
+    expect(Ana.send :singleton_class?).to eq(false)
+  end
+
+end

data/spec/dsl_spec.rb

@@ -8,7 +8,7 @@ describe CarrierWave::Processor::Dsl do
 
   it "returns processor node on carrierwave_processor call" do
     processor = carrierwave_processor(:some_processor){}
-    processor.should be_kind_of CarrierWave::Processor::Node
+    processor.should be_kind_of Hash
   end
 
   it "stores processor to centralized hash storage" do
@@ -31,12 +31,5 @@ describe CarrierWave::Processor::Dsl do
     ::CarrierWave::Processor.processors.should_not have_key :another_processor
   end
 
-  it "saves carrierwave processor arguments to cw_processors" do
-    processor = carrierwave_processor :some do
-      process :nya
-    end
-    processor.cw_processors.first.should == {:args => [:nya], :block => nil}
-  end
-
   
 end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'bundler/setup'
 require 'carrierwave'
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'carrierwave/processor'
-require 'carrierwave_test_helper'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/uploader_dsl_spec.rb

@@ -2,14 +2,8 @@ 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
+    CarrierWave::Processor.stub(:merge_multiple_conditions) do |*args|
+      args
     end
   end
   before :each do
@@ -17,6 +11,14 @@ describe CarrierWave::Processor::UploaderDsl do
       Object.send(:remove_const, :FooUploader)
     end
     class FooUploader < CarrierWave::Uploader::Base
+      version :alalas do
+        def chacha
+        end
+      end
+
+      def test_me
+        "original"
+      end
     end
   end
 
@@ -36,9 +38,6 @@ describe CarrierWave::Processor::UploaderDsl do
   end
 
   it "merges processor condition with use_processor condition" do
-    CarrierWave::Processor.stub(:conditions_merge) do |*args|
-      args
-    end
     combinations = [:method1, ->(u,o){true}].product([:method2, ->u,o{false}])
     combinations.each do |a, b|
       carrierwave_processor :some_processor do
@@ -68,11 +67,12 @@ describe CarrierWave::Processor::UploaderDsl do
   it "calls inner version method with :from_version key" do
     carrierwave_processor :some_processor do
       version :some_version do
-        version :another_version
+        version :another_version do
+        end
       end
     end
 
-    FooUploader.should_receive(:version).with(:some_version)
+    FooUploader.should_receive(:version).with(:some_version).and_call_original
     FooUploader.should_receive(:version).with(:another_version, :from_version => :some_version)
     FooUploader.send(:use_processor, :some_processor)
   end
@@ -141,4 +141,75 @@ describe CarrierWave::Processor::UploaderDsl do
     expect {FooUploader.send(:use_processor, :some_processor) }.to raise_error(CarrierWave::Processor::ProcessorNotFoundError)
   end
 
+  it "includes declared methods in each version" do
+    carrierwave_processor :some_proc do
+      def some_method
+      end
+
+      version :test do
+        def some_method2
+        end
+      end
+    end
+
+    FooUploader.send(:use_processor, :some_proc)
+    FooUploader.new.should respond_to :some_method
+    FooUploader.new.should_not respond_to :some_method2
+    FooUploader.versions[:test][:uploader].new.should respond_to :some_method2
+  end
+
+  it 'redefine default methods' do
+
+    carrierwave_processor :some_proc do
+      def test_me
+        "overriden"
+      end
+
+      version :test do
+        def test_me
+          "overriden internal"
+        end
+      end
+    end
+
+    FooUploader.send(:use_processor, :some_proc)
+    FooUploader.new.test_me.should == "overriden"
+    FooUploader.versions[:test][:uploader].new.test_me.should == "overriden internal"
+  end
+
+  it "doesnt include injector's method_missing into uploader" do
+     carrierwave_processor :some_proc do
+      def test_me
+        "overriden"
+      end
+
+      version :test do
+        def test_me
+          "overriden internal"
+        end
+      end
+    end
+
+    FooUploader.send(:use_processor, :some_proc)
+    FooUploader.new.should_not respond_to :method_missing
+    FooUploader.versions[:test][:uploader].new.should_not respond_to :method_missing
+  end
+
+  it "doesnt break carrrierwave uploader instance versions" do
+    carrierwave_processor :some_proc do
+      def test_me
+        "overriden"
+      end
+
+      version :test do
+        def test_me
+          "overriden internal"
+        end
+      end
+    end
+    FooUploader.send(:use_processor, :some_proc)
+    FooUploader.new.versions.map{|name, uploader| uploader.should be_kind_of FooUploader}
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-processor
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Kostrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -96,10 +96,10 @@ files:
 - carrierwave-processor.gemspec
 - lib/carrierwave/processor.rb
 - lib/carrierwave/processor/dsl.rb
-- lib/carrierwave/processor/node.rb
+- lib/carrierwave/processor/injector.rb
 - lib/carrierwave/processor/uploader_dsl.rb
 - lib/carrierwave/processor/version.rb
-- spec/carrierwave_test_helper.rb
+- spec/active_support_spec.rb
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
 - spec/uploader_dsl_spec.rb
@@ -124,12 +124,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Carrierwave distinct processing declaration
 test_files:
-- spec/carrierwave_test_helper.rb
+- spec/active_support_spec.rb
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
 - spec/uploader_dsl_spec.rb

data/lib/carrierwave/processor/node.rb

@@ -1,31 +0,0 @@
-require_relative './dsl'
-
-module CarrierWave
-  module Processor
-    class Node
-      include Dsl
-
-      attr_accessor :name, :options
-      attr_accessor :processors
-      attr_reader :cw_processors
-
-      def initialize opts={}
-        @cw_processors = []
-        @processors = {}
-        @options = opts
-      end
-
-      def process *args, &block
-        processor = {:args => args, :block => block}
-        @cw_processors << processor
-      end
-
-      def background *args, &block
-      end
-
-      alias_method :version, :carrierwave_processor
-
-        
-    end
-  end
-end

data/spec/carrierwave_test_helper.rb

@@ -1,76 +0,0 @@
-module CarrierWave
-  module Test
-    module MockStorage
-      def mock_storage(kind)
-        storage = mock("storage for #{kind} uploader")
-        storage.stub!(:setup!)
-        storage
-      end
-    end
-
-    module MockFiles
-      def stub_merb_tempfile(filename)
-        raise "#{path} file does not exist" unless File.exist?(file_path(filename))
-
-        t = Tempfile.new(filename)
-        FileUtils.copy_file(file_path(filename), t.path)
-
-        return t
-      end
-
-      def stub_tempfile(filename, mime_type=nil, fake_name=nil)
-        raise "#{path} file does not exist" unless File.exist?(file_path(filename))
-
-        t = Tempfile.new(filename)
-        FileUtils.copy_file(file_path(filename), t.path)
-
-        # This is stupid, but for some reason rspec won't play nice...
-        eval <<-EOF
-        def t.original_filename; '#{fake_name || filename}'; end
-        def t.content_type; '#{mime_type}'; end
-        def t.local_path; path; end
-        EOF
-
-        return t
-      end
-
-      def stub_stringio(filename, mime_type=nil, fake_name=nil)
-        if filename
-          t = StringIO.new( IO.read( file_path( filename ) ) )
-        else
-          t = StringIO.new
-        end
-        t.stub!(:local_path => "",
-                :original_filename => filename || fake_name,
-                :content_type => mime_type)
-        return t
-      end
-
-      def stub_file(filename, mime_type=nil, fake_name=nil)
-        f = File.open(file_path(filename))
-        return f
-      end
-    end
-
-    module I18nHelpers
-      def change_locale_and_store_translations(locale, translations, &block)
-        current_locale = I18n.locale
-        begin
-          I18n.backend.store_translations locale, translations
-          I18n.locale = locale
-          yield
-        ensure
-          I18n.reload!
-          I18n.locale = current_locale
-        end
-      end
-    end
-
-    module ManipulationHelpers
-      def color_of_pixel(path, x, y)
-        image = ::MiniMagick::Image.open(path)
-        color = image.run_command("convert", "#{image.path}[1x1+#{x}+#{y}]", "-depth", "8", "txt:").split("\n")[1]
-      end
-    end
-  end
-end