vidibus-service 0.0.4 → 0.1.0

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "mongoid", "~> 2.0.0.beta.20"
+gem "mongoid", "~> 2.0.0"
 gem "vidibus-core_extensions"
 gem "vidibus-secure"
 gem "vidibus-uuid"
@@ -11,7 +11,7 @@ gem "json"
 group :development do
   gem "jeweler"
   gem "rake"
-  gem "rspec", "~> 2.0.0.beta.20"
+  gem "rspec", "~> 2.0.0"
   gem "rr"
   gem "relevance-rcov"
   gem "webmock"

data/README.rdoc

@@ -1,4 +1,4 @@
-= vidibus-service
+= Vidibus::Service
 
 Description goes here.
 
@@ -11,6 +11,9 @@ If you don't see this error message, add the route manually at the top of your r
 
   match "/connector" => Vidibus::Service::ConnectorApp
 
+== TODO
+
+* ControllerValidations: Setting @service and @realm is inconsistent; @service is a service object, @realm is a string
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/config/locales/en.yml

@@ -1,5 +1,4 @@
 en:
-  activemodel:
-    errors:
-      messages:
-        secret_not_allowed_for_connector: "is not allowed for a Connector"
+  errors:
+    messages:
+      secret_not_allowed_for_connector: "is not allowed for a Connector"

data/lib/vidibus/service/connector_app.rb

@@ -41,7 +41,7 @@ module Vidibus
 
       # Returns settings of this and Connector.
       # This action must only be called by Connector. Thus it is signed
-      # with the Service's secret.
+      # with the service's secret.
       def get
         verify_request!
         out = {:this => this.public_data}
@@ -60,12 +60,19 @@ module Vidibus
           unless Vidibus::Uuid.validate(uuid)
             raise "Updating failed: '#{uuid}' is not a valid UUID."
           end
-          unless _service = service.where(:uuid => uuid).first
+          conditions = {:uuid => uuid}
+          if realm_uuid = attributes.delete("realm_uuid")
+            conditions[:realm_uuid] = realm_uuid
+          end
+          result = service.where(conditions)
+          unless result.any?
             raise "Updating service #{uuid} failed: This service does not exist!"
           end
-          _service.attributes = attributes
-          unless _service.save
-            raise "Updating service #{uuid} failed: #{_service.errors.full_messages}"
+          for _service in result
+            _service.attributes = attributes
+            unless _service.save
+              raise "Updating service #{uuid} failed: #{_service.errors.full_messages}"
+            end
           end
         end
         response(:success => "Services updated.")
@@ -91,7 +98,7 @@ module Vidibus
         response(:error => e.message)
       end
 
-      # Verifies that signature is valid.
+      # Verifies that the signature is valid.
       def verify_request!
         unless Vidibus::Secure.verify_request(@request.request_method, @request.url, @request.params, this.secret)
           raise SignatureError.new("Invalid signature.")

data/lib/vidibus/service/mongoid.rb

@@ -71,9 +71,10 @@ module Vidibus
         # This method is called from Vidibus' OauthServer when issuing an OAuth token.
         # To prevent sending the service's secret over the network, the ConnectorClient
         # sends a signature instead.
-        # TODO: Where to put this method?
+        # TODO: Where to put this method? Wanted to extend this gem with vidius-user gem,
+        # but that's not a good idea...
         def valid_oauth2_secret?(client_secret)
-          client_secret == Vidibus::Secure.sign("#{self.class.this.url}#{uuid}", secret)
+          client_secret == Vidibus::Secure.sign(uuid, secret)
         end
 
         protected

data/spec/vidibus/service/connector_app_spec.rb

@@ -15,6 +15,8 @@ describe "Vidibus::Service::ConnectorApp" do
   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)}
+  let(:uploader_params) {{:uuid => "c0861d609247012d0a8b58b035f038ab", :url => "http://uploader.local", :function => "uploader"}}
+  let(:uploader) {Service.create!(uploader_params.merge(:secret => "whatever", :realm_uuid => "408411702613012e39ec58b035f038ab"))}
 
   def app
     @app ||= Vidibus::Service::ConnectorApp
@@ -209,7 +211,7 @@ describe "Vidibus::Service::ConnectorApp" do
       last_response.status.should eql(400)
     end
 
-    it "should update existing services" do
+    it "should update an existing service without realm_uuid" do
       this and connector
       url = "http://newconnector.local"
       signed_request(:put, "http://manager.local/connector", {connector.uuid => {:url => url}})
@@ -217,6 +219,31 @@ describe "Vidibus::Service::ConnectorApp" do
       Service.local(:connector).url.should eql(url)
     end
 
+    it "should update an existing service with given realm_uuid" do
+      this and connector and uploader
+      url = "http://newuploader.local"
+      signed_request(:put, "http://manager.local/connector", {uploader.uuid => {:url => url, :realm_uuid => uploader.realm_uuid}})
+      last_response.status.should eql(200)
+      Service.local(:uploader, uploader.realm_uuid).url.should eql(url)
+    end
+
+    it "should not update existing services with a different realm_uuid" do
+      this and connector and uploader
+      different_realm_uuid = "e75234809111012d05ac58b035f038ab"
+      different_uploader = Service.create!(uploader_params.merge(:secret => "whatever", :realm_uuid => different_realm_uuid))
+      signed_request(:put, "http://manager.local/connector", {uploader.uuid => {:url => "http://newuploader.local", :realm_uuid => uploader.realm_uuid}})
+      last_response.status.should eql(200)
+      Service.local(:uploader, different_realm_uuid).url.should eql(different_uploader.url)
+    end
+
+    it "should update all existing services with matching uuid" do
+      this and connector and uploader
+      another_uploader = Service.create!(uploader_params.merge(:realm_uuid => "e75234809111012d05ac58b035f038ab", :secret => "whatever"))
+      signed_request(:put, "http://manager.local/connector", {uploader.uuid => {:function => "fancy"}})
+      last_response.status.should eql(200)
+      Service.where(:function => "fancy").to_a.should have(2).services
+    end
+
     it "should fail if no uuid is given" do
       this and connector
       url = "http://newconnector.local"

data/vidibus-service.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-service}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2011-01-02}
+  s.date = %q{2011-05-04}
   s.description = %q{Description...}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -45,7 +44,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/vidibus/vidibus-service}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Provides tools for Vidibus services}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -57,11 +56,10 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     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<mongoid>, ["~> 2.0.0"])
       s.add_runtime_dependency(%q<vidibus-core_extensions>, [">= 0"])
       s.add_runtime_dependency(%q<vidibus-secure>, [">= 0"])
       s.add_runtime_dependency(%q<vidibus-uuid>, [">= 0"])
@@ -70,12 +68,12 @@ Gem::Specification.new do |s|
       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<rspec>, ["~> 2.0.0"])
       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<mongoid>, ["~> 2.0.0"])
       s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
       s.add_dependency(%q<vidibus-secure>, [">= 0"])
       s.add_dependency(%q<vidibus-uuid>, [">= 0"])
@@ -84,13 +82,13 @@ Gem::Specification.new do |s|
       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<rspec>, ["~> 2.0.0"])
       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<mongoid>, ["~> 2.0.0"])
     s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
     s.add_dependency(%q<vidibus-secure>, [">= 0"])
     s.add_dependency(%q<vidibus-uuid>, [">= 0"])
@@ -99,7 +97,7 @@ Gem::Specification.new do |s|
     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<rspec>, ["~> 2.0.0"])
     s.add_dependency(%q<rr>, [">= 0"])
     s.add_dependency(%q<relevance-rcov>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-service
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,32 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +01:00
+date: 2011-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mongoid
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
-  requirement: *id001
+        version: 2.0.0
+  name: mongoid
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: vidibus-core_extensions
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  name: vidibus-core_extensions
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: vidibus-secure
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: vidibus-secure
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: vidibus-uuid
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  name: vidibus-uuid
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: vidibus-validate_uri
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  name: vidibus-validate_uri
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: httparty
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: httparty
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: json
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  name: json
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -133,12 +130,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  name: jeweler
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rake
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,30 +144,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  name: rake
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
-  requirement: *id010
+        version: 2.0.0
+  name: rspec
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rr
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -179,12 +174,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  name: rr
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: relevance-rcov
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,12 +188,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  name: relevance-rcov
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: webmock
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -207,7 +202,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
+  name: webmock
+  version_requirements: *id013
 description: Description...
 email: andre@vidibus.com
 executables: []
@@ -222,7 +218,6 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -273,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provides tools for Vidibus services

data/Gemfile.lock

@@ -1,133 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.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)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      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.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)
-    git (1.2.5)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    i18n (0.5.0)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    json (1.4.6)
-    macaddr (1.0.0)
-    mail (2.2.12)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    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.6)
-      rack (>= 1.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.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.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.12)
-    vidibus-secure (0.0.3)
-      activesupport (~> 3.0.0)
-      mongoid (~> 2.0.0.beta.20)
-      rack
-      vidibus-core_extensions
-    vidibus-uuid (0.3.8)
-      mongoid (~> 2.0.0.beta.20)
-      uuid (~> 2.3.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)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  httparty
-  jeweler
-  json
-  mongoid (~> 2.0.0.beta.20)
-  rake
-  relevance-rcov
-  rr
-  rspec (~> 2.0.0.beta.20)
-  vidibus-core_extensions
-  vidibus-secure
-  vidibus-uuid
-  vidibus-validate_uri
-  webmock