carrierwave-riak 0.1.0 → 0.1.1

data/carrierwave-riak.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-riak"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kevin Motschiedler"]
   s.email       = ["kdmotschiedler@gmail.com"]

data/lib/carrierwave/storage/riak.rb

@@ -28,6 +28,8 @@ module CarrierWave
           robject = ::Riak::RObject.new(bucket, key)
           robject.content_type = headers[:content_type]
           robject.raw_data = payload
+          headers.delete(:content_type)
+          robject.meta = headers
           robject.store
         end
 

data/lib/carrierwave/uploader/riak.rb

@@ -13,11 +13,48 @@ module CarrierWave
         after :store, :updatemodel
 
         def updatemodel(file)
-          if(model.read_attribute(:"#{self.mounted_as}").nil?)
+          if model.read_attribute(:"#{self.mounted_as}").nil? || model.read_attribute(:"#{self.mounted_as}") != self.key
             model.update_attribute(:"#{self.mounted_as}", self.key)
           end
         end
       end
+
+      private
+
+      def build_versioned_key(key, version_name)
+        unless version_name.nil?
+          "#{version_name}_#{key}"
+        else
+          key
+        end
+
+      end
+
+      def store_versions!(new_file)
+        active_versions.each { |name, v|
+          v.key = build_versioned_key(key, name)
+          v.store!(new_file)
+        }
+      end
+
+      def remove_versions!
+        versions.each { |name, v|
+          v.key = build_versioned_key(key, name)
+          v.remove!
+        }
+      end
+
+      def retrieve_versions_from_cache!(cache_name)
+        versions.each { |name, v|
+          v.key = build_versioned_key(key, name)
+          v.retrieve_from_cache!(cache_name)
+        }
+      end
+
+      def retrieve_versions_from_store!(identifier)
+        versions.each { |name, v|
+          v.retrieve_from_store!(build_versioned_key(identifier, name)) }
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave-riak
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kevin Motschiedler
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-07-17 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: carrierwave
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -35,11 +33,9 @@ dependencies:
   name: riak-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -51,11 +47,9 @@ dependencies:
   name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 3
         - 0
@@ -67,11 +61,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 6
@@ -82,11 +74,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 9
@@ -112,6 +102,7 @@ files:
 - lib/carrierwave/storage/riak.rb
 - lib/carrierwave/uploader/riak.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/motske/carrierwave-riak
 licenses: []
 
@@ -121,30 +112,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Riak Storage support for CarrierWave
 test_files: 
 - spec/spec_helper.rb
-has_rdoc: