trumpet-trumpet 0.0.12 → 0.1.0

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.homepage = "http://github.com/trumpet/trumpet"
     gem.authors = ["Michael Taras"]
     gem.add_dependency 'json'
+    gem.add_dependency 'fakeweb'
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 12
+:minor: 1
+:patch: 0
 :major: 0
-:minor: 0

data/lib/trumpet.rb

@@ -5,6 +5,7 @@ require 'json'
 
 require 'net/http'
 require 'uri'
+require 'pp'
 
 require 'core_extensions'
 
@@ -12,12 +13,15 @@ require 'core_extensions'
 module Trumpet
 end
 
-require 'trumpet/request'
 require 'trumpet/exceptions'
+require 'trumpet/request'
+require 'trumpet/resource'
 require 'trumpet/message'
 require 'trumpet/receiver'
 require 'trumpet/listener'
 require 'trumpet/transmitter'
 require 'trumpet/channel'
 require 'trumpet/user'
-require 'trumpet/helpers'
+require 'trumpet/helpers'
+require 'trumpet/delegator'
+require 'trumpet/base'

data/lib/trumpet/base.rb

@@ -0,0 +1,16 @@
+module Trumpet
+  class Base
+    include Delegator
+    
+    delegate_with_credentials :users,         User
+    delegate_with_credentials :channels,      Channel
+    delegate_with_credentials :messages,      Message
+    delegate_with_credentials :receivers,     Receiver
+    delegate_with_credentials :listeners,     Listener
+    delegate_with_credentials :transmitters,  Transmitter
+            
+    def initialize(credentials={})
+      @credentials = credentials unless credentials.empty?
+    end
+  end
+end

data/lib/trumpet/channel.rb

@@ -1,49 +1,33 @@
 module Trumpet
-  class Channel
-    @@attributes = [
-      :name,
-      :description,
-      :receiver_id,
-      :transmitter_id,
-      :owner_id,
-      :created_at,
-      :updated_at
-    ]
-    
-    attr_reader *@@attributes
+  class Channel < Trumpet::Resource
     
     def self.create(options)
-      Channel.new(Trumpet::Request.post('/channels', :parameters => options))
+      Channel.new(Trumpet::Request.post('/channels', options))
     end
     
-    def self.find(name)
-      Channel.new(Trumpet::Request.get("/channels/#{name}"))
+    def self.find(name, options={})
+      Channel.new(Trumpet::Request.get("/channels/#{name}", options))
     end
     
-    def self.all
-      Trumpet::Request.get('/channels').map { |attributes| Channel.new(attributes) }
+    def self.all(options={})
+      Trumpet::Request.get('/channels', options).map { |attributes| Channel.new(attributes) }
     end
     
-    def self.all_by_user(name)
-      channels = Trumpet::Request.get("/users/#{name}/channels")
+    def self.all_by_user(name, options={})
+      channels = Trumpet::Request.get("/users/#{name}/channels", options)
       channels.map { |attributes| Channel.new(attributes) }
     end
         
-    def broadcast(message)
-      !!Trumpet::Request.post("/channels/#{@name}/messages", :parameters => message.to_h, :parse_response => false)
+    def broadcast(message, options={})
+      options[:credentials] ||= @credentials
+      !!Trumpet::Request.post("/channels/#{@name}/messages", :parameters => message.to_h, :parse_response => false, :credentials => options[:credentials])
     end
     
-    def messages
-      messages = Trumpet::Request.get("/channels/#{@name}/messages")
+    def messages(options={})
+      options[:credentials] ||= @credentials
+      messages = Trumpet::Request.get("/channels/#{@name}/messages", options)
       messages.map { |attributes| Message.new(attributes) }
     end
-
-    protected
     
-      def initialize(attributes)
-        @@attributes.each do |attr|
-          self.instance_variable_set(:"@#{attr.to_s}", attributes[attr.to_s]) if attributes[attr.to_s]
-        end
-      end
   end
 end

data/lib/trumpet/delegator.rb

@@ -0,0 +1,47 @@
+# This module defines the delegate_with_credentials method on classes that include it
+# This allows the class to say the following :
+#
+#   delegate_with_request :users, Trumpet::User
+# 
+# And any instance of the class will have a users method on it, which will delegate
+# calls to the Trumpet::User class with the proper request object in the args
+
+module Trumpet
+  module Delegator
+    
+    class ResourceDelegator
+      def initialize(delegate, credentials)
+        @delegate = delegate
+        @credentials = credentials
+      end
+
+      def method_missing(sym, args=nil)
+        if args.nil?
+          new_args = Hash.new
+          new_args[:credentials] = @credentials if @credentials
+          @delegate.send sym, new_args
+        elsif args.is_a? Hash
+          new_args = {}
+          new_args[:parameters] = args
+          new_args[:credentials] = @credentials if @credentials
+          @delegate.send sym, new_args
+        else
+          new_args = [args]
+          new_args << {:credentials => @credentials} if @credentials            
+          @delegate.send sym, *new_args
+        end
+      end
+    end
+    
+    def self.included(includer)
+      class << includer
+        def delegate_with_credentials(resource, klass)
+          define_method resource do
+            ResourceDelegator.new(klass, @credentials)
+          end
+        end
+      end
+    end
+    
+  end
+end

data/lib/trumpet/helpers.rb

@@ -1,14 +1,5 @@
-module Trumpet
-  def self.authenticate(username, password)
-    Trumpet::Request.authenticate(username, password)
-    true
-  end
-  
+module Trumpet  
   def self.set_server(uri, port=nil)
     Trumpet::Request.set_server(uri, port)
   end
-  
-  def self.clear_credentials
-    Trumpet::Request.clear_credentials
-  end
 end

data/lib/trumpet/listener.rb

@@ -1,46 +1,23 @@
 module Trumpet
-  class Listener
-    @@attributes = [
-      :id,
-      :receiver_id,
-      :owner_id,
-      :uri,
-      :schedule,
-      :created_at,
-      :updated_at,
-    ]
-    
-    attr_reader *@@attributes
-    
+  class Listener < Trumpet::Resource
     
     def self.create(options)
-      if options[:receiver_id]
-        Listener.new(Trumpet::Request.post("/receivers/#{options[:receiver_id]}/listeners", :parameters => options))
+      if options[:parameters][:receiver_id]
+        Listener.new(Trumpet::Request.post("/receivers/#{options[:parameters][:receiver_id]}/listeners", options))
       else
         raise Trumpet::BadRequest, "Must specify a receiver id when creating a listener"
       end
     end
     
-    def self.find(id)
-      Listener.new(Trumpet::Request.get("/listeners/#{id}"))
-    end
-    
-    def self.all_by_user(name)
-      listeners = Trumpet::Request.get("/users/#{name}/listeners")
-      listeners.map { |attributes| Listener.new(attributes) }
+    def self.find(id, options={})
+      Listener.new(Trumpet::Request.get("/listeners/#{id}", options))
     end
     
-    def delete
-      !!Trumpet::Request.delete("/listeners/#{@id}", :parse_response => false)
+    def delete(options={})
+      options[:credentials] ||= @credentials
+      options[:parse_response] = false
+      !!Trumpet::Request.delete("/listeners/#{@id}", options)
     end
     
-    
-    protected
-    
-      def initialize(attributes)
-        @@attributes.each do |attr|
-          self.instance_variable_set(:"@#{attr.to_s}", attributes[attr.to_s]) if attributes[attr.to_s]
-        end
-      end
   end
 end

data/lib/trumpet/message.rb

@@ -1,5 +1,6 @@
 module Trumpet
   class Message
+    
     @@attributes = [
       :url        , :created_by_id,
       :author     , :author_name,
@@ -9,36 +10,27 @@ module Trumpet
       :lat        , :lng,
       :radius     , :channel,
       :public     , :authorized_receiver_owners,
-      :content    , :created_at,
-      :updated_at , :id
+      :content    , :id,
+      :created_at , :updated_at
     ]
     
     #TODO: created_at and updated_at maybe not writable
-    
-
+ 
     attr_accessor *@@attributes
 
-    def initialize(attributes)
+    def initialize(options)
+      parameters = options[:parameters] ? options[:parameters] : options
       @@attributes.each do |attr|
-        self.send "#{attr.to_s}=".to_sym, (attributes[attr] || attributes[attr.to_s])
+        self.send "#{attr.to_s}=".to_sym, (parameters[attr] || parameters[attr.to_s])
       end
     end
     
-    def self.create(attributes)
-      message = Message.new(attributes)
-      message.broadcast
-      message
-    end
-    
-    # Post a message to the server, but only if it didn't come from the server
-    def broadcast
-      unless @id
-        !!Trumpet::Request.post('/messages', :parameters => self.to_h, :parse_response => false)
-      end
+    def self.create(request, attributes)
+      !!request.post('/messages', :parameters => self.to_h, :parse_response => false)
     end
     
     def to_h
       @@attributes.inject({}) { |hash, attribute| hash[attribute] = self.send(attribute); hash }
     end
   end
-end
+end

data/lib/trumpet/receiver.rb

@@ -1,59 +1,29 @@
 module Trumpet
-  class Receiver
+  class Receiver < Trumpet::Resource
     
-    @@attributes = [
-      :id         , :url,
-      :source_url , :owner_id         ,
-      :author     , :author_name      ,
-      :avatar_url , :authored_at      ,
-      :title      , :description      ,
-      :tags       , :location_string  ,
-      :lat        , :lng              ,
-      :radius     , :channels         ,
-      :keywords   , :name             ,  
-      :created_at , :updated_at       ,
-      :errors
-    ]
-    attr_reader *@@attributes
-    
-    
-    def self.create(options={})
-      Receiver.new(Trumpet::Request.post("/receivers", :parameters => options))
+    def self.create(options)
+      Receiver.new(Trumpet::Request.post("/receivers", options))
     end
     
-    def self.find(id)
-      Receiver.new(Trumpet::Request.get("/receivers/#{id}"))
-    end
-    
-    def self.all_by_user(name)
-      receivers = Trumpet::Request.get("/users/#{name}/receivers")
-      receivers.map { |attributes| Receiver.new(attributes) }
-    end
-
-    def delete
-      !!Trumpet::Request.delete("/receivers/#{@id}")
+    def self.find(id, options={})
+      Receiver.new(Trumpet::Request.get("/receivers/#{id}", options))
     end
     
-    def listeners
-      Trumpet::Listener.all_by_receiver_id(@id)
+    def delete(options={})
+      options[:credentials] ||= @credentials
+      options[:parse_response] = false
+      !!Trumpet::Request.delete("/receivers/#{@id}", options)
     end
     
-    def messages
-      messages = Trumpet::Request.get("/receivers/#{@id}/messages")
+    def messages(options={})
+      options[:credentials] ||= @credentials
+      messages = Trumpet::Request.get("/receivers/#{@id}/messages", options)
       messages.map { |attributes| Message.new(attributes) }
     end
     
     def listen
       #TODO: impliment this
     end
-    
-    
-    protected
-    
-      def initialize(attributes)
-        @@attributes.each do |attr|
-          self.instance_variable_set(:"@#{attr.to_s}", attributes[attr.to_s]) if attributes[attr.to_s]
-        end
-      end
+
   end
 end

data/lib/trumpet/request.rb

@@ -1,17 +1,7 @@
 module Trumpet
   module Request
-    @@http = Net::HTTP.new('api.trumpet.io', 3000)
-    @@http_auth = {}
-  
-    def self.authenticate(username, password)
-      @@http_auth[:username] = username
-      @@http_auth[:password] = password
-    end
-    
-    def self.clear_credentials
-      @@http_auth = {}
-    end
-      
+    @@http = Net::HTTP.new('api.trumpet.io')
+     
     def self.get(path, options={})
       do_request(Net::HTTP::Get, path, options)
     end
@@ -25,23 +15,33 @@ module Trumpet
     end
 
     def self.delete(path, options={})
-      do_request(Net::HTTP::Delete, path, options) 
+      do_request(Net::HTTP::Delete, path, options)
     end
     
-    def self.set_server(uri, port=nil)
-      @@http = Net::HTTP.new(uri.gsub('http://', ''), port) #no http:// in hosts
+    def self.set_server(host, port=nil)
+      @@http = Net::HTTP.new(host.gsub('http://', ''), port) #no http:// in hosts
     end
 
     private
   
-      def self.do_request(http_method, path, options)
+      def self.do_request(http_method, path, options={})
         raw_request = http_method.new(path)
-        raw_request.basic_auth(@@http_auth[:username], @@http_auth[:password]) unless @@http_auth.empty?
+        raw_request.basic_auth(options[:credentials][:username], options[:credentials][:password]) if options[:credentials]
         raw_request.body = options[:parameters].to_params if options[:parameters]
-
-
+        
         response = @@http.request(raw_request)
-
+        handle_errors(response)
+        
+        if options[:parse_response] == false
+          response 
+        else
+          parsed_response = JSON.parse(response.body)
+          attach_credentials(parsed_response, options[:credentials]) if options[:credentials]
+          parsed_response
+        end
+      end
+      
+      def self.handle_errors(response)
         unless response.code.to_i < 400
           error_string = JSON.parse(response.body).to_s
           case response.code.to_i
@@ -60,8 +60,18 @@ module Trumpet
           when 501
             raise Trumpet::NotImplemented, error_string
           end
-        end      
-        (options[:parse_response] == false) ? response : JSON.parse(response.body)
+        end
       end
+      
+      def self.attach_credentials(parsed_response, credentials)
+        if parsed_response.is_a? Array
+          parsed_response.each do |attributes|
+            attributes[:credentials] = credentials
+          end
+        else
+          parsed_response[:credentials] = credentials
+        end
+      end
+      
   end
 end

data/lib/trumpet/resource.rb

@@ -0,0 +1,13 @@
+module Trumpet
+  class Resource
+    
+    protected
+    
+      def initialize(attributes)
+        attributes.each do |attribute, value|
+          self.class.send(:define_method, attribute) { instance_variable_get(:"@#{attribute.to_s}") }
+          instance_variable_set(:"@#{attribute.to_s}", value)
+        end
+      end
+  end
+end

data/lib/trumpet/transmitter.rb

@@ -1,54 +1,24 @@
 module Trumpet
-  class Transmitter
-    @@attributes = [
-      :id,
-      :source_url,
-      :tags,
-      :location_string,
-      :channel,
-      :lat,
-      :lng,
-      :radius,
-      :public,
-      :created_at,
-      :updated_at,
-    ]
-    
-    attr_reader *@@attributes
+  class Transmitter < Trumpet::Resource
     
     def self.create(options)
-      Transmitter.new(Trumpet::Request.post('transmitters', :parameters => options))
-    end
-    
-    def self.find(id)
-      Transmitter.new(Trumpet::Request.get("/transmitters/#{id}"))
+      Transmitter.new(Trumpet::Request.post('/transmitters', options))
     end
     
-    def self.all_by_user(name)
-      transmitters = Trumpet::Request.get("/users/#{name}/transmitters")
-      transmitters.map { |attributes| Trumpet::Transmitter.new(attributes) }
+    def self.find(id, options={})
+      Transmitter.new(Trumpet::Request.get("/transmitters/#{id}", options))
     end
     
-    def delete
-      Trumpet::Request.delete("/transmitters/#{@id}")
+    def delete(options={})
+      Trumpet::Request.delete("/transmitters/#{@id}", options)
     end
     
-    def listeners
-      listeners = Trumpet::Request.get("/transmitters/#{@id}/listeners")
-      listeners.map { |attributes| Listener.new(attributes) }
+    def broadcast(message, options={})
+      options[:credentials] ||= @credentials
+      options[:parameters] = message.to_h
+      options[:parse_response] = false
+      !!Trumpet::Request.post("/transmitters/#{@id}/messages", options)
     end
     
-    def broadcast(message)
-      Trumpet::Request.post("/transmitters/#{@transmitter_id}/messages", :parameters => message.to_h, :parse_response => false)
-    end
-    
-    
-    protected
-    
-      def initialize(attributes)
-        @@attributes.each do |attr|
-          self.instance_variable_set(:"@#{attr.to_s}", attributes[attr.to_s]) if attributes[attr.to_s]
-        end
-      end
   end
 end

data/lib/trumpet/user.rb

@@ -1,40 +1,38 @@
 module Trumpet
-  class User
-    @@attributes = [:id, :name]
-    attr_reader *@@attributes
+  class User < Trumpet::Resource
     
     def self.create(options)
-      attributes = Trumpet::Request.post('/users', :parameters => options)
+      attributes = Trumpet::Request.post('/users', options)
       User.new(attributes)
     end
     
-    def self.find(name)
-      User.new(Trumpet::Request.get("/users/#{name}"))
+    def self.find(name, options={})
+      User.new(Trumpet::Request.get("/users/#{name}", options))
     end
     
-    def delete
-      !!Trumpet::Request.delete("/users/#{@name}")
+    def delete(options={})
+      options[:credentials] ||= @credentials
+      options[:parse_response] = false
+      !!Trumpet::Request.delete("/users/#{@name}", options)
     end
     
-    def channels
-      Trumpet::Channel.all_by_user(@name)
+    def channels(options={})
+      options[:credentials] ||= @credentials
+      channels = Trumpet::Request.get("/users/#{name}/channels", options)
+      channels.map { |attributes| Channel.new(attributes) }
     end
     
-    def listeners
-      Trumpet::Listener.all_by_user(@name)
+    def listeners(options={})
+      options[:credentials] ||= @credentials
+      listeners = Trumpet::Request.get("/users/#{name}/listeners", options)
+      listeners.map { |attributes| Listener.new(attributes) }
     end
     
-    def receivers
-      Trumpet::Receiver.all_by_user(@name)
+    def receivers(options={})
+      options[:credentials] ||= @credentials
+      receivers = Trumpet::Request.get("/users/#{name}/receivers", options)
+      receivers.map { |attributes| Receiver.new(attributes) }
     end
 
-    
-    protected
-    
-      def initialize(attributes)
-        @@attributes.each do |attr|
-          self.instance_variable_set(:"@#{attr.to_s}", attributes[attr.to_s]) if attributes[attr.to_s]
-        end
-      end
   end
 end

data/spec/channel_spec.rb

@@ -1,5 +1,43 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe "Channel" do
   
+  before(:all) do
+    @trumpet = Trumpet::Base.new :username => 'somedude', :password => 'somepassword'
+    
+    FakeWeb.register_uri :post, "somedude:somepassword@api.trumpet.io/channels", :file => "#{File.dirname(__FILE__)}/fixtures/channels/create"
+    FakeWeb.register_uri :get, "somedude:somepassword@api.trumpet.io/channels", :file => "#{File.dirname(__FILE__)}/fixtures/channels/all"
+    FakeWeb.register_uri :get, "somedude:somepassword@api.trumpet.io/channels/radical", :file => "#{File.dirname(__FILE__)}/fixtures/channels/show"
+    FakeWeb.register_uri :post, "somedude:somepassword@api.trumpet.io/channels/radical/messages", :status => ["204", "OK"]
+    FakeWeb.register_uri :get, "somedude:somepassword@api.trumpet.io/channels/radical/messages", :file => "#{File.dirname(__FILE__)}/fixtures/channels/messages"
+  end
+  
+  it 'should let me create a channel' do
+    channel = @trumpet.channels.create :name => 'radical'
+    channel.name.should == 'radical'
+  end
+  
+  it 'should return a list of all channels' do
+    channels = @trumpet.channels.all
+    channels.length.should == 2
+    channels.first.name.should == 'cool'
+    channels.last.name.should == 'radical'
+  end
+  
+  it 'should find a channel by name' do
+    channel = @trumpet.channels.find 'radical'
+    channel.name.should == 'radical'
+  end
+  
+  it 'should allow me to broadcast a message through a channel' do
+    channel = @trumpet.channels.find 'radical'
+    channel.broadcast(Trumpet::Message.new(:content => 'dude, awesome')).should == true
+  end
+  
+  it 'should return all messages in a given channel' do
+    channel = @trumpet.channels.find 'radical'
+    messages = channel.messages
+    messages.length.should == 3
+  end
+  
 end

data/spec/fixtures/channels/all

@@ -0,0 +1 @@
+[{"receiver_id":1,"name":"cool","updated_at":null,"description":null,"owner_id":1,"transmitter_id":1,"created_at":null},{"receiver_id":2,"name":"radical","updated_at":null,"description":null,"owner_id":1,"transmitter_id":2,"created_at":null}]

data/spec/fixtures/channels/create

@@ -0,0 +1 @@
+{"receiver_id":2,"name":"radical","updated_at":null,"description":null,"owner_id":1,"transmitter_id":2,"created_at":null}

data/spec/fixtures/channels/messages

@@ -0,0 +1 @@
+[{"updated_at":"2009/05/13 11:29:50 -0700","public":true,"id":2,"content":"Super Gnarly Dude","channel":"radical","created_at":"2009/05/13 11:29:50 -0700"},{"updated_at":"2009/05/13 11:36:50 -0700","public":true,"id":3,"content":"Super Gnarly Dude","channel":"radical","created_at":"2009/05/13 11:36:50 -0700"},{"updated_at":"2009/05/13 11:36:51 -0700","public":true,"id":4,"content":"Super Gnarly Dude","channel":"radical","created_at":"2009/05/13 11:36:51 -0700"}]

data/spec/fixtures/channels/show

@@ -0,0 +1 @@
+{"receiver_id":2,"name":"radical","updated_at":null,"description":null,"owner_id":1,"transmitter_id":2,"created_at":null}

data/spec/fixtures/listeners/create

@@ -0,0 +1 @@
+{"owner":"raddude","created_at":"2009/05/13 16:01:01 -0700","receiver_id":1,"schedule":{"end":null,"start":null,"days":null},"id":1,"updated_at":"2009/05/13 16:01:01 -0700","uri":"mailto:\/\/someraddude@mailinator.com"}

data/spec/fixtures/listeners/find

@@ -0,0 +1 @@
+{"owner":"raddude","created_at":"2009/05/13 16:01:01 -0700","receiver_id":1,"schedule":{"end":null,"start":null,"days":null},"id":1,"updated_at":"2009/05/13 16:01:01 -0700","uri":"mailto:\/\/someraddude@mailinator.com"}

data/spec/fixtures/receivers/create

@@ -0,0 +1 @@
+{"name":"Everything ","updated_at":"2009/05/12 14:40:32 -0700","id":1,"owner_id":1,"channel":"cool","last_request":"2009/05/12 14:40:32 -0700","created_at":"2009/05/12 14:40:32 -0700","active":true}

data/spec/fixtures/receivers/find

@@ -0,0 +1 @@
+{"name":"Everything ","updated_at":"2009/05/12 14:40:32 -0700","id":1,"owner_id":1,"channel":"cool","last_request":"2009/05/12 14:40:32 -0700","created_at":"2009/05/12 14:40:32 -0700","active":true}

data/spec/fixtures/receivers/messages

@@ -0,0 +1 @@
+[{"updated_at":"2009/05/12 14:49:07 -0700","public":true,"author":"radical","id":1,"content":"yay","channel":"cool","created_at":"2009/05/12 14:49:07 -0700"}]

data/spec/fixtures/transmitters/create

@@ -0,0 +1 @@
+{"radius":null,"updated_at":"2009/05/13 17:36:45 -0700","public":null,"tags":"dudes, gnarly, rad","source_url":null,"lng":null,"id":1,"public_transmissions":false,"owner_id":2,"channel":null,"location_string":null,"lat":null,"created_at":"2009/05/13 17:36:45 -0700"}

data/spec/fixtures/transmitters/find

@@ -0,0 +1 @@
+{"radius":null,"updated_at":"2009/05/13 17:36:45 -0700","public":null,"tags":"dudes, gnarly, rad","source_url":null,"lng":null,"id":1,"public_transmissions":false,"owner_id":2,"channel":null,"location_string":null,"lat":null,"created_at":"2009/05/13 17:36:45 -0700"}

data/spec/fixtures/users/channels

@@ -0,0 +1 @@
+[{"receiver_id":3,"name":"channel1","updated_at":null,"description":null,"owner_id":2,"transmitter_id":3,"created_at":null},{"receiver_id":4,"name":"channel2","updated_at":null,"description":null,"owner_id":2,"transmitter_id":4,"created_at":null},{"receiver_id":5,"name":"channel3","updated_at":null,"description":null,"owner_id":2,"transmitter_id":5,"created_at":null}]

data/spec/fixtures/users/create

@@ -0,0 +1 @@
+{"name":"raddude","created_at":"2009/05/13 12:29:10 -0700","id":2,"updated_at":"2009/05/13 12:29:10 -0700"}

data/spec/fixtures/users/listeners

@@ -0,0 +1 @@
+[{"owner":"raddude","created_at":"2009/05/13 14:24:53 -0700","receiver_id":1,"schedule":{"end":null,"start":null,"days":null},"id":1,"updated_at":"2009/05/13 14:24:53 -0700","uri":"mailto:\/\/someraddude@mailinator.com"},{"owner":"raddude","created_at":"2009/05/13 14:25:08 -0700","receiver_id":1,"schedule":{"end":null,"start":null,"days":null},"id":2,"updated_at":"2009/05/13 14:25:08 -0700","uri":"mailto:\/\/someotherdude@mailinator.com"},{"owner":"raddude","created_at":"2009/05/13 14:25:22 -0700","receiver_id":1,"schedule":{"end":null,"start":null,"days":null},"id":3,"updated_at":"2009/05/13 14:25:22 -0700","uri":"mailto:\/\/andanotherdude@mailinator.com"}]

data/spec/fixtures/users/receivers

@@ -0,0 +1 @@
+[{"name":"other things, rad dudes ","updated_at":"2009/05/13 14:29:18 -0700","id":6,"owner_id":2,"last_request":"2009/05/13 14:29:18 -0700","keywords":"other things, rad dudes","created_at":"2009/05/13 14:29:18 -0700","active":true},{"name":"gnarly things, radical things ","updated_at":"2009/05/13 14:29:31 -0700","id":7,"owner_id":2,"last_request":"2009/05/13 14:29:31 -0700","keywords":"gnarly things, radical things","created_at":"2009/05/13 14:29:31 -0700","active":true},{"name":"other sweet things, pretty sweet stuff ","updated_at":"2009/05/13 14:29:49 -0700","id":8,"owner_id":2,"last_request":"2009/05/13 14:29:49 -0700","keywords":"other sweet things, pretty sweet stuff","created_at":"2009/05/13 14:29:49 -0700","active":true}]

data/spec/fixtures/users/show

@@ -0,0 +1 @@
+{"name":"raddude","created_at":"2009/05/13 12:29:10 -0700","id":2,"updated_at":"2009/05/13 12:29:10 -0700"}

data/spec/listener_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Listener" do
+  
+  before(:all) do
+    @trumpet = Trumpet::Base.new :username => "somedude", :password => "somepassword"
+    
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/receivers/1/listeners", :file => "#{File.dirname(__FILE__)}/fixtures/listeners/create"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/listeners/1",           :file => "#{File.dirname(__FILE__)}/fixtures/listeners/find"
+    FakeWeb.register_uri :delete, "#{AUTHENTICATED_URI}/listeners/1",           :string => ["204", "OK"]
+  end
+  
+  it "should let me create a listener" do
+    listener = @trumpet.listeners.create :receiver_id => 1, :uri => 'mailto://someraddude@mailinator.com'
+    listener.uri.should == 'mailto://someraddude@mailinator.com'
+  end
+  
+  it "should let me find an existing listener" do
+    listener = @trumpet.listeners.find(1)
+    listener.uri.should == 'mailto://someraddude@mailinator.com'
+  end
+  
+  it "should let me delete an existing listener" do
+    listener = @trumpet.listeners.find(1)
+    listener.delete.should == true
+  end
+end

data/spec/message_spec.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Channel" do
+  
+  before(:all) do
+    @trumpet = Trumpet::Base.new :username => 'somedude', :password => 'somepassword'
+    
+    FakeWeb.register_uri :post, "somedude:somepassword@api.trumpet.io/messages", :file => "#{File.dirname(__FILE__)}/fixtures/messages/create"
+  end
+  
+  it "should instantiate a message through the trumpet object with the proper attributes" do
+    message = @trumpet.messages.new(
+      :url => 'http://gnarly.com',
+      :author => 'gnarlydude073',
+      :avatar_url  => 'http://gnarly.com',
+      :title => 'Radical Dude',
+      :tags => 'gnarly, dudes, radical',
+      :content => 'Bla bla bla, some short message.',
+      :author_name => 'Gnarly Dude',
+      :authored_at => 'Sep 1, 2008',
+      :description => 'Some sort of description.',
+      :location_string => 'San Francisco, CA'
+    )
+    
+    message.url.should == 'http://gnarly.com'
+    message.author.should == 'gnarlydude073'
+    message.avatar_url.should == 'http://gnarly.com'
+    message.title.should == 'Radical Dude'
+    message.tags.should == 'gnarly, dudes, radical'
+    message.content.should == 'Bla bla bla, some short message.'
+    message.author_name.should == 'Gnarly Dude'
+    message.description.should == 'Some sort of description.'
+    message.location_string.should == 'San Francisco, CA'
+  end
+  
+  it "should instantiate a message directly with the proper attributes" do
+    message = Trumpet::Message.new(
+      :url => 'http://gnarly.com',
+      :author => 'gnarlydude073',
+      :avatar_url  => 'http://gnarly.com',
+      :title => 'Radical Dude',
+      :tags => 'gnarly, dudes, radical',
+      :content => 'Bla bla bla, some short message.',
+      :author_name => 'Gnarly Dude',
+      :authored_at => 'Sep 1, 2008',
+      :description => 'Some sort of description.',
+      :location_string => 'San Francisco, CA'
+    )
+    
+    message.url.should == 'http://gnarly.com'
+    message.author.should == 'gnarlydude073'
+    message.avatar_url.should == 'http://gnarly.com'
+    message.title.should == 'Radical Dude'
+    message.tags.should == 'gnarly, dudes, radical'
+    message.content.should == 'Bla bla bla, some short message.'
+    message.author_name.should == 'Gnarly Dude'
+    message.description.should == 'Some sort of description.'
+    message.location_string.should == 'San Francisco, CA'
+  end
+end

data/spec/receiver_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Receiver" do
+  
+  before(:all) do
+    @trumpet = Trumpet::Base.new :username => "somedude", :password => "somepassword"
+    
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/receivers",             :file => "#{File.dirname(__FILE__)}/fixtures/receivers/create"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/receivers/1",           :file => "#{File.dirname(__FILE__)}/fixtures/receivers/find"
+    FakeWeb.register_uri :delete, "#{AUTHENTICATED_URI}/receivers/1",           :string => ["204", "OK"]
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/receivers/1/messages",  :file => "#{File.dirname(__FILE__)}/fixtures/receivers/messages"
+  end
+  
+  it "should let me create a receiver" do
+    receiver = @trumpet.receivers.create
+    receiver.name.should == "Everything "  
+  end
+  
+  it "should let me find an existing receiver" do
+    receiver = @trumpet.receivers.find(1)
+    receiver.name.should == "Everything "
+  end
+  
+  it "should let me delete an existing receiver" do
+    receiver = @trumpet.receivers.find(1)
+    receiver.delete.should == true
+  end
+  
+  it "should let me fetch all of the messages for a given receiver" do
+    receiver = @trumpet.receivers.find(1)
+    messages = receiver.messages
+    messages.length.should == 1
+    messages.first.content.should == 'yay'
+  end
+end

data/spec/resource_spec.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Resource" do
+  # TODO: write some general specs for behavior that is common to all resources, namely :
+  #   - error handling (exception throwing)
+  #   - instantiating
+end

data/spec/spec_helper.rb

@@ -7,5 +7,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'trumpet'
 
 Spec::Runner.configure do |config|
+  FakeWeb.allow_net_connect = false
   
+  # URI's for the app
+  AUTHENTICATED_URI = 'somedude:somepassword@api.trumpet.io'
+  UNAUTHENTICATED_URI = 'api.trumpet.io'
 end

data/spec/transmitter_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Transmitter" do
+  
+  before(:all) do
+    @trumpet = Trumpet::Base.new :username => "somedude", :password => "somepassword"
+    
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/transmitters",            :file => "#{File.dirname(__FILE__)}/fixtures/transmitters/create"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/transmitters/1",          :file => "#{File.dirname(__FILE__)}/fixtures/transmitters/find"
+    FakeWeb.register_uri :delete, "#{AUTHENTICATED_URI}/transmitters/1",           :string => ["204", "OK"]
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/transmitters/1/messages",  :string => ["204", "OK"]
+  end
+  
+  it "should let me create a transmitter" do
+    transmitter = @trumpet.transmitters.create :tags => 'dudes, gnarly, rad'
+    transmitter.tags.should == 'dudes, gnarly, rad'
+  end
+  
+  it "should let me delete a transmitter" do
+    transmitter = @trumpet.transmitters.find(1)
+    transmitter.tags.should == 'dudes, gnarly, rad'
+  end
+  
+  it "should let me broadcast a message into a receiver" do
+    transmitter = @trumpet.transmitters.find(1)
+    transmitter.broadcast(Trumpet::Message.new(:content => 'dude, awesome')).should == true
+  end
+  
+end

data/spec/user_spec.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "User" do
+  
+  before(:all) do
+    @trumpet = Trumpet::Base.new :username => "somedude", :password => "somepassword"
+    
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/users",                   :file => "#{File.dirname(__FILE__)}/fixtures/users/create"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/users/raddude",           :file => "#{File.dirname(__FILE__)}/fixtures/users/show"
+    FakeWeb.register_uri :delete, "#{AUTHENTICATED_URI}/users/raddude",           :string => ["204", "OK"]
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/users/raddude/channels",  :file => "#{File.dirname(__FILE__)}/fixtures/users/channels"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/users/raddude/listeners", :file => "#{File.dirname(__FILE__)}/fixtures/users/listeners"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/users/raddude/receivers", :file => "#{File.dirname(__FILE__)}/fixtures/users/receivers"
+  end
+  
+  it "should let me create a new user" do
+    user = @trumpet.users.create :name => 'raddude', :password => 'raddude'
+    user.name.should == 'raddude'
+  end
+  
+  it "should let me find an existing user by name" do
+    user = @trumpet.users.find 'raddude'
+    user.name.should == 'raddude'
+  end
+  
+  it "should let me delete an existing user" do
+    user = @trumpet.users.find 'raddude'
+    user.delete.should == true
+  end
+  
+  it "should let me find all of an existing user's channels" do
+    user = @trumpet.users.find 'raddude'
+    channels = user.channels
+    channels.length.should == 3
+    channels[0].name.should == 'channel1'
+    channels[1].name.should == 'channel2'
+    channels[2].name.should == 'channel3'
+  end
+  
+  it "should let me find all of an existing user's listeners" do
+    user = @trumpet.users.find 'raddude'
+    listeners = user.listeners
+    listeners.length.should == 3
+    listeners[0].uri.should == 'mailto://someraddude@mailinator.com'
+    listeners[1].uri.should == 'mailto://someotherdude@mailinator.com'
+    listeners[2].uri.should == 'mailto://andanotherdude@mailinator.com'
+  end
+  
+  it "should let me find all of an existing user's receivers" do
+    user = @trumpet.users.find 'raddude'
+    receivers = user.receivers
+    receivers.length.should == 3
+    receivers[0].keywords.should == 'other things, rad dudes'
+    receivers[1].keywords.should == 'gnarly things, radical things'
+    receivers[2].keywords.should == 'other sweet things, pretty sweet stuff'
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trumpet-trumpet
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Taras
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2009-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: wtf@trumpet.io
 executables: []
@@ -38,18 +48,43 @@ files:
 - VERSION.yml
 - lib/core_extensions.rb
 - lib/trumpet.rb
+- lib/trumpet/base.rb
 - lib/trumpet/channel.rb
+- lib/trumpet/delegator.rb
 - lib/trumpet/exceptions.rb
 - lib/trumpet/helpers.rb
 - lib/trumpet/listener.rb
 - lib/trumpet/message.rb
 - lib/trumpet/receiver.rb
 - lib/trumpet/request.rb
+- lib/trumpet/resource.rb
 - lib/trumpet/transmitter.rb
 - lib/trumpet/user.rb
 - spec/channel_spec.rb
+- spec/fixtures/channels/all
+- spec/fixtures/channels/create
+- spec/fixtures/channels/messages
+- spec/fixtures/channels/show
+- spec/fixtures/listeners/create
+- spec/fixtures/listeners/find
+- spec/fixtures/receivers/create
+- spec/fixtures/receivers/find
+- spec/fixtures/receivers/messages
+- spec/fixtures/transmitters/create
+- spec/fixtures/transmitters/find
+- spec/fixtures/users/channels
+- spec/fixtures/users/create
+- spec/fixtures/users/listeners
+- spec/fixtures/users/receivers
+- spec/fixtures/users/show
+- spec/listener_spec.rb
+- spec/message_spec.rb
+- spec/receiver_spec.rb
+- spec/resource_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+- spec/transmitter_spec.rb
+- spec/user_spec.rb
+has_rdoc: false
 homepage: http://github.com/trumpet/trumpet
 post_install_message: 
 rdoc_options: 
@@ -73,8 +108,14 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: The official trumpet gem
 test_files: 
 - spec/channel_spec.rb
+- spec/listener_spec.rb
+- spec/message_spec.rb
+- spec/receiver_spec.rb
+- spec/resource_spec.rb
 - spec/spec_helper.rb
+- spec/transmitter_spec.rb
+- spec/user_spec.rb