lib/scamp/channels.rb in scamp-0.0.1 vs lib/scamp/channels.rb in scamp-0.0.2

@@ -5,27 +5,28 @@
     # SoundMessage (plays a sound as determined by the message, which can be either “rimshot”, “crickets”, or “trombone”),
     # TweetMessage (a Twitter status URL to be fetched and inserted into the chat)
     
     #  curl -vvv -H 'Content-Type: application/json' -d '{"message":{"body":"Yeeeeeaaaaaahh", "type":"Textmessage"}}' -u API_KEY:X https://37s.campfirenow.com/room/293788/speak.json
     def say(message, channel)
-      url = "https://37s.campfirenow.com/room/#{channel_id(channel)}/speak.json"
+      url = "https://#{subdomain}.campfirenow.com/room/#{channel_id(channel)}/speak.json"
       http = EventMachine::HttpRequest.new(url).post :head => {'Content-Type' => 'application/json', 'authorization' => [api_key, 'X']}, :body => Yajl::Encoder.encode({:message => {:body => message, :type => "Textmessage"}})
       
-      http.errback { STDERR.puts "Error speaking: '#{message}' to #{channel_id(channel)}" }
+      http.errback { logger.error "Error speaking: '#{message}' to #{channel_id(channel)}" }
     end
     
     def paste(text, channel)
     end
     
     def upload
     end
     
     def join(channel_id)
-      url = "https://37s.campfirenow.com/room/#{channel_id}/join.json"
+      logger.info "Joining channel #{channel_id}"
+      url = "https://#{subdomain}.campfirenow.com/room/#{channel_id}/join.json"
       http = EventMachine::HttpRequest.new(url).post :head => {'Content-Type' => 'application/json', 'authorization' => [api_key, 'X']}
       
-      http.errback { STDERR.puts "Error joining channel: #{channel_id}" }
+      http.errback { logger.error "Error joining channel: #{channel_id}" }
       http.callback {
         yield if block_given?
       }
     end
 
@@ -50,13 +51,13 @@
       fetch_channel_data(channel_id)
       return false
     end
     
     def populate_channel_list
-      url = "https://37s.campfirenow.com/rooms.json"
+      url = "https://#{subdomain}.campfirenow.com/rooms.json"
       http = EventMachine::HttpRequest.new(url).get :head => {'authorization' => [api_key, 'X']}
-      http.errback { puts http.status }
+      http.errback { logger.error "Error populating the channel list: #{http.status.inspect}" }
       http.callback {
         new_channels = {}
         Yajl::Parser.parse(http.response)['rooms'].each do |c|
           new_channels[c["name"]] = c
         end
@@ -67,35 +68,44 @@
         yield if block_given?
       }
     end
 
     def fetch_channel_data(channel_id)
-      STDERR.puts "Fetching channel data for #{channel_id}"
-      url = "https://37s.campfirenow.com/room/#{channel_id}.json"
+      logger.debug "Fetching channel data for #{channel_id}"
+      url = "https://#{subdomain}.campfirenow.com/room/#{channel_id}.json"
       http = EventMachine::HttpRequest.new(url).get :head => {'authorization' => [api_key, 'X']}
-      http.errback { STDERR.puts "Couldn't get data for channel #{channel_id} at url #{url}" }
+      http.errback { logger.error "Couldn't get data for channel #{channel_id} at url #{url}" }
       http.callback {
-        puts "Fetched channel data for #{channel_id}"
+        logger.debug "Fetched channel data for #{channel_id}"
         room = Yajl::Parser.parse(http.response)['room']
         channel_cache[room["id"]] = room
         room['users'].each do |u|
           update_user_cache_with(u["id"], u)
         end
       }
     end
     
+    def join_and_stream(id)
+      join(id) do
+        logger.info "Joined channel #{id} successfully"
+        fetch_channel_data(id)
+        stream(id)
+      end
+    end
+    
     def stream(channel_id)
       json_parser = Yajl::Parser.new :symbolize_keys => true
       json_parser.on_parse_complete = method(:process_message)
       
       url = "https://streaming.campfirenow.com/room/#{channel_id}/live.json"
       http = EventMachine::HttpRequest.new(url).get :head => {'authorization' => [api_key, 'X']}
-      http.errback { STDERR.puts "Couldn't stream channel #{channel_id} at url #{url}" }
+      http.errback { logger.error "Couldn't stream channel #{channel_id} at url #{url}" }
+      http.callback { logger.error "Disconnected from #{url}" }
       http.stream {|chunk| json_parser << chunk }
     end
 
     def channel_id_from_channel_name(channel_name)
-      puts "Looking for channel id for #{channel_name}"
+      logger.debug "Looking for channel id for #{channel_name}"
       channels[channel_name]["id"]
     end
   end
-end #class
+end