nsicloudooo 0.2.9 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/lib/nsicloudooo/client.rb

@@ -1,15 +1,31 @@
 require "json"
 require "net/http"
 require File.dirname(__FILE__) + '/errors'
+require File.dirname(__FILE__) + '/configuration'
 
 module NSICloudooo
   class Client
 
-    def initialize(url)
-      user_and_pass = url.match(/(\w+):(\w+)/)
-      @user, @password = user_and_pass[1], user_and_pass[2]
-      @url = url.match(/@(.*):/)[1]
-      @port = url.match(/([0-9]+)(\/)?$/)[1]
+    # Initialize a client to a CloudoooManager node
+    #
+    # @param [Hash] options used to connect to the desired CloudoooManager
+    # @options options [String] host to connect
+    # @options options [String] port to connect
+    # @options options [String] user to authenticatie with
+    # @options options [String] password to the refered user
+    #
+    # @return [Client] the object itself
+    # @example
+    #   nsisam = NSISam::Client.new host: 'localhost', port: '8886', user: 'test', password: 'test'
+    #
+    # @note if you had used the 'configure' method, you can use it without parameters
+    #       and those you provided before will be used (see Client#configure)
+    def initialize(params = {})
+      params = Configuration.settings.merge(params)
+      @user = params[:user]
+      @password = params[:password]
+      @host = params[:host]
+      @port = params[:port]
     end
 
     # Send a document be granulated by a nsi.cloudooo node
@@ -115,6 +131,14 @@ module NSICloudooo
       execute_request(request)
     end
 
+    # Pre-configure the NSICloudooo module with default params for the NSICloudooo::Client
+    #
+    # @yield a Configuration object (see {NSICloudooo::Client::Configuration})
+    # 
+    def self.configure(&block)
+      Configuration.instance_eval(&block)
+    end
+
     private
 
     def insert_download_data(options)
@@ -137,7 +161,7 @@ module NSICloudooo
 
     def execute_request(request)
       begin
-        response = Net::HTTP.start @url, @port do |http|
+        response = Net::HTTP.start @host, @port do |http|
           http.request(request)
         end
       rescue Errno::ECONNREFUSED => e

data/lib/nsicloudooo/configuration.rb

@@ -0,0 +1,58 @@
+module NSICloudooo
+  class Client
+    class Configuration
+      class << self
+        # Set the default {NSICloudooo::Client} user
+        #
+        #
+        # @param [String] user to set
+        #
+        # @return [String] the user set
+        def user(user = nil)
+          @user = user unless user.nil?
+          @user
+        end
+
+        # Set the default {NSICloudooo::Client} password
+        #
+        #
+        # @param [String] password to set
+        #
+        # @return [String] the password set
+        def password(password = nil)
+          @password = password unless password.nil?
+          @password
+        end
+
+        # Set the default {NSICloudooo::Client} host
+        #
+        #
+        # @param [String] host to set
+        #
+        # @return [String] the host set
+        def host(host = nil)
+          @host = host unless host.nil?
+          @host
+        end
+
+        # Set the default {NSICloudooo::Client} port
+        #
+        #
+        # @param [String] port to set
+        #
+        # @return [String] the port set
+        def port(port = nil)
+          @port = port unless port.nil?
+          @port
+        end
+
+        # See how are the settings
+        #
+        # @return [Hash] actual settings
+        def settings
+          {user: @user, password: @password, host: @host, port: @port}
+        end
+      end
+    end
+  end
+end

data/nsicloudooo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nsicloudooo"
-  s.version = "0.2.9"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas Camata"]
-  s.date = "2012-04-28"
+  s.date = "2012-05-16"
   s.description = "A simple gem to access a nsi.cloudooo node"
   s.email = "d.camata@gmail.com"
   s.extra_rdoc_files = [
@@ -26,16 +26,18 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/nsicloudooo.rb",
     "lib/nsicloudooo/client.rb",
+    "lib/nsicloudooo/configuration.rb",
     "lib/nsicloudooo/errors.rb",
     "lib/nsicloudooo/fake_server.rb",
     "nsicloudooo.gemspec",
+    "spec/configuration_spec.rb",
     "spec/nsicloudooo_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/nsi-iff/nsicloudooo-ruby.git"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   s.summary = "A simple gem to access a nsi.cloudooo node"
 
   if s.respond_to? :specification_version then

data/spec/configuration_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "NSICloudooo::Client::Configuration" do
+  Configuration = NSICloudooo::Client::Configuration
+
+  it "set and return user" do
+    Configuration.user 'why'
+    Configuration.user.should == 'why'
+  end
+
+  it "set and return password" do
+    Configuration.password 'admin123'
+    Configuration.password.should == 'admin123'
+  end
+
+  it "set and return host" do
+    Configuration.host '192.168.0.100'
+    Configuration.host.should == '192.168.0.100'
+  end
+
+  it "set and return port" do
+    Configuration.port '8888'
+    Configuration.port.should == '8888'
+  end
+
+  it "return a hash of attributes" do
+    Configuration.instance_eval do
+      user     "why"
+      password "chunky"
+      host     "localhost"
+      port     "8888"
+    end
+    Configuration.settings.should == {user: "why", password: "chunky",
+                                      host: "localhost", port: "8888"}
+  end
+end

data/spec/nsicloudooo_spec.rb

@@ -6,7 +6,8 @@ $folder = File.expand_path(File.dirname(__FILE__))
 describe NSICloudooo do
 
   before :all do
-    @nsicloudooo = NSICloudooo::Client.new 'http://test:test@localhost:9886'
+    @nsicloudooo = NSICloudooo::Client.new user: 'test', password: 'test',
+                                           host: 'localhost', port: '9886'
     @fake_cloudooo = NSICloudooo::FakeServerManager.new.start_server
   end
 
@@ -16,7 +17,8 @@ describe NSICloudooo do
 
   context "cannot connect to the server" do
     it "throws error if couldn't connec to the server" do
-      nsicloudooo = NSICloudooo::Client.new 'http://test:test@localhost:4000'
+      nsicloudooo = NSICloudooo::Client.new user: 'test', password: 'test',
+                                           host: 'localhost', port: '4000'
       expect { nsicloudooo.granulate(:file => 'document', :filename => "teste.odt") }.to \
              raise_error(NSICloudooo::Errors::Client::ConnectionRefusedError)
     end
@@ -31,7 +33,7 @@ describe NSICloudooo do
 
     it "should throw error if any required parameter is missing" do
       expect { @nsicloudooo.granulate(:file => 'document') }.to raise_error(NSICloudooo::Errors::Client::MissingParametersError)
-      expect { @nsicloudooo.granulate(:sam_uid => 'document') }.to raise_error(NSICloudooo::Errors::Client::MissingParametersError)
+      expect { @nsicloudooo.granulate(:cloudooo_uid => 'document') }.to raise_error(NSICloudooo::Errors::Client::MissingParametersError)
       expect { @nsicloudooo.granulate(:filename => 'document') }.to raise_error(NSICloudooo::Errors::Client::MissingParametersError)
     end
   end
@@ -89,5 +91,32 @@ describe NSICloudooo do
     end
   end
 
+  context "get configuration" do
+    before do
+      NSICloudooo::Client.configure do
+        user     "why"
+        password "chunky"
+        host     "localhost"
+        port     "8888"
+      end
+    end
+
+    it "by configure" do
+      cloudooo = NSICloudooo::Client.new
+      cloudooo.instance_variable_get(:@user).should == "why"
+      cloudooo.instance_variable_get(:@password).should == "chunky"
+      cloudooo.instance_variable_get(:@host).should == "localhost"
+      cloudooo.instance_variable_get(:@port).should == "8888"
+    end
+
+    it "by initialize parameters" do
+      cloudooo = NSICloudooo::Client.new(user: 'luckystiff', password: 'bacon', host: 'why.com', port: '9999')
+      cloudooo.instance_variable_get(:@user).should == "luckystiff"
+      cloudooo.instance_variable_get(:@password).should == "bacon"
+      cloudooo.instance_variable_get(:@host).should == "why.com"
+      cloudooo.instance_variable_get(:@port).should == "9999"
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsicloudooo
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -124,9 +124,11 @@ files:
 - VERSION
 - lib/nsicloudooo.rb
 - lib/nsicloudooo/client.rb
+- lib/nsicloudooo/configuration.rb
 - lib/nsicloudooo/errors.rb
 - lib/nsicloudooo/fake_server.rb
 - nsicloudooo.gemspec
+- spec/configuration_spec.rb
 - spec/nsicloudooo_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/nsi-iff/nsicloudooo-ruby.git
@@ -144,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1769661169347116718
+      hash: -4092089429222275052
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple gem to access a nsi.cloudooo node