trumpet-trumpet 0.1.1 → 0.1.2

data/VERSION.yml

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

data/lib/trumpet/channel.rb

@@ -17,6 +17,11 @@ module Trumpet
       channels = Trumpet::Request.get("/users/#{name}/channels", options)
       channels.map { |attributes| Channel.new(attributes) }
     end
+    
+    def delete(options={})
+      options[:credentials] ||= @credentials
+      !!Trumpet::Request.delete("/channels/#{name}", :parse_response => false, :credentials => options[:credentials])
+    end
         
     def broadcast(message, options={})
       options[:credentials] ||= @credentials

data/lib/trumpet/resource.rb

@@ -1,6 +1,14 @@
 module Trumpet
   class Resource
     
+    def to_h(excludes=[])
+      excludes << '@credentials'
+      instance_variables.inject({}) do |hash, value|
+        hash[value.gsub('@', '')] = instance_variable_get(value) unless excludes.include?(value)
+        hash
+      end
+    end
+    
     protected
     
       def initialize(attributes)
@@ -9,5 +17,13 @@ module Trumpet
           instance_variable_set(:"@#{attribute.to_s}", value)
         end
       end
+      
+    private
+    
+      def set_attributes(attributes)
+        attributes.each do |attribute, value|
+          instance_variable_set(:"@#{attribute.to_s}", value)
+        end
+      end
   end
 end

data/lib/trumpet/user.rb

@@ -9,6 +9,16 @@ module Trumpet
     def self.find(name, options={})
       User.new(Trumpet::Request.get("/users/#{name}", options))
     end
+
+    # TODO: Not yet supported in backend
+    # def update(parameters)
+    #   options = {}
+    #   
+    #   options[:credentials] ||= @credentials
+    #   options[:parameters] = self.to_h.merge(parameters)
+    #   
+    #   !!set_attributes(Trumpet::Request.put("/users/#{name}", options))
+    # end
     
     def delete(options={})
       options[:credentials] ||= @credentials

data/spec/channel_spec.rb

@@ -5,11 +5,12 @@ 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"
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/channels",                  :file => "#{File.dirname(__FILE__)}/fixtures/channels/create"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/channels",                  :file => "#{File.dirname(__FILE__)}/fixtures/channels/all"
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/channels/radical",          :file => "#{File.dirname(__FILE__)}/fixtures/channels/show"
+    FakeWeb.register_uri :delete, "#{AUTHENTICATED_URI}/channels/radical",          :status => ["204", "OK"]
+    FakeWeb.register_uri :post,   "#{AUTHENTICATED_URI}/channels/radical/messages", :status => ["204", "OK"]
+    FakeWeb.register_uri :get,    "#{AUTHENTICATED_URI}/channels/radical/messages", :file => "#{File.dirname(__FILE__)}/fixtures/channels/messages"
   end
   
   it 'should let me create a channel' do
@@ -29,6 +30,11 @@ describe "Channel" do
     channel.name.should == 'radical'
   end
   
+  it "should let me delete an existing channel" do
+    channel = @trumpet.channels.find 'radical'
+    channel.delete.should == true
+  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

data/spec/fixtures/users/put

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

data/spec/user_spec.rb

@@ -7,6 +7,7 @@ describe "User" do
     
     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 :put,    "#{AUTHENTICATED_URI}/users/raddude",           :file => "#{File.dirname(__FILE__)}/fixtures/users/put"
     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"
@@ -22,6 +23,14 @@ describe "User" do
     user = @trumpet.users.find 'raddude'
     user.name.should == 'raddude'
   end
+
+  # TODO: Note yet supported on backend
+  # it "should let me update an existing user" do
+  #   user = @trumpet.users.find 'raddude'
+  #   
+  #   user.update(:name => 'radicaldude')
+  #   user.name.should == 'radicaldude'
+  # end
   
   it "should let me delete an existing user" do
     user = @trumpet.users.find 'raddude'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trumpet-trumpet
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Michael Taras
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -07:00
+date: 2009-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - spec/fixtures/users/channels
 - spec/fixtures/users/create
 - spec/fixtures/users/listeners
+- spec/fixtures/users/put
 - spec/fixtures/users/receivers
 - spec/fixtures/users/show
 - spec/listener_spec.rb