scamp 0.2.1 → 1.0.0

data/README.md

@@ -232,6 +232,7 @@ First class support, commits and pull requests, thanks guys!
 
 * [Caius Durling](http://caius.name/)
 * Sudara Williams of [Ramen Music](http://ramenmusic.com)
+* [Dom Hodgson](http://www.thehodge.co.uk/) (for the name)
 
 ## License
 

data/lib/scamp/connection.rb

@@ -2,7 +2,7 @@ class Scamp
   module Connection
     private
     
-    def connect(api_key, room_list)
+    def connect(api_key, room_list, &blk)
       EventMachine.run do
         
         # Check for rooms to join, and join them
@@ -15,6 +15,11 @@ class Scamp
         populate_room_list do
           logger.debug "Adding #{room_list.join ', '} to list of rooms to join"
           @rooms_to_join = room_list.map{|c| room_id(c) }
+
+          # Call a post connection block
+          if block_given?
+            yield
+          end
         end
         
         # populate bot data separately, in case we are ignoring ourselves

data/lib/scamp/users.rb

@@ -3,23 +3,31 @@ class Scamp
     # Return the user_id if we haven't got the real name and
     # kick off a user data fetch
     def username_for(user_id)
-      return user_cache[user_id]["name"] if user_cache[user_id]
-      fetch_data_for(user_id)
-      return user_id.to_s
+      if cached_user?(user_id)
+        user_cache[user_id]["name"]
+      else
+        fetch_data_for(user_id)
+        user_id.to_s
+      end
     end
-    
+
     def is_me?(user_id)
       if user_cache['me']
-        return user_cache['me']['id'] == user_id
+        user_cache['me']['id'] == user_id
       else
         fetch_data_for('me')
-        return false        
+        false
       end
     end
-    
-    private
-    
+
+    def cached_user? user_id
+      user_cache[user_id] != nil
+    end
+
+  private
+
     def fetch_data_for(user_id)
+      return unless user_id
       url = "https://#{subdomain}.campfirenow.com/users/#{user_id}.json"
       http = EventMachine::HttpRequest.new(url).get(:head => {'authorization' => [api_key, 'X'], "Content-Type" => "application/json"})
       http.callback do

data/lib/scamp/version.rb

@@ -1,3 +1,3 @@
 class Scamp
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

data/lib/scamp.rb

@@ -46,9 +46,9 @@ class Scamp
     instance_eval &block
   end
   
-  def connect!(room_list)
+  def connect!(room_list, &blk)
     logger.info "Starting up"
-    connect(api_key, room_list)
+    connect(api_key, room_list, &blk)
   end
   
   def command_list

data/spec/lib/scamp_spec.rb

@@ -550,6 +550,7 @@ describe Scamp do
     context "room operations" do
       before do
         @room_list_url = "https://#{@valid_params[:subdomain]}.campfirenow.com/rooms.json"
+        @me_list_url = "https://#{@valid_params[:subdomain]}.campfirenow.com/users/me.json"
         @room_url = "https://#{@valid_params[:subdomain]}.campfirenow.com/room/123.json"
         @stream_url = "https://streaming.campfirenow.com/room/123/live.json"
       end
@@ -566,7 +567,37 @@ describe Scamp do
         }
         logger_output.should =~ /DEBUG.*Fetched room list/
       end
-      
+
+      it "should invoke the post connection callback" do
+        mock_logger
+        bot = a Scamp
+
+        invoked_cb = false
+
+        EM.run_block {
+          stub_request(:get, @room_list_url).
+          with(:headers => {
+                 'Authorization'=>[@valid_params[:api_key], 'X'],
+                 'Content-Type' => 'application/json'
+               }).
+          to_return(:status => 200, :body => Yajl::Encoder.encode(:rooms => @valid_room_cache_data.values), :headers => {})
+
+          stub_request(:get, @room_list_url).
+          with(:headers => {
+                 'Authorization'=>[@valid_params[:api_key], 'X']
+               }).
+          to_return(:status => 200, :body => Yajl::Encoder.encode(:rooms => @valid_room_cache_data.values), :headers => {})
+
+          # Disable fetch_data_for, not important to this test.
+          Scamp.any_instance.expects(:fetch_data_for).returns(nil)
+
+          bot.send(:connect!, [@valid_room_cache_data.keys.first]) do
+            invoked_cb = true
+          end
+        }
+        invoked_cb.should be_true
+      end
+
       it "should handle HTTP errors fetching the room list" do
         mock_logger
         bot = a Scamp
@@ -705,7 +736,7 @@ describe Scamp do
   def mock_logger
     @logger_string = StringIO.new
     @fake_logger = Logger.new(@logger_string)
-    Scamp.any_instance.expects(:logger).returns(@fake_logger)
+    Scamp.any_instance.expects(:logger).at_least(1).returns(@fake_logger)
   end
 
   # Bleurgh

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scamp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70213556054000 !ruby/object:Gem::Requirement
+  requirement: &70092491483860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70213556054000
+  version_requirements: *70092491483860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70213556053500 !ruby/object:Gem::Requirement
+  requirement: &70092491483340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70213556053500
+  version_requirements: *70092491483340
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70213556053020 !ruby/object:Gem::Requirement
+  requirement: &70092491482760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70213556053020
+  version_requirements: *70092491482760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213556052560 !ruby/object:Gem::Requirement
+  requirement: &70092491482300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70213556052560
+  version_requirements: *70092491482300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213556052060 !ruby/object:Gem::Requirement
+  requirement: &70092491481840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70213556052060
+  version_requirements: *70092491481840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70213556051600 !ruby/object:Gem::Requirement
+  requirement: &70092491481380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70213556051600
+  version_requirements: *70092491481380
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70213556051020 !ruby/object:Gem::Requirement
+  requirement: &70092491480920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.7.6
   type: :development
   prerelease: false
-  version_requirements: *70213556051020
+  version_requirements: *70092491480920
 description: Eventmachine based Campfire bot framework
 email:
 - will@willj.net