vidibus-service 0.0.1 → 0.0.3

data/Gemfile

@@ -5,15 +5,14 @@ gem "vidibus-core_extensions"
 gem "vidibus-secure"
 gem "vidibus-uuid"
 gem "vidibus-validate_uri"
-
 gem "httparty"
 gem "json"
 
-# Development dependecies
-gem "jeweler"
-gem "rake"
-gem "rspec", "~> 2.0.0.beta.20"
-gem "rr"
-gem "relevance-rcov"
-gem "webmock"
-
+group :development do
+  gem "jeweler"
+  gem "rake"
+  gem "rspec", "~> 2.0.0.beta.20"
+  gem "rr"
+  gem "relevance-rcov"
+  gem "webmock"
+end

data/Gemfile.lock

@@ -2,117 +2,115 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    addressable (2.2.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bson (1.0.4)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    addressable (2.2.2)
+    arel (2.0.6)
+    bson (1.1.4)
     builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gemcutter (0.6.1)
     git (1.2.5)
     httparty (0.6.1)
       crack (= 0.1.8)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.5.0)
+    jeweler (1.5.1)
+      bundler (~> 1.0.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
+      rake
     json (1.4.6)
-    json_pure (1.4.6)
     macaddr (1.0.0)
-    mail (2.2.6)
+    mail (2.2.12)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.0.7)
-      bson (>= 1.0.4)
-    mongoid (2.0.0.beta.17)
-      activemodel (~> 3.0.0)
-      bson (= 1.0.4)
-      mongo (= 1.0.7)
+    mongo (1.1.4)
+      bson (>= 1.1.1)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     relevance-rcov (0.9.2.1)
-    rr (1.0.0)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
+    rr (1.0.2)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    thor (0.14.0)
-    treetop (1.4.8)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
     uuid (2.3.1)
       macaddr (~> 1.0)
-    vidibus-core_extensions (0.3.5)
-    vidibus-secure (0.0.1)
+    vidibus-core_extensions (0.3.12)
+    vidibus-secure (0.0.3)
       activesupport (~> 3.0.0)
-      mongoid (~> 2.0.0.beta.17)
+      mongoid (~> 2.0.0.beta.20)
       rack
       vidibus-core_extensions
-    vidibus-uuid (0.3.7)
-      mongoid (~> 2.0.0.beta.17)
+    vidibus-uuid (0.3.8)
+      mongoid (~> 2.0.0.beta.20)
       uuid (~> 2.3.1)
-    vidibus-validate_uri (0.1.1)
-      rails (~> 3.0.0.rc)
-    webmock (1.3.5)
-      addressable (>= 2.1.1)
+    vidibus-validate_uri (0.1.3)
+      rails (~> 3.0.0)
+      rails (~> 3.0.0)
+    webmock (1.6.1)
+      addressable (>= 2.2.2)
       crack (>= 0.1.7)
     will_paginate (3.0.pre2)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Andre Pankratz
+Copyright (c) 2010 Andre Pankratz
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -2,6 +2,16 @@
 
 Description goes here.
 
+
+== Requirements
+
+In order to work properly this gem needs the route /connector to call a Rack app. Usually this route gets provided automatically but that may fail if your application has some sort of catch-all route. To check if the route works as expected, just call http://yourapp.com/connector and expect an error message like +This service has not been configured yet. Use your Connector to set it up.+
+
+If you don't see this error message, add the route manually at the top of your routes.rb:
+
+  match "/connector" => Vidibus::Service::ConnectorApp
+
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -13,13 +13,6 @@ begin
     gem.email = "andre@vidibus.com"
     gem.homepage = "http://github.com/vidibus/vidibus-service"
     gem.authors = ["Andre Pankratz"]
-    gem.add_dependency "mongoid", "~> 2.0.0.beta.20"
-    gem.add_dependency "vidibus-core_extensions"
-    gem.add_dependency "vidibus-uuid"
-    gem.add_dependency "vidibus-secure"
-    gem.add_dependency "vidibus-validate_uri"
-    gem.add_dependency "httparty"
-    gem.add_dependency "json"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/lib/vidibus/service/connector_app.rb

@@ -4,13 +4,13 @@ module Vidibus
   module Service
     class ConnectorApp
       class SignatureError < StandardError; end
+      class ValidationError < StandardError; end
+      class SetupError < StandardError; end
 
       def self.call(env)
         self.new.call(env)
       end
 
-      # This is just a rack endpoint for Remote authentication. It will be called
-      # by the Remote after requesting an authentication code.
       def call(env)
         @request = Rack::Request.new(env)
         unless @request.path == "/connector"
@@ -27,39 +27,16 @@ module Vidibus
       protected
 
       # Creates this service and, unless it has already been set up, a Connector service.
-      # Once this service has been created, a secret will be traded for given nonce.
+      # Once this service has been created, a secret will be traded for the given nonce.
       def post
-        unless this = service.where(:this => true, :realm => nil).first
-          unless connector = service.local(:connector)
-            connector_data = @request.params["connector"] or
-              return response(:error => "No Connector data given.")
-            connector = service.new(connector_data.merge(:function => "connector"))
-            unless connector.save
-              return response(:error => "Setting up the Connector failed: #{connector.errors.full_messages}")
-            end
-          end
-          this_data = @request.params["this"] or
-            return response(:error => "No data for this service given.")
-          this = service.new(this_data.merge(:this => true))
-          this.secret = "this is just a mock"
-          if this.valid?
-            nonce = @request.params["this"]["nonce"]
-            unless nonce == ""
-              uri = "#{connector.url}/services/#{this.uuid}/secret"
-              res = HTTParty.get(uri, :format => :json)
-            end
-            unless nonce.to_s.length > 5 and Vidibus::Secure.sign(res["secret"], nonce) == res["sign"]
-              return response(:error => "Nonce is invalid.")
-            end
-            this.secret = Vidibus::Secure.decrypt(res["secret"], nonce)
-            if this.save
-              return response({:success => "Setup successful"}, 201)
-            end
-          end
-          response(:error => "Setting up this service failed: #{this.errors.full_messages}")
-        else
-          response(:error => "Service has already been set up.")
+        if service.where(:this => true, :realm => nil).first
+          raise SetupError, "This service has already been set up."
         end
+        service.local(:connector) || create_connector!
+        create_this!
+        response({:success => "Setup successful"}, 201)
+      rescue SetupError => e
+        response(:error => e.message)
       end
 
       # Returns settings of this and Connector.
@@ -77,14 +54,18 @@ module Vidibus
       end
 
       # Updates data of given services.
-      # If a service does not exist, it will be created.
       def put
         verify_request!
-        for function, attributes in @request.params.except("sign")
-          _service = service.local(function) || service.new(:function => function)
+        for uuid, attributes in @request.params.except("sign")
+          unless Vidibus::Uuid.validate(uuid)
+            raise "Updating failed: '#{uuid}' is not a valid UUID."
+          end
+          unless _service = service.where(:uuid => uuid).first
+            raise "Updating service #{uuid} failed: This service does not exist!"
+          end
           _service.attributes = attributes
           unless _service.save
-            return response(:error => "Updating #{function} failed: #{_service.errors.full_messages}")
+            raise "Updating service #{uuid} failed: #{_service.errors.full_messages}"
           end
         end
         response(:success => "Services updated.")
@@ -95,10 +76,14 @@ module Vidibus
       # Deletes services by their UUID.
       def delete
         verify_request!
-        raise ArgumentError.new("Provide list of :uuids") unless uuids = @request.params["uuids"]
+        unless uuids = @request.params["uuids"]
+          raise "Provide list of UUIDs of services to delete."
+        end
         for uuid in uuids
-          if found = service.where(:uuid => uuid).first
-            found.destroy
+          _service = service.where(:uuid => uuid).first
+          next unless _service
+          unless _service.destroy
+            raise "Deleting service #{uuid} failed: #{_service.errors.full_messages}"
           end
         end
         response(:success => "Services have been deleted.")
@@ -108,8 +93,9 @@ module Vidibus
 
       # Verifies that signature is valid.
       def verify_request!
-        Vidibus::Secure.verify_request(@request.request_method, @request.url, @request.params, this.secret) or
+        unless Vidibus::Secure.verify_request(@request.request_method, @request.url, @request.params, this.secret)
           raise SignatureError.new("Invalid signature.")
+        end
       end
 
       # Renders response.
@@ -149,6 +135,56 @@ module Vidibus
       def connector
         @connector ||= service.connector
       end
+
+      # Creates Connector service from params containing +function+ "connector".
+      def create_connector!
+        uuid, data = @request.params.select {|k,v| v["function"] == "connector"}.first
+        raise SetupError, "No Connector data given." unless data
+        connector = service.new(data)
+        unless connector.save
+          raise SetupError, "Setting up the Connector failed: #{connector.errors.full_messages}"
+        end
+        connector
+      end
+
+      # Creates this service from params containing "this".
+      def create_this!
+        uuid, data = @request.params.select {|k,v| v["this"] == "true"}.first
+        raise SetupError, "No data given for this service." unless data
+
+        this = service.new(data)
+        this.valid?
+        raise ValidationError unless this.errors.except(:secret).empty?
+
+        set_secret!(this)
+        this.save or raise ValidationError
+      rescue ValidationError
+        raise SetupError, "Setting up this service failed: #{this.errors.full_messages}"
+      end
+
+      # Trades given nonce for secret.
+      def set_secret!(service)
+        raise SetupError, "Setting a secret for this service is not allowed!" if service.secret
+        nonce = service.nonce
+        raise SetupError, "No nonce given." unless nonce and nonce != ""
+
+        fetched = fetch_secret(service)
+        service.secret = decrypt_secret!(fetched["secret"], nonce, fetched["sign"])
+      end
+
+      # Requests encrypted secret for given service from Connector.
+      def fetch_secret(service)
+        uri = "#{connector.url}/services/#{service.uuid}/secret"
+        HTTParty.get(uri, :format => :json)
+      end
+
+      # Decrypts secret with nonce.++
+      def decrypt_secret!(secret, nonce, sign)
+        unless Vidibus::Secure.sign(secret, nonce) == sign
+          raise SetupError, "Nonce is invalid."
+        end
+        Vidibus::Secure.decrypt(secret, nonce)
+      end
     end
   end
 end

data/lib/vidibus/service/mongoid.rb

@@ -14,6 +14,7 @@ module Vidibus
         field :realm_uuid
         field :this, :type => Boolean
 
+        attr_accessor :nonce
         attr_encrypted :secret
 
         validates :url, :uri => {:protocol => [:http, :https], :accessible => false}

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ Mongoid.configure do |config|
 end
 
 RSpec.configure do |config|
-  config.include WebMock
+  config.include WebMock::API
   config.mock_with :rr
   config.before(:each) do
     Mongoid.master.collections.select {|c| c.name !~ /system/}.each(&:drop)

data/spec/vidibus/service/connector_app_spec.rb

@@ -2,11 +2,19 @@ require "spec_helper.rb"
 
 describe "Vidibus::Service::ConnectorApp" do
   include Rack::Test::Methods
+  let(:this_uuid) {"344b4b8088fb012dd3e558b035f038ab"}
+  let(:this_uri) {"https://connector.local/services/#{this_uuid}/secret"}
+  let(:connector_uuid) {"60dfef509a8e012d599558b035f038ab"}
 
-  let(:this_params) { {"uuid" => "344b4b8088fb012dd3e558b035f038ab", "url" => "http://manager.local", "function" => "manager"} }
-  let(:connector_params) { {"uuid" => "60dfef509a8e012d599558b035f038ab", "url" => "https://connector.local"} }
-  let(:this) { Service.create!(this_params.merge(:secret => "EaDai5nz16DbQTWQuuFdd4WcAiZYRPDwZTn2IQeXbPE4yBg3rr", :realm_uuid => nil, :this => true)) }
-  let(:connector) { Service.create!(connector_params.merge(:function => "connector", :secret => nil, :realm_uuid => nil)) }
+  let(:nonce) {"hkO2ssb28Gks19s9h2hdhbBs83hdis"}
+  let(:secret) {"EaDai5nz16DbQTWQuuFdd4WcAiZYRPDwZTn2IQeXbPE4yBg3rr"}
+  let(:encrypted_secret) {Vidibus::Secure.encrypt(secret, nonce)}
+  let(:signature) {Vidibus::Secure.sign(encrypted_secret, nonce)}
+
+  let(:this_params) {{:uuid => this_uuid, :url => "http://manager.local", :function => "manager", :this => true}}
+  let(:connector_params) {{:uuid => connector_uuid, :url => "https://connector.local", :function => "connector", :secret => nil, :realm_uuid => nil}}
+  let(:this) {Service.create!(this_params.merge(:secret => "EaDai5nz16DbQTWQuuFdd4WcAiZYRPDwZTn2IQeXbPE4yBg3rr", :realm_uuid => nil))}
+  let(:connector) {Service.create!(connector_params)}
 
   def app
     @app ||= Vidibus::Service::ConnectorApp
@@ -70,83 +78,107 @@ describe "Vidibus::Service::ConnectorApp" do
       this
       post "http://manager/connector", {}
       last_response.status.should eql(400)
-      last_response.body.should eql(%({"error":"Service has already been set up."}))
+      last_response.body.should match("This service has already been set up.")
     end
 
-    it "should require Connector params" do
-      post "http://manager.local/connector"
-      last_response.status.should eql(400)
-      last_response.body.should eql(%({"error":"No Connector data given."}))
+    context "without Connector or Connector params" do
+      it "should require Connector params" do
+        post "http://manager.local/connector"
+        last_response.status.should eql(400)
+        last_response.body.should match("No Connector data given.")
+      end
     end
 
-    it "should fail if Connector data is invalid" do
-      post "http://manager.local/connector", {:connector => {:some => "thing"}}
-      last_response.status.should eql(400)
-      last_response.body.should match("Setting up the Connector failed:")
-    end
+    context "with Connector params" do
+      before {stub.any_instance_of(Vidibus::Service::ConnectorApp).create_this!}
+
+      it "should fail if params are invalid given" do
+        post "http://manager.local/connector", {connector_uuid => connector_params.except(:url)}
+        last_response.status.should eql(400)
+        last_response.body.should match("Setting up the Connector failed:")
+      end
 
-    it "should set up a Connector" do
-      mock(::Service).new(connector_params.merge(:function => "connector"))
-      expect {
-        post "http://manager.local/connector", {:connector => connector_params}
-      }.to raise_error(NoMethodError, "undefined method `save' for nil:NilClass")
+      it "should set up a Connector with valid params" do
+        post "http://manager.local/connector", {connector_uuid => connector_params}
+        last_response.status.should eql(201)
+        connector = Service.where(:uuid => connector_params[:uuid]).first
+        connector.should be_a(Service)
+      end
+
+      it "should accept any value as key" do
+        post "http://manager.local/connector", {"something" => connector_params}
+        last_response.status.should eql(201)
+      end
+
+      it "should not create another connector if one already exists" do
+        connector
+        post "http://manager.local/connector", {connector_uuid => connector_params}
+        last_response.status.should eql(201)
+      end
     end
 
-    context "with Connector or Connector params" do
+    context "with existing Connector" do
+      let(:secret_data) {{"secret" => encrypted_secret, "sign" => signature}}
+      let(:stub_secret_request!) {stub(HTTParty).get(this_uri, :format => :json) {secret_data}}
       before { connector }
 
       it "should not require Connector params if a Connector is present" do
         post "http://manager.local/connector"
-        last_response.body.should_not eql(%({"error":"No Connector data given."}))
+        last_response.body.should_not match("No Connector data given.")
       end
 
       it "should require params for this service" do
         post "http://manager.local/connector"
         last_response.status.should eql(400)
-        last_response.body.should eql(%({"error":"No data for this service given."}))
+        last_response.body.should match("No data given for this service.")
       end
 
       it "should fail if params for this service are invalid" do
-        post "http://manager.local/connector", {:this => {:some => "thing"}}
+        post "http://manager.local/connector", {this_uuid => this_params.except(:function)}
         last_response.status.should eql(400)
         last_response.body.should match("Setting up this service failed:")
       end
 
-      it "should set up this Service" do
-        mock(::Service).new(this_params.merge(:this => true))
-        expect {
-          post "http://manager.local/connector", {:this => this_params}
-        }.to raise_error(NoMethodError, "undefined method `secret=' for nil:NilClass")
+      it "should fail if a secret is given" do
+        post "http://manager.local/connector", {this_uuid => this_params.merge(:secret => "something")}
+        last_response.status.should eql(400)
+        last_response.body.should match("Setting a secret for this service is not allowed!")
+      end
+
+      it "should fail unless a nonce is given" do
+        post "http://manager.local/connector", {this_uuid => this_params}
+        last_response.status.should eql(400)
+        last_response.body.should match("No nonce given.")
       end
 
       it "should request a secret for this Service" do
-        uri = "https://connector.local/services/#{this_params["uuid"]}/secret"
-        stub_http_request(:get, uri).to_return(:status => 200)
-        post "http://manager.local/connector", {:this => this_params}
+        mock(HTTParty).get(this_uri, :format => :json) {{}}
+        stub.any_instance_of(Vidibus::Service::ConnectorApp).decrypt_secret! {"ok"}
+        post "http://manager.local/connector", {this_uuid => this_params.merge(:nonce => nonce)}
       end
 
-      it "should require a valid nonce to decrypt requested secret" do
-        uri = "https://connector.local/services/#{this_params["uuid"]}/secret"
-        params = {}
-        stub_http_request(:get, uri).to_return(:status => 200, :body => %({"secret":"something","sign":"else"}))
-        post "http://manager.local/connector", {:this => this_params.merge("nonce" => "invalid")}
+      it "should fail if sign cannot be validated with nonce" do
+        stub_secret_request!
+        post "http://manager.local/connector", {this_uuid => this_params.merge(:nonce => "invalid")}
         last_response.status.should eql(400)
         last_response.body.should match("Nonce is invalid.")
       end
 
-      it "should decrypt requested secret and store it on the service object" do
-        nonce = "hkO2ssb28Gks19s9h2hdhbBs83hdis"
-        secret = "EaDai5nz16DbQTWQuuFdd4WcAiZYRPDwZTn2IQeXbPE4yBg3rr"
-        encrypted_secret = Vidibus::Secure.encrypt(secret, nonce)
-        signature = Vidibus::Secure.sign(encrypted_secret, nonce)
-        uri = "https://connector.local/services/#{this_params["uuid"]}/secret"
-        params = {:secret => encrypted_secret, :sign => signature}
-        stub_http_request(:get, uri).to_return(:status => 200, :body => params.to_json)
-        post "http://manager.local/connector", {:this => this_params.merge("nonce" => nonce)}
+      it "should decrypt the secret with a valid nonce" do
+        stub_secret_request!
+        mock.any_instance_of(Service).secret=(secret)
+        post "http://manager.local/connector", {this_uuid => this_params.merge(:nonce => nonce)}
+      end
+
+      it "should set up this Service with valid params" do
+        stub_secret_request!
+        post "http://manager.local/connector", {connector_uuid => this_params.merge(:nonce => nonce)}
+        stub(HTTParty).get(this_uri, :format => :json) {secret_data}
         last_response.status.should eql(201)
-        this = ::Service.where(:this => true).first
-        this.should be_a(::Service)
+        this = Service.where(:this => true).first
+        this.should be_a(Service)
         this.secret.should eql(secret)
+        this.url.should eql("http://manager.local")
       end
     end
   end
@@ -180,26 +212,33 @@ describe "Vidibus::Service::ConnectorApp" do
     it "should update existing services" do
       this and connector
       url = "http://newconnector.local"
-      signed_request(:put, "http://manager.local/connector", {:connector => {:url => url}})
+      signed_request(:put, "http://manager.local/connector", {connector.uuid => {:url => url}})
       last_response.status.should eql(200)
       Service.local(:connector).url.should eql(url)
     end
 
-    it "should fail if invalid data are given" do
+    it "should fail if no uuid is given" do
       this and connector
       url = "http://newconnector.local"
-      signed_request(:put, "http://manager.local/connector", {:connector => {:secret => "not allowed"}})
+      signed_request(:put, "http://manager.local/connector", {:url => url})
       last_response.status.should eql(400)
-      last_response.body.should match("Updating connector failed:")
+      last_response.body.should match("Updating failed: 'url' is not a valid UUID.")
     end
 
-    it "should create new services" do
+    it "should fail if an invalid uuid is given" do
       this and connector
       url = "http://newconnector.local"
-      signed_request(:put, "http://manager.local/connector",
-        {:uploader => {:url => "http://uploader.local", :uuid => "c0861d609247012d0a8b58b035f038ab", :secret => "A7q8Vzxgrk9xrw2FCnvV4bv01UP/LBUUM0lIGDmMcB2GsBTIqx", :realm_uuid => "12ab69f099a4012d4df558b035f038ab"}})
-      last_response.status.should eql(200)
-      Service.local(:uploader, "12ab69f099a4012d4df558b035f038ab").url.should eql("http://uploader.local")
+      signed_request(:put, "http://manager.local/connector", {"c0861d609247012d0a8b58b035f038ab" => {:url => url}})
+      last_response.status.should eql(400)
+      last_response.body.should match("Updating service c0861d609247012d0a8b58b035f038ab failed:")
+    end
+
+    it "should fail if invalid data is given" do
+      this and connector
+      url = "http://newconnector.local"
+      signed_request(:put, "http://manager.local/connector", {connector.uuid => {:secret => "not allowed"}})
+      last_response.status.should eql(400)
+      last_response.body.should match("Updating service 60dfef509a8e012d599558b035f038ab failed:")
     end
   end
 
@@ -227,19 +266,27 @@ describe "Vidibus::Service::ConnectorApp" do
       this and connector
       signed_request(:delete, "http://manager.local/connector", {})
       last_response.status.should eql(400)
-      last_response.body.should eql(%({"error":"Provide list of :uuids"}))
+      last_response.body.should eql(%({"error":"Provide list of UUIDs of services to delete."}))
+    end
+
+    it "should fail if deleting of a service fails" do
+      this and connector
+      stub.any_instance_of(Service).destroy {false} # Would be nice: errors.add(:base, "Failed")
+      signed_request(:delete, "http://manager.local/connector", {:uuids =>[connector_uuid]})
+      last_response.status.should eql(400)
+      last_response.body.should eql(%({"error":"Deleting service 60dfef509a8e012d599558b035f038ab failed: "}))
     end
 
     it "should delete services given by UUID" do
       this and connector
-      signed_request(:delete, "http://manager.local/connector", {:uuids =>["60dfef509a8e012d599558b035f038ab"]})
+      signed_request(:delete, "http://manager.local/connector", {:uuids =>[connector_uuid]})
       last_response.status.should eql(200)
       Service.local(:connector).should be_nil
     end
 
     it "should not care if any given UUID is invalid" do
       this and connector
-      signed_request(:delete, "http://manager.local/connector", {:uuids =>["invalid", "60dfef509a8e012d599558b035f038ab"]})
+      signed_request(:delete, "http://manager.local/connector", {:uuids =>["invalid", connector_uuid]})
       last_response.status.should eql(200)
     end
   end

data/vidibus-service.gemspec

@@ -1,61 +1,59 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-service}
-  s.version = "0.0.1"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-12-08}
   s.description = %q{Description...}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".bundle/config",
-     ".document",
-     ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "app/models/service.rb",
-     "config/locales/en.yml",
-     "config/routes.rb",
-     "lib/vidibus-service.rb",
-     "lib/vidibus/service.rb",
-     "lib/vidibus/service/client.rb",
-     "lib/vidibus/service/connector_app.rb",
-     "lib/vidibus/service/controller_validations.rb",
-     "lib/vidibus/service/mongoid.rb",
-     "spec/spec_helper.rb",
-     "spec/vidibus/service/client_spec.rb",
-     "spec/vidibus/service/connector_app_spec.rb",
-     "spec/vidibus/service/controller_validations_spec.rb",
-     "spec/vidibus/service/mongoid_spec.rb",
-     "spec/vidibus/service_spec.rb",
-     "vidibus-service.gemspec"
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "app/models/service.rb",
+    "config/locales/en.yml",
+    "config/routes.rb",
+    "lib/vidibus-service.rb",
+    "lib/vidibus/service.rb",
+    "lib/vidibus/service/client.rb",
+    "lib/vidibus/service/connector_app.rb",
+    "lib/vidibus/service/controller_validations.rb",
+    "lib/vidibus/service/mongoid.rb",
+    "spec/spec_helper.rb",
+    "spec/vidibus/service/client_spec.rb",
+    "spec/vidibus/service/connector_app_spec.rb",
+    "spec/vidibus/service/controller_validations_spec.rb",
+    "spec/vidibus/service/mongoid_spec.rb",
+    "spec/vidibus/service_spec.rb",
+    "vidibus-service.gemspec"
   ]
   s.homepage = %q{http://github.com/vidibus/vidibus-service}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Provides tools for Vidibus services}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/vidibus/service/client_spec.rb",
-     "spec/vidibus/service/connector_app_spec.rb",
-     "spec/vidibus/service/controller_validations_spec.rb",
-     "spec/vidibus/service/mongoid_spec.rb",
-     "spec/vidibus/service_spec.rb"
+    "spec/vidibus/service/client_spec.rb",
+    "spec/vidibus/service/connector_app_spec.rb",
+    "spec/vidibus/service/controller_validations_spec.rb",
+    "spec/vidibus/service/mongoid_spec.rb",
+    "spec/vidibus/service_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -65,28 +63,46 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongoid>, ["~> 2.0.0.beta.20"])
       s.add_runtime_dependency(%q<vidibus-core_extensions>, [">= 0"])
-      s.add_runtime_dependency(%q<vidibus-uuid>, [">= 0"])
       s.add_runtime_dependency(%q<vidibus-secure>, [">= 0"])
+      s.add_runtime_dependency(%q<vidibus-uuid>, [">= 0"])
       s.add_runtime_dependency(%q<vidibus-validate_uri>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.20"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<relevance-rcov>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
     else
       s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.20"])
       s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
-      s.add_dependency(%q<vidibus-uuid>, [">= 0"])
       s.add_dependency(%q<vidibus-secure>, [">= 0"])
+      s.add_dependency(%q<vidibus-uuid>, [">= 0"])
       s.add_dependency(%q<vidibus-validate_uri>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.20"])
+      s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<relevance-rcov>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
     s.add_dependency(%q<mongoid>, ["~> 2.0.0.beta.20"])
     s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
-    s.add_dependency(%q<vidibus-uuid>, [">= 0"])
     s.add_dependency(%q<vidibus-secure>, [">= 0"])
+    s.add_dependency(%q<vidibus-uuid>, [">= 0"])
     s.add_dependency(%q<vidibus-validate_uri>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.20"])
+    s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<relevance-rcov>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-service
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: mongoid
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -34,12 +35,12 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: vidibus-core_extensions
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: vidibus-core_extensions
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +49,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  name: vidibus-secure
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: vidibus-uuid
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: vidibus-uuid
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +77,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  name: vidibus-validate_uri
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: vidibus-secure
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: httparty
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +105,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  name: json
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: vidibus-validate_uri
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,12 +133,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id005
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,12 +147,30 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id006
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: json
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 62196427
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rr
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,8 +179,35 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id007
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: relevance-rcov
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: webmock
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id013
 description: Description...
 email: andre@vidibus.com
 executables: []
@@ -132,7 +220,6 @@ extra_rdoc_files:
 files: 
 - .bundle/config
 - .document
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -161,8 +248,8 @@ homepage: http://github.com/vidibus/vidibus-service
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC