confluencer 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/confluencer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{confluencer}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabor Ratky"]

data/lib/confluence/page.rb

@@ -13,14 +13,26 @@ module Confluence
     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
+      unless self.version
+        # check for existing page by id or title
+        existing_page = if page_id
+          Page.find_by_id(page_id)
+        else
+          Page.find_by_title(space, title)
+        end
+        
+        # take page_id and version from existing page if available
+        if existing_page
+          self.page_id = existing_page.page_id
+          self.version = existing_page.version
+        end
+      end
       
       # reinitialize page after storing it
       initialize(client.storePage(attributes))
+      
+      # return self
+      self
     end
     
     def remove

data/spec/confluence/page_spec.rb

@@ -3,8 +3,14 @@ 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"
+  def create_test_page(content = "foobar")
+    Confluence::Page.new :space => config[:space], :title => config[:page_title], :content => content
+  end
+  
+  def store_test_page
+    new_session do
+      return create_test_page.store
+    end
   end
 end
 
@@ -50,22 +56,14 @@ describe Confluence::Page do
     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
+  it "should update an existing page in Confluence by id" do
+    page = store_test_page
     
     new_session do
       # create test page with same id but updated content
-      updated_page = create_test_page
+      updated_page = create_test_page "updated content"
+
       updated_page.page_id = page.page_id
-      updated_page.content = "updated content"
       
       # store page
       updated_page.store
@@ -75,4 +73,24 @@ describe Confluence::Page do
       updated_page.content.should == "updated content"
     end
   end
+  
+  it "should update an existing page in Confluence by space and title" do
+    page = store_test_page
+    
+    new_session do
+        # create test page with same title but updated content
+        updated_page = create_test_page "updated content"
+
+        updated_page.page_id.should be_nil
+        updated_page.title.should == page.title
+        updated_page.space.should == page.space
+
+        # store page
+        updated_page.store
+
+        # assert version
+        updated_page.version.should > page.version
+        updated_page.content.should == "updated content"
+      end      
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Gabor Ratky