blobsterix_carrierwave 0.0.7 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ea3e909ae2f9f7de7dede8bee31dcdffb2d2ad1
-  data.tar.gz: 10456d10772b34e0200757b561ad3348e7c7fa21
+  metadata.gz: 5571825930a719842fb398fe30926e4c347056c1
+  data.tar.gz: 76feba09b117ae454252b3501a3802b1ae977b22
 SHA512:
-  metadata.gz: 93dedde583457804200e53ffc0fe0777ae34d7a3486bb9ce010d9b096acbfa579b9e16a7c8949005c6c1bd9cad87da3c1ef43f8029ddacec778c17f5aaf4b315
-  data.tar.gz: 9496905c70773e445d2965eb38b36ee7a1a6abfa794b418a0648ddd96b26c54a004711b302b891b552c611fe81fb9b43d7ae14e3d0b48c0985244eaaff6dbb63
+  metadata.gz: b09ec7994926e5c20b76ca337236c3cf36592d6fe00db2bea946be396b14f1aafacf12b04225d1c74c6f9faac0ff8449e7dd1d661f8bbb2d4a705373bc3d011d
+  data.tar.gz: 63747ed5dcab2209cad8dba84bea4f2f6eed0350f704f0f2e52a2ca94fb911159df640916284ad44c0a60e6b6af2cff56fa79cd33711c02eaf6299880f8d0da2

data/.gitignore

@@ -16,5 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .ruby-gemset
-.ruby-version
 .rbenv-gemsets

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p481

data/CHANGELOG.txt

@@ -1,3 +1,13 @@
+= 1.0.0
+  * updated fog and carrierwave.
+  BREAKING CHANGES:
+    * in case you used the uploader version patch before you have to now include the patches/carrierwave_0100_... version of the patch.
+= 0.0.9
+ * made the version name change optional. found in patches folder
+= 0.0.8
+ * changed uploaded version class naming. So they can be recreated from sessions.(needs to be changed when switching carrierwave version!!)
+= 0.0.7
+ * something
 = 0.0.6
  * just version bump
 = 0.0.5

data/README.md

@@ -84,6 +84,12 @@ Setup:
 
   # this will generate the url and blobsterix will generate the image on the fly.
 
+## Patches
+
+In case you want to recreate uploader from saved instances you need fixed class names. To achieve this simply do:
+
+  require "blobsterix_carrierwave/patches/carrierwave_090_uploader_version_name"
+
 ## Contributing
 
 1. Fork it

data/blobsterix_carrierwave.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = BlobsterixCarrierwave::VERSION
 
-  gem.add_dependency "carrierwave", "~> 0.9.0"
-  gem.add_dependency "fog"        , "~> 1.3.1"
+  gem.add_dependency "carrierwave", "~> 0.10.0"
+  gem.add_dependency "fog"        , "~> 1.22.0"
 end

data/lib/blobsterix_carrierwave/blobsterix_adhoc_transforms.rb

@@ -13,7 +13,7 @@ module BlobsterixAdhocTransforms
 
         #init the trafos
         (@options[:trafos] || []).each{|t|
-          c.send(t[0], t[1])
+          self.send(t[0], t[1])
         }
       end
 
@@ -52,8 +52,9 @@ module BlobsterixAdhocTransforms
       def method_missing(method, *args)
         if BlobsterixAdhocTransforms.respond_to?(method)
           @chain << BlobsterixAdhocTransforms.send(method, *args)
-        else
-          #shit!
+        elsif uploader && uploader.respond_to?(method)
+          specific_trafo = uploader.send(method, *args)
+          @chain << specific_trafo if specific_trafo && specific_trafo.kind_of?(Hash)
         end
         self
       end

data/lib/blobsterix_carrierwave/blobsterix_carrierwave.rb

@@ -48,7 +48,7 @@ module Blobsterix
         #   puts "Do: #{method} with #{args.inspect}"
         #   trafos.send(method, *args)
         # end
-        BlobsterixAdhocTransforms::Generator.new(:trafos => self.class.processors.map{|method, args, condition|[method, args]}).transform(encrypt)
+        BlobsterixAdhocTransforms::Generator.new(:uploader => self,:trafos => self.class.processors.map{|method, args, condition|[method, args]}).transform(encrypt)
       else
         ""
       end
@@ -59,7 +59,7 @@ module Blobsterix
       if enable_processing and version_name
         current_processor = self.class
         remote_processor_array = []
-        until current_processor.parent == Object
+        until current_processor.parent.parent == Object
           remote_processor_array+=current_processor.processors.map{|method, args, condition|[method, args]}
           current_processor = current_processor.parent
         end

data/lib/blobsterix_carrierwave/blobsterix_storage.rb

@@ -53,7 +53,7 @@ module CarrierWave
             :key          => path,
             :public       => @uploader.fog_public,
             :collection => directory.files,
-            :connection => directory.files.connection
+            :service => directory.files.service
           }.merge(@uploader.fog_attributes))
           @file.metadata={"x-amz-meta-trafo" => @uploader.remote_process!(false)}
           @file.save()
@@ -66,11 +66,22 @@ module CarrierWave
         end
 
         def read
-          super()
+          @read||=load_file_from_blobsterix
+        end
+
+        def load_file_from_blobsterix
+          uri = URI(public_url)
+          body = Net::HTTP.start(uri.host, uri.port) do |http|
+            response = http.get uri.path
+            response.body
+          end
+          body||""
         end
+
         def size
-          super()
+          read.size
         end
+
         def delete
           super()
         end

data/lib/blobsterix_carrierwave/blobsterix_uploader.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 class BlobsterixUploader < CarrierWave::Uploader::Base
 
-  include CarrierWave::MimeTypes
+  #include CarrierWave::MimeTypes
   include Blobsterix::CarrierWave
 
   #storage :file
@@ -9,16 +9,6 @@ class BlobsterixUploader < CarrierWave::Uploader::Base
 
   include BlobsterixTransforms
 
-  after :store, :done_store
-  before :store, :before_store
-
-  def before_store obj
-    #puts "Start with storing"
-  end
-  def done_store obj
-    #puts "Done with storing"
-  end
-
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir

data/lib/blobsterix_carrierwave/patches/carrierwave_0100_uploader_version_name.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Uploader
+    module Versions
+      module ClassMethods
+        def build_version(name, options)
+          uploader = Class.new(self)
+          const_set("Uploader#{name}".gsub('-', '_'), uploader)
+          uploader.version_names += [name]
+          uploader.versions = {}
+          uploader.processors = []
+
+          uploader.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            # Define the enable_processing method for versions so they get the
+            # value from the parent class unless explicitly overwritten
+            def self.enable_processing(value=nil)
+              self.enable_processing = value if value
+              if !@enable_processing.nil?
+                @enable_processing
+              else
+                superclass.enable_processing
+              end
+            end
+
+            # Regardless of what is set in the parent uploader, do not enforce the
+            # move_to_cache config option on versions because it moves the original
+            # file to the version's target file.
+            #
+            # If you want to enforce this setting on versions, override this method
+            # in each version:
+            #
+            # version :thumb do
+            #   def move_to_cache
+            #     true
+            #   end
+            # end
+            #
+            def move_to_cache
+              false
+            end
+          RUBY
+
+          class_eval <<-RUBY
+            def #{name}
+              versions[:#{name}]
+            end
+          RUBY
+
+          # Add the current version hash to class attribute :versions
+          current_version = {
+            name => {
+              :uploader => uploader,
+              :options  => options
+            }
+          }
+          self.versions = versions.merge(current_version)
+        end
+      end
+    end
+  end
+end

data/lib/blobsterix_carrierwave/patches/carrierwave_090_uploader_version_name.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Uploader
+    module Versions
+      module ClassMethods
+        def version(name, options = {}, &block)
+          name = name.to_sym
+          unless versions[name]
+            uploader = Class.new(self)
+            const_set("Uploader#{name}".gsub('-', '_'), uploader)
+            uploader.versions = {}
+
+            # Define the enable_processing method for versions so they get the
+            # value from the parent class unless explicitly overwritten
+            uploader.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def self.enable_processing(value=nil)
+                self.enable_processing = value if value
+                if !@enable_processing.nil?
+                  @enable_processing
+                else
+                  superclass.enable_processing
+                end
+              end
+            RUBY
+
+            # Regardless of what is set in the parent uploader, do not enforce the
+            # move_to_cache config option on versions because it moves the original
+            # file to the version's target file.
+            #
+            # If you want to enforce this setting on versions, override this method
+            # in each version:
+            #
+            # version :thumb do
+            #   def move_to_cache
+            #     true
+            #   end
+            # end
+            #
+            uploader.class_eval <<-RUBY
+              def move_to_cache
+                false
+              end
+            RUBY
+
+            # Add the current version hash to class attribute :versions
+            current_version = {}
+            current_version[name] = {
+              :uploader => uploader,
+              :options  => options
+            }
+            self.versions = versions.merge(current_version)
+
+            versions[name][:uploader].version_names += [name]
+
+            class_eval <<-RUBY
+              def #{name}
+                versions[:#{name}]
+              end
+            RUBY
+            # as the processors get the output from the previous processors as their
+            # input we must not stack the processors here
+            versions[name][:uploader].processors = versions[name][:uploader].processors.dup
+            versions[name][:uploader].processors.clear
+          end
+          versions[name][:uploader].class_eval(&block) if block
+          versions[name]
+        end
+      end
+    end
+  end
+end

data/lib/blobsterix_carrierwave/version.rb

@@ -1,4 +1,4 @@
 module BlobsterixCarrierwave
-  VERSION = "0.0.7"
+  VERSION = "1.0.4"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobsterix_carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.4
 platform: ruby
 authors:
 - Daniel Sudmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.22.0
 description: This gem is used to create a carrierwave binding to a blobsterix server
 email:
 - suddani@googlemail.com
@@ -47,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - CHANGELOG.txt
 - Gemfile
 - LICENSE
@@ -61,6 +62,8 @@ files:
 - lib/blobsterix_carrierwave/blobsterix_storage.rb
 - lib/blobsterix_carrierwave/blobsterix_transforms.rb
 - lib/blobsterix_carrierwave/blobsterix_uploader.rb
+- lib/blobsterix_carrierwave/patches/carrierwave_0100_uploader_version_name.rb
+- lib/blobsterix_carrierwave/patches/carrierwave_090_uploader_version_name.rb
 - lib/blobsterix_carrierwave/version.rb
 homepage: http://experteer.com
 licenses: []