campfiyah 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50e6cebc5f704d3bc802fd79863d83443533acc
-  data.tar.gz: fcb9ae27fff12bedeab0c05869ebdf58c4b76ed2
+  metadata.gz: 138144f1c52be3e93efd7d421ef44c822d3c004c
+  data.tar.gz: a180497c63f6828db04609c648cd95cad7f3ae96
 SHA512:
-  metadata.gz: f6c7256cda075ca3b550eec0f2635d1d5d545599f33e0ac3f67ec26e1188b79cc2c4e7467d9b60f30ae6345d751894029c1c788bb38c20ca910bc08bca4247f3
-  data.tar.gz: fd1120c9b555532ad40131f1233a3d403e2e9d5099ce4144f95bbf77f75828af7d2954f88f6c5eac9a64f96b711b1b76495952de83dac8b6e61f207567d9cb1e
+  metadata.gz: 49069a3c5686d5fcd91c1aa792771e0daf80efe1ac5e5b84374ca2b0ccd75cdd26d00c50c8f8cf4051286215ceee8244e2171c51f9883e23dd082e443e385ed5
+  data.tar.gz: 369d5185d32df7117152a49e8a1c6b7703839da6ef670ff88786c92a7879a38ce08393242124acd138526790745eee72ba2773486042c20948acb1175c86dc21

data/README.md

@@ -37,6 +37,15 @@ room = account.room_by_id(123456)
 room.message("woot")
 ```
 
+Or you can find information on users
+
+```ruby
+account = Campfiyah::Account.new(default_subdomain, default_token)
+user = account.user_by_id(123456)
+user.email
+user.name
+```
+
 You can also enable the in-memory adapter for development or tests.
 
 ```ruby

data/campfiyah.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "debugger"
 end

data/lib/campfiyah/account.rb

@@ -21,7 +21,11 @@ module Campfiyah
     end
 
     def room_by_id(id)
-      rooms.find {|r| r.id.to_i == id.to_i}
+      if @rooms
+        rooms.find {|r| r.id.to_i == id.to_i}
+      else
+        @adapter.room_by_id(id)
+      end
     end
 
     def room_by_name(name)

data/lib/campfiyah/adapters.rb

@@ -18,4 +18,4 @@ module Campfiyah
 end
 
 require 'campfiyah/adapters/http'
-require 'campfiyah/adapters/memory'
+require 'campfiyah/adapters/memory'

data/lib/campfiyah/adapters/http.rb

@@ -26,6 +26,14 @@ module Campfiyah
         rooms.sort { |a,b| b['updated_at'] <=> a['updated_at'] }
       end
 
+      def room_by_id(id)
+        room = nil
+        response = connection.get("/room/#{id}.json")
+        if response.status == 200
+          room = response.body["room"]
+        end
+      end
+
       def user_by_id(id)
         response = connection.get("/users/#{id}.json")
         if response.status == 200

data/lib/campfiyah/adapters/memory.rb

@@ -5,6 +5,10 @@ module Campfiyah
         @rooms ||= Yajl.load(File.read("#{File.dirname(__FILE__)}/memory/rooms.json"))['rooms']
       end
 
+      def room_by_id(id)
+        @room ||= Yajl.load(File.read("#{File.dirname(__FILE__)}/memory/room.json"))['room']
+      end
+
       def user_by_id(id)
         hash = Yajl.load(File.read("#{File.dirname(__FILE__)}/memory/user.json"))['user']
         hash['id'] = id

data/lib/campfiyah/adapters/memory/room.json

@@ -0,0 +1 @@
+{"room":{"full":false,"locked":false,"users":[{"type":"Member","email_address":"hubot@github.com","avatar_url":"http://dge9rmgqjs8m1.cloudfront.net/global/missing/avatar.gif?r=3","admin":true,"name":"Hubot","created_at":"2008/04/12 01:08:29 +0000","id":307524},{"type":"Member","email_address":"atmos@atmos.org","avatar_url":"http://dge9rmgqjs8m1.cloudfront.net/global/d2f0470bc40603fa3c32d01018db49548fb7de7e/avatar.gif?r=3","admin":true,"name":"atmos","created_at":"2010/08/18 18:01:25 +0000","id":420}],"name":"The Danger Room","updated_at":"2013/09/26 20:27:25 +0000","open_to_guests":false,"created_at":"2011/02/07 22:36:38 +0000","topic":"Danger","id":123456}}

data/lib/campfiyah/room.rb

@@ -12,5 +12,14 @@ module Campfiyah
     def message(message)
       @adapter.message(id, message)
     end
+
+    def users
+      @users ||= users!
+    end
+
+    def users!
+      room = @adapter.room_by_id(id)
+      room['users'].map { |user| User.from_hash(user, @adapter) }
+    end
   end
-end
+end

data/lib/campfiyah/version.rb

@@ -1,3 +1,3 @@
 module Campfiyah
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/room_spec.rb

@@ -5,5 +5,16 @@ describe Campfiyah::Room do
     it "messages a channel" do
       pending
     end
+
+    it "finds users for a room" do
+      account = Campfiyah::Account.new(default_subdomain, default_token)
+      account.rooms.should_not be_empty
+
+      room = account.room_by_name("The Danger Room")
+      room.users.size.should eql(2)
+
+      room = account.room_by_id(123456)
+      room.name.should eql("The Danger Room")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: campfiyah
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple faraday based Campfire API
 email:
 - atmos@atmos.org
@@ -126,6 +140,7 @@ files:
 - lib/campfiyah/adapters.rb
 - lib/campfiyah/adapters/http.rb
 - lib/campfiyah/adapters/memory.rb
+- lib/campfiyah/adapters/memory/room.json
 - lib/campfiyah/adapters/memory/rooms.json
 - lib/campfiyah/adapters/memory/user.json
 - lib/campfiyah/room.rb
@@ -164,3 +179,4 @@ test_files:
 - spec/room_spec.rb
 - spec/spec_helper.rb
 - spec/user_spec.rb
+has_rdoc: