nsisam 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/nsisam/client.rb

@@ -110,7 +110,7 @@ module NSISam
     #   nsisam.get_file("test_key", :doc)
     def get_file(key, type=:file, expected_checksum = nil)
       response = get(key, expected_checksum)
-      Response.new(
+      response = Response.new(
         'key' => response.key,
         'checksum' => response.checksum,
         'filename' => response.data['filename'],
@@ -149,9 +149,9 @@ module NSISam
     #   nsisam.update_file("my key", "my value")
     #   nsisam.update_file("my key", "my value", :video)
     #   nsisam.update_file("my key", "my value", :doc)
-    def update_file(key, type=:file, new_content)
+    def update_file(key, type=:file, new_content, filename)
       encoded = Base64.encode64(new_content)
-      update(key, type => encoded)
+      update(key, type => encoded, filename: filename)
     end
 
     # Pre-configure the NSISam module with default params for the NSISam::Client

data/lib/nsisam/fake_client.rb

@@ -11,7 +11,7 @@ module NSISam
     def store(data)
       key = Time.now.to_i.to_s
       @storage[key] = JSON.load(data.to_json)
-      {'key' => key, 'checksum' => 0}
+      Response.new 'key' => key, 'checksum' => 0
     end
 
     def store_file(file, type=:file)
@@ -22,7 +22,7 @@ module NSISam
 
     def get(key, expected_checksum=nil)
       if @storage.has_key?(key)
-        {'data' => @storage[key]}
+        Response.new 'data' => @storage[key]
       else
         raise NSISam::Errors::Client::KeyNotFoundError
       end
@@ -40,7 +40,7 @@ module NSISam
     def delete(key)
       if @storage.has_key?(key)
         @storage.delete key
-        {'deleted' => true}
+        Response.new 'deleted' => true
       else
         raise NSISam::Errors::Client::KeyNotFoundError
       end
@@ -49,7 +49,7 @@ module NSISam
     def update(key, value)
       if @storage.has_key?(key)
         @storage[key] = value
-        {'key' => key, 'checksum' => 0}
+        Response.new 'key' => key, 'checksum' => 0
       else
         raise NSISam::Errors::Client::KeyNotFoundError
       end

data/nsisam.gemspec

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

@@ -8,8 +8,8 @@ describe "NSISam::FakeClient" do
   it "can store a value" do
     response = @nsisam.store("something")
     response.should_not be_nil
-    response.should have_key("key")
-    response.should have_key("checksum")
+    response.key.should_not be_nil
+    response.checksum.should_not be_nil
   end
 
   it "can store a file" do
@@ -21,8 +21,8 @@ describe "NSISam::FakeClient" do
 
   it "can delete a stored value" do
     resp = @nsisam.store("delete this")
-    response = @nsisam.delete(resp["key"])
-    response["deleted"].should be_true
+    response = @nsisam.delete(resp.key)
+    response.should be_deleted
   end
 
   it "raises error when key not found" do
@@ -38,8 +38,8 @@ describe "NSISam::FakeClient" do
 
   it "can retrieve a stored value" do
     resp = @nsisam.store("retrieve this")
-    response = @nsisam.get(resp['key'])
-    response["data"].should == "retrieve this"
+    response = @nsisam.get(resp.key)
+    response.data.should == "retrieve this"
   end
 
   it "can retrieve a stored file" do
@@ -50,9 +50,9 @@ describe "NSISam::FakeClient" do
 
   it "can update values in keys already stored" do
     resp = @nsisam.store("update this")
-    response = @nsisam.update(resp['key'], "updated")
-    response["key"].should == resp['key']
-    @nsisam.get(response['key'])['data'].should == "updated"
-    response.should have_key("checksum")
+    response = @nsisam.update(resp.key, "updated")
+    response.key.should == resp.key
+    @nsisam.get(response.key).data.should == "updated"
+    response.checksum.should_not be_nil
   end
 end

data/spec/nsisam_spec.rb

@@ -16,6 +16,7 @@ describe NSISam do
   end
 
   let(:file_content) { example_file_content }
+  let(:filename) { 'teste.txt' }
 
   context "cannot connect to server" do
     it "throws error if couldn't connect to the server" do
@@ -36,9 +37,9 @@ describe NSISam do
       it "encodes content before storing" do
         Base64.should_receive(:encode64).with(file_content).
           and_return(:dummy_value)
-        @nsisam.should_receive(:store).with(file: :dummy_value).
+        @nsisam.should_receive(:store).with(file: :dummy_value, filename: filename).
           and_return(:dummy_result)
-        @nsisam.store_file(file_content).should == :dummy_result
+        @nsisam.store_file(file_content, filename).should == :dummy_result
       end
     end
   end
@@ -87,7 +88,7 @@ describe NSISam do
         Base64.should_receive(:decode64).with(:dummy_value).
           and_return(:decoded_dummy)
         response = @nsisam.get_file(:key)
-        response.data.should == :decoded_dummy
+        response.file.should == :decoded_dummy
       end
 
       it "can generate a direct link to download any file" do
@@ -112,12 +113,12 @@ describe NSISam do
 
     context 'file' do
       it 'encodes content before updating' do
-        key = @nsisam.store_file(file_content).key
+        key = @nsisam.store_file(file_content, filename).key
         Base64.should_receive(:encode64).with(:dummy_content).
           and_return(:dummy_content)
-        @nsisam.should_receive(:update).with(key, file: :dummy_content).
+        @nsisam.should_receive(:update).with(key, file: :dummy_content, filename: filename).
           and_return(:dummy_result)
-        @nsisam.update_file(key, :dummy_content).should == :dummy_result
+        @nsisam.update_file(key, :dummy_content, filename).should == :dummy_result
       end
     end
   end
@@ -125,26 +126,26 @@ describe NSISam do
   context 'file storage without mocking' do
     it 'stores, retrieves and updates files' do
       updated_file_content = file_content + 'anything ha!'
-      key = @nsisam.store_file(file_content).key
-      @nsisam.get_file(key).data.should == file_content
-      @nsisam.update_file(key, updated_file_content)
-      @nsisam.get_file(key).data.should == updated_file_content
+      key = @nsisam.store_file(file_content, filename).key
+      @nsisam.get_file(key).file.should == file_content
+      @nsisam.update_file(key, updated_file_content, filename)
+      @nsisam.get_file(key).file.should == updated_file_content
     end
 
     it 'stores, retrieves and updates documents for other nsi-services' do
       updated_file_content = file_content + 'anything ha!'
-      key = @nsisam.store_file(file_content, :doc).key
-      @nsisam.get_file(key, :doc).data.should == file_content
-      @nsisam.update_file(key, :doc, updated_file_content)
-      @nsisam.get_file(key, :doc).data.should == updated_file_content
+      key = @nsisam.store_file(file_content, filename, :doc).key
+      @nsisam.get_file(key, :doc).file.should == file_content
+      @nsisam.update_file(key, :doc, updated_file_content, filename)
+      @nsisam.get_file(key, :doc).file.should == updated_file_content
     end
 
     it 'stores, retrieves and updates videos for other nsi-services' do
       updated_file_content = file_content + 'anything ha!'
-      key = @nsisam.store_file(file_content, :video).key
-      @nsisam.get_file(key, :video).data.should == file_content
-      @nsisam.update_file(key, :video, updated_file_content)
-      @nsisam.get_file(key, :video).data.should == updated_file_content
+      key = @nsisam.store_file(file_content, filename, :video).key
+      @nsisam.get_file(key, :video).file.should == file_content
+      @nsisam.update_file(key, :video, updated_file_content, filename)
+      @nsisam.get_file(key, :video).file.should == updated_file_content
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsisam
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-31 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: 2048548786722952462
+      hash: -3250131280174348984
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: