em-campfire 0.0.1 → 1.0.0

data/spec/messages_helper.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+require "rooms_helper"
+
+def stub_message_post_request(response_code = 201)
+  message_post_url = "https://#{valid_params[:subdomain]}.campfirenow.com/room/123/speak.json"
+  stub_request(:post, message_post_url).
+    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X'], 'Content-Type' => 'application/json'}).
+    to_return(:status => response_code, :body => "", :headers => {})
+end

data/spec/rooms_helper.rb

@@ -0,0 +1,98 @@
+require "spec_helper"
+
+def valid_room_cache_data
+  {
+    123 => {
+      "id" => 123,
+      "name" => "foo",
+      "users" => []
+    },
+    456 => {
+      "id" => 456,
+      "name" => "bar",
+      "users" => []
+    }
+  }
+end
+
+# Joining a room
+
+def stub_join_room_request(room, response_code = 200)
+  url = "https://#{valid_params[:subdomain]}.campfirenow.com/room/#{room}/join.json"
+  stub_request(:post, url).
+    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X'], 'Content-Type'=>'application/json'}).
+    to_return(:status => response_code, :body => "", :headers => {})
+end
+
+# Streaming a room
+
+def stream_url_for_room(id)
+  "https://streaming.campfirenow.com/room/#{id}/live.json"
+end
+
+def stub_stream_room_request(room_id, body, response_code = 200)
+  stub_request(:get, stream_url_for_room(room_id)).
+    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X']}).
+    to_return(:status => response_code, :body => body, :headers => {})
+end
+
+def stub_timeout_stream_room_request(room_id)
+  stub_request(:get, stream_url_for_room(room_id)).
+    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X']}).
+    to_timeout
+end
+
+def stream_message(body = "This is the body of the message")
+  {:room_id=>19505, :created_at=>"2012/10/01 14:24:49 +0000", :body=>body, :starred=>false, :id=>685107688, :user_id=>599452, :type=>"TextMessage"}
+end
+
+def stream_message_json(body = "This is the body of the message")
+  Yajl::Encoder.encode stream_message(body)
+end
+
+# Individual room data requests
+
+def room_data_url(room_id)
+  "https://#{valid_params[:subdomain]}.campfirenow.com/room/#{room_id}.json"
+end
+
+def stub_room_data_request(room_id, response_code = 200)
+  body = response_code == 200 ? Yajl::Encoder.encode(:room => valid_room_cache_data[room_id]) : ""
+  stub_request(:get, room_data_url(room_id)).
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}).
+    to_return(:status => response_code, :body => body, :headers => {:ETag => etag_for_data(valid_room_cache_data[room_id])})
+end
+
+def stub_timeout_room_data_request(room_id)
+  stub_request(:get, room_data_url(room_id)).
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X']}).
+    to_timeout
+end
+
+# Room list data requests
+
+def rooms_data_url
+  "https://#{valid_params[:subdomain]}.campfirenow.com/rooms.json"
+end
+
+def stub_room_list_data_request(response_code = 200)
+  body = response_code == 200 ? Yajl::Encoder.encode(room_list_data_api_response) : ""
+  etag_header = response_code == 200 ? {:ETag => 'new etag'} : {:ETag => etag_for_room_list_data}
+  stub_request(:get, rooms_data_url).
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json', 'ETag' => etag_for_room_list_data}).
+    to_return(:status => response_code, :body => body, :headers => etag_header)
+end
+
+def stub_timeout_room_list_data_request
+  stub_request(:get, rooms_data_url).
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}).
+    to_timeout
+end
+
+def room_list_data_api_response
+  {'rooms' => valid_room_cache_data.map {|key, val| val}}
+end
+
+def etag_for_room_list_data
+  etag_for_data(room_list_data_api_response)
+end

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
+require 'simplecov'
+require 'digest'
+
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
 require File.expand_path("../lib/em-campfire", File.dirname(__FILE__))
 
-require 'mocha'
 require 'webmock/rspec'
 
 RSpec.configure do |config|
@@ -13,66 +19,28 @@ def a klass, params={}
   params = valid_params.merge(params) if klass == EM::Campfire
   klass.new(params)
 end
-  
-# Urg
-def mock_logger
+
+def mock_logger(klass = EM::Campfire)
   @logger_string = StringIO.new
   @fake_logger = Logger.new(@logger_string)
-  EM::Campfire.any_instance.expects(:logger).at_least(1).returns(@fake_logger)
+  klass.any_instance.expects(:logger).at_least(1).returns(@fake_logger)
 end
-  
-# Bleurgh
+
 def logger_output
   str = @logger_string.dup
   str.rewind
   str.read
 end
 
-def valid_user_cache_data
-  {123 => {"name" => "foo"}, 456 => {"name" => "bar"}, 'me' => {"name" => "bot", "id" => 123}}
-end
-
-def valid_room_cache_data
-  {
-    123 => {
-      "id" => 123,
-      "name" => "foo",
-      "users" => []
-    },
-    456 => {
-      "id" => 456,
-      "name" => "bar",
-      "users" => []
-    }
-  }
+def etag_for_data(data)
+  "\"#{Digest::SHA2.hexdigest(data.to_s)}\""
 end
 
 def valid_params
-  {:api_key => "6124d98749365e3db2c9e5b27ca04db6", :subdomain => "oxygen"} 
-end
-
-def stub_join_room_request(room)
-  url = "https://#{valid_params[:subdomain]}.campfirenow.com/room/#{room}/join.json"
-  stub_request(:post, url).
-    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X'], 'Content-Type'=>'application/json'}).
-    to_return(:status => 200, :body => "", :headers => {})
-end
-
-def stub_rooms_data_request
-  stub_request(:get, "https://#{valid_params[:subdomain]}.campfirenow.com/rooms.json").
-    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X']}).
-    to_return(:status => 200, :body => Yajl::Encoder.encode(:rooms => valid_room_cache_data.values), :headers => {})
-end
-
-def stub_message_post_request
-  message_post_url = "https://#{valid_params[:subdomain]}.campfirenow.com/room/123/speak.json"
-  stub_request(:post, message_post_url).
-    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X'], 'Content-Type' => 'application/json'}).
-    to_return(:status => 201, :body => "", :headers => {})
+  {:api_key => "6124d98749365e3db2c9e5b27ca04db6", :subdomain => "oxygen", :ignore_self => false} 
 end
 
-def stub_stream_room_request(room)
-  stub_request(:get, "https://streaming.campfirenow.com/room/#{room}/live.json").
-    with(:headers => {'Authorization'=>[valid_params[:api_key], 'X']}).
-    to_return(:status => 200, :body => "", :headers => {})
+class ModuleHarness
+  def subdomain; valid_params[:subdomain]; end
+  def api_key; valid_params[:api_key]; end
 end

data/spec/users_helper.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+def valid_user_cache_data
+  {123 => {"name" => "foo"}, 456 => {"name" => "bar"}, 'me' => {"name" => "bot", "id" => 789}}
+end
+
+# Fetching data about users
+
+def stub_user_data_request(user_id, response_code = 200)
+  body = response_code == 200 ? Yajl::Encoder.encode(:user => valid_user_cache_data[user_id]) : ""
+  stub_request(:get, "https://#{valid_params[:subdomain]}.campfirenow.com/users/#{user_id}.json").
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}).
+    to_return(:status => response_code, :body => body, :headers => {:ETag => etag_for_data(valid_user_cache_data[user_id])})
+end
+
+def stub_timeout_user_data_request(user_id)
+  stub_request(:get, "https://#{valid_params[:subdomain]}.campfirenow.com/users/#{user_id}.json").
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}).
+    to_timeout
+end
+
+# Fetching data about self
+
+def stub_self_data_request(response_code = 200)
+  body = response_code == 200 ? Yajl::Encoder.encode(:user => valid_user_cache_data['me']) : ""
+  stub_request(:get, "https://#{valid_params[:subdomain]}.campfirenow.com/users/me.json").
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}).
+    to_return(:status => response_code, :body => body, :headers => {:ETag => etag_for_data(valid_user_cache_data['me'])})
+end
+
+def stub_timeout_self_data_request
+  stub_request(:get, "https://#{valid_params[:subdomain]}.campfirenow.com/users/me.json").
+    with(:headers => {'Authorization'=>['6124d98749365e3db2c9e5b27ca04db6', 'X'], 'Content-Type'=>'application/json'}).
+    to_timeout
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-campfire
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,85 +9,136 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70274674754820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274674754820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70274674754280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70274674754280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70274674753780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274674753780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70274674753320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274674753320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70274674752720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70274674752720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70274674751940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.12'
   type: :development
   prerelease: false
-  version_requirements: *70274674751940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70274674751460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 1.8.10
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274674751460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Eventmachine campfire API lib
 email:
 - will@willj.net
@@ -95,24 +146,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
 - em-campfire.gemspec
 - examples/simple.rb
 - lib/em-campfire.rb
+- lib/em-campfire/cache.rb
 - lib/em-campfire/connection.rb
 - lib/em-campfire/messages.rb
 - lib/em-campfire/rooms.rb
 - lib/em-campfire/users.rb
 - lib/em-campfire/version.rb
+- spec/lib/cache_spec.rb
 - spec/lib/connection_spec.rb
 - spec/lib/em-campfire_spec.rb
 - spec/lib/messages_spec.rb
 - spec/lib/rooms_spec.rb
+- spec/lib/users_spec.rb
+- spec/messages_helper.rb
+- spec/rooms_helper.rb
 - spec/spec_helper.rb
+- spec/users_helper.rb
 homepage: https://github.com/wjessop/em-campfire
 licenses: []
 post_install_message: 
@@ -125,21 +183,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4475605419022692822
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4475605419022692822
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Eventmachine campfire API lib
 test_files:
+- spec/lib/cache_spec.rb
 - spec/lib/connection_spec.rb
 - spec/lib/em-campfire_spec.rb
 - spec/lib/messages_spec.rb
 - spec/lib/rooms_spec.rb
+- spec/lib/users_spec.rb
+- spec/messages_helper.rb
+- spec/rooms_helper.rb
 - spec/spec_helper.rb
+- spec/users_helper.rb