active_cmis 0.1.3 → 0.1.4

data/Rakefile

@@ -25,6 +25,7 @@ begin
     gemspec.add_runtime_dependency 'nokogiri', '>= 1.4.1'
 
     gemspec.required_ruby_version = '>= 1.8.6'
+    gemspec.files.exclude '.gitignore'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/active_cmis/active_cmis.rb

@@ -5,8 +5,6 @@ module ActiveCMIS
     @default_logger ||= Logger.new(nil)
   end
 
-  # Will search for a given configuration in a file, and return the equivalent Repository
-  #
   # server_url and repository_id are required options
   #
   # server_login, server_password and server_auth can be used to authenticate against the server,
@@ -22,6 +20,47 @@ module ActiveCMIS
   #
   # Default locations for the config file are: ./cmis.yml and .cmis.yml in that order
   # @return [Repository]
+  def self.connect(config)
+    if config.is_a? Hash
+      if config.has_key? "log_file"
+        trace_file = config["trace_file"]
+        if trace_file == "-"
+          trace_file = STDOUT
+        end
+        logger = Logger.new(trace_file)
+      else
+        logger = default_logger
+      end
+      if config.has_key? "log_level"
+        logger.level = Logger.const_get(config["trace_level"].upcase) rescue config["trace_level"].to_i
+      else
+        logger.level = Logger::WARN
+      end
+
+      server = Server.new(config["server_url"], logger)
+      if user_name = config["server_login"] and password = config["server_password"]
+        auth_type = config["server_auth"] || :basic
+        server.authenticate(auth_type, user_name, password)
+      end
+      repository = server.repository(config["repository_id"])
+      if user_name = config["repository_login"] and password = config["repository_password"]
+        auth_type = config["repository_auth"] || :basic
+        repository.authenticate(auth_type, user_name, password)
+      end
+      return repository
+    elsif config.nil?
+      raise "Configuration not found in file"
+    else
+      raise "Configuration does not have correct format (not a hash)"
+    end
+  end
+
+  # Will search for a given configuration in a file, and return the equivalent Repository
+  #
+  # The options that can be used are the same as for the connect method
+  #
+  # Default locations for the config file are: ./cmis.yml and .cmis.yml in that order
+  # @return [Repository]
   def self.load_config(config_name, file = nil)
     if file.nil?
       ["cmis.yml", File.join(ENV["HOME"], ".cmis.yml")].each do |sl|
@@ -39,38 +78,7 @@ module ActiveCMIS
     config = YAML.load_file(file)
     if config.is_a? Hash
       config = config[config_name]
-      if config.is_a? Hash
-        if config.has_key? "log_file"
-          trace_file = config["trace_file"]
-          if trace_file == "-"
-            trace_file = STDOUT
-          end
-          logger = Logger.new(trace_file)
-        else
-          logger = default_logger
-        end
-        if config.has_key? "log_level"
-          logger.level = Logger.const_get(config["trace_level"].upcase) rescue config["trace_level"].to_i
-        else
-          logger.level = Logger::WARN
-        end
-
-        server = Server.new(config["server_url"], logger)
-        if user_name = config["server_login"] and password = config["server_password"]
-          auth_type = config["server_auth"] || :basic
-          server.authenticate(auth_type, user_name, password)
-        end
-        repository = server.repository(config["repository_id"])
-        if user_name = config["repository_login"] and password = config["repository_password"]
-          auth_type = config["repository_auth"] || :basic
-          repository.authenticate(auth_type, user_name, password)
-        end
-        return repository
-      elsif config.nil?
-        raise "Configuration not found in file"
-      else
-        raise "Configuration does not have right format (not a hash)"
-      end
+      connect(config[config_name])
     else
       raise "Configuration file does not have right format (not a hash)"
     end

metadata

@@ -1,48 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_cmis
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 0.1.4
+  prerelease: !!null 
 platform: ruby
-authors: 
+authors:
 - Joeri Samson
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-02-28 00:00:00.000000000 +01:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
+  requirement: &73028210 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id001
-description: A CMIS library implementing both reading and updating capabilities through the AtomPub/REST binding to CMIS.
+  prerelease: false
+  version_requirements: *73028210
+description: A CMIS library implementing both reading and updating capabilities through
+  the AtomPub/REST binding to CMIS.
 email: joeri@xaop.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - TODO
-files: 
-- .gitignore
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -74,34 +64,27 @@ files:
 has_rdoc: true
 homepage: http://xaop.com/labs/activecmis/
 licenses: []
-
-post_install_message: 
-rdoc_options: 
+post_install_message: !!null 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.6
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
 summary: A library to interact with CMIS repositories through the AtomPub/REST binding
 test_files: []
-

data/.gitignore

@@ -1,3 +0,0 @@
-doc
-.yardoc
-pkg