hobostove 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c7295b9bbe575c31eb65da98a8fe03550f6208
-  data.tar.gz: 931f5f3e8b558e871950dda4736c1794ddda0b22
+  metadata.gz: 1fb76c2892a743794debc51500b56ca9b8b222db
+  data.tar.gz: 12ea293f89da75edfde81e350355a760c544daa0
 SHA512:
-  metadata.gz: c604d75ce1366ba30b857da0ca58797625bfb62779db89cf0d940513fdb622fe6d15c0dc3764be4e8686ab1ce03903eefcad2fd098137731ebfea2403839db4c
-  data.tar.gz: ec9ecffc302cde28fc91eeca3a9459ea296520dcf39dddbc6dabe525c59325e5aae31f5e8af82f7e624fa57df4f08c0d4bfc4e15ba91e48fac636421757962e7
+  metadata.gz: e37dafa2929d7ecc9e1c01543649e4a9f8739658e698311b35a6cf91c0f00402d69db36a371e8fbdb97667e7503a885d5e971a5c9331a794b2082271298a8114
+  data.tar.gz: 4d2e0255a4777d4793bd3518a7f2c697857d8957f221bd619eb4d78bf14bdabd9414214e70b3fa1167be9fcf28e56cff4ceb24d0605cb4f7c2e8080df3fdaf75

data/lib/hobostove/campfire.rb

@@ -0,0 +1,96 @@
+module Hobostove
+  class Campfire
+    attr_reader :room_id
+
+    def initialize
+      load_current_room
+
+      @users = {}
+    end
+
+    def recent_messages
+      messages = connection.get("/room/#{room_id}/recent.json?limit=10").body
+      messages = JSON.parse(messages)["messages"]
+      messages.map do |message|
+        message = Hobostove::Models::Message.new(
+          message["id"],
+          Time.parse(message["created_at"]),
+          message["type"],
+          user(message["user_id"]),
+          message["body"]
+        )
+        message = handle_upload(message) if message.type == "UploadMessage"
+        message
+      end
+    end
+
+    def send_message(message)
+      connection.post("/room/#{room_id}/speak.json") do |req|
+        req.body = {
+          :message => {
+            :type => "TextMessage",
+            :body => message,
+          }
+        }.to_json
+      end
+    end
+
+    def current_users
+      room = connection.get("/room/#{room_id}.json").body
+      room = JSON.parse(room)["room"]
+      room["users"].map do |user|
+        @users[user["id"]] = Hobostove::Models::User.new(user["id"], user["name"])
+      end
+    end
+
+    def join
+      connection.post("/room/#{room_id}/join.json")
+    end
+
+    def leave
+      connection.post("/room/#{room_id}/leave.json")
+    end
+
+    private
+
+    def base_uri
+      "https://#{Configuration.subdomain}.campfirenow.com"
+    end
+
+    def connection
+      return @connection if @connection
+      @connection = Faraday.new(base_uri) do |faraday|
+        faraday.adapter *Faraday.default_adapter
+      end
+      @connection.basic_auth(Configuration.token, "x")
+      @connection
+    end
+
+    def load_current_room
+      rooms = connection.get("/rooms.json").body
+      rooms = JSON.parse(rooms)["rooms"]
+      @room_id = rooms.find do |room|
+        room["name"] == Configuration.room
+      end["id"]
+    end
+
+    def user(user_id)
+      return @users[user_id] if @users[user_id]
+      user = connection.get("/users/#{user_id}.json").body
+      user = JSON.parse(user)["user"]
+      @users[user_id] = Hobostove::Models::User.new(user_id, user["name"])
+    end
+
+    def handle_upload(message)
+      upload = connection.get("room/#{room_id}/messages/#{message.id}/upload.json").body
+      upload = JSON.parse(upload)["upload"]
+      Hobostove::Models::Message.new(
+        message.id,
+        message.timestamp,
+        message.type,
+        message.user,
+        upload["full_url"],
+      )
+    end
+  end
+end

data/lib/hobostove/message_renderer.rb

@@ -1,5 +1,5 @@
 module Hobostove
-  class MessageRenderer < Struct.new(:subdomain, :room_id, :window_size)
+  class MessageRenderer < Struct.new(:window_size)
     def render_lines(message)
       message = render(message)
       return [] if message.nil?

data/lib/hobostove/window.rb

@@ -19,7 +19,7 @@ module Hobostove
     end
 
     def main
-      room.join
+      campfire.join
 
       while @running && (ch = Curses.getch)
         Hobostove.logger.debug("#{ch} - #{ch.chr.inspect} pressed")
@@ -45,7 +45,7 @@ module Hobostove
         @message_panel.update_cursor
       end
 
-      room.leave
+      campfire.leave
     end
 
     def speak
@@ -54,18 +54,17 @@ module Hobostove
         return
       end
 
-      room.speak @current_message
+      campfire.send_message @current_message
       @current_message = ""
     end
 
     def stream
       Thread.new do
         loop do
-          recent = room.recent(10)
+          recent = campfire.recent_messages
           recent.each do |message|
-            next if messages.include?(message[:id])
-            messages << message[:id]
-
+            next if messages.include?(message.id)
+            messages << message.id
             handle_message(message)
           end
 
@@ -78,7 +77,6 @@ module Hobostove
 
     def handle_message(message)
       Hobostove.logger.debug(message.inspect)
-      message = Models::Message.convert(message)
 
       case message.type
       when "TextMessage"
@@ -88,15 +86,7 @@ module Hobostove
       when "LeaveMessage"
         @users_panel.remove_user(message.user)
       when "UploadMessage"
-        upload = room.send(:get, "messages/#{message.id}/upload")
-        Hobostove.logger.debug(upload.inspect)
-        message = Models::Message.new(
-          message.id,
-          message.timestamp,
-          message.type,
-          message.user,
-          upload.upload.full_url
-        )
+        Notify.notify message.username, message.body
       end
 
       message_renderer.render_lines(message).each do |line|
@@ -106,15 +96,11 @@ module Hobostove
       Hobostove.logger.fatal(e.inspect)
     end
 
-    def room
-      @room ||= campfire.find_room_by_name(Configuration.room)
-    end
-
     private
 
     def message_renderer
       @message_renderer ||=
-        MessageRenderer.new(Configuration.subdomain, room.id, Curses.cols - 25)
+        MessageRenderer.new(Curses.cols - 25)
     end
 
     def start_curses
@@ -138,15 +124,15 @@ module Hobostove
     end
 
     def load_users
-      room.users.each do |user|
+      campfire.current_users.each do |user|
         Hobostove.logger.info user.name
-        @users_panel.add_user(Models::User.convert(user), false)
+        @users_panel.add_user(user, false)
       end
       @users_panel.refresh
     end
 
     def campfire
-      @campfire ||= Tinder::Campfire.new Configuration.subdomain, :token => Configuration.token
+      @campfire ||= Campfire.new
     end
   end
 end

data/lib/hobostove.rb

@@ -11,6 +11,7 @@ require 'yaml'
 require 'hobostove/models/message'
 require 'hobostove/models/user'
 
+require 'hobostove/campfire'
 require 'hobostove/message_renderer'
 
 require 'hobostove/cli/setup'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobostove
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Oestrich
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - bin/hobostove
 - lib/hobostove.rb
+- lib/hobostove/campfire.rb
 - lib/hobostove/cli/room_picker.rb
 - lib/hobostove/cli/setup.rb
 - lib/hobostove/cli/upgrade.rb