carrierwave-riak 0.1.1 → 0.1.2

data/README.md

@@ -26,6 +26,18 @@ CarrierWave.configure do |config|
 end
 ```
 
+or, if you use claster of nodes
+
+```ruby
+CarrierWave.configure do |config|
+  config.storage = :riak
+  config.riak_nodes = [
+    { host: "127.0.0.1", http_port: 8098 }, 
+    { host: "127.0.0.1", http_port: 8099 }
+  ]
+end
+```
+
 ## Usage example
 
 Note that for your uploader, your should extend the CarrierWave::Uploader::Riak class.

data/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

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.1"
+  s.version     = "0.1.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kevin Motschiedler"]
   s.email       = ["kdmotschiedler@gmail.com"]
@@ -20,4 +20,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails", ["~> 3.0.5"]
   s.add_development_dependency "rspec", ["~> 2.6"]
   s.add_development_dependency "rake", ["~> 0.9"]
-end
+end

data/lib/carrierwave/riak/configuration.rb

@@ -6,6 +6,7 @@ module CarrierWave
         add_config :riak_bucket
         add_config :riak_host
         add_config :riak_port
+        add_config :riak_nodes
       end
     end
 

data/lib/carrierwave/storage/riak.rb

@@ -17,10 +17,7 @@ module CarrierWave
 
       class Connection
         def initialize(options={})
-          @riak_bucket = options[:riak_bucket]
-          @host = options[:riak_host]
-          @port = options[:riak_port]
-          @client = ::Riak::Client.new(:host => @host, :http_port => @port)
+          @client = ::Riak::Client.new(options)
         end
 
         def store(bucket, key, payload, headers = {})
@@ -28,8 +25,6 @@ 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
 
@@ -179,12 +174,15 @@ module CarrierWave
             if @riak_client
               @riak_client
             else
-              config = {
-                :riak_bucket => @uploader.riak_bucket,
-                :riak_host => @uploader.riak_host,
-                :riak_port => @uploader.riak_port
-              }
-              @riak_client ||= CarrierWave::Storage::Riak::Connection.new(config)
+              @riak_client ||= CarrierWave::Storage::Riak::Connection.new(riak_options)
+            end
+          end
+
+          def riak_options
+            if @uploader.respond_to? :riak_nodes
+              {:nodes => @uploader.riak_nodes}
+            else
+              {:host => @uploader.riak_host, :http_port => @uploader.riak_port}
             end
           end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave-riak
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kevin Motschiedler
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 -06:00
-default_executable: 
+date: 2012-11-14 00:00:00 Z
 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"
@@ -33,9 +35,11 @@ dependencies:
   name: riak-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -47,9 +51,11 @@ dependencies:
   name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 3
         - 0
@@ -61,9 +67,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 6
@@ -74,9 +82,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
@@ -96,13 +106,13 @@ files:
 - .rspec
 - Gemfile
 - README.md
+- Rakefile
 - carrierwave-riak.gemspec
 - lib/carrierwave/riak.rb
 - lib/carrierwave/riak/configuration.rb
 - 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: []
 
@@ -112,25 +122,30 @@ 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.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Riak Storage support for CarrierWave
 test_files: 
 - spec/spec_helper.rb
+has_rdoc: