trumpet-trumpet 0.0.7 → 0.0.8

data/Rakefile

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

data/VERSION.yml

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

data/lib/trumpet.rb

@@ -1,9 +1,11 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
-require 'resourceful'
 require 'json'
 
+require 'net/http'
+require 'uri'
+
 require 'core_extensions'
 
 
@@ -11,7 +13,6 @@ module Trumpet
 end
 
 require 'trumpet/request'
-require 'trumpet/trumpet_resource'
 require 'trumpet/exceptions'
 require 'trumpet/message'
 require 'trumpet/receiver'
@@ -19,4 +20,5 @@ require 'trumpet/listener'
 require 'trumpet/transmitter'
 require 'trumpet/channel'
 require 'trumpet/user'
-require 'trumpet/helpers'
+require 'trumpet/helpers'
+require 'trumpet/duckpunch'

data/lib/trumpet/channel.rb

@@ -29,7 +29,7 @@ module Trumpet
     end
         
     def broadcast(message)
-     Trumpet::Request.post("/channels/#{@name}/messages", :parameters => message.to_h, :parse_response => false)
+      !!Trumpet::Request.post("/channels/#{@name}/messages", :parameters => message.to_h, :parse_response => false)
     end
     
     def messages

data/lib/trumpet/helpers.rb

@@ -4,7 +4,7 @@ module Trumpet
     true
   end
   
-  def self.set_server(uri)
-    Trumpet::Request.set_server(uri)
+  def self.set_server(uri, port=nil)
+    Trumpet::Request.set_server(uri, port)
   end
 end

data/lib/trumpet/message.rb

@@ -33,7 +33,7 @@ module Trumpet
     # 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)
+        !!Trumpet::Request.post('/messages', :parameters => self.to_h, :parse_response => false)
       end
     end
     

data/lib/trumpet/receiver.rb

@@ -1,6 +1,5 @@
 module Trumpet
   class Receiver
-    include TrumpetResource
     
     @@attributes = [
       :id         , :url,

data/lib/trumpet/request.rb

@@ -1,51 +1,50 @@
 module Trumpet
   module Request
-    @@http = Resourceful::HttpAccessor.new
-    @@uri = 'http://api.trumpet.io:3000'
+    @@http = Net::HTTP.new('api.trumpet.io', 3000)
+    @@http_auth = {}
   
     def self.authenticate(username, password)
-      realm_authenticator = Resourceful::BasicAuthenticator.new('Trumpet Service', username, password)    
-      @@http = Resourceful::HttpAccessor.new(:authenticator => realm_authenticator)
+      @@http_auth[:username] = username
+      @@http_auth[:password] = password
     end
-  
+      
     def self.get(path, options={})
-      do_request(:get, path, options)
+      do_request(Net::HTTP::Get, path, options)
     end
 
     def self.post(path, options={})
-      do_request(:post, path, options)
+      do_request(Net::HTTP::Post, path, options)
     end
 
     def self.put(path, options={})
-      do_request(:put, path, options)
+      do_request(Net::HTTP::Put, path, options)
     end
 
     def self.delete(path, options={})
-      do_request(:delete, path, options) 
+      do_request(Net::HTTP::Delete, path, options) 
     end
     
-    def self.set_server(uri)
-      @@uri = uri
+    def self.set_server(uri, port=nil)
+      @@http = Net::HTTP.new(uri.gsub('http://', ''), port) #no http:// in hosts
     end
 
     private
   
-      def self.do_request(method, path, options)
-        resource = @@http.resource("#{@@uri}#{URI.encode(path)}")
-        begin
-          response =
-            if method == :post
-              resource.send(method, options[:parameters].to_params, :content_type => "application/x-www-form-urlencoded")
-            elsif options[:parameters]
-              resource.send(method, options[:parameters].to_params)
-            else
-              resource.send(method)
-          end
-        rescue Resourceful::UnsuccessfulHttpRequestError => e
-          response = e.http_response
+      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?
+
+        if http_method == Net::HTTP::Post
+          raw_request.set_form_data(options[:parameters]) if options[:parameters]
+        else
+          raw_request.body = options[:parameters].to_params if options[:parameters]
+        end
+
+        response = @@http.request(raw_request)
+
+        unless response.code.to_i < 400
           error_string = JSON.parse(response.body).to_s
-        
-          case response.code
+          case response.code.to_i
           when 400
             raise Trumpet::BadRequest, error_string
           when 401
@@ -61,10 +60,7 @@ module Trumpet
           when 501
             raise Trumpet::NotImplemented, error_string
           end
-        rescue IOError # Coudln't connect to server
-          raise Trumpet::ServerConnectionError, 'Could not connect to server'
-        end
-      
+        end      
         (options[:parse_response] == false) ? response : JSON.parse(response.body)
       end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trumpet-trumpet
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Michael Taras
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: resourceful
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: json
   type: :runtime
@@ -56,7 +46,6 @@ files:
 - lib/trumpet/receiver.rb
 - lib/trumpet/request.rb
 - lib/trumpet/transmitter.rb
-- lib/trumpet/trumpet_resource.rb
 - lib/trumpet/user.rb
 - spec/channel_spec.rb
 - spec/spec_helper.rb

data/lib/trumpet/trumpet_resource.rb

@@ -1,7 +0,0 @@
-module Trumpet
-  module TrumpetResource
-    def to_h
-      @@attributes.inject({}) { |hash, attribute| hash[attribute] = self.send(attribute); hash }
-    end
-  end
-end