confluencer 0.3.0 → 0.3.1

data/README.rdoc

@@ -1,6 +1,8 @@
 = confluencer
 
-Description goes here.
+Easy to use, ActiveRecord-like classes to find spaces, pages and bookmarks as well as adding new ones and updating existing ones. Very much work in progress, every version will most likely break your code. I will update the README when the codebase is more stable.
+
+Uses the Confluence XMLRPC API (v1).
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/confluencer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{confluencer}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabor Ratky"]
-  s.date = %q{2010-05-11}
+  s.date = %q{2010-05-12}
   s.description = %q{ActiveRecord-like classes to access Confluence through XMLRPC.}
   s.email = %q{rgabo@rgabostyle.com}
   s.extra_rdoc_files = [

data/lib/confluence/client.rb

@@ -83,9 +83,15 @@ module Confluence
 		    else
 		      log.debug "#{method_name}(#{(args.collect {|a| a.inspect}).join(', ')})"
 	      end
- 		    result = proxy.send(method_name, *([@token] + args))
- 		    log.debug(result.inspect)
- 		    result
+	      
+	      begin
+   		    result = proxy.send(method_name, *([@token] + args))
+   		    log.debug(result.inspect)
+   		    result
+   		  rescue EOFError => e
+   		    log.warn "Could not complete XMLRPC call, retrying... Error: #{e.inspect}"
+   		    retry
+ 		    end
 	    end
 		end
 		
@@ -118,7 +124,7 @@ module Confluence
 		  begin
 		    block.call
 			rescue XMLRPC::FaultException => e
-			  log.warn message = e.faultString.rpartition(':').last
+			  log.warn message = e.faultString.rpartition(':').last.strip
 			  
         case message
 		    when /Transaction rolled back/

data/lib/confluence/page.rb

@@ -8,7 +8,7 @@ module Confluence
     record_attr_accessor :title, :creator, :modifier, :content
     record_attr_accessor :created, :modified, :version
     record_attr_accessor :url
-        
+            
     def children(klass = self.class)
       children = client.getChildren(page_id)
       children.collect { |child| klass.find(:id => child["id"]) } if children

data/lib/confluence/record.rb

@@ -44,13 +44,17 @@ module Confluence
       end
     end
 
+    def client
+      Record.client
+    end
+
     attr_accessor :attributes
     
     # Initializes a new record.
     #
     # ==== Parameters
     # hash<Hash>:: A hash containing the attributes and its values. Keys can be Strings or Symbols.
-    def initialize(hash)
+    def initialize(hash = {})
       @attributes = {}
 
       # iterate through each key/value pair and set attribute keyed by symbol
@@ -86,11 +90,5 @@ module Confluence
       
       @labels = value
     end
-    
-    private
-    
-    def client
-      Record.client
-    end
   end
 end

data/lib/confluence/space.rb

@@ -13,7 +13,7 @@ module Confluence
     end
     
     def bookmarks
-      bookmark_page ? bookmark_page.children(Bookmark) : []
+      @bookmarks ||= bookmark_page ? bookmark_page.children(Bookmark) : []
     end
     
     def blog_entries

data/spec/confluence/record_spec.rb

@@ -1,9 +1,23 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe Confluence::Record do
-  it "should initialize new record from Confluence hash" do
-    record = Confluence::Record.new :foo => 'bar'
+  it "should store the client" do
+    Confluence::Record.client = 'client'
+    
+    Confluence::Record.client.should == 'client'
+    Confluence::Record.new.client.should == 'client'
+  end
+  
+  it "should initialize new record from hash" do
+    record = Confluence::Record.new(:foo => 'bar', 'string' => 'works')
     
     record[:foo].should == 'bar'
+    record[:string].should == 'works'
+  end
+  
+  it "should return the id of the record" do
+    record = Confluence::Record.new 'id' => '12345'
+    
+    record.record_id.should == '12345'
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Gabor Ratky
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +02:00
+date: 2010-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency