riaktor 0.0.3 → 0.0.4.1

data/Manifest.txt

@@ -1,4 +1,5 @@
 History.txt
+lib/riaktor/client/map_reduce.rb
 lib/riaktor/client.rb
 lib/riaktor/document/association.rb
 lib/riaktor/document/associations.rb
@@ -13,11 +14,15 @@ lib/riaktor/r_object/persistence.rb
 lib/riaktor/r_object.rb
 lib/riaktor.rb
 Manifest.txt
+Manifest.txt.old
 PostInstall.txt
 Rakefile
 README.rdoc
 script/console
 script/destroy
 script/generate
+test/test_associations.rb
 test/test_helper.rb
+test/test_map_reduce.rb
 test/test_riaktor.rb
+test/test_siblings.rb

data/Manifest.txt.old

@@ -0,0 +1,23 @@
+History.txt
+lib/riaktor/client.rb
+lib/riaktor/document/association.rb
+lib/riaktor/document/associations.rb
+lib/riaktor/document/attribute.rb
+lib/riaktor/document/attributes.rb
+lib/riaktor/document/base.rb
+lib/riaktor/document/index.rb
+lib/riaktor/document/indexes.rb
+lib/riaktor/document.rb
+lib/riaktor/r_object/link.rb
+lib/riaktor/r_object/persistence.rb
+lib/riaktor/r_object.rb
+lib/riaktor.rb
+Manifest.txt
+PostInstall.txt
+Rakefile
+README.rdoc
+script/console
+script/destroy
+script/generate
+test/test_helper.rb
+test/test_riaktor.rb

data/lib/riaktor.rb

@@ -17,7 +17,7 @@ gem "activemodel", '= 3.0.0.beta'
 require "active_model"
   
 module Riaktor
-  VERSION = '0.0.3'
+  VERSION = '0.0.4.1'
 end
 
 require "#{File.dirname(__FILE__)}/riaktor/client"

data/lib/riaktor/client.rb

@@ -1,3 +1,5 @@
+require "#{File.dirname(__FILE__)}/client/map_reduce"
+
 module Riaktor
   class Client
     class MissingOperationKey < RuntimeError; end
@@ -48,10 +50,25 @@ module Riaktor
       response.code == 204
     end
     
+    def self.run_map_reduce(mr)
+      hydra = Typhoeus::Hydra.new(:max_concurrency => self.max_concurrency)
+      request = Typhoeus::Request.new("http://#{self.config[:host]}:#{self.config[:port]}/mapred",
+        :method  => :post,
+        :headers => {"Content-Type" => "application/json", "Accept" => "application/json"},
+        :body => mr.to_json)
+      resp = nil
+      request.on_complete do |response|
+        resp = { "raw_headers" => response.headers, "headers" => response.headers_hash, 
+          "body" => response.body, "code" => response.code }
+      end
+      hydra.queue request
+      hydra.run; resp
+    end
+    
     def self.put(op)
       self.put_many([op])[[op["bucket"],op["key"]]]
     end
-    
+        
     def self.put_many(operations)
       operations.each do |operation|
         operation['bucket']  ||  raise(MissingOperationKey, "bucket")

data/lib/riaktor/client/map_reduce.rb

@@ -0,0 +1,39 @@
+module Riaktor
+  class Client
+    class MapReduce
+      class UnexpectedHttpStatus < RuntimeError; end
+      
+      attr_accessor :inputs, :phases, :response
+      
+      def initialize(inputs=nil,phases=nil)
+        @inputs = inputs || []
+        @phases = phases || []
+      end
+      
+      def add_input(bucket, key)
+        @inputs << [bucket, key]
+      end
+      
+      def add_phase(type, js, keep=nil)
+        phase = { type => { "language" => "javascript", "source" => js } }
+        phase[type]["keep"] = keep if !keep.nil?
+        @phases << phase
+      end
+      
+      def to_hash
+        { "inputs" => self.inputs,
+          "query" => self.phases }
+      end
+      
+      def to_json
+        Yajl::Encoder.encode(self.to_hash)
+      end
+      
+      def run!
+        @response = Riaktor::Client.run_map_reduce(self)
+        raise(UnexpectedHttpStatus, @response["code"]) unless @response["code"] == 200
+        Yajl::Parser.parse(@response["body"])
+      end
+    end # MapReduce
+  end # Client
+end # Riaktor

data/lib/riaktor/document/association.rb

@@ -58,8 +58,15 @@ module Riaktor
               uncached = found.select { |f| f.is_a?(String) }
               unless uncached.empty?
                 klass.find_many(uncached).each do |key,doc|
-                  cache_doc(key,doc)
-                  found[found.index(doc.key)] = doc
+                  if doc
+                    cache_doc(key,doc)
+                    found[found.index(doc.key)] = doc
+                  else
+                    # prob deleted
+                    self.remove_by_key(key)
+                    found.delete_at(found.index(key))
+                    sort_index.delete(key)
+                  end
                 end
               end
               found.sort! { |x,y| sort_index.index(x.key) <=> sort_index.index(y.key) }
@@ -82,9 +89,18 @@ module Riaktor
         true
       end
       
+      def remove_by_key(key)
+        @changed = true
+        @parent.links.reject! { |l| l.bucket == klass.bucket && l.key == key }
+        uncache_doc(key)
+        reload
+        true
+      end
+      
       def remove(doc)
         @changed = true
         @parent.links.reject! { |l| l.bucket == doc.bucket && l.key == doc.key }
+        uncache_doc(doc.key)
         reload
         true
       end
@@ -101,6 +117,12 @@ module Riaktor
         (@cached_doc || {})[key]
       end
       
+      def uncache_doc(key)
+        if @cached_doc
+          @cached_doc.delete(key)
+        end
+      end
+      
       def cache_doc(key,doc)
         @cached_doc ||= {}
         @cached_doc[key] = doc

data/test/test_associations.rb

@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestRiaktor < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_associations
+    ["test_links_ben","test_links_chris", "test_links_sean"].each do |key|
+      if p = Person.find(key)
+        p.destroy
+      end
+    end
+  
+    ben = Person.new(:key => "test_links_ben")
+    ben.value = "Ben"
+    ben.age.value = 26
+    ben.phone_number.value = "555-444-5555"
+    assert ben.save
+    ben.age.value = 25
+    assert ben.save
+
+    chris = Person.new(:key => "test_links_chris")
+    chris.value = "Chris"
+    chris.age.value = 26
+    chris.phone_number.value = "555-555-5555"
+    assert chris.save
+
+    sean = Person.new(:key => "test_links_sean")
+    sean.value = "Sean"
+    sean.age.value = 26
+    sean.phone_number.value = "123-555-5555"
+    assert sean.save
+  
+    assert_equal [], ben.links
+    assert_equal [], ben.friends.members
+    assert ben.friends << chris
+    assert_equal 1, ben.friends.members.size
+    assert_equal 1, ben.links.size
+  
+    ben = Person.find("test_links_ben")
+    assert_equal [], ben.links
+    assert_equal [], ben.friends.members
+    assert ben.friends << chris
+    assert_equal 1, ben.friends.members.size
+    assert_equal 1, ben.links.size
+    assert ben.friends.save
+  
+    ben = Person.find("test_links_ben")
+    assert_equal 1, ben.friends.members.size
+    assert_equal 1, ben.links.size
+    assert_equal chris, ben.friends.members.first
+  
+    ben.friends << sean
+    assert ben.friends.save
+    assert_equal 2, ben.friends.members.size
+    assert_equal 2, ben.links.size
+    assert_equal chris, ben.friends.members.first
+    ben = Person.find("test_links_ben")
+    assert_equal 2, ben.friends.members.size
+    assert_equal 2, ben.links.size
+    assert_equal chris, ben.friends.members.first
+    assert_equal [chris], ben.friends.members(0,0)
+    assert_equal [sean], ben.friends.members(1,1)
+    assert_equal [chris,sean], ben.friends.members
+    
+    assert chris.destroy
+    ben = Person.find("test_links_ben")
+    assert_equal 2, ben.links.size
+    assert_equal 1, ben.friends.members.size
+    assert_equal [sean], ben.friends.members
+    assert_equal 1, ben.links.size
+    assert ben.save
+    ben = Person.find("test_links_ben")
+    assert_equal 1, ben.links.size
+  
+    assert ben.friends.remove(sean)
+    assert_equal 0, ben.links.size
+    assert_equal 0, ben.friends.members.size
+    assert ben.friends.save
+  
+    ben = Person.find("test_links_ben")
+    assert_equal 0, ben.links.size
+    assert_equal 0, ben.friends.members.size
+  end
+  
+end

data/test/test_helper.rb

@@ -21,4 +21,8 @@ class Person < Riaktor::Document::Base
   def set_updated_at
     self.updated_at.value = Time.now.utc
   end
+end
+
+class Book < Riaktor::Document::Base
+  attribute :content
 end

data/test/test_map_reduce.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestRiaktor < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def test_map_reduce
+    1.upto(3) do |i|
+      if b = Book.find("test_map_reduce_#{i}")
+        b.destroy
+      end
+    end; sleep(0.1)
+    
+    b1 = Book.new
+    b1.key = "test_map_reduce_1"
+    b1.content.value = <<-EOF
+    Alice was beginning to get very tired of sitting by her sister on the
+    bank, and of having nothing to do: once or twice she had peeped into the
+    book her sister was reading, but it had no pictures or conversations in
+    it, 'and what is the use of a book,' thought Alice 'without pictures or
+    conversation?'
+    EOF
+    assert b1.save
+    
+    b2 = Book.new
+    b2.key = "test_map_reduce_2"
+    b2.content.value = <<-EOF
+    So she was considering in her own mind (as well as she could, for the
+    hot day made her feel very sleepy and stupid), whether the pleasure
+    of making a daisy-chain would be worth the trouble of getting up and
+    picking the daisies, when suddenly a White Rabbit with pink eyes ran
+    close by her.
+    EOF
+    assert b2.save
+    
+    b3 = Book.new
+    b3.key = "test_map_reduce_3"
+    b3.content.value = <<-EOF
+    The rabbit-hole went straight on like a tunnel for some way, and then
+    dipped suddenly down, so suddenly that Alice had not a moment to think
+    about stopping herself before she found herself falling down a very deep
+    well.
+    EOF
+    assert b3.save
+    
+    mr = Riaktor::Client::MapReduce.new
+    
+    [b1,b2,b3].each do |b|
+      mr.add_input(b.content.bucket, b.content.key)
+    end
+
+    mr.add_phase("map","function(v) { var m = v.values[0].data.toLowerCase().match('\\\\w*','g'); var r = []; for(var i in m) if (m[i] != '') { var o = {}; o[m[i]] = 1; r.push(o); } return r; }")
+    mr.add_phase("reduce","function(v) { var r = {}; for (var i in v) { for(var w in v[i]) { if (w in r) r[w] += v[i][w]; else r[w] = v[i][w]; } } return [r]; }")
+    
+    result = mr.run!
+    assert_equal 2, result[0]["pictures"]
+  end
+end

data/test/test_riaktor.rb

@@ -183,73 +183,4 @@ class TestRiaktor < Test::Unit::TestCase
     assert p.destroy
     assert_nil Person.find_with_index(:phone_number, "555-444-5555")
   end
-  
-  def test_links
-    ["test_links_ben","test_links_chris", "test_links_sean"].each do |key|
-      if p = Person.find(key)
-        p.destroy
-      end
-    end
-    
-    ben = Person.new(:key => "test_links_ben")
-    ben.value = "Ben"
-    ben.age.value = 26
-    ben.phone_number.value = "555-444-5555"
-    assert ben.save
-    ben.age.value = 25
-    assert ben.save
-
-    chris = Person.new(:key => "test_links_chris")
-    chris.value = "Chris"
-    chris.age.value = 26
-    chris.phone_number.value = "555-555-5555"
-    assert chris.save
-
-    sean = Person.new(:key => "test_links_sean")
-    sean.value = "Sean"
-    sean.age.value = 26
-    sean.phone_number.value = "123-555-5555"
-    assert sean.save
-    
-    assert_equal [], ben.links
-    assert_equal [], ben.friends.members
-    assert ben.friends << chris
-    assert_equal 1, ben.friends.members.size
-    assert_equal 1, ben.links.size
-    
-    ben = Person.find("test_links_ben")
-    assert_equal [], ben.links
-    assert_equal [], ben.friends.members
-    assert ben.friends << chris
-    assert_equal 1, ben.friends.members.size
-    assert_equal 1, ben.links.size
-    assert ben.friends.save
-    
-    ben = Person.find("test_links_ben")
-    assert_equal 1, ben.friends.members.size
-    assert_equal 1, ben.links.size
-    assert_equal chris, ben.friends.members.first
-    
-    ben.friends << sean
-    assert ben.friends.save
-    assert_equal 2, ben.friends.members.size
-    assert_equal 2, ben.links.size
-    assert_equal chris, ben.friends.members.first
-    ben = Person.find("test_links_ben")
-    assert_equal 2, ben.friends.members.size
-    assert_equal 2, ben.links.size
-    assert_equal chris, ben.friends.members.first
-    assert_equal [chris], ben.friends.members(0,0)
-    assert_equal [sean], ben.friends.members(1,1)
-    assert_equal [chris,sean], ben.friends.members
-    
-    assert ben.friends.remove(chris)
-    assert_equal 1, ben.links.size
-    assert_equal 1, ben.friends.members.size
-    assert ben.friends.save
-    
-    ben = Person.find("test_links_ben")
-    assert_equal 1, ben.links.size
-    assert_equal 1, ben.friends.members.size
-  end
 end

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  - 1
+  version: 0.0.4.1
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 -07:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +147,7 @@ extra_rdoc_files:
 - PostInstall.txt
 files: 
 - History.txt
+- lib/riaktor/client/map_reduce.rb
 - lib/riaktor/client.rb
 - lib/riaktor/document/association.rb
 - lib/riaktor/document/associations.rb
@@ -160,14 +162,18 @@ files:
 - lib/riaktor/r_object.rb
 - lib/riaktor.rb
 - Manifest.txt
+- Manifest.txt.old
 - PostInstall.txt
 - Rakefile
 - README.rdoc
 - script/console
 - script/destroy
 - script/generate
+- test/test_associations.rb
 - test/test_helper.rb
+- test/test_map_reduce.rb
 - test/test_riaktor.rb
+- test/test_siblings.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/riaktor
 licenses: []
@@ -200,6 +206,8 @@ signing_key:
 specification_version: 3
 summary: Riaktor is a Ruby client and object mapper for Riak (http://riak.basho.com/)
 test_files: 
+- test/test_associations.rb
 - test/test_helper.rb
+- test/test_map_reduce.rb
 - test/test_riaktor.rb
 - test/test_siblings.rb