rest_ejabberd 0.0.1 → 0.0.2

data/README.md

@@ -1,9 +1,21 @@
 # RestEjabberd
 
-Ruby interface to ejabberd's mod_restful
+Ruby interface to ejabberd's [https://github.com/jadahl/mod_restful](mod_restful)
 
 This allows to:
 
 * create a user
 * delete a user
+* check existance
 * change password
+
+```ruby
+client = RestEjabberd.new secret: 'shhhhh', host: 'chat.server.com/api/'
+client.register 'me@localhost', '123123'
+client.is_registered? 'me@localhost'
+#=> true
+client.change_password 'me@localhost', '123123', 'asdasd'
+#=> true
+client.unregister 'me@localhost', 'asdasd'
+#=> true
+```

data/lib/rest_ejabberd.rb

@@ -10,16 +10,21 @@ class RestEjabberd
     @client.set_debug_output $stdout if ENV['DEBUG']
   end
 
-  def register(username, password, host = @api.host)
+  def register(username, password)
+    check_for_host username
     url = @api + "admin"
+    username, host = username.split('@')
+
     request = prepare_request(Net::HTTP::Post.new(url.request_uri))
     request.body = command('register', username, host, password)
 
     JSON.parse @client.request(request).body
   end
 
-  def unregister(username, password, host = @api.host)
+  def unregister(username, password)
+    check_for_host username
     url = @api + "admin"
+    username, host = username.split('@')
     request = prepare_request(Net::HTTP::Post.new(url.request_uri))
     request.body = command('unregister', username, host)
 
@@ -27,15 +32,19 @@ class RestEjabberd
     response.has_key?("ok")
   end
 
-  def change_password(username, old_password, new_password, host = @api.host)
+  def change_password(username, old_password, new_password)
+    check_for_host username
     url = @api + 'register/change_password'
+    username, host = username.split('@')
     request = prepare_request(Net::HTTP::Post.new(url.request_uri))
     request.body = change_password_command(username, host, old_password, new_password)
 
     @client.request(request).body == '"ok"'
   end
 
-  def is_registered?(username, password, host = @api.host)
+  def is_registered?(username)
+    check_for_host username
+    username, host = username.split('@')
     url = @api + "register/is_registered?username=#{username}&host=#{host}&key=#{@secret}"
     request = prepare_request(Net::HTTP::Get.new(url.request_uri))
     @client.request(request).body == 'true'
@@ -43,6 +52,10 @@ class RestEjabberd
 
   private
 
+  def check_for_host(username)
+    raise IndexError unless username.include?("@")
+  end
+
   def command(command, *args)
     {
       key: @secret,
@@ -52,7 +65,6 @@ class RestEjabberd
   end
 
   def change_password_command(username, host, old_password, new_password)
-    # { "key":"secret", "username":"t1", "host":"localhost", "old_password":"hejhej", "new_password":"sansan" }
     {
       key: @secret,
       username: username,

data/rest_ejabberd.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "rest_ejabberd"
-  s.version           = "0.0.1"
+  s.version           = "0.0.2"
   s.summary           = "Ruby interface for ejabberd's mod_restful"
   s.description       = "Easy tool to use ejabberd's mod_restful from Ruby"
   s.authors           = ["elcuervo"]

data/test/fixtures/cassettes/change_user_password.yml

@@ -30,7 +30,7 @@ http_interactions:
       encoding: US-ASCII
       string: "{\"ok\":\"User test@localhost successfully registered\"}"
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:45:07 GMT
+  recorded_at: Fri, 06 Jul 2012 15:25:32 GMT
 - request: 
     method: post
     uri: http://localhost:8088/api/register/change_password
@@ -61,7 +61,7 @@ http_interactions:
       encoding: US-ASCII
       string: "\"ok\""
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:45:07 GMT
+  recorded_at: Fri, 06 Jul 2012 15:25:32 GMT
 - request: 
     method: get
     uri: http://localhost:8088/api/register/is_registered?username=test&host=localhost&key=secret
@@ -92,7 +92,7 @@ http_interactions:
       encoding: US-ASCII
       string: "true"
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:45:07 GMT
+  recorded_at: Fri, 06 Jul 2012 15:25:32 GMT
 - request: 
     method: post
     uri: http://localhost:8088/api/admin
@@ -123,7 +123,7 @@ http_interactions:
       encoding: US-ASCII
       string: "{\"ok\":\"\"}"
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:45:07 GMT
+  recorded_at: Fri, 06 Jul 2012 15:25:32 GMT
 - request: 
     method: get
     uri: http://localhost:8088/api/register/is_registered?username=test&host=localhost&key=secret
@@ -154,5 +154,5 @@ http_interactions:
       encoding: US-ASCII
       string: "false"
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:45:07 GMT
+  recorded_at: Fri, 06 Jul 2012 15:25:32 GMT
 recorded_with: VCR 2.1.1

data/test/fixtures/cassettes/create_and_remove_a_user.yml

@@ -30,7 +30,7 @@ http_interactions:
       encoding: US-ASCII
       string: "{\"ok\":\"User test@localhost successfully registered\"}"
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:21:37 GMT
+  recorded_at: Fri, 06 Jul 2012 15:01:50 GMT
 - request: 
     method: post
     uri: http://localhost:8088/api/admin
@@ -61,5 +61,5 @@ http_interactions:
       encoding: US-ASCII
       string: "{\"ok\":\"\"}"
     http_version: "1.1"
-  recorded_at: Wed, 04 Jul 2012 17:21:37 GMT
+  recorded_at: Fri, 06 Jul 2012 15:01:50 GMT
 recorded_with: VCR 2.1.1

data/test/rest_ejabberd_test.rb

@@ -3,10 +3,16 @@ require 'test_helper'
 describe RestEjabberd do
   before do
     @client = RestEjabberd.new secret: 'secret'
-    @username = 'test'
+    @username = 'test@localhost'
     @password = 'password'
   end
 
+  it 'should raise an IndexError if the username is malformed' do
+    assert_raises IndexError do
+      @client.is_registered?('wrong')
+    end
+  end
+
   it 'should register and unregister a user' do
     VCR.use_cassette("create and remove a user") do
       response = @client.register @username, @password
@@ -20,10 +26,10 @@ describe RestEjabberd do
     VCR.use_cassette("change user password") do
       @client.register @username, @password
 
-      assert @client.change_password @username, @password, 'newpassword'
-      assert @client.is_registered?(@username, @password)
-      assert @client.unregister @username, @password
-      assert !@client.is_registered?(@username, @password)
+      assert @client.change_password(@username, @password, 'newpassword')
+      assert @client.is_registered?(@username)
+      assert @client.unregister(@username, @password)
+      assert !@client.is_registered?(@username)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest_ejabberd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest