spire_io 1.0.0.beta.3 → 1.0.0

data/lib/spire/api/account.rb

@@ -8,13 +8,14 @@ class Spire
 
       define_request(:billing_subscription) do |info|
         billing = properties["billing"]
+        capability = billing["capabilities"]["subscribe"]
         {
           :method => :put,
           :url => billing["url"],
           :body => info.to_json,
           :headers => {
             "Accept" => media_type, "Content-Type" => media_type,
-            "Authorization" => "Capability #{billing["capability"]}"
+            "Authorization" => "Capability #{capability}"
           }
         }
       end

data/lib/spire/api/channel.rb

@@ -12,7 +12,7 @@ class Spire
           :url => @url,
           :body => string,
           :headers => {
-            "Authorization" => "Capability #{@capability}",
+            "Authorization" => "Capability #{@capabilities["publish"]}",
             "Accept" => @spire.mediaType("message"),
             "Content-Type" => @spire.mediaType("message")
           }

data/lib/spire/api/message.rb

@@ -0,0 +1,9 @@
+class Spire
+  class API
+    class Message < Resource
+      def resource_name
+        "message"
+      end
+    end
+  end
+end

data/lib/spire/api/resource.rb

@@ -8,7 +8,7 @@ class Spire
           :method => :get,
           :url => @url,
           :headers => {
-            "Authorization" => "Capability #{@capability}",
+            "Authorization" => "Capability #{@capabilities["get"]}",
             "Accept" => media_type
           }
         }
@@ -20,7 +20,7 @@ class Spire
           :url => @url,
           :body => properties.to_json,
           :headers => {
-            "Authorization" => "Capability #{@capability}",
+            "Authorization" => "Capability #{@capabilities["update"]}",
             "Accept" => media_type,
             "Content-Type" => media_type
           }
@@ -32,20 +32,20 @@ class Spire
           :method => :delete,
           :url => @url,
           :headers => { 
-            "Authorization" => "Capability #{@capability}",
+            "Authorization" => "Capability #{@capabilities["delete"]}",
             "Accept" => media_type,
             "Content-Type" => media_type,
           }
         }
       end
   
-      attr_reader :url, :capability, :properties
+      attr_reader :url, :properties, :capabilities, :capability
 
       def initialize(spire, data)
         @spire = spire
         @client = spire.client
         @url = data["url"]
-        @capability = data["capability"]
+        @capabilities = data["capabilities"]
         @properties = data
       end
 

data/lib/spire/api/session.rb

@@ -4,25 +4,15 @@ class Spire
     class Session
       include Requestable
 
-      define_request(:account) do
-        resource = @resources["account"]
-        {
-          :method => :get,
-          :url => resource["url"],
-          :headers => {
-            "Authorization" => "Capability #{resource["capability"]}",
-            "Accept" => @spire.mediaType("account")
-          }
-        }
-      end
-
       define_request(:channels) do
         collection = @resources["channels"]
+        capability = collection["capabilities"]["all"]
+        url = collection["url"]
         request = {
           :method => :get,
           :url => collection["url"],
           :headers => {
-            "Authorization" => "Capability #{collection["capability"]}",
+            "Authorization" => "Capability #{capability}",
             "Accept" => @spire.mediaType("channels"),
           }
         }
@@ -30,12 +20,14 @@ class Spire
 
       define_request(:channel_by_name) do |name|
         collection = @resources["channels"]
+        capability = collection["capabilities"]["get_by_name"]
+        url = collection["url"]
         request = {
           :method => :get,
-          :url => collection["url"],
+          :url => url,
           :query => {:name => name},
           :headers => {
-            "Authorization" => "Capability #{collection["capability"]}",
+            "Authorization" => "Capability #{capability}",
             "Accept" => @spire.mediaType("channels"),
           }
         }
@@ -43,43 +35,76 @@ class Spire
 
       define_request(:create_channel) do |name|
         collection = @resources["channels"]
+        capability = collection["capabilities"]["create"]
+        url = collection["url"]
         {
           :method => :post,
-          :url => collection["url"],
+          :url => url,
           :body => { :name => name }.to_json,
           :headers => {
-            "Authorization" => "Capability #{collection["capability"]}",
+            "Authorization" => "Capability #{capability}",
             "Accept" => @spire.mediaType("channel"),
             "Content-Type" => @spire.mediaType("channel")
           }
         }
       end
 
+      define_request(:subscriptions) do
+        collection = @resources["subscriptions"]
+        capability = collection["capabilities"]["all"]
+        url = collection["url"]
+        {
+          :method => :get,
+          :url => url,
+          :headers => {
+            "Authorization" => "Capability #{capability}",
+            "Accept" => @spire.mediaType("subscriptions"),
+          }
+        }
+      end
+
       define_request(:create_subscription) do |subscription_name, channel_urls|
         collection = @resources["subscriptions"]
+        capability = collection["capabilities"]["create"]
+        url = collection["url"]
         {
           :method => :post,
-          :url => collection["url"],
+          :url => url,
           :body => {
             :channels => channel_urls,
             :name => subscription_name
           }.to_json,
           :headers => {
-            "Authorization" => "Capability #{collection["capability"]}",
+            "Authorization" => "Capability #{capability}",
             "Accept" => @spire.mediaType("subscription"),
             "Content-Type" => @spire.mediaType("subscription")
           }
         }
       end
 
-      attr_reader :url, :resources, :schema, :capability
+      define_request(:subscription_by_name) do |name|
+        collection = @resources["subscriptions"]
+        capability = collection["capabilities"]["get_by_name"]
+        url = collection["url"]
+        request = {
+          :method => :get,
+          :url => url,
+          :query => {:name => name},
+          :headers => {
+            "Authorization" => "Capability #{capability}",
+            "Accept" => @spire.mediaType("subscriptions"),
+          }
+        }
+      end
+
+      attr_reader :url, :resources, :schema, :capabilities, :capability
 
       def initialize(spire, data)
         @spire = spire
         @client = spire.client
         @schema = spire.schema["session"]
         @url = data["url"]
-        @capability = data["capability"]
+        @capabilities = data["capabilities"]
         @resources = data["resources"]
       end
 
@@ -107,7 +132,11 @@ class Spire
           raise "Error creating Subscription: (#{response.status}) #{response.body}"
         end
         data = response.data
-        subscriptions[data["name"]] = API::Subscription.new(@spire, data)
+        subscription = API::Subscription.new(@spire, data) 
+        if subscription_name
+          subscriptions[data["name"]] = subscription
+        end
+        subscription
       end
 
       def channels!
@@ -127,17 +156,6 @@ class Spire
         @channels ||= channels!
       end
 
-      define_request(:subscriptions) do
-        {
-          :method => :get,
-          :url => @resources["subscriptions"]["url"],
-          :headers => {
-            "Authorization" => "Capability #{@resources["subscriptions"]["capability"]}",
-            "Accept" => @spire.mediaType("subscriptions"),
-          }
-        }
-      end
-
       def subscriptions
         @subscriptions ||= subscriptions!
       end

data/lib/spire/api/subscription.rb

@@ -19,7 +19,7 @@ class Spire
             "delay" => options[:delay]
           },
           :headers => {
-            "Authorization" => "Capability #{@capability}",
+            "Authorization" => "Capability #{@capabilities["messages"]}",
             "Accept" => @spire.mediaType("events")
           }
         }
@@ -43,8 +43,10 @@ class Spire
         unless response.status == 200
           raise "Error retrieving messages from #{self.class.name}: (#{response.status}) #{response.body}"
         end
-        messages = response.data["messages"]
-        @last = messages.last["timestamp"] unless messages.empty?
+        messages = response.data["messages"].map do |message|
+          API::Message.new(@spire, message)
+        end
+        @last = messages.last.timestamp unless messages.empty?
         messages.each do |message|
           listeners.each do |listener|
             listener.call(message)

data/lib/spire/api.rb

@@ -10,6 +10,7 @@ require "spire/api/session"
 require "spire/api/account"
 require "spire/api/channel"
 require "spire/api/subscription"
+require "spire/api/message"
 
 class Spire
 
@@ -39,11 +40,11 @@ class Spire
       }
     end
 
-    define_request(:create_session) do |key|
+    define_request(:create_session) do |secret|
       {
         :method => :post,
         :url => @description["resources"]["sessions"]["url"],
-        :body => {:key => key}.to_json,
+        :body => {:secret => secret}.to_json,
         :headers => {
           "Accept" => mediaType("session"),
           "Content-Type" => mediaType("account")
@@ -110,9 +111,9 @@ class Spire
       schema[name]["mediaType"]
     end
    
-    def create_session(key)
-      response = request(:create_session, key)
-      raise "Error starting a key-based session" if response.status != 201
+    def create_session(secret)
+      response = request(:create_session, secret)
+      raise "Error starting a secret-based session" if response.status != 201
       session_data = response.data
       API::Session.new(self, session_data)
     end

data/lib/spire/commands/cli.rb

@@ -0,0 +1,59 @@
+require "spire/commands/register"
+require "spire/commands/console"
+
+class Spire
+  module Commands
+    
+    # This is the spire command
+    module CLI
+
+      COMMANDS = {
+        "register" => Spire::Commands::Register,
+        "console" => Spire::Commands::Console
+      }
+      
+      def self.run(subcommand,*args)
+        if command = COMMANDS[subcommand]
+          begin
+            command.run(args)
+          rescue => e
+            $stderr.puts "spire: #{e.message}"
+            exit(-1)
+          end
+        else
+          usage "#{subcommand} is not a supported command"
+        end
+      end
+      
+      def self.rc
+        @rc ||= (YAML.load_file(File.expand_path("~/.spirerc")) rescue {})
+      end
+      
+      def self.save_rc
+        File.open(File.expand_path("~/.spirerc"),"w") { |f| YAML.dump(rc,f) }
+      end
+      
+      def self.url
+        rc["url"]||"https://api.spire.io"
+      end
+      
+      def self.usage(message)
+        $stderr.puts "spire: #{message}"
+        $stderr.puts <<-eos
+Usage: spire <subcommand> <options>
+
+The spire command provides command line access to the spire.io API. 
+
+Valid commands:
+
+    register     Register a new account
+    console      Open up an IRB session with an open spire session.
+    
+You can get more options for any command with --help or -h.
+eos
+        exit(-1)
+      end
+      
+    end
+  end
+end

data/lib/spire/commands/console.rb

@@ -0,0 +1,32 @@
+require "spire_io"
+require "spire/commands/mixins/authenticate"
+require "spire/commands/mixins/help"
+require "mixlib/cli"
+require "highline/import"
+
+require "irb"
+require "irb/completion"
+
+class Spire
+  module Commands
+    
+    # This is the spire command
+    class Console
+      
+      include Mixins::Authenticate
+      include Mixins::Help
+
+      def self.run(args)
+        self.new.run(args)
+      end
+      
+      def run(args)
+        parse_options(args)
+        $spire = connect
+        ARGV.clear
+        IRB.start
+      end
+            
+    end
+  end
+end

data/lib/spire/commands/mixins/authenticate.rb

@@ -0,0 +1,57 @@
+require "yaml"
+
+class Spire
+  module Commands
+    module Mixins
+      module Authenticate
+        
+        def self.included(target)
+          target.module_eval do
+            
+            include Mixlib::CLI
+            
+            option :email, 
+              :short => "-e EMAIL",
+              :long  => "--email EMAIL",
+              :description => "The email for your account"
+
+            option :password, 
+              :short => "-p PASSWORD",
+              :long  => "--password PASSWORD",
+              :description => "The password for your account"
+
+            option :secret,
+              :short => "-s SECRET",
+              :long => "--secret SECRET",
+              :description => "The account secret for your account"
+          end
+  
+        end
+        
+        def connect
+          if config[:email]
+            if !config[:password]
+              config[:password] = ask("Password:") { |q| q.echo = false}
+            end
+            spire = Spire.new(CLI.url)
+            spire.login(config[:email],config[:password])
+            return spire
+          else 
+            if !config[:secret]
+              if CLI.rc["secret"]
+                config[:secret] = CLI.rc["secret"]
+              else
+                raise "No secret provided or found in ~/.spirerc"
+              end
+            end
+            spire = Spire.new(CLI.url)
+            spire.start(config[:secret])
+            return spire
+          end
+        end
+      end
+    end
+  end
+end
+            
+          

data/lib/spire/commands/mixins/help.rb

@@ -0,0 +1,23 @@
+class Spire
+  module Commands
+    module Mixins
+      module Help
+        def self.included(target)
+          target.module_eval do
+            include Mixlib::CLI
+            option :help,
+              :short => "-h",
+              :long => "--help",
+              :description => "Show this message",
+              :on => :tail,
+              :boolean => true,
+              :show_options => true,
+              :exit => 0
+          end
+        end
+        
+      end
+    end
+  end
+end
+            

data/lib/spire/commands/register.rb

@@ -0,0 +1,42 @@
+require "yaml"
+require "spire_io"
+require "spire/commands/mixins/help"
+require "mixlib/cli"
+
+class Spire
+  module Commands
+    
+    # This is the spire command
+    class Register
+      
+      include Mixlib::CLI
+      include Mixins::Help
+
+      option :email, 
+        :short => "-e EMAIL",
+        :long  => "--email EMAIL",
+        :required => true,
+        :description => "The email for the account you're registering"
+
+      option :password, 
+        :short => "-p PASSWORD",
+        :long  => "--password PASSWORD",
+        :required => true,
+        :description => "Set the password for managing this account"
+
+      def self.run(args)
+        self.new.run(args)
+      end
+      
+      def run(args)
+        parse_options(args)
+        spire = Spire.new(CLI.url)
+        spire.register(:email => config[:email], :password => config[:password])
+        CLI.rc["secret"] = spire.secret
+        CLI.save_rc
+				$stdout.puts spire.secret
+      end
+            
+    end
+  end
+end

data/lib/spire/commands.rb

@@ -0,0 +1 @@
+require "spire/commands/cli"

data/lib/spire_io.rb

@@ -18,8 +18,8 @@ class Spire
     discover
   end
 
-  def key
-    @session.resources["account"]["key"]
+  def secret
+    @session.resources["account"]["secret"]
   end
   
   def discover
@@ -27,8 +27,8 @@ class Spire
     self
   end
  
-  def start(key)
-    @session = @api.create_session(key)
+  def start(secret)
+    @session = @api.create_session(secret)
     self
   end
 
@@ -96,7 +96,7 @@ class Spire
           return channel
         else
           @channel_error_counts[name] += 1
-          retry unless @channel_error_counts >= RETRY_CREATION_LIMIT
+          retry unless @channel_error_counts[name] >= RETRY_CREATION_LIMIT
         end
 
       else
@@ -126,6 +126,7 @@ class Spire
         if subscription = @session.subscriptions![subscription_name]
           return subscription
         else
+        	@subscription_error_counts[subscription_name] += 1
           retry unless @subscription_error_counts >= RETRY_CREATION_LIMIT
         end
 
@@ -163,7 +164,7 @@ class Spire
   #
   # You can get a channel object by calling [] on a Spire object
   # * spire = Spire.new
-  # * spire.start("your api key")
+  # * spire.start("your api secret")
   # * channel = spire["channel name"]
   class Channel < SimpleDelegator
     def initialize(spire, channel)
@@ -191,7 +192,7 @@ class Spire
   # by calling subscribe on a channel object
   #
   # * spire = Spire.new
-  # * spire.start("your api key")
+  # * spire.start("your api secret")
   # *THEN*
   # * subscription = spire.subscribe("subscription name", "channel name")
   # *OR*
@@ -215,11 +216,11 @@ class Spire
     # wraps the underlying Subscription#add_listener to
     # provided named listeners, threading, and a
     # stop_listening method.
-    def add_listener(name=nil, &block)
+    def add_listener(listener_name = nil, &block)
       raise ArgumentError unless block_given?
-      name ||= generate_listener_name
+      listener_name ||= generate_listener_name
       listener = wrap_listener(&block)
-      listeners[name] = listener
+      listeners[listener_name] = listener
       __getobj__.add_listener(&listener)
     end
 
@@ -227,8 +228,8 @@ class Spire
       if arg.is_a? String
         listener = listeners.delete(arg)
       else
-        name, _listener = listeners.detect {|k,v| v == arg }
-        listener = listeners.delete(name)
+        listener_name, _listener = listeners.detect {|k,v| v == arg }
+        listener = listeners.delete(listener_name)
       end
 
       if listener

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spire_io
 version: !ruby/object:Gem::Version 
-  hash: 3899554913
-  prerelease: 6
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  - 3
-  version: 1.0.0.beta.3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Dan Yoder
@@ -19,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 -08:00
+date: 2012-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,9 +51,41 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mixlib-cli
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 2
+        - 2
+        version: 1.2.2
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 6
+        - 11
+        version: 1.6.11
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,11 +96,11 @@ dependencies:
         - 7
         version: "2.7"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +111,11 @@ dependencies:
         - 7
         version: "0.7"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: redcarpet
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,7 +127,7 @@ dependencies:
         - 0
         version: 2.1.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 description: "\t\tThe spire_io gem allows you to quickly and easily use the spire.io service\n\
   \t\tusing Ruby. See http://www.spire.io/ for more.\n"
 email: 
@@ -113,11 +143,18 @@ extra_rdoc_files: []
 files: 
 - lib/spire/api/account.rb
 - lib/spire/api/channel.rb
+- lib/spire/api/message.rb
 - lib/spire/api/requestable.rb
 - lib/spire/api/resource.rb
 - lib/spire/api/session.rb
 - lib/spire/api/subscription.rb
 - lib/spire/api.rb
+- lib/spire/commands/cli.rb
+- lib/spire/commands/console.rb
+- lib/spire/commands/mixins/authenticate.rb
+- lib/spire/commands/mixins/help.rb
+- lib/spire/commands/register.rb
+- lib/spire/commands.rb
 - lib/spire_io.rb
 has_rdoc: true
 homepage: https://github.com/spire-io/spire.io.rb
@@ -140,18 +177,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby client for spire.io