firering 1.0.7 → 1.1.0

data/README.rdoc

@@ -84,6 +84,7 @@ For more details take a look at spec/fixtures/load_server.rb file.
 * indirect (Andre Arko), https://github.com/EmmanuelOga/firering/pull/1 ,
                          https://github.com/EmmanuelOga/firering/pull/2 ,
                          https://github.com/EmmanuelOga/firering/pull/3
+* caius (Caius Durling), https://github.com/EmmanuelOga/firering/pull/5
 
 == Copyright
 

data/bin/campf-notify

@@ -19,7 +19,7 @@ if subdomain.to_s =~ /^\s*$/ || token.to_s =~ /^\s*$/ || room_name.to_s =~ /^\s*
   puts
   exit 1
 else
-  host = "http://#{subdomain}.campfirenow.com"
+  host = "https://#{subdomain}.campfirenow.com"
   puts "connecting to #{host}"
 end
 
@@ -27,22 +27,26 @@ conn = Firering::Connection.new(host) {|c| c.token = token }
 
 EM.run do
   conn.rooms do |rooms|
-    room = rooms.detect { |r| r.name == room_name }
+    room = rooms.detect { |r| room_name =~ /#{r.name}|#{r.id}/i }
 
-    unless room
-      puts "Could not find that room. Found rooms:"
-      rooms.each { |room| puts "  * #{room}" }
-      exit 1
-    end
-
-    puts "Streaming #{room}"
+    if room
+      puts "Streaming #{room}"
 
-    room.stream do |message|
-      if message.from_user?
-        message.user { |user| system("notify-send -i #{icon_path.shellescape} -t 10000 Campfire #{ "( #{user} ) #{message}".shellescape }") }
+      room.stream do |message|
+        if message.from_user?
+          message.user { |user| system("notify-send -i #{icon_path.shellescape} -t 10000 Campfire #{ "( #{user} ) #{message}".shellescape }") }
+        else
+          system("notify-send -i #{icon_path.shellescape} -t 10000 Campfire #{message.to_s.shellescape}") if message.to_s =~ /\S/
+        end
+      end
+    else
+      if rooms.empty?
+        puts "Could not find any rooms on #{host}. Check your host/credentials?"
       else
-        system("notify-send -i #{icon_path.shellescape} -t 10000 Campfire #{message.to_s.shellescape}") if message.to_s =~ /\S/
+        puts "Could not find #{room_name.inspect} room on #{host}, but found: "
+        rooms.each { |room| puts "  * #{room}" }
       end
+      EM.stop
     end
   end
 

data/firering.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'firering'
-  s.version           = '1.0.7'
-  s.date              = '2011-03-03'
+  s.version           = '1.1.0'
+  s.date              = '2011-05-04'
   s.rubyforge_project = 'firering'
 
   s.summary     = "Campfire API interface powered by eventmachine em-http-request and yajl-ruby."

data/lib/firering/data/user.rb

@@ -1,5 +1,5 @@
 module Firering
-  User = Struct.new(:connection, :id, :name, :email_address, :admin, :created_at, :type, :api_auth_token)
+  User = Struct.new(:connection, :id, :name, :email_address, :admin, :created_at, :type, :api_auth_token, :avatar_url)
 
   class User
     extend Instantiator

data/lib/firering/instantiator.rb

@@ -10,8 +10,19 @@ module Firering
       attributes ||= Hash.new
 
       attributes.each do |key, val|
+        setter = "#{key}="
         value = ( key.to_s =~ /(_at|_on)$/ ) ? (Time.parse(val) rescue val) : val
-        instance.send("#{key}=", value)
+        if instance.respond_to?(setter)
+          instance.send(setter, value)
+        else
+          warning = "WARNING: Tried to set #{setter} #{value.inspect} on a #{instance.class} instance but it didn't respond. Probably the API got updated, please report this! (https://github.com/EmmanuelOga/firering/issues)"
+
+          if conn && conn.logger
+            conn.logger.warn warning
+          else
+            Kernel.warn warning
+          end
+        end
       end
 
       callback.call(instance) if callback

data/lib/firering/requests.rb

@@ -27,7 +27,12 @@ module Firering
     # multi: if true, gets all the users from each room as Firering::User objects
     def rooms(&callback)
       http(:get, "/rooms.json") do |data, http|
-        callback.call(data[:rooms].map{|room| Firering::Room.instantiate(self, room)}) if callback
+        if data[:rooms]
+          callback.call(data[:rooms].map{|room| Firering::Room.instantiate(self, room)}) if callback
+        else
+          logger.error(http.response)
+          callback.call([])
+        end
       end
     end
 

data/lib/firering.rb

@@ -5,7 +5,7 @@ require 'yajl'
 require 'em-http'
 
 module Firering
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 
   Error = Class.new(StandardError)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: firering
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 7
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors: 
 - Emmanuel Oga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -03:00
+date: 2011-05-04 00:00:00 -03:00
 default_executable: campf-notify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: firering
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 2
 summary: Campfire API interface powered by eventmachine em-http-request and yajl-ruby.