dokument 1.0.0.alpha → 1.0.0.beta

data/lib/dokument/association.rb

@@ -1,11 +1,12 @@
 module Dokument
   class Association
 
-    attr_accessor :name, :key, :bucket
+    attr_accessor :name, :owner, :key, :bucket
 
-    def initialize(name, options = {})
+    def initialize(name, owner, options = {})
       self.name   = name
-      self.bucket = options[:bucket] || name.to_s
+      self.owner  = owner
+      self.bucket = options[:bucket] || "#{owner.name}_#{name}"
       self.key    = options[:key]    || :id
     end
 

data/lib/dokument/attachment.rb

@@ -4,7 +4,7 @@ module Dokument
   class Attachment
     extend Forwardable
 
-    delegate %w[data data= content_type content_type=] => :robject
+    delegate %w[raw_data raw_data= content_type content_type=] => :robject
 
     attr_reader :model, :association
 
@@ -17,9 +17,17 @@ module Dokument
       @robject ||= bucket.get_or_new(model.send(association.key).to_s)
     end
 
-    def save
+    def data
+      raw_data
+    end
+
+    def data=(value)
+      self.raw_data = value
+    end
+
+    def save(options={})
       raise IncompleteError.new("Attachment is missing content_type or data (#{inspect})") unless complete?
-      robject.store
+      robject.store(options)
     end
 
     def incomplete?
@@ -35,7 +43,7 @@ module Dokument
     def bucket
       Dokument.client[association.bucket]
     end
-
+    
     class IncompleteError < StandardError ; end
 
   end

data/lib/dokument/model.rb

@@ -11,7 +11,7 @@ module Dokument
       end
 
       def dokument(name, options={})
-        dokuments[name] = Association.new(name)
+        dokuments[name] = Association.new(name, self, options)
         add_association_reader(name)
       end
 

data/lib/dokument/version.rb

@@ -1,3 +1,3 @@
 module Dokument
-  VERSION = "1.0.0.alpha"
+  VERSION = "1.0.0.beta"
 end

data/spec/dokument/association_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Dokument::Association do
 
   before :each do 
-    @association = Dokument::Association.new(:file)
+    @association = Dokument::Association.new(:file, ExampleModel)
   end
 
   it "take a name upon initialization" do
@@ -23,14 +23,14 @@ describe Dokument::Association do
       @association.key.should eq(:id)
     end
 
-    it "defaults the bucket to the string version of the name" do
-      @association.bucket.should eq('file')
+    it "defaults the bucket to the string version of the name with the model class" do
+      @association.bucket.should eq('ExampleModel_file')
     end
   end
 
   describe "initialization options" do
     before :each do
-      @association = Dokument::Association.new(:file, :bucket => 'files_bucket', :key => 'some_id')
+      @association = Dokument::Association.new(:file, ExampleModel, :bucket => 'files_bucket', :key => 'some_id')
     end
 
     it "can set the bucket name" do

data/spec/dokument/attachment_spec.rb

@@ -20,11 +20,26 @@ describe Dokument::Attachment do
     @attachment.data.should eq(@data)
   end
 
-  it "delegates saving to it's robject" do
+  it "delegates data to raw_data" do
+    @attachment.should_receive(:raw_data)
+    @attachment.data
+  end
+
+  it "delegates data= to raw_data=" do
+    @attachment.should_receive(:raw_data=).with('awesome')
+    @attachment.data = 'awesome'
+  end
+
+  it "delegates saving to its robject" do
     @attachment.robject.should_receive(:store)
     @attachment.save
   end
 
+  it "delegates options passed to save to the robject when storing" do
+    @attachment.robject.should_receive(:store).with(:awesome => true)
+    @attachment.save(:awesome => true)
+  end
+
   describe "completeness" do
     it "is true if the data and content_type are set" do
       @attachment.should be_complete
@@ -47,11 +62,11 @@ describe Dokument::Attachment do
   end
 
   describe "robject" do
-    it "uses the attachments data" do
+    it "uses the attachment's data" do
       @attachment.robject.data.should eq(@data)
     end
 
-    it "uses the attachments content_type" do
+    it "uses the attachment's content_type" do
       @attachment.robject.content_type.should eq(@content_type)
     end
 
@@ -59,7 +74,7 @@ describe Dokument::Attachment do
       @attachment.robject.key.should eq(@model.id.to_s)
     end
 
-    it "uses the associations bucket for the bucket name" do
+    it "uses the association's bucket for the bucket name" do
       @attachment.robject.bucket.name.should eq(@association.bucket)
     end
   end

data/spec/dokument/model_spec.rb

@@ -10,6 +10,11 @@ describe Dokument::Model do
       ExampleModel.dokument :file
       ExampleModel.dokuments[:file].should be_a(Dokument::Association)
     end
+
+    it "accepts options with the `dokument` class method" do
+      ExampleModel.dokument :file, :bucket => 'files'
+      ExampleModel.dokuments[:file].bucket.should eq('files')
+    end
   end
 
   describe "provided instance methods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dokument
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &70364752141440 !ruby/object:Gem::Requirement
+  requirement: &70128315028780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70364752141440
+  version_requirements: *70128315028780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70364752140940 !ruby/object:Gem::Requirement
+  requirement: &70128315028280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70364752140940
+  version_requirements: *70128315028280
 description: Provides a ripple document to give models 1 or n file attachments.
 email:
 - adamhunter@me.com