spire_io 1.2.1 → 1.2.2

data/lib/spire/api.rb

@@ -25,10 +25,11 @@ class Spire
     end
 
     attr_reader :client, :description, :schema
-    def initialize(url="https://api.spire.io", options={})
+    def initialize(url="https://api.spire.io", spire=nil, options={})
       @version = options[:version] || "1.0"
       @client = Excon
       @url = url
+      @spire = spire
     end
 
     define_request(:discover) do
@@ -166,22 +167,5 @@ class Spire
       end
       API::Application.new(self, response.data)
     end
-
-    # Returns a billing object than contains a list of all the plans available
-    # @param [String] info optional object description
-    # @return [Billing]
-    def billing(info=nil)
-      response = request(:billing)
-      raise "Error getting billing plans: #{response.status}" if response.status != 200
-      API::Billing.new(self, response.data)
-    end
-    
-    class Billing < Resource
-      def resource_name
-        "billing"
-      end
-    end
-
   end
-
 end

data/lib/spire/api/application.rb

@@ -9,7 +9,7 @@ class Spire
         "application"
       end
 
-      def initialize(spire, data)
+      def initialize(api, data)
         super
         @resources = data["resources"]
       end
@@ -31,8 +31,8 @@ class Spire
           :body => body,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("channel"),
-            "Content-Type" => @spire.mediaType("channel")
+            "Accept" => @api.mediaType("channel"),
+            "Content-Type" => @api.mediaType("channel")
           }
         }
       end
@@ -46,7 +46,7 @@ class Spire
           :url => url,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("channels"),
+            "Accept" => @api.mediaType("channels"),
           }
         }
       end
@@ -61,7 +61,7 @@ class Spire
           :query => {:name => name},
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("channels"),
+            "Accept" => @api.mediaType("channels"),
           }
         }
       end
@@ -76,7 +76,7 @@ class Spire
           :url => url,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscriptions"),
+            "Accept" => @api.mediaType("subscriptions"),
           }
         }
       end
@@ -94,8 +94,8 @@ class Spire
           }.to_json,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscription"),
-            "Content-Type" => @spire.mediaType("subscription")
+            "Accept" => @api.mediaType("subscription"),
+            "Content-Type" => @api.mediaType("subscription")
           }
         }
       end
@@ -110,7 +110,7 @@ class Spire
           :query => {:name => name},
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscriptions"),
+            "Accept" => @api.mediaType("subscriptions"),
           }
         }
       end
@@ -126,8 +126,8 @@ class Spire
           :body => data.to_json,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("member"),
-            "Content-Type" => @spire.mediaType("member")
+            "Accept" => @api.mediaType("member"),
+            "Content-Type" => @api.mediaType("member")
           }
         }
       end
@@ -141,7 +141,7 @@ class Spire
           :url => url,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("members"),
+            "Accept" => @api.mediaType("members"),
           }
         }
       end
@@ -156,7 +156,7 @@ class Spire
           :query => {:login => login},
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("member"),
+            "Accept" => @api.mediaType("member"),
           }
         }
       end
@@ -169,7 +169,7 @@ class Spire
           :url => url,
           :body => data.to_json,
           :headers => {
-            "Accept" => @spire.mediaType("member"),
+            "Accept" => @api.mediaType("member"),
           }
         }
       end
@@ -182,7 +182,7 @@ class Spire
           :method => :get,
           :url => url,
           :headers => {
-            "Accept" => @spire.mediaType("member"),
+            "Accept" => @api.mediaType("member"),
             "Authorization" => "Basic #{auth}"
           }
         }
@@ -204,7 +204,7 @@ class Spire
         unless response.status == 200
           raise "Error authenticating for application #{self.name}: (#{response.status}) #{response.body}"
         end
-        API::Member.new(@spire, response.data)
+        API::Member.new(@api, response.data)
       end
 
       #Alternative application authentication, without using basic auth
@@ -213,7 +213,7 @@ class Spire
         unless response.status == 201
           raise "Error authenticating for application #{self.name}: (#{response.status}) #{response.body}"
         end
-        API::Member.new(@spire, response.data)
+        API::Member.new(@api, response.data)
       end
 
       #If you do not give a new password, you will get back an authenticated member but have to change
@@ -225,7 +225,7 @@ class Spire
         unless response.status == 201
           raise "Error reseting password for application #{self.name}: (#{response.status}) #{response.body}"
         end
-        API::Member.new(@spire, response.data)
+        API::Member.new(@api, response.data)
       end
 
       def create_member(member_data)
@@ -233,7 +233,7 @@ class Spire
         unless response.status == 201
           raise "Error creating member for application #{self.name}: (#{response.status}) #{response.body}"
         end
-        API::Member.new(@spire, response.data)
+        API::Member.new(@api, response.data)
       end
       
       #Resets a members password based on email
@@ -256,7 +256,7 @@ class Spire
         end
         @members = {}
         response.data.each do |login, properties|
-          @members[login] = API::Member.new(@spire, properties)
+          @members[login] = API::Member.new(@api, properties)
         end
         @members
       end
@@ -267,7 +267,7 @@ class Spire
           raise "Error finding member with login #{member_login}: (#{response.status}) #{response.body}"
         end
         properties = response.data[member_login]
-        member = API::Member.new(@spire, properties)
+        member = API::Member.new(@api, properties)
         @members[member_login] = member if @members.is_a?(Hash)
         member
       end
@@ -280,7 +280,7 @@ class Spire
           raise "Error creating Channel: (#{response.status}) #{response.body}"
         end
         properties = response.data
-        channels[name] = API::Channel.new(@spire, properties)
+        channels[name] = API::Channel.new(@api, properties)
       end
 
       def create_subscription(subscription_name, channel_names)
@@ -290,7 +290,7 @@ class Spire
           raise "Error creating Subscription: (#{response.status}) #{response.body}"
         end
         data = response.data
-        subscription = API::Subscription.new(@spire, data) 
+        subscription = API::Subscription.new(@api, data) 
         if subscription_name
           subscriptions[data["name"]] = subscription
         end
@@ -305,7 +305,7 @@ class Spire
         channels_data = response.data
         @channels = {}
         channels_data.each do |name, properties|
-          @channels[name] = API::Channel.new(@spire, properties)
+          @channels[name] = API::Channel.new(@api, properties)
         end
         @channels
       end
@@ -325,7 +325,7 @@ class Spire
         end
         @subscriptions = {}
         response.data.each do |name, properties|
-          @subscriptions[name] = API::Subscription.new(@spire, properties)
+          @subscriptions[name] = API::Subscription.new(@api, properties)
         end
         @subscriptions
       end
@@ -336,7 +336,7 @@ class Spire
           raise "Error finding channel with name #{name}: (#{response.status}) #{response.body}"
         end
         properties = response.data[name]
-        channel = API::Channel.new(@spire, properties)
+        channel = API::Channel.new(@api, properties)
         @channels[name] = channel if @channels.is_a?(Hash)
         channel
       end
@@ -347,7 +347,7 @@ class Spire
           raise "Error finding subscription with name #{name}: (#{response.status}) #{response.body}"
         end
         properties = response.data[name]
-        sub = API::Subscription.new(@spire, properties)
+        sub = API::Subscription.new(@api, properties)
         @subscriptions[name] = sub if @subscriptions.is_a?(Hash)
         sub
       end

data/lib/spire/api/channel.rb

@@ -1,6 +1,12 @@
 class Spire
   class API
 
+    # Object representing a Spire channel
+    #
+    # You can get a channel object by calling [] on a Spire object
+    # * spire = Spire.new
+    # * spire.start("your api secret")
+    # * channel = spire["channel name"]
     class Channel < Resource
 
       attr_reader :resources
@@ -23,7 +29,7 @@ class Spire
           :url => url,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscriptions"),
+            "Accept" => @api.mediaType("subscriptions"),
           }
         }
       end
@@ -35,8 +41,8 @@ class Spire
           :body => string,
           :headers => {
             "Authorization" => "Capability #{@capabilities["publish"]}",
-            "Accept" => @spire.mediaType("message"),
-            "Content-Type" => @spire.mediaType("message")
+            "Accept" => @api.mediaType("message"),
+            "Content-Type" => @api.mediaType("message")
           }
         }
       end
@@ -51,8 +57,8 @@ class Spire
           :body => {:name => name}.to_json,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscription"),
-            "Content-Type" => @spire.mediaType("subscription")
+            "Accept" => @api.mediaType("subscription"),
+            "Content-Type" => @api.mediaType("subscription")
           }
         }
       end
@@ -68,7 +74,7 @@ class Spire
         end
         @subscriptions = {}
         response.data.each do |name, properties|
-          @subscriptions[name] = API::Subscription.new(@spire, properties)
+          @subscriptions[name] = API::Subscription.new(@api, properties)
         end
         @subscriptions
       end
@@ -79,7 +85,7 @@ class Spire
         unless response.status == 201
           raise "Error publishing to #{self.class.name}: (#{response.status}) #{response.body}"
         end
-        API::Message.new(@spire, response.data)
+        API::Message.new(@api, response.data)
       end
 
       def subscribe(name = nil)
@@ -87,9 +93,8 @@ class Spire
         unless response.status == 201
           raise "Error creating subscription for #{self.name}: (#{response.status}) #{response.body}"
         end
-        API::Subscription.new(@spire, response.data)
+        API::Subscription.new(@api, response.data)
       end
     end
-
   end
 end

data/lib/spire/api/notification.rb

@@ -16,8 +16,8 @@ class Spire
           }.to_json,
           :headers => {
             "Authorization" => "Capability #{@capabilities["push"]}",
-            "Accept" => @spire.mediaType("notification"),
-            "Content-Type" => @spire.mediaType("notification")
+            "Accept" => @api.mediaType("notification"),
+            "Content-Type" => @api.mediaType("notification")
           }
         }
       end

data/lib/spire/api/resource.rb

@@ -41,9 +41,9 @@ class Spire
   
       attr_reader :url, :properties, :capabilities, :capability
 
-      def initialize(spire, data)
-        @spire = spire
-        @client = spire.client
+      def initialize(api, data)
+        @api = api
+        @client = api.client
         @url = data["url"]
         @capabilities = data["capabilities"]
         @properties = data
@@ -92,7 +92,7 @@ class Spire
       end
 
       def schema
-        @spire.schema[resource_name]
+        @api.schema[resource_name]
       end
 
       def media_type

data/lib/spire/api/session.rb

@@ -1,6 +1,5 @@
 class Spire
   class API
-
     class Session
       include Requestable
 
@@ -13,7 +12,7 @@ class Spire
           :url => collection["url"],
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("channels"),
+            "Accept" => @api.mediaType("channels"),
           }
         }
       end
@@ -28,7 +27,7 @@ class Spire
           :query => {:name => name},
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("channels"),
+            "Accept" => @api.mediaType("channels"),
           }
         }
       end
@@ -49,8 +48,8 @@ class Spire
           :body => body,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("channel"),
-            "Content-Type" => @spire.mediaType("channel")
+            "Accept" => @api.mediaType("channel"),
+            "Content-Type" => @api.mediaType("channel")
           }
         }
       end
@@ -64,7 +63,7 @@ class Spire
           :url => url,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscriptions"),
+            "Accept" => @api.mediaType("subscriptions"),
           }
         }
       end
@@ -91,8 +90,8 @@ class Spire
           }.to_json,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscription"),
-            "Content-Type" => @spire.mediaType("subscription")
+            "Accept" => @api.mediaType("subscription"),
+            "Content-Type" => @api.mediaType("subscription")
           }
         }
       end
@@ -107,7 +106,7 @@ class Spire
           :query => {:name => name},
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("subscriptions"),
+            "Accept" => @api.mediaType("subscriptions"),
           }
         }
       end
@@ -125,8 +124,8 @@ class Spire
           }.to_json,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("notification"),
-            "Content-Type" => @spire.mediaType("notification")
+            "Accept" => @api.mediaType("notification"),
+            "Content-Type" => @api.mediaType("notification")
           }
         }
       end
@@ -140,7 +139,7 @@ class Spire
           :url => url,
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("notifications"),
+            "Accept" => @api.mediaType("notifications"),
           }
         }
       end
@@ -153,7 +152,7 @@ class Spire
           :url => collection["url"],
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("applications"),
+            "Accept" => @api.mediaType("applications"),
           }
         }
       end
@@ -168,7 +167,7 @@ class Spire
           :query => {:name => name},
           :headers => {
             "Authorization" => "Capability #{capability}",
-            "Accept" => @spire.mediaType("applications"),
+            "Accept" => @api.mediaType("applications"),
           }
         }
       end
@@ -181,21 +180,33 @@ class Spire
           :body => data.to_json,
           :headers => {
             "Authorization" => "Capability #{collection["capabilities"]["create"]}",
-            "Accept" => @spire.mediaType("application"),
-            "Content-Type" => @spire.mediaType("application")
+            "Accept" => @api.mediaType("application"),
+            "Content-Type" => @api.mediaType("application")
           }
         }
       end
 
       attr_reader :url, :resources, :schema, :capabilities, :capability
 
-      def initialize(spire, data)
-        @spire = spire
-        @client = spire.client
-        @schema = spire.schema["session"]
+      def initialize(api, data)
+        @api = api
+        @client = api.client
+        @schema = api.schema["session"]
         @url = data["url"]
         @capabilities = data["capabilities"]
         @resources = data["resources"]
+
+        @channel_error_counts = {}
+        @application_error_counts = {}
+        @subscription_error_counts = {}
+        @notification_error_counts = {}
+      end
+
+      # Returns a channel object for the named channel
+      # @param [String] name Name of channel returned
+      # @return [Channel]
+      def [](name)
+        API::Channel.new(@api, channels[name] || find_or_create_channel(name))
       end
 
       def account
@@ -203,7 +214,7 @@ class Spire
       end
 
       def account!
-        @account = API::Account.new(@spire, @resources["account"]).get
+        @account = API::Account.new(@api, @resources["account"]).get
       end
 
       def create_channel(name, options={})
@@ -214,7 +225,33 @@ class Spire
           raise "Error creating Channel: (#{response.status}) #{response.body}"
         end
         properties = response.data
-        channels[name] = API::Channel.new(@spire, properties)
+        channels[name] = API::Channel.new(@api, properties)
+      end
+
+      # Creates a channel on spire.  Returns a Channel object.  Note that this will
+      # fail with a 409 if a channel with the same name exists.
+      def find_or_create_channel(name)
+        @channel_error_counts[name] ||= 0
+
+        begin
+          return create_channel(name)
+        # TODO custom error class for Conflict, which we can
+        # then match here, instead of testing for error message
+        rescue => error
+          if error.message =~ /409/
+
+            # Dear retry, I love you.  Affectionately, Matthew.
+            if channel = channels![name]
+              return channel
+            else
+              @channel_error_counts[name] += 1
+              retry unless @channel_error_counts[name] >= RETRY_CREATION_LIMIT
+            end
+
+          else
+            raise error
+          end
+        end
       end
 
       def create_subscription(subscription_name, channel_names, expiration=nil, device_token=nil, notification_name=nil, second_try=false)
@@ -239,7 +276,7 @@ class Spire
           raise "Error creating Subscription: (#{response.status}) #{response.body}"
         end
         data = response.data
-        subscription = API::Subscription.new(@spire, data)
+        subscription = API::Subscription.new(@api, data)
         if subscription_name
           subscriptions[data["name"]] = subscription
         end
@@ -252,7 +289,7 @@ class Spire
           raise "Error finding application with name #{name}: (#{response.status}) #{response.body}"
         end
         properties = response.data[name]
-        app = API::Application.new(@spire, properties)
+        app = API::Application.new(@api, properties)
         @applications[name] = app if @applications.is_a?(Hash)
         app
       end
@@ -264,7 +301,7 @@ class Spire
           raise "Error creating Application (#{response.status}) #{response.body}"
         end
         properties = response.data
-        applications[name] = API::Application.new(@spire, properties)
+        applications[name] = API::Application.new(@api, properties)
       end
 
       def applications!
@@ -275,7 +312,7 @@ class Spire
         applications_data = response.data
         @applications = {}
         applications_data.each do |name, properties|
-          @applications[name] = API::Application.new(@spire, properties)
+          @applications[name] = API::Application.new(@api, properties)
         end
         @applications
       end
@@ -290,7 +327,7 @@ class Spire
           raise "Error creating Notification: (#{response.status}) #{response.body}"
         end
         data = response.data
-        notification = API::Notification.new(@spire, data) 
+        notification = API::Notification.new(@api, data) 
         if options[:name]
           notifications[data["name"]] = notification
         end
@@ -305,7 +342,7 @@ class Spire
         channels_data = response.data
         @channels = {}
         channels_data.each do |name, properties|
-          @channels[name] = API::Channel.new(@spire, properties)
+          @channels[name] = API::Channel.new(@api, properties)
         end
         @channels
       end
@@ -325,11 +362,44 @@ class Spire
         end
         @subscriptions = {}
         response.data.each do |name, properties|
-          @subscriptions[name] = API::Subscription.new(@spire, properties)
+          @subscriptions[name] = API::Subscription.new(@api, properties)
         end
         @subscriptions
       end
       
+      # Returns a subscription object for the given channels
+      # @param [String] subscription_name Name for the subscription
+      # @param [String] channels One or more channel names for the subscription to listen on
+      # @return [Subscription]
+      def subscribe(name, *channels)
+        channels.each { |channel| self.find_or_create_channel(channel) }
+        API::Subscription.new(@api,
+          subscriptions[name] || find_or_create_subscription(name, *channels)
+        )
+      end
+      
+      def find_or_create_subscription(subscription_name, *channels)
+        @subscription_error_counts[subscription_name] ||= 0
+        begin
+          return create_subscription(subscription_name, channels)
+        rescue => error
+          if error.message =~ /409/
+
+            if subscription = subscriptions![subscription_name]
+              return subscription
+            else
+              @subscription_error_counts[subscription_name] += 1
+              retry unless @subscription_error_counts >= RETRY_CREATION_LIMIT
+            end
+
+          else
+            raise error
+          end
+        end
+      end
+
+      alias :subscription :subscribe #For compatibility with other clients
+
       def notifications
         @notifications ||= notifications!
       end
@@ -341,12 +411,62 @@ class Spire
         end
         @notifications = {}
         response.data.each do |name, properties|
-          @notifications[name] = API::Notification.new(@spire, properties)
+          @notifications[name] = API::Notification.new(@api, properties)
         end
         @notifications
       end
 
-    end
+      def notification(name, mode="development")
+        Notification.new(@api,
+          @notifications[name] || find_or_create_notification(name, ssl_cert)
+        )
+      end
+      
+      def find_or_create_notification(notification_name, mode)
+        @notification_error_counts[notification_name] ||= 0
+        begin
+          return create_notification(
+              :name => notification_name,
+              :mode => mode
+            )
+        rescue => error
+          if error.message =~ /409/
+          
+            if notification = notification![notification_name]
+              return notification
+            else
+              @notification_error_counts[notification_name] += 1
+              retry unless @notification_error_counts >= RETRY_CREATION_LIMIT
+            end
+          
+          else
+            raise error
+          end
+        end
+      end
 
+      # Creates an application on spire.  Returns an Application object.  Will retry on a 409.
+      # @param [String] Name of the application to find/create
+      def find_or_create_application(name)
+        @application_error_counts[name] ||= 0
+        begin
+          return create_application(name)
+        # TODO custom error class for Conflict, which we can
+        # then match here, instead of testing for error message
+        rescue => error
+          if error.message =~ /409/
+            # Dear retry, I love you.  Affectionately, Matthew.
+            if application = applications![name]
+              return application
+            else
+              @application_error_counts[name] += 1
+              retry unless @application_error_counts[name] >= RETRY_CREATION_LIMIT
+            end
+          else
+            raise error
+          end
+        end
+      end
+    end
   end
 end

data/lib/spire/api/subscription.rb

@@ -1,6 +1,18 @@
 class Spire
   class API
 
+    # The subscription class represents a read connection to a Spire channel
+    #
+    # You can get a subscription by calling subscribe on a spire object with the name of the channel or
+    # by calling subscribe on a channel object
+    #
+    # * spire = Spire.new
+    # * spire.start("your api secret")
+    # *THEN*
+    # * subscription = spire.subscribe("subscription name", "channel name")
+    # *OR*
+    # * channel = spire["channel name"]
+    # * subscription = channel.subscribe("subscription name")
     class Subscription < Resource
 
       attr_accessor :last
@@ -23,7 +35,7 @@ class Spire
           },
           :headers => {
             "Authorization" => "Capability #{@capabilities["events"]}",
-            "Accept" => @spire.mediaType("events")
+            "Accept" => @api.mediaType("events")
           }
         }
       end
@@ -36,20 +48,75 @@ class Spire
         else
           @listeners = { }
           EVENT_TYPES.each do |type|
-            @listeners[type] = []
+            @listeners[type] = {}
           end
           @listeners
         end
       end
 
-      def add_listener(type="message", &block)
+      # provided named listeners, threading, and a
+      # stop_listening method.
+      def add_listener(type, listener_name = nil, &block)
+        type ||= ""
         type.downcase!
         if !EVENT_TYPES.include?(type)
           throw "Listener type must be one of #{EVENT_TYPES}"
         end
 
-        listeners[type] << block
-        block
+        raise ArgumentError unless block_given?
+        listener_name ||= generate_listener_name
+        listener = wrap_listener(&block)
+        listeners[type][listener_name] = listener
+        listener_name
+      end
+
+      def remove_listener(type, arg)
+        type ||= ""
+        type.downcase!
+        if !EVENT_TYPES.include?(type)
+          throw "Listener type must be one of #{EVENT_TYPES}"
+        end
+
+        if arg.is_a? String
+          listener = listeners[type].delete(arg)
+        else
+          listener_name, _listener = listeners.detect {|k,v| v == arg }
+          listener = listeners[type].delete(listener_name)
+        end
+
+        if listener
+          listeners[type].delete(listener)
+        end
+      end
+
+      def wrap_listener(&block)
+        lambda do |message|
+          Thread.new do
+            # Messages received after a call to stop_listening
+            # will not be processed.
+            yield message if @listening
+          end
+        end
+      end
+
+      def generate_listener_name
+        listener_name = nil
+        while !listener_name
+          new_name = "Listener-#{rand(9999999)}"
+          listener_name = new_name unless listeners.has_key?(new_name)
+        end
+        listener_name
+      end
+
+      def start_listening(options={})
+        @listening = true
+        Thread.new do
+          long_poll(options) while @listening
+        end
+      end
+
+      def stop_listening
+        @listening = false
       end
 
       def retrieve_events(options={})
@@ -70,10 +137,10 @@ class Spire
           response.data[type_pl].each do |event|
             klass_name = type.capitalize
             klass = API.const_get(klass_name)
-            event_obj = klass.new(@spire, event)
+            event_obj = klass.new(@api, event)
             event_hash[type_pl.to_sym].push(event_obj)
 
-            listeners[type].each do |listener|
+            listeners[type].each_value do |listener|
               listener.call(event_obj)
             end
           end
@@ -93,13 +160,6 @@ class Spire
         options[:last] = @last if @last
         retrieve_events(options)
       end
-
-      def listen(options={})
-        loop do
-          break unless yield(long_poll(options))
-        end
-      end
-
     end
   end
 end

data/lib/spire_io.rb

@@ -13,22 +13,9 @@ class Spire
   def initialize(url="https://api.spire.io")
     @api = Spire::API.new(url)
     @url = url
-    @channel_error_counts = {}
-    @application_error_counts = {}
-    @subscription_error_counts = {}
-    @notification_error_counts = {}
-    discover
-  end
-
-  def secret
-    @session.resources["account"]["secret"]
-  end
-  
-  def discover
     @api.discover
-    self
   end
- 
+
   def start(secret)
     @session = @api.create_session(secret)
     self
@@ -52,301 +39,4 @@ class Spire
   def password_reset_request(email)
     @api.password_reset_request(email)
   end
-
-
-  # Deletes the currently authenticated account
-  def delete_account
-    @session.account.delete
-  end
-
-  # Updates the current account with the new account information
-  # See Spire docs for available settings
-  def update(info)
-    @session.account.update(info)
-    self
-  end
-
-  # Returns a channel object for the named channel
-  # @param [String] name Name of channel returned
-  # @return [Channel]
-  def [](name)
-    Channel.new(self, channels[name] || find_or_create_channel(name))
-  end
-
-  def channels
-    @session.channels
-  end
-
-  def channels!
-    @session.channels!
-  end
-
-  # Creates a channel on spire.  Returns a Channel object.  Note that this will
-  # fail with a 409 if a channel with the same name exists.
-  def find_or_create_channel(name)
-  	@channel_error_counts[name] ||= 0
-
-    begin
-      return @session.create_channel(name)
-    # TODO custom error class for Conflict, which we can
-    # then match here, instead of testing for error message
-    rescue => error
-      if error.message =~ /409/
-
-        # Dear retry, I love you.  Affectionately, Matthew.
-        if channel = @session.channels![name]
-          return channel
-        else
-          @channel_error_counts[name] += 1
-          retry unless @channel_error_counts[name] >= RETRY_CREATION_LIMIT
-        end
-
-      else
-        raise error
-      end
-    end
-  end
-
-  # Returns a subscription object for the given channels
-  # @param [String] subscription_name Name for the subscription
-  # @param [String] channels One or more channel names for the subscription to listen on
-  # @return [Subscription]
-  def subscribe(name, *channels)
-    channels.each { |channel| self.find_or_create_channel(channel) }
-    Subscription.new(
-      @session.subscriptions[name] || find_or_create_subscription(name, *channels)
-    )
-  end
-
-  def find_or_create_subscription(subscription_name, *channels)
-  	@subscription_error_counts[subscription_name] ||= 0
-    begin
-      return @session.create_subscription(subscription_name, channels)
-    rescue => error
-      if error.message =~ /409/
-
-        if subscription = @session.subscriptions![subscription_name]
-          return subscription
-        else
-        	@subscription_error_counts[subscription_name] += 1
-          retry unless @subscription_error_counts >= RETRY_CREATION_LIMIT
-        end
-
-      else
-        raise error
-      end
-    end
-  end
-
-  alias :subscription :subscribe #For compatibility with other clients
-
-	#Returns an array of subscription objects for all of this account's subscriptions
-	#@return [Array]
-	def subscriptions
-		@session.subscriptions.values
-	end
-	
-
-  def notification(name, mode="development")
-    Notification.new(
-      @session.notifications[name] || find_or_create_notification(name, ssl_cert)
-    )
-  end
-  
-  def find_or_create_notification(notification_name, mode)
-  	@notification_error_counts[notification_name] ||= 0
-    begin
-      return @session.create_notification(
-          :name => notification_name,
-          :mode => mode
-        )
-    rescue => error
-      if error.message =~ /409/
-      
-        if notification = @session.notification![notification_name]
-          return notification
-        else
-          @notification_error_counts[notification_name] += 1
-          retry unless @notification_error_counts >= RETRY_CREATION_LIMIT
-        end
-      
-      else
-        raise error
-      end
-    end
-  end
-  
-
-  def applications
-    @session.applications
-  end
-
-  def applications!
-    @session.applications!
-  end
-
-  # Creates an application on spire.  Returns an Application object.  Will retry on a 409.
-  # @param [String] Name of the application to find/create
-  def find_or_create_application(name)
-    @application_error_counts[name] ||= 0
-    begin
-      return @session.create_application(name)
-    # TODO custom error class for Conflict, which we can
-    # then match here, instead of testing for error message
-    rescue => error
-      if error.message =~ /409/
-        # Dear retry, I love you.  Affectionately, Matthew.
-        if application = @session.applications![name]
-          return application
-        else
-          @application_error_counts[name] += 1
-          retry unless @application_error_counts[name] >= RETRY_CREATION_LIMIT
-        end
-      else
-        raise error
-      end
-    end
-  end
-
-  # Returns a billing object than contains a list of all the plans available
-  # @param [String] info optional object description
-  # @return [Billing]
-  def billing
-    @api.billing
-  end
-  
-  # Updates and subscribe the account to a billing plan
-  # @param [Object] info data containing billing description
-  # @return [Account]
-  def billing_subscription(info)
-    @session.account.billing_subscription(info)
-    self
-  end
-
-
-  # Object representing a Spire channel
-  #
-  # You can get a channel object by calling [] on a Spire object
-  # * spire = Spire.new
-  # * spire.start("your api secret")
-  # * channel = spire["channel name"]
-  class Channel < SimpleDelegator
-    def initialize(spire, channel)
-      super(channel)
-      @spire = spire
-    end
-    # Obtain a subscription for the channel
-    # @param [String] subscription_name Name of the subscription
-    # @return [Subscription]
-    def subscribe(subscription_name = nil)
-      @spire.subscribe(subscription_name, properties["name"])
-    end
-
-    # this is required because Delegator's method_missing relies
-    # on the object having a method defined, but in this case
-    # the API::Channel is also using method_missing
-    def name
-      __getobj__.name
-    end
-  end
-  
-  # The subscription class represents a read connection to a Spire channel
-  #
-  # You can get a subscription by calling subscribe on a spire object with the name of the channel or
-  # by calling subscribe on a channel object
-  #
-  # * spire = Spire.new
-  # * spire.start("your api secret")
-  # *THEN*
-  # * subscription = spire.subscribe("subscription name", "channel name")
-  # *OR*
-  # * channel = spire["channel name"]
-  # * subscription = channel.subscribe("subscription name")
-  class Subscription < SimpleDelegator
-
-    # this is required because Delegator's method_missing relies
-    # on the object having a method defined, but in this case
-    # the API::Subscription is also using method_missing
-    def name
-      __getobj__.name
-    end
-
-    # misnamed method, here for backompat.  Should be something like #get_messages,
-    # because it only makes one request.
-    def listen(options={})
-      long_poll(options)
-    end
-
-    # wraps the underlying Subscription#add_listener to
-    # provided named listeners, threading, and a
-    # stop_listening method.
-    def add_listener(listener_name = nil, &block)
-      raise ArgumentError unless block_given?
-      listener_name ||= generate_listener_name
-      listener = wrap_listener(&block)
-      listeners[listener_name] = listener
-      __getobj__.add_listener("message", &listener)
-    end
-
-    def remove_listener(arg)
-      if arg.is_a? String
-        listener = listeners.delete(arg)
-      else
-        listener_name, _listener = listeners.detect {|k,v| v == arg }
-        listener = listeners.delete(listener_name)
-      end
-
-      if listener
-        __getobj__.listeners["message"].delete(listener)
-      end
-    end
-
-    def wrap_listener(&block)
-      lambda do |message|
-        Thread.new do
-          # Messages received after a call to stop_listening
-          # will not be processed.
-          yield message["content"] if @listening
-        end
-      end
-    end
-
-    def listeners
-      @listeners ||= {}
-    end
-
-    def generate_listener_name
-      listener_name = nil
-      while !listener_name
-        new_name = "Listener-#{rand(9999999)}"
-        listener_name = new_name unless listeners.has_key?(new_name)
-      end
-      listener_name
-    end
-
-    def start_listening(options={})
-      @listening = true
-      Thread.new do
-        long_poll(options) while @listening
-      end
-    end
-
-    def stop_listening
-      @listening = false
-    end
-
-  end
-
-  class Notification < SimpleDelegator
-
-    # this is required because Delegator's method_missing relies
-    # on the object having a method defined, but in this case
-    # the API::Subscription is also using method_missing
-    def name
-      __getobj__.name
-    end
-    
-    
-  end
-  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spire_io
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Dan Yoder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 -07:00
+date: 2012-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency