confluencer 0.2.3 → 0.2.4

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 config/*.yaml
+spec/confluence.yaml

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/confluencer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{confluencer}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabor Ratky"]
-  s.date = %q{2010-05-05}
+  s.date = %q{2010-05-06}
   s.description = %q{ActiveRecord-like classes to access Confluence through XMLRPC.}
   s.email = %q{rgabo@rgabostyle.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
      "lib/confluencer.rb",
      "script/console",
      "script/console_init.rb",
+     "spec/confluence.yaml.example",
+     "spec/confluence/page_spec.rb",
      "spec/confluencer_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -45,7 +47,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Useful classes to manage Confluence.}
   s.test_files = [
-    "spec/confluencer_spec.rb",
+    "spec/confluence/page_spec.rb",
+     "spec/confluencer_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/confluence/page.rb

@@ -4,14 +4,22 @@ module Confluence
     record_attr_accessor :parentId => :parent_id
     record_attr_accessor :space
     record_attr_accessor :title, :creator, :modifier, :content
-    record_attr_accessor :created, :modified
+    record_attr_accessor :created, :modified, :version
     record_attr_accessor :url
         
     def children
-      client.getChildren(page_id).collect { |child| Page.find_by_id(child["id"]) }
+      children = client.getChildren(page_id)
+      children.collect { |child| Page.find_by_id(child["id"]) } if children
     end
     
     def store
+      # check for existing page
+      existing_page = Page.find_by_id(page_id)
+      
+      # take version from existing page if available
+      self.version = existing_page.version if existing_page
+      
+      # reinitialize page after storing it
       initialize(client.storePage(attributes))
     end
     
@@ -20,11 +28,17 @@ module Confluence
     end
         
     def self.find_by_id(page_id)
-      self.new(client.getPage(page_id))
+      begin
+        self.new(client.getPage(page_id))
+      rescue RuntimeError
+      end
     end
     
     def self.find_by_title(space, title)
-      self.new(client.getPage(space, title))
+      begin
+        self.new(client.getPage(space, title))
+      rescue RuntimeError
+      end
     end
   end
 end

data/spec/confluence.yaml.example

@@ -0,0 +1,7 @@
+# Confluence configuration
+:test:
+    :url:           http://confluence.acmecorp.com
+    :username:      roger
+    :password:      jessica
+    :space:         confluencer
+    :page_title:    Confluencer RSpec Test Page

data/spec/confluence/page_spec.rb

@@ -0,0 +1,78 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+module PageHelperMethods
+  include SessionHelperMethods
+  
+  def create_test_page
+    Confluence::Page.new :space => config[:space], :title => config[:page_title], :content => "foobar"
+  end
+end
+
+describe Confluence::Page do
+  include PageHelperMethods
+  
+  after :each do
+    new_session do
+      begin
+        # check whether we need to remove the test page
+        test_page = Confluence::Page.find_by_title config[:space], config[:page_title]
+        test_page.remove if test_page
+      rescue RuntimeError
+      end
+    end    
+  end
+  
+  it "should add a new page in Confluence" do
+    page = nil
+    
+    new_session do
+      # initialize test page
+      page = create_test_page
+      
+      # page_id should be nil
+      page.page_id.should be_nil
+      
+      # store page
+      page.store
+      
+      # check page_id
+      page.page_id.should_not be_nil
+    end
+
+    # initialize new session
+    new_session do
+      # find page by id
+      new_page = Confluence::Page.find_by_id page.page_id
+      
+      # assert page
+      new_page.should_not be_nil
+      new_page.title.should == page.title
+    end
+  end
+  
+  it "should update an existing page in Confluence" do
+    page = nil
+    
+    new_session do
+      # initialize test page
+      page = create_test_page
+      
+      # store page
+      page.store
+    end
+    
+    new_session do
+      # create test page with same id but updated content
+      updated_page = create_test_page
+      updated_page.page_id = page.page_id
+      updated_page.content = "updated content"
+      
+      # store page
+      updated_page.store
+      
+      # assert version
+      updated_page.version.should > page.version
+      updated_page.content.should == "updated content"
+    end
+  end
+end

data/spec/confluencer_spec.rb

@@ -1,4 +1,2 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Confluencer do
-end

data/spec/spec_helper.rb

@@ -1,9 +1,25 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'confluencer'
 require 'spec'
 require 'spec/autorun'
+require 'yaml'
 
 Spec::Runner.configure do |config|
+end
+
+module SessionHelperMethods
+  def config
+    # load configuration
+    @config ||= YAML.load(File.open(File.join(File.dirname(__FILE__), 'confluence.yaml')))[:test]
+  end
   
+  def new_session
+    # initialize session and yield if block given
+    Confluence::Session.new config do
+      yield if block_given?
+    end
+  end
 end
+  

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Gabor Ratky
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 +02:00
+date: 2010-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,8 @@ files:
 - lib/confluencer.rb
 - script/console
 - script/console_init.rb
+- spec/confluence.yaml.example
+- spec/confluence/page_spec.rb
 - spec/confluencer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -93,5 +95,6 @@ signing_key:
 specification_version: 3
 summary: Useful classes to manage Confluence.
 test_files: 
+- spec/confluence/page_spec.rb
 - spec/confluencer_spec.rb
 - spec/spec_helper.rb