confluencer 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/confluencer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{confluencer}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabor Ratky"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "script/console_init.rb",
      "spec/confluence.yaml.example",
      "spec/confluence/page_spec.rb",
+     "spec/confluence/session_spec.rb",
      "spec/confluencer_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Useful classes to manage Confluence.}
   s.test_files = [
     "spec/confluence/page_spec.rb",
+     "spec/confluence/session_spec.rb",
      "spec/confluencer_spec.rb",
      "spec/spec_helper.rb"
   ]

data/lib/confluence/session.rb

@@ -3,7 +3,7 @@ module Confluence
     attr_reader :client
     
     def token
-      client.token
+      client.token if client
     end
     
     def initialize(arguments = {})
@@ -18,17 +18,31 @@ module Confluence
         @client.login(arguments[:username], arguments[:password])
       end
 
-      begin
-        # set client for records
-        Confluence::Record::client = @client
+      # set client for records
+      Confluence::Record::client = @client
 
-        yield @client if block_given?
+      if block_given?
+        begin
+          yield @client
+        rescue RuntimeError => e
+          # strip non-message part of java exception message
+          raise e.message.split(":").last.strip
+        end
 
-        Confluence::Record::client = nil
-      rescue RuntimeError => e
-        # strip non-message part of java exception message
-        raise e.message.split(":").last.strip
+        self.destroy
       end
     end
+    
+    def destroy
+      # invalidate the token
+      client.logout
+      
+      # client and token is not valid anymore
+      @client = nil
+      @token = nil
+      
+      # reset client for records
+      Confluence::Record::client = nil
+    end
   end
 end

data/spec/confluence/page_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 module PageHelperMethods
   include SessionHelperMethods

data/spec/confluence/session_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe Confluence::Session do
+  include ConfigurationHelperMethods
+  
+  it "should log into Confluence and have valid token" do
+    session = Confluence::Session.new config
+    
+    session.client.should_not be_nil
+    session.token.should_not be_nil
+  end
+  
+  it "should log out of Confluence and invalidate token" do
+    session = Confluence::Session.new config
+
+    # destroy session
+    session.destroy
+    
+    session.client.should be_nil
+    session.token.should be_nil
+  end
+  
+  it "should yield the client and log out of Confluence if a block is given" do
+    session = Confluence::Session.new(config) do |client|
+      client.should_not be_nil
+      client.token.should_not be_nil
+    end
+    
+    session.client.should be_nil
+    session.token.should be_nil
+  end
+end

data/spec/spec_helper.rb

@@ -9,16 +9,23 @@ require 'yaml'
 Spec::Runner.configure do |config|
 end
 
-module SessionHelperMethods
+module ConfigurationHelperMethods
   def config
     # load configuration
     @config ||= YAML.load(File.open(File.join(File.dirname(__FILE__), 'confluence.yaml')))[:test]
   end
+end
+
+module SessionHelperMethods
+  include ConfigurationHelperMethods
   
   def new_session
-    # initialize session and yield if block given
-    Confluence::Session.new config do
-      yield if block_given?
+    if block_given?
+      # initialize session and yield
+      Confluence::Session.new config { yield }
+    else
+      # initialize session and return
+      Confluence::Session.new config
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Gabor Ratky
@@ -61,6 +61,7 @@ files:
 - script/console_init.rb
 - spec/confluence.yaml.example
 - spec/confluence/page_spec.rb
+- spec/confluence/session_spec.rb
 - spec/confluencer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -96,5 +97,6 @@ specification_version: 3
 summary: Useful classes to manage Confluence.
 test_files: 
 - spec/confluence/page_spec.rb
+- spec/confluence/session_spec.rb
 - spec/confluencer_spec.rb
 - spec/spec_helper.rb