confluence-soap 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2764dfcb327101f95a5add4d63b972c8e88b1a25
-  data.tar.gz: 562eb62fdca0d1513918dbfb1735af9a65794418
+  metadata.gz: 5dd3ae54fb12362a0f0e89e5d5d01451edd1519f
+  data.tar.gz: 30d78f9164051adceb7759a9b307de247be9ea57
 SHA512:
-  metadata.gz: c4e1e94eca44a3693e562cb4e196cc8afb0c1ba7e8b41b7b2cbc5d9391084ea1e095b749b1095e1baa18b781cdc489d9b1fc3fe45228e3057b1ec2d274291e4c
-  data.tar.gz: d8dbef33ef3c01c00c30a9674ba498eda501c3d25cb93e9b744faab2c50f69ba920da0810d510dcb0c106b5e8ba8db772e1e977f4c36e5a09d57c07043ae9ad2
+  metadata.gz: 1d4a364b0a3962ae83c3034544155c2532632f6e0bc0f47d6896a6d8cf9897c16d0c3d78e5d27bcd4744987b9fa9b1463542715120d65d8d98622df7ef65995e
+  data.tar.gz: 8791722d3061ebbe9015cf6594b3302d7715b6e8d789b0f991d363f214f9e035b3fe9ebcd2e25973ddf8cf7366fd58195946a921ac8216445b6bea9ed8cb8094

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/confluence-soap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "confluence-soap"
-  s.version = "0.0.5"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ping Yu", "Eric Himmelreich"]
-  s.date = "2014-01-28"
+  s.date = "2014-01-29"
   s.description = ""
   s.email = ["ping@intridea.com", "eric@intridea.com"]
   s.extra_rdoc_files = [

data/lib/confluence-soap.rb

@@ -3,20 +3,26 @@ require 'savon'
 class ConfluenceSoap
   attr_reader :client, :token, :user
 
-  Page = Struct.new(:content, :content_status, :created, :creator, :current, :home_page, :id,
-                    :modified, :modifier, :parent_id, :permissions, :space, :title, :url, :version) do
-    def self.from_hash h
-      values = h.values_at(*Page.members.map {|m|m.to_sym}).map {|v| v.is_a?(Hash) ? v[:value]||'' : v}
+  Page = Struct.new(:content, :content_status, :created, :creator, :current,
+                    :home_page, :id, :modified, :modifier, :parent_id,
+                    :permissions, :space, :title, :url, :version) do
+
+    def self.from_hash(h)
+      values =
+        h.values_at(*Page.members.map { |m| m.to_sym })
+        .map { |v| v.is_a?(Hash) ? v[:value] || '' : v }
+
       self.new *values
     end
 
-    SKIPPED_KEYS = [:content_status, :created, :creator, :current, :home_page, :modified, :modifier, :url]
+    SKIPPED_KEYS = [:content_status, :created, :creator, :current, :home_page,
+                    :modified, :modifier, :url]
     def to_soap
-      to_h.reject {|k,v| v.nil? || SKIPPED_KEYS.include?(k)}
+      to_h.reject { |k, v| v.nil? || SKIPPED_KEYS.include?(k) }
     end
   end
 
-  def initialize url, user, password
+  def initialize(url, user, password)
     @user = user
     @password = password
     @client = Savon.client(wsdl: url) do
@@ -25,7 +31,7 @@ class ConfluenceSoap
     @token = login(user, password)
   end
 
-  def login user, password
+  def login(user, password)
     response = @client.call :login, message: {in0: user, in1: password}
     @token = response.body[:login_response][:login_return]
   end
@@ -34,36 +40,36 @@ class ConfluenceSoap
     @client.call :logout, message: {in0: @token} if @token
   end
 
-  def get_pages space
+  def get_pages(space)
     response = @client.call :get_pages, auth_message({in1: space})
     pages = parse_array_response :get_pages, response
     pages.map { |page| Page.from_hash(page) }
   end
 
-  def get_page page_id
+  def get_page(page_id)
     response = @client.call :get_page, auth_message({in1: page_id})
     Page.from_hash parse_response :get_page, response
   end
 
-  def get_children page_id
+  def get_children(page_id)
     response = @client.call :get_children, auth_message({in1: page_id})
     pages = parse_array_response :get_children, response
     pages.map { |page| Page.from_hash(page) }
   end
 
-  def store_page page
+  def store_page(page)
     response = @client.call :store_page, auth_message({in1: page.to_soap})
     Page.from_hash parse_response :store_page, response
   end
 
-  def update_page page
+  def update_page(page)
     response =
       @client.call(:update_page,
                    auth_message({in1: page.to_soap, in2: {minorEdit: true} }))
     Page.from_hash parse_response :update_page, response
   end
 
-  def remove_page page_id
+  def remove_page(page_id)
     response = @client.call :remove_page, auth_message({in1: page_id})
     Page.from_hash parse_response :remove_page, response
   end
@@ -93,12 +99,12 @@ class ConfluenceSoap
     parse_response(:remove_label_by_name, response)
   end
 
-  def has_user user
+  def has_user(user)
     response = @client.call(:has_user, auth_message({in1: user}))
     parse_response(:has_user, response)
   end
 
-  def execute &block
+  def execute(&block)
     yield self
     rescue Savon::SOAPFault => e
       if e.to_hash[:fault][:faultstring] =~ /InvalidSessionException/
@@ -115,8 +121,11 @@ class ConfluenceSoap
     login(@user, @password)
   end
 
-  def parse_array_response method, response
-    parse_response(method, response)["#{method}_return".to_sym] || []
+  def parse_array_response(method, response)
+    parsed_response =
+      parse_response(method, response)["#{method}_return".to_sym] || []
+
+    parsed_response.respond_to?(:to_hash) ? [parsed_response] : parsed_response
   end
 
   def auth_message(params = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confluence-soap
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ping Yu
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: ruby client for confluence soap API