spire_io 1.0.0.beta.2 → 1.0.0.beta.3

data/lib/spire/api/session.rb

@@ -127,38 +127,32 @@ class Spire
         @channels ||= channels!
       end
 
-       # Not yet in Spire API
-      #define_request(:subscriptions) do
-        #{
-          #:method => :get,
-          #:url => @resources["subscriptions"]["url"],
-          #:headers => {
-            #"Authorization" => "Capability #{@resources["subscriptions"]["capability"]}",
-            #"Accept" => @spire.mediaType("subscription"),
-          #}
-        #}
-      #end
-
-     def subscriptions
-        if @subscriptions
-          @subscriptions
-        else
-          # TODO Fix this to use an API call once Spire supports it
-          @subscriptions = {}
-          channels.each do |name, channel|
-            if subs = channel.properties["subscriptions"]
-              subs.each do |key, sub|
-                @subscriptions[key] = API::Subscription.new(@spire, sub)
-              end
-            end
-          end
-          @subscriptions
-        end
+      define_request(:subscriptions) do
+        {
+          :method => :get,
+          :url => @resources["subscriptions"]["url"],
+          :headers => {
+            "Authorization" => "Capability #{@resources["subscriptions"]["capability"]}",
+            "Accept" => @spire.mediaType("subscriptions"),
+          }
+        }
       end
 
-     def subscriptions!
-       raise "unimplemented"
-     end
+      def subscriptions
+        @subscriptions ||= subscriptions!
+      end
+
+      def subscriptions!
+        response = request(:subscriptions)
+        unless response.status == 200
+          raise "Error retrieving Subscriptions: (#{response.status}) #{response.body}"
+        end
+        @subscriptions = {}
+        response.data.each do |name, properties|
+          @subscriptions[name] = API::Subscription.new(@spire, properties)
+        end
+        @subscriptions
+      end
 
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spire_io
 version: !ruby/object:Gem::Version 
-  hash: 62196359
-  prerelease: true
+  hash: 3899554913
+  prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 2
-  version: 1.0.0.beta.2
+  - 3
+  version: 1.0.0.beta.3
 platform: ruby
 authors: 
 - Dan Yoder
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 -08:00
+date: 2012-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +151,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: Ruby client for spire.io