nsisam 0.3.4 → 0.4.0

data/Gemfile

@@ -11,6 +11,6 @@ group :development do
   gem "rake"
   gem "yard"
   gem "rspec", "~> 2.8.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.8.3"
 end

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/lib/nsisam/client.rb

@@ -1,6 +1,8 @@
 require "json"
 require "net/http"
 require "digest"
+
+require File.dirname(__FILE__) + '/configuration'
 require File.dirname(__FILE__) + '/errors'
 
 module NSISam
@@ -8,15 +10,17 @@ module NSISam
 
     # Initialize a client to a SAM node hosted at a specific url
     #
-    # @param [String] url the SAM node url
+    # @param [Hash] optional hash with user, password, host and port of the SAM node
     # @return [Client] the object itself
     # @example
-    #   nsisam = NSISam::Client.new 'http://user:pass@ip:port/'
-    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]
+    #   nsisam = NSISam::Client.new user: 'username' password: 'pass',
+    #                               host: 'localhost', port: '8888'
+    def initialize(params = {})
+      params = Configuration.settings.merge(params)
+      @user = params[:user]
+      @password = params[:password]
+      @host = params[:host]
+      @port = params[:port]
     end
 
     # Store a given data in SAM
@@ -93,6 +97,21 @@ module NSISam
       execute_request(request)
     end
 
+    # Configure the default values for NSISam::Client objects
+    #
+    # @param [Block]
+    #
+    # @example
+    #   NSISam::Client.configure do
+    #     user     "why"
+    #     password "chunky"
+    #     host     "localhost"
+    #     port     "8888"
+    #   end
+    def self.configure(&block)
+      Configuration.instance_eval(&block)
+    end
+
     private
 
     def prepare_request(verb, body)
@@ -105,7 +124,7 @@ module NSISam
 
     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/nsisam/configuration.rb

@@ -0,0 +1,31 @@
+module NSISam
+  class Client
+    class Configuration
+      class << self
+        def user(user = nil)
+          @user = user unless user.nil?
+          @user
+        end
+
+        def password(password = nil)
+          @password = password unless password.nil?
+          @password
+        end
+
+        def host(host = nil)
+          @host = host unless host.nil?
+          @host
+        end
+
+        def port(port = nil)
+          @port = port unless port.nil?
+          @port
+        end
+
+        def settings
+          {user: @user, password: @password, host: @host, port: @port}
+        end
+      end
+    end
+  end
+end

data/lib/nsisam.rb

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/nsisam/client'
+require File.dirname(__FILE__) + '/nsisam/configuration'
+require File.dirname(__FILE__) + '/nsisam/errors'
 require File.dirname(__FILE__) + '/nsisam/fake_server'
 
 module NSISam

data/nsisam.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nsisam"
-  s.version = "0.3.4"
+  s.version = "0.4.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-08"
   s.description = "A simple gem to access a SAM node. For more info about SAM\n                       visit www.github.com/nsi-iff/sam_buildout."
   s.email = "d.camata@gmail.com"
   s.extra_rdoc_files = [
@@ -26,9 +26,11 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/nsisam.rb",
     "lib/nsisam/client.rb",
+    "lib/nsisam/configuration.rb",
     "lib/nsisam/errors.rb",
     "lib/nsisam/fake_server.rb",
     "nsisam.gemspec",
+    "spec/configuration_spec.rb",
     "spec/nsisam_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -47,7 +49,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<json>, [">= 0"])
@@ -55,7 +57,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
@@ -64,7 +66,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "NSISam::Client::Configuration" do
+  Configuration = NSISam::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/nsisam_spec.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe NSISam do
 
   before :all do
-    @nsisam = NSISam::Client.new 'http://test:test@localhost:8888'
+    @nsisam = NSISam::Client.new user: 'test', password: 'test',
+                                 host: 'localhost', port: '8888'
     @keys = Array.new
     @fake_sam = NSISam::FakeServerManager.new.start_server
   end
@@ -14,7 +15,8 @@ describe NSISam do
 
   context "cannot connect to server" do
     it "throws error if couldn't connect to the server" do
-      sam = NSISam::Client.new 'http://test:test@localhost:4000'
+      sam = NSISam::Client.new user: 'test', password: 'test',
+                                   host: 'localhost', port: '4000'
       expect { sam.store('anything') }.to raise_error(NSISam::Errors::Client::ConnectionRefusedError)
     end
   end
@@ -78,4 +80,30 @@ describe NSISam do
     end
   end
 
+  context "get configuration" do
+    before do
+      NSISam::Client.configure do
+        user     "why"
+        password "chunky"
+        host     "localhost"
+        port     "8888"
+      end
+    end
+
+    it "by configure" do
+      sam = NSISam::Client.new
+      sam.instance_variable_get(:@user).should == "why"
+      sam.instance_variable_get(:@password).should == "chunky"
+      sam.instance_variable_get(:@host).should == "localhost"
+      sam.instance_variable_get(:@port).should == "8888"
+    end
+
+    it "by initialize parameters" do
+      sam = NSISam::Client.new(user: 'luckystiff', password: 'bacon', host: 'why.com', port: '9999')
+      sam.instance_variable_get(:@user).should == "luckystiff"
+      sam.instance_variable_get(:@password).should == "bacon"
+      sam.instance_variable_get(:@host).should == "why.com"
+      sam.instance_variable_get(:@port).should == "9999"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsisam
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.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-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -141,9 +141,11 @@ files:
 - VERSION
 - lib/nsisam.rb
 - lib/nsisam/client.rb
+- lib/nsisam/configuration.rb
 - lib/nsisam/errors.rb
 - lib/nsisam/fake_server.rb
 - nsisam.gemspec
+- spec/configuration_spec.rb
 - spec/nsisam_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/nsi-iff/nsisam-ruby
@@ -161,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1576657204801045917
+      hash: -1798483526539682580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: