confluencer 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/confluencer.gemspec

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

data/lib/confluence/bookmark.rb

@@ -3,13 +3,19 @@ module Confluence
     BOOKMARKS_PAGE_TITLE = ".bookmarks"
 
     attr_reader :bookmark_url, :description
-    
+
     def initialize(hash)
       super(hash)
-
-      # parse bookmark_url and description out of content
-      @bookmark_url = content[/\{bookmark:url=([^\}]+)\}/, 1] if content
-      @description = content[/\{bookmark.*\}([^\{]*)\{bookmark\}/, 1] if content
+      
+      # if no content, try to use hash to initialize, delete in the process
+      unless content
+        self.bookmark_url = attributes.delete :bookmark_url
+        self.description = attributes.delete :description
+      else
+        # parse bookmark_url and description out of content
+        @bookmark_url = content[/\{bookmark:url=([^\}]+)\}/, 1]
+        @description = content[/\{bookmark.*\}([^\{]*)\{bookmark\}/, 1]
+      end
     end
     
     def bookmark_url=(value)
@@ -28,8 +34,9 @@ module Confluence
     
     def store
       # always set .bookmarks as the parent page
-      parent_id = Page.find_by_title(space, BOOKMARKS_PAGE_TITLE).page_id
+      self.parent_id = Page.find_by_title(space, BOOKMARKS_PAGE_TITLE).page_id
       
+      # continue with storing the page
       super
     end
     

data/lib/confluence/page.rb

@@ -1,7 +1,8 @@
 module Confluence
   class Page < Record
     record_attr_accessor :id => :page_id
-    record_attr_accessor :parentId, :space
+    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 :url
@@ -18,12 +19,12 @@ module Confluence
       client.removePage(page_id)
     end
         
-    def self.find_by_id(pageid)
-      self.new(client.getPage(pageid))
+    def self.find_by_id(page_id)
+      self.new(client.getPage(page_id))
     end
     
-    def self.find_by_title(spacekey, title)
-      self.new(client.getPage(spacekey, title))
+    def self.find_by_title(space, title)
+      self.new(client.getPage(space, title))
     end
   end
 end

data/lib/confluence/session.rb

@@ -6,10 +6,10 @@ module Confluence
       client.token
     end
     
-    def initialize(arguments = {}, &block)
+    def initialize(arguments = {})
       raise ArgumentError, "Required argument 'url' is missing." unless arguments.key? :url
       
-      @client = Client.new(arguments)
+      @client = Confluence::Client.new(arguments)
       
       unless @client.has_token?
         raise ArgumentError, "Required argument 'username' is missing." unless arguments.key? :username
@@ -22,7 +22,7 @@ module Confluence
         # set client for records
         Confluence::Record::client = @client
 
-        block.call(@client) if block
+        yield @client if block_given?
 
         Confluence::Record::client = nil
       rescue RuntimeError => e

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Gabor Ratky