confluence-soap 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa98e76adbdb9a7a9ae872be7ba356b280989f4
-  data.tar.gz: 67c6bacca0f5dcf9bf85ecdb19a20182d9240764
+  metadata.gz: b45379fdb6d8fc2681a17d2409d79b31181950cc
+  data.tar.gz: 0fbae6f9db31ace9c3a205e84646d5c0a35a95d9
 SHA512:
-  metadata.gz: a67efcc7f12ea2ad22230c7244dba08a83d193044e91043b5f48ab339145f75f817b896d036c37d8e8a384e8030a0da2e4461b5cc64da34ccce689b63dd6a08f
-  data.tar.gz: 57d04949ed82713889656e05aa6b4952fc5f429f70cac6959a90bda7deb6cd8ddf209f004a00072df4add1596eb0e7063b3557a49bfb2c1e3d7592895178253f
+  metadata.gz: 7e93da27f1d2c8c5a7ed27d3097ac93f335dbbf9e4ab95f8ba4bdd974f7ec7b21e15709c75d9f3357a2b378bd6356c1c34e88f7678d441da1a802abdbfd8c7b7
+  data.tar.gz: 9311e48598ffbf0b5e7822c840329d673d6f43e57cf832b39f70fe7b86e0ee7c7cdcd52a5ba21567348bc874269354248568411a5276c37263131117147add80

data/Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 gem 'savon'
-gem 'activesupport'
 
 group :development do
   gem "bundler", "~> 1.0"

data/Gemfile.lock

@@ -1,9 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.16)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
     addressable (2.3.5)
     akami (1.2.0)
       gyoku (>= 0.4.0)
@@ -30,7 +27,6 @@ GEM
     httpi (2.1.0)
       rack
       rubyntlm (~> 0.3.2)
-    i18n (0.6.9)
     jeweler (2.0.0)
       builder
       bundler (>= 1.0)
@@ -92,7 +88,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   bundler (~> 1.0)
   jeweler (~> 2.0.0)
   rdoc (~> 3.12)

data/README.md

@@ -2,7 +2,8 @@ confluence-soap
 ===============
 
 Ruby client for Confluence's SOAP API
-http://<confluence-install>/rpc/soap-axis/confluenceservice-v2?wsdl
+
+    http://<confluence-install>/rpc/soap-axis/confluenceservice-v2?wsdl
 
 ## Contributing to confluence-soap
 
@@ -14,6 +15,15 @@ http://<confluence-install>/rpc/soap-axis/confluenceservice-v2?wsdl
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
+### Credits
+=======
+[Ping Yu](https://github.com/pyu10055)
+
+[Eric Himmelreich](https://github.com/rawsyntax)
+
+[Intridea](http://www.intridea.com)
+
+
 ### Copyright
 
 Copyright (c) 2014 Intridea. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/confluence-soap.rb

@@ -1,8 +1,7 @@
 require 'savon'
-require 'active_support/core_ext/string'
 
 class ConfluenceSoap
-  attr_reader :client, :token
+  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
@@ -12,15 +11,16 @@ class ConfluenceSoap
 
     SKIPPED_KEYS = [:content_status, :created, :creator, :current, :home_page, :modified, :modifier, :url]
     def to_soap
-      to_h.inject({}) do |hash, (k,v)|
-        hash[k.to_s.camelize(:lower).to_sym] = v unless (v.nil? || SKIPPED_KEYS.include?(k))
-        hash
-      end
+      to_h.reject {|k,v| v.nil? || SKIPPED_KEYS.include?(k)}
     end
   end
 
   def initialize url, user, password
-    @client = Savon.client(wsdl: url)
+    @user = user
+    @password = password
+    @client = Savon.client(wsdl: url) do
+      convert_request_keys_to :lower_camelcase
+    end
     @token = login(user, password)
   end
 
@@ -75,7 +75,23 @@ class ConfluenceSoap
     pages.map { |page| Page.from_hash(page) }
   end
 
+  def has_user user
+    response =
+      @client.call(:has_user, message: { in0: @token, in1: user })
+    parse_response(:has_user, response)
+  end
+
+  def execute &block
+    yield self
+    rescue Savon::SOAPFault => e
+      reconnect if e.to_hash[:fault][:faultstring] =~ /InvalidSessionException/
+      yield e
+  end
+
   private
+  def reconnect
+    login(@user, @password)
+  end
 
   def parse_array_response method, response
     parse_response(method, response)["#{method}_return".to_sym]

data/spec/confluence-soap_spec.rb

@@ -100,7 +100,7 @@ describe ConfluenceSoap do
       ConfluenceSoap.any_instance.stub(:login).and_return('token')
       subject.client.should_receive(:call)
         .with(:store_page, message: {in0: 'token', in1: {content: 'test', title: 'Testing API ',
-                                      space: 'Space Name', parentId: 'parent_id', permissions: 0}})
+                                      space: 'Space Name', parent_id: 'parent_id', permissions: 0}})
         .and_return(double(:response, body: {store_page_response: {store_page_return: {}}}))
     end
 
@@ -119,7 +119,7 @@ describe ConfluenceSoap do
       ConfluenceSoap.any_instance.stub(:login).and_return('token')
       subject.client.should_receive(:call)
         .with(:update_page, message: {in0: 'token', in1: {content: 'test', title: 'Testing API ',
-                                      space: 'Space Name', parentId: 'parent_id', permissions: 0},
+                                      space: 'Space Name', parent_id: 'parent_id', permissions: 0},
                                       in2: {minorEdit: true}})
         .and_return(double(:response, body: {update_page_response: {update_page_return: {}}}))
     end
@@ -131,7 +131,7 @@ describe ConfluenceSoap do
 
   describe '#search' do
     let(:term) { 'search term' }
-    let(:criteria) { {item: [{key: :spaceKey, value: 'SpaceName'}]} }
+    let(:criteria) { {item: [{key: :space_key, value: 'SpaceName'}]} }
     before (:each)  do
       ConfluenceSoap.any_instance.stub(:login).and_return('token')
       subject.client.should_receive(:call)
@@ -141,7 +141,22 @@ describe ConfluenceSoap do
     end
 
     it 'should search with savon' do
-      subject.search(term, spaceKey: 'SpaceName').should == []
+      subject.search(term, space_key: 'SpaceName').should == []
+    end
+  end
+
+  describe '#execute' do
+    before (:each)  do
+      ConfluenceSoap.any_instance.stub(:login).and_return('token')
+      subject.should_receive(:login)
+    end
+
+    it 'should reconnect when session is invalid' do
+      Savon::SOAPFault.any_instance.stub(:to_hash).and_return({fault: {faultstring: 'InvalidSessionException'}})
+      ex = Savon::SOAPFault.new nil, nil
+      subject.execute do |x|
+        raise ex if x.is_a? ConfluenceSoap
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confluence-soap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ping Yu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -25,20 +25,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement