nsisam 0.6.4 → 0.7.0

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "json"
 gem "sinatra"
+gem "webmock", github: "douglascamata/webmock"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -11,6 +12,6 @@ group :development do
   gem "rake"
   gem "yard"
   gem "rspec", "~> 2.8.0"
-  gem "bundler", "~> 1.1.0"
+  gem "bundler", "~> 1.2.0"
   gem "jeweler", "~> 1.8.3"
 end

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.7.0

data/lib/nsisam/fake_client.rb

@@ -1,25 +1,36 @@
 require 'json'
 require 'base64'
 require File.dirname(__FILE__) + '/response'
+require 'webmock'
+include WebMock::API
+WebMock.allow_net_connect!
+
 
 module NSISam
   class FakeClient
 
     attr_accessor :expire
+    attr_reader :host, :port
 
-    def initialize
+    def initialize(host="localhost", port="8888")
       @storage = {}
+      @host = host
+      @port = port
     end
 
     def store(data)
-      key = Time.now.to_i.to_s
+      key = Time.now.nsec.to_s
       @storage[key] = JSON.load(data.to_json) unless @expire
+      if data.kind_of?(Hash) and data.has_key?(:file) and data.has_key?(:filename)
+        stub_request(:get, "http://#{@host}:#{@port}/file/#{key}").to_return(body: Base64.decode64(data[:file]))
+      end
       Response.new 'key' => key, 'checksum' => 0
     end
 
-    def store_file(file, type=:file)
+    def store_file(file, filename, type=:file)
       key = Time.now.to_i.to_s
-      @storage[key] = {type.to_s => Base64.encode64(file)}.to_json unless @expire
+      @storage[key] = {type.to_s => Base64.encode64(file), filename: filename}.to_json unless @expire
+      stub_request(:get, "http://#{@host}:#{@port}/file/#{key}").to_return(body: file)
       Response.new "key" => key, "checksum" => 0
     end
 
@@ -54,12 +65,21 @@ module NSISam
         if @expire
           @storage.delete(key)
         else
-          @storage[key] = value 
+          @storage[key] = value
         end
-        Response.new 'key' => key, 'checksum' => 0 
+        Response.new 'key' => key, 'checksum' => 0
       else
         raise NSISam::Errors::Client::KeyNotFoundError
       end
     end
+
+    def update_file(key, file, filename)
+      hash = {file: file, filename: filename}
+      @storage[key] = hash
+      remove_request_stub(:get, "http://#{@host}:#{@port}/file/#{key}")
+      stub_request(:get, "http://#{@host}:#{@port}/file/#{key}").to_return(body: file)
+      Response.new "key" => key, "checksum" => 0
+    end
+
   end
 end

data/nsisam.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "nsisam"
-  s.version = "0.6.4"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Douglas Camata"]
-  s.date = "2012-09-06"
+  s.date = "2012-09-26"
   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 = [
@@ -55,27 +55,30 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<webmock>, [">= 0"])
       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.1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
       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.1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
     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.1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end
 end

data/spec/fake_client_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'net/http'
 
 describe "NSISam::FakeClient" do
   before :all do
@@ -13,7 +14,7 @@ describe "NSISam::FakeClient" do
   end
 
   it "can store a file" do
-    response = @nsisam.store_file("some file not in base64")
+    response = @nsisam.store_file("some file not in base64", 'dumb.txt')
     response.should_not be_nil
     response.key.should_not be_nil
     response.checksum.should_not be_nil
@@ -43,7 +44,7 @@ describe "NSISam::FakeClient" do
   end
 
   it "can retrieve a stored file" do
-    resp = @nsisam.store_file("file not in base64")
+    resp = @nsisam.store_file("file not in base64", 'dumb.txt')
     response = @nsisam.get_file(resp.key)
     response.data.should_not be_nil
   end
@@ -55,4 +56,43 @@ describe "NSISam::FakeClient" do
     @nsisam.get(response.key).data.should == "updated"
     response.checksum.should_not be_nil
   end
+
+  context "can host files" do
+    it "stored by #store_file" do
+      response = @nsisam.store_file("file not in base64", 'dumb.txt')
+      response.key.should_not be_nil
+      request = Net::HTTP.get_response(URI.parse("http://#{@nsisam.host}:#{@nsisam.port}/file/#{response.key}"))
+      request.body.should == "file not in base64"
+    end
+
+    it "stored by #store in a dict with file and filename" do
+      data = {file: Base64.encode64('a file'), filename: 'dumb.txt'}
+      response = @nsisam.store(data)
+      request = Net::HTTP.get_response(URI.parse("http://#{@nsisam.host}:#{@nsisam.port}/file/#{response.key}"))
+      request.body.should == "a file"
+    end
+
+    it "should update the hosted file when the file is updated through #store" do
+      data = {file: Base64.encode64('a file'), filename: 'dumb.txt'}
+      response = @nsisam.store(data)
+      request = Net::HTTP.get_response(URI.parse("http://#{@nsisam.host}:#{@nsisam.port}/file/#{response.key}"))
+      request.body.should == "a file"
+
+      data = {file: Base64.encode64('another file'), filename: 'dumb.txt'}
+      response = @nsisam.store(data)
+      request = Net::HTTP.get_response(URI.parse("http://#{@nsisam.host}:#{@nsisam.port}/file/#{response.key}"))
+      request.body.should == "another file"
+    end
+
+    it "should update the hosted file when the file is updated through #store_file" do
+      response = @nsisam.store_file('a file', 'dumb.txt')
+      request = Net::HTTP.get_response(URI.parse("http://#{@nsisam.host}:#{@nsisam.port}/file/#{response.key}"))
+      request.body.should == "a file"
+
+      response = @nsisam.update_file(response.key, 'another file', 'dumb.txt')
+      request = Net::HTTP.get_response(URI.parse("http://#{@nsisam.host}:#{@nsisam.port}/file/#{response.key}"))
+      request.body.should == "another file"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nsisam
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1859438398968231153
+      hash: 2819258548481392356
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: