nsisam 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/nsisam/client.rb

@@ -10,6 +10,8 @@ require File.dirname(__FILE__) + '/response'
 module NSISam
   class Client
 
+    attr_accessor :expire
+
     # Initialize a client to a SAM node hosted at a specific url
     #
     # @param [Hash] optional hash with user, password, host and port of the SAM node
@@ -23,6 +25,7 @@ module NSISam
       @password = params[:password]
       @host = params[:host]
       @port = params[:port]
+      @expire = params[:expire]
     end
 
     # Store a given data in SAM
@@ -37,8 +40,9 @@ module NSISam
     # @example
     #   nsisam.store("something")
     def store(data)
-      request_data = {:value => data}.to_json
-      request = prepare_request :PUT, request_data
+      request_data = {:value => data}
+      request_data[:expire] = @expire if @expire
+      request = prepare_request :PUT, request_data.to_json
       Response.new(execute_request(request))
     end
 
@@ -130,8 +134,9 @@ module NSISam
     # @example
     #   nsisam.update("my key", "my value")
     def update(key, value)
-      request_data = {:key => key, :value => value}.to_json
-      request = prepare_request :POST, request_data
+      request_data = {:key => key, :value => value}
+      request_data[:expire] = @expire if @expire
+      request = prepare_request :POST, request_data.to_json
       Response.new(execute_request(request))
     end
 

data/lib/nsisam/configuration.rb

@@ -46,11 +46,22 @@ module NSISam
           @port
         end
 
+        # Set the default {NSISam::Client} expire time
+        #
+        #
+        # @param [Fixnum] expire time to set
+        #
+        # @return [Fixnum] the expire set
+        def expire(expire = nil)
+          @expire = expire unless expire.nil?
+          @expire
+        end
+
         # See how are the settings
         #
         # @return [Hash] actual settings
         def settings
-          {user: @user, password: @password, host: @host, port: @port}
+          {user: @user, password: @password, host: @host, port: @port, expire: @expire}
         end
       end
     end

data/lib/nsisam/fake_server.rb

@@ -17,7 +17,7 @@ module NSISam
       content_type :json
       incoming = JSON.parse(request.body.read)
       key = generate_key
-      storage[key] = incoming['value']
+      storage[key] = incoming['value'] unless incoming.has_key? 'expire'
       { key: key, checksum: "0" }.to_json
     end
 
@@ -44,9 +44,14 @@ module NSISam
     post "/" do
       content_type :json
       incoming = JSON.parse(request.body.read)
+      expire = incoming['expire']
       key = incoming["key"]
       return 404 unless storage.has_key?(key)
-      storage[key] = incoming['value']
+      if incoming.has_key? 'expire'
+        storage.delete(key)
+      else
+        storage[key] = incoming['value'] 
+      end
       { key: key, checksum: 0 }.to_json
     end
   end

data/nsisam.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nsisam"
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas Camata"]
-  s.date = "2012-08-31"
+  s.date = "2012-09-04"
   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 = [

data/spec/configuration_spec.rb

@@ -23,14 +23,21 @@ describe "NSISam::Client::Configuration" do
     Configuration.port.should == '8888'
   end
 
+  it "set and return default expire time" do
+    Configuration.expire 5
+    Configuration.expire.should == 5
+  end
+
   it "return a hash of attributes" do
     Configuration.instance_eval do
       user     "why"
       password "chunky"
       host     "localhost"
       port     "8888"
+      expire   8
     end
     Configuration.settings.should == {user: "why", password: "chunky",
-                                      host: "localhost", port: "8888"}
+                                      host: "localhost", port: "8888",
+                                      expire: 8}
   end
 end

data/spec/nsisam_spec.rb

@@ -4,11 +4,15 @@ require 'base64'
 describe NSISam do
   before :all do
     fake_options = { user: 'test', password: 'test', host: 'localhost',
-      port: '8888' }
+      port: '9888' }
     @options = integration_options || fake_options
     @nsisam = NSISam::Client.new(@options)
     @keys = Array.new
-    @fake_sam = NSISam::FakeServerManager.new.start_server unless integrating?
+    @fake_sam = NSISam::FakeServerManager.new.start_server(9888) unless integrating?
+  end
+
+  before :each do
+    @nsisam.expire = false
   end
 
   after :all do
@@ -33,6 +37,14 @@ describe NSISam do
       response.should respond_to("checksum")
     end
 
+    it "can store a value with an expire time" do
+      @nsisam.expire = 2
+      response = @nsisam.store('teste')
+      sleep(3) 
+      expect { @nsisam.get(response.key) }.to raise_error(NSISam::Errors::Client::KeyNotFoundError)
+      @nsisam.expire = false
+    end
+
     context "file" do
       it "encodes content before storing" do
         Base64.should_receive(:encode64).with(file_content).
@@ -107,6 +119,14 @@ describe NSISam do
       @nsisam.get(key).data.should == 'updated'
     end
 
+    it "can update values with an expire time to the new value" do
+      response = @nsisam.store('test')
+      @nsisam.expire = 2
+      @nsisam.update(response.key, 'test 2')
+      sleep(3)
+      expect { @nsisam.get(response.key) }.to raise_error(NSISam::Errors::Client::KeyNotFoundError)
+    end
+
     it "raises error when key not found" do
       expect { @nsisam.update("dont exist ruby is fast", "foo") }.to raise_error(NSISam::Errors::Client::KeyNotFoundError)
     end
@@ -156,6 +176,7 @@ describe NSISam do
         password "chunky"
         host     "localhost"
         port     "8888"
+        expire   false
       end
     end
 
@@ -165,14 +186,16 @@ describe NSISam do
       sam.instance_variable_get(:@password).should == "chunky"
       sam.instance_variable_get(:@host).should == "localhost"
       sam.instance_variable_get(:@port).should == "8888"
+      sam.instance_variable_get(:@expire).should == false
     end
 
     it "by initialize parameters" do
-      sam = NSISam::Client.new(user: 'luckystiff', password: 'bacon', host: 'why.com', port: '9999')
+      sam = NSISam::Client.new(user: 'luckystiff', password: 'bacon', host: 'why.com', port: '9999', expire: 5)
       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"
+      sam.instance_variable_get(:@expire).should == 5
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsisam
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3250131280174348984
+      hash: -2000685296802539724
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: