vidibus-resource 0.0.6 → 0.0.7

data/README.rdoc

@@ -1,7 +1,16 @@
-= vidibus-resource
+= Vidibus::Resource
 
 Description goes here.
 
+
+== TODO
+
+* Write specs
+* Allow an individual provider for each resource. Store resource provider and realm on consumer instance.
+* Don't allow resource consumers without a realm. Ensure realm matches request.
+* Allow multiple providers for one resource?
+
+
 == Copyright
 
 Copyright (c) 2011 Andre Pankratz. See LICENSE for details.

data/app/controllers/api/resources_controller.rb

@@ -1,3 +1,4 @@
+# TODO: Split this file: one part for providers, one for consumers?
 class Api::ResourcesController < ApiController
   before_filter :ensure_klass
   before_filter :find_instance
@@ -5,7 +6,7 @@ class Api::ResourcesController < ApiController
   # Creates resource consumer on provider.
   def create
     @instance.add_resource_consumer(params["service"])
-    render :json => {:resource => @instance.fixed_resourceable_hash}
+    render(:json => {:resource => @instance.fixed_resourceable_hash})
   end
 
   # Updates resource on consumer.
@@ -15,27 +16,28 @@ class Api::ResourcesController < ApiController
       render :nothing => true
     rescue => e
       Rails.logger.error 'Error while updating resource consumer: '+e.inspect
-      render :json => { :error => e }, :status => :bad_request
+      render(:json => {:error => e}, :status => :bad_request)
     end
   end
 
   # Removes a resource consumer from provider
+  # or remove a resource from a consumer.
   def destroy
-    if @instance.resource_provider?
+    if @instance.respond_to?(:resource_consumers)
       @instance.remove_resource_consumer(params["service"])
     else
-      # TODO
+      @instance.destroy_without_callback
     end
     render :nothing => true
   end
 
-  protected
+  private
 
   def ensure_klass
     begin
       @klass = params[:klass].classify.constantize
     rescue => e
-      render :json => { :error => e }, :status => :bad_request
+      render :json => {:error => e}, :status => :bad_request
     end
   end
 
@@ -44,6 +46,6 @@ class Api::ResourcesController < ApiController
     if @klass.new.respond_to?(:realm_uuid)
       result.and(:realm_uuid => params[:realm])
     end
-    @instance = result.first or render(:nothing => true, :status => :not_found)
+    @instance = result.first or render(:json => {:error => "#{@klass} #{params[:uuid]} not found"}, :status => :not_found)
   end
 end

data/lib/vidibus/resource/consumer/mongoid.rb

@@ -14,9 +14,11 @@ module Vidibus::Resource
         index :uuid
         validates :uuid, :uuid => true
 
+        attr_accessor :extinct
+
         before_create :add_resource_consumer
         before_save :set_resource_attributes
-        before_destroy :remove_resource_consumer
+        before_destroy :remove_resource_consumer, :unless => :extinct
       end
 
       # Registers this consumer with provider.
@@ -90,7 +92,12 @@ module Vidibus::Resource
         true # ensure true!
       end
 
-      protected
+      def destroy_without_callback
+        self.extinct = true
+        destroy
+      end
+
+      private
 
       # Fix empty arrays
       def fix_resource_attributes(data)

data/lib/vidibus/resource/provider/mongoid.rb

@@ -10,7 +10,7 @@ module Vidibus::Resource
         field :resourceable_hash_checksum, :type => Hash
 
         before_update :update_resource_consumers
-        # before_destroy :destroy_resource_consumers
+        before_destroy :destroy_resource_consumers
       end
 
       # Adds given resource consumer.
@@ -49,7 +49,7 @@ module Vidibus::Resource
         resourceable_hash
       end
 
-      protected
+      private
 
       # Update resource consumers if significant changes were made.
       # TODO: Send changes only (the resourceable ones)!
@@ -72,6 +72,20 @@ module Vidibus::Resource
           end
         end
       end
+
+      # Removes this resource from consumers.
+      def destroy_resource_consumers
+        for service in resource_consumers
+          begin
+            ::Service.discover(service, realm_uuid).delete("/api/resources/#{self.class.to_s.tableize}/#{uuid}")
+          rescue => e
+            Rails.logger.error "An error occurred while destroying resource consumer #{service}:"
+            Rails.logger.error e.inspect
+            errors = true
+          end
+        end
+        true unless errors # ensure true!
+      end
     end
   end
 end

data/lib/vidibus/resource/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Resource
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-resource
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Pankratz"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +02:00
+date: 2011-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,7 +176,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile

data/Gemfile.lock

@@ -1,138 +0,0 @@
-PATH
-  remote: .
-  specs:
-    vidibus-resource (0.0.1)
-      rails (~> 3.0.0)
-      vidibus-api
-      vidibus-service
-      vidibus-uuid
-
-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)
-    arel (2.0.7)
-    bson (1.1.5)
-    builder (2.1.2)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    i18n (0.5.0)
-    json (1.4.6)
-    macaddr (1.0.0)
-    mail (2.2.14)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.1.5)
-      bson (>= 1.1.5)
-    mongoid (2.0.0.rc.4)
-      activemodel (~> 3.0)
-      mongo (~> 1.1.5)
-      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.7)
-      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)
-    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.24)
-    uuid (2.3.1)
-      macaddr (~> 1.0)
-    vidibus-api (0.0.1)
-      vidibus-service
-    vidibus-core_extensions (0.3.15)
-    vidibus-secure (0.0.3)
-      activesupport (~> 3.0.0)
-      mongoid (~> 2.0.0.beta.20)
-      rack
-      vidibus-core_extensions
-    vidibus-service (0.0.4)
-      httparty
-      json
-      mongoid (~> 2.0.0.beta.20)
-      vidibus-core_extensions
-      vidibus-secure
-      vidibus-uuid
-      vidibus-validate_uri
-    vidibus-uuid (0.3.8)
-      mongoid (~> 2.0.0.beta.20)
-      uuid (~> 2.3.1)
-    vidibus-validate_uri (0.1.4)
-      rails (~> 3.0.0)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.0)
-  rack-test
-  rails (~> 3.0.0)
-  rake
-  rr
-  rspec
-  vidibus-api
-  vidibus-resource!
-  vidibus-service
-  vidibus-uuid