confluencer 0.4.4 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.6

data/confluencer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{confluencer}
-  s.version = "0.4.4"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabor Ratky"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-05-17}
   s.description = %q{ActiveRecord-like classes to access Confluence through XMLRPC.}
   s.email = %q{rgabo@rgabostyle.com}
   s.extra_rdoc_files = [
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rgabo/confluencer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Useful classes to manage Confluence.}
   s.test_files = [
     "spec/confluence/bookmark_spec.rb",
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_runtime_dependency(%q<log4r>, [">= 1.1.7"])
     else

data/lib/confluence/bookmark.rb

@@ -44,12 +44,12 @@ module Confluence
       end
     end
     
-    def store
+    def store(args = {})
       # always set .bookmarks as the parent page
       self.parent_id = Page.find(:space => space, :title => Space::BOOKMARKS_PAGE_TITLE).page_id
       
       # continue with storing the page
-      super
+      super(args)
     end
     
     def to_hash

data/lib/confluence/page.rb

@@ -1,5 +1,7 @@
 module Confluence
   class Page < Record
+    INVALID_TITLE_CHARS = ":@/\\|^#;[]{}<>"
+    
     class Details < Hash
       REGEXP = /\{details:label=([^\}]+)\}([^\{}]*)\{details\}/m
       PAIR_REGEXP = /([^:]+):([^\n]+)/m
@@ -81,7 +83,7 @@ module Confluence
       children.collect { |child| klass.find(:id => child["id"]) } if children
     end
     
-    def store
+    def store(args = {})
       unless self.version
         # check for existing page by id or title
         existing_page = if page_id
@@ -92,8 +94,14 @@ module Confluence
         
         # 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
+          if args[:recreate_if_exists]
+            # remove existing page
+            existing_page.remove
+          else
+            # update page with page_id and version info
+            self.page_id = existing_page.page_id
+            self.version = existing_page.version
+          end
         end
       end
       
@@ -136,4 +144,10 @@ module Confluence
       end
     end
   end
+end
+
+class String
+  def to_page_title
+    self.delete(Confluence::Page::INVALID_TITLE_CHARS).strip
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confluencer
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Gabor Ratky
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 +02:00
+date: 2010-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: log4r
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 1
@@ -98,23 +103,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Useful classes to manage Confluence.