dm-riak-adapter 0.0.1 → 0.0.2

data/README.md

@@ -0,0 +1,42 @@
+# dm-riak-adapter
+
+DataMapper adapter for the Dynamo-inspired key/value store, [Riak](http://riak.basho.com/).
+
+## Install
+
+Requires that you have Riak installed. You can download the latest release [here](http://downloads.basho.com/riak/), or install using [homebrew](http://github.com/mxcl/homebrew):
+
+      brew install riak
+
+Install the **dm-riak-adapter** gem:
+
+      gem install dm-riak-adapter
+
+## Usage
+
+Require **dm-core** and **dm-riak-adapter**. Tell DataMapper to use the Riak adapter and set a namespace for your app. This namespace will prefix each bucket like the following. `myapp:projects` `myapp:tasks`
+
+      require 'dm-core'
+      require 'dm-riak-adapter'
+      
+      DataMapper.setup :default, :adapter => 'riak', :namespace => 'myapp'
+      
+Continue Defining your models and properties as you normally would.
+      
+      class Project
+        include DataMapper::Resource
+        
+        property :id,   Serial
+        property :name, String
+        
+        has n, :tasks
+      end
+      
+      class Task
+        include DataMapper::Resource
+        
+        property :id,       Serial
+        property :summary,  String
+        
+        belongs_to :project
+      end

data/lib/dm-riak-adapter.rb

@@ -4,57 +4,61 @@ module DataMapper::Adapters
   class RiakAdapter < AbstractAdapter
     def initialize(name, options)
       super
-      @riak = Riak::Client.new
+      @riak = Riak::Client.new(:prefix => options[:prefix] || 'riak')
+      @namespace = options[:namespace] ? options[:namespace] + ':' : ''
     end
     
     def create(resources)
-      stores = stores_for(resources.first.model)
+      objects = objects_for(resources.first.model)
       
-      resources.each {|r| initialize_serial(r, stores.size.succ)}
-      create_store(resources)
+      resources.each {|r| initialize_serial(r, objects.size.succ)}
+      create_objects(resources)
     end
     
     def read(query)
-      query.filter_records(stores_for(query.model).dup)
+      query.filter_records(objects_for(query.model).dup)
     end
     
     def update(attributes, collection)
       attributes = attributes_as_fields(attributes)
       
-      stores_for(collection.query.model).each {|r| r.update(attributes)}
-      update_store(collection)
+      objects_for(collection.query.model).each {|r| r.update(attributes)}
+      update_objects(collection)
     end
     
     def delete(collection)
-      delete_store(collection)
+      delete_objects(collection)
     end
     
     private
     
-    def stores_for(model)
-      bucket = @riak[model.storage_name]
-      bucket.keys.map {|key| bucket[key].data}
+    def bucket(model)
+      @riak.bucket(@namespace + model.storage_name)
     end
     
-    def create_store(resources)
+    def objects_for(model)
+      bucket(model).keys.map {|key| bucket(model)[key].data}
+    end
+    
+    def create_objects(resources)
       resources.each do |resource|
-        robject = @riak[resource.model.storage_name].new("#{resource.id}").store
-        robject.data = resource.attributes(:field)
-        robject.store
+        object = bucket(resource.model).new("#{resource.id}")
+        object.data = resource.attributes(:field)
+        object.store
       end
     end
     
-    def update_store(resources)
+    def update_objects(resources)
       resources.each do |resource|
-        robject = @riak[resource.model.storage_name]["#{resource.id}"]
-        robject.data = resource.attributes(:field)
-        robject.store
+        object = bucket(resource.model)["#{resource.id}"]
+        object.data = resource.attributes(:field)
+        object.store
       end
     end
     
-    def delete_store(resources)
+    def delete_objects(resources)
       resources.each do |resource|
-        @riak[resource.model.storage_name]["#{resource.id}"].delete
+        bucket(resource.model)["#{resource.id}"].delete
       end
     end
   end

data/spec/dm-riak-adapter_spec.rb

@@ -5,7 +5,11 @@ require 'dm-core/spec/adapter_shared_spec'
 
 describe DataMapper::Adapters::RiakAdapter do
   before :all do
-    @adapter = DataMapper.setup(:default, :adapter => 'riak')
+    @adapter = DataMapper.setup(:default, :adapter => 'riak', :namespace => 'test')
+  end
+  
+  after :all do
+    Heffalump.all.destroy
   end
 
   it_should_behave_like 'An Adapter'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-riak-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mike Richards
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ripple
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: DataMapper adapter for Riak
 email: mike22e@gmail.com
 executables: []
@@ -41,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README.md
 - lib/dm-riak-adapter.rb
 - spec/dm-riak-adapter_spec.rb
 - spec/spec_helper.rb
@@ -57,18 +69,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: DataMapper adapter for Riak