trumpet-trumpet 0.0.6 → 0.0.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 6
+:patch: 7
 :major: 0
 :minor: 0

data/lib/trumpet.rb

@@ -18,4 +18,5 @@ require 'trumpet/receiver'
 require 'trumpet/listener'
 require 'trumpet/transmitter'
 require 'trumpet/channel'
+require 'trumpet/user'
 require 'trumpet/helpers'

data/lib/trumpet/channel.rb

@@ -4,6 +4,7 @@ module Trumpet
       :name,
       :receiver_id,
       :transmitter_id,
+      :owner_id,
       :created_at,
       :updated_at
     ]
@@ -24,7 +25,7 @@ module Trumpet
     
     def self.all_by_user(name)
       channels = Trumpet::Request.get("/users/#{name}/channels")
-      channels.map { |attributes| Trumpet::Channel.new(attributes) }
+      channels.map { |attributes| Channel.new(attributes) }
     end
         
     def broadcast(message)

data/lib/trumpet/exceptions.rb

@@ -12,6 +12,9 @@ module Trumpet
   # HTTP 400 Error
   class BadRequest < StandardError; end
   
+  # HTTP 401 Error
+  class Unauthorized < StandardError; end
+  
   # HTTP 403 Error
   class Forbidden < StandardError; end
   

data/lib/trumpet/listener.rb

@@ -2,6 +2,7 @@ module Trumpet
   class Listener
     @@attributes = [
       :receiver_id,
+      :owner_id,
       :uri,
       :schedule,
       :created_at,
@@ -13,11 +14,9 @@ module Trumpet
     
     def self.create(options)
       if options[:receiver_id]
-        attributes = Trumpet::Request.post("/receivers/#{options[:receiver_id]}/listeners", :parameters => options)
-        Listener.new(attributes)
-        # Listener.new(Trumpet::Request.post("/receivers/#{options[:receiver_id]}/listeners", :parameters => options))
+        Listener.new(Trumpet::Request.post("/receivers/#{options[:receiver_id]}/listeners", :parameters => options))
       else
-        throw Trumpet::BadRequest "Must specify a receiver id when creating a listener"
+        raise Trumpet::BadRequest, "Must specify a receiver id when creating a listener"
       end
     end
     
@@ -27,7 +26,7 @@ module Trumpet
     
     def self.all_by_user(name)
       listeners = Trumpet::Request.get("/users/#{name}/listeners")
-      listeners.map { |attributes| Trumpet::Channel.new(attributes) }
+      listeners.map { |attributes| Listener.new(attributes) }
     end
     
     def self.delete

data/lib/trumpet/receiver.rb

@@ -4,7 +4,7 @@ module Trumpet
     
     @@attributes = [
       :id         , :url,
-      :source_url , :created_by_id    ,
+      :source_url , :owner_id         ,
       :author     , :author_name      ,
       :avatar_url , :authored_at      ,
       :title      , :description      ,
@@ -28,7 +28,7 @@ module Trumpet
     
     def self.all_by_user(name)
       receivers = Trumpet::Request.get("/users/#{name}/receivers")
-      receivers.map { |attributes| Trumpet::Receiver.new(attributes) }
+      receivers.map { |attributes| Receiver.new(attributes) }
     end
 
     def delete

data/lib/trumpet/request.rb

@@ -4,8 +4,8 @@ module Trumpet
     @@uri = 'http://api.trumpet.io:3000'
   
     def self.authenticate(username, password)
-      my_realm_authenticator = Resourceful::BasicAuthenticator.new('Trumpet', username, password)    
-      @@http = Resourceful::HttpAccessor.new(:authenticator => my_realm_authenticator)
+      realm_authenticator = Resourceful::BasicAuthenticator.new('Trumpet Service', username, password)    
+      @@http = Resourceful::HttpAccessor.new(:authenticator => realm_authenticator)
     end
   
     def self.get(path, options={})
@@ -48,6 +48,8 @@ module Trumpet
           case response.code
           when 400
             raise Trumpet::BadRequest, error_string
+          when 401
+            raise Trumpet::Unauthorized, error_string
           when 403
             raise Trumpet::Forbidden, error_string
           when 404

data/lib/trumpet/user.rb

@@ -12,10 +12,6 @@ module Trumpet
       User.new(Trumpet::Request.get("/users/#{name}"))
     end
     
-    def self.authenticate(name, password)
-      # TODO: write this method
-    end
-    
     def delete
       !!Trumpet::Request.delete("/users/#{@name}")
     end
@@ -31,10 +27,7 @@ module Trumpet
     def receivers
       Trumpet::Receiver.all_by_user(@name)
     end
-    
-    def transmitters
-      Trumpet::Transmitter.all_by_user(@name)
-    end
+
     
     protected
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trumpet-trumpet
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Michael Taras