vidibus-service 0.1.3 → 0.2.0

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2010-2011 Andre Pankratz
+MIT License
+
+Copyright (c) 2010-2013 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.md

@@ -1,4 +1,4 @@
-# Vidibus::Service [![](http://travis-ci.org/vidibus/vidibus-service.png)](http://travis-ci.org/vidibus/vidibus-service) [![](http://stillmaintained.com/vidibus/vidibus-service.png)](http://stillmaintained.com/vidibus/vidibus-service)
+# Vidibus::Service [![](http://travis-ci.org/vidibus/vidibus-service.png)](http://travis-ci.org/vidibus/vidibus-service)
 
 DESCRIBE
 
@@ -12,11 +12,11 @@ Add `gem "vidibus-service"` to your Gemfile. Then call `bundle install` on your
 
 ##  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 
+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:
-  
+
 ```
 This service has not been configured yet. Use your Connector to set it up.
 ```
@@ -35,4 +35,4 @@ DESCRIBE
 
 ## Copyright
 
-© 2010-2011 Andre Pankratz. See LICENSE for details.
+© 2010-2013 Andre Pankratz. See LICENSE for details.

data/Rakefile

@@ -8,12 +8,6 @@ Bundler::GemHelper.install_tasks
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "vidibus/service/version"
 
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = "spec/**/*_spec.rb"
-  t.rcov = true
-  t.rcov_opts = ["--exclude", "^spec,/gems/"]
-end
-
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
   rdoc.title = "vidibus-sysinfo #{Vidibus::Service::VERSION}"
@@ -21,5 +15,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
   rdoc.options << "--charset=utf-8"
 end
-
-task :default => :rcov

data/lib/vidibus/service/connector_app.rb

@@ -86,11 +86,13 @@ module Vidibus
         unless uuids = @request.params["uuids"]
           raise "Provide list of UUIDs of services to delete."
         end
-        for uuid in uuids
-          _service = service.where(:uuid => uuid).first
-          next unless _service
-          unless _service.destroy
-            raise "Deleting service #{uuid} failed: #{_service.errors.full_messages}"
+
+        uuids.each do |uuid|
+          obj = service.where(:uuid => uuid).first
+          next unless obj
+          unless obj.destroy
+            errors = obj.errors.full_messages.join(',')
+            raise "Deleting service #{uuid} failed: #{errors}"
           end
         end
         response(:success => "Services have been deleted.")
@@ -161,9 +163,9 @@ module Vidibus
 
         this = service.new(data)
         this.valid?
-        errors = this.errors.respond_to?(:messages) ? this.errors.messages : this.errors # Support Rails < 3.0.9
-        raise ValidationError unless errors.except(:secret).empty?
-
+        unless this.errors.messages.except(:secret).empty?
+          raise ValidationError
+        end
         set_secret!(this)
         this.save or raise ValidationError
       rescue ValidationError

data/lib/vidibus/service/mongoid.rb

@@ -12,7 +12,7 @@ module Vidibus
         field :uuid
         field :function
         field :realm_uuid
-        field :this, :type => Boolean
+        field :this, :type => ::Mongoid::Boolean
 
         attr_accessor :nonce
         attr_encrypted :secret
@@ -37,26 +37,6 @@ module Vidibus
           @is_connector ||= function == "connector"
         end
 
-        # Sends a GET request to given path.
-        def get(path, options = {})
-          client.get(path, options)
-        end
-
-        # Sends a POST request to given path.
-        def post(path, options = {})
-          client.post(path, options)
-        end
-
-        # Sends a PUT request to given path.
-        def put(path, options = {})
-          client.put(path, options)
-        end
-
-        # Sends a DELETE request to given path.
-        def delete(path, options = {})
-          client.delete(path, options)
-        end
-
         # Returns publicly requestable data.
         def public_data
           attributes.only(%w[uuid function url])
@@ -67,6 +47,11 @@ module Vidibus
           url.gsub(/https?:\/\//, "") if url
         end
 
+        # Returns a Client for current service.
+        def client
+          @client ||= Client.new(self)
+        end
+
         # Returns true if given client_secret matches signature.
         # This method is called from Vidibus' OauthServer when issuing an OAuth token.
         # To prevent sending the service's secret over the network, the ConnectorClient
@@ -79,14 +64,11 @@ module Vidibus
 
         protected
 
-        # Returns a Client for current service.
-        def client
-          @client ||= Client.new(self)
-        end
-
         # Sets an error if secret is given for Connector service.
         def dont_allow_secret_for_connector
-          errors.add(:secret, :secret_not_allowed_for_connector) if connector? and secret
+          if connector? && secret
+            errors.add(:secret, :secret_not_allowed_for_connector)
+          end
         end
       end
 
@@ -126,7 +108,7 @@ module Vidibus
           unless realm
             raise ArgumentError.new("Please provide a valid realm to discover an appropriate service.")
           end
-          if response = connector.get("/services/#{wanted}", :query => {:realm => realm})
+          if response = connector.client.get("/services/#{wanted}", :query => {:realm => realm})
             secret = response["secret"] || raise(ConnectorError.new("The Connector did not return a secret for #{wanted}. Response was: #{response.parsed_response.inspect}"))
             secret = Vidibus::Secure.decrypt(secret, this.secret)
             attributes = response.only(%w[uuid function url]).merge(:realm_uuid => realm, :secret => secret)

data/lib/vidibus/service/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Service
-    VERSION = "0.1.3"
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,246 +1,262 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vidibus-service
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Andre Pankratz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-15 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: vidibus-core_extensions
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: vidibus-core_extensions
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: vidibus-secure
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vidibus-secure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: vidibus-uuid
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vidibus-uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: vidibus-validate_uri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vidibus-validate_uri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.7.8
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.8
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables Vidibus Services for the embedding Rails application
 email: andre@vidibus.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/vidibus/service/client.rb
 - lib/vidibus/service/connector_app.rb
 - lib/vidibus/service/controller_validations.rb
@@ -255,41 +271,32 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-has_rdoc: true
 homepage: https://github.com/vidibus/vidibus-service
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -240109756340464642
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: vidibus-service
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Service handling for Vidibus applications
 test_files: []
-