protolink 0.2.6 → 0.2.7

data/lib/protolink.rb

@@ -2,6 +2,7 @@ require 'protolink/protonet'
 require 'protolink/channel'
 require 'protolink/user'
 require 'protolink/listen'
+require 'protolink/node'
 
 module Protolink
   class Error < StandardError; end

data/lib/protolink/channel.rb

@@ -1,12 +1,14 @@
 module Protolink
   class Channel
-    attr_reader :id, :name, :description
+    attr_reader :id, :name, :description, :global, :uuid
 
     def initialize(connection, attributes = {})
       @connection  = connection
       @id          = attributes['id']
       @name        = attributes['name']
       @description = attributes['description']
+      @global      = attributes['global']
+      @uuid        = attributes['uuid']
       @loaded      = false
     end
     

data/lib/protolink/node.rb

@@ -0,0 +1,24 @@
+module Protolink
+  class Node
+    attr_reader :id, :uuid, :name, :description
+
+    def initialize(connection, attributes = {})
+      @connection   = connection
+      @id           = attributes['id']
+      @uuid         = attributes['uuid']
+      @name         = attributes['name']
+      @description  = attributes['description']
+      @loaded     = false
+    end
+
+    def coupled?
+      connection.get("/api/v1/couplings/#{id}")
+    end
+
+    protected
+      def connection
+        @connection
+      end
+
+  end
+end

data/lib/protolink/protonet.rb

@@ -17,11 +17,11 @@ module Protolink
     # * +:password+: your api users password
     # * +:proxy+: a hash with your proxy options (e.g. {:uri => 'http://user:pass@example.com', :port => 8800})
     #
-    def self.open(uri, username, password, proxy = nil)
+    def self.open(uri, username = nil, password = nil, proxy = nil)
       # this allows you to use the httparty class helpers (base_uri...) with multiple connections
       clazz = self.dup
       clazz.base_uri(uri)
-      clazz.basic_auth(username, password)
+      clazz.basic_auth(username, password) if username && password
       if proxy
         clazz.http_proxy(proxy[:uri], proxy[:port])
       end
@@ -32,7 +32,7 @@ module Protolink
 
     # Get an array of all the available channels
     def channels
-      get('/api/v1/channels.json').map do |channel|
+      get('/api/v1/channels').map do |channel|
         Channel.new(self, channel)
       end
     end
@@ -43,7 +43,8 @@ module Protolink
       description   = options[:description]
       display_name  = options[:display_name]
       skip_autosubscribe = options[:skip_autosubscribe]
-      post('/api/v1/channels', :body => { :name => name, :description => description, :display_name => display_name, :skip_autosubscribe => skip_autosubscribe } )
+      global = options[:global]
+      post('/api/v1/channels', :body => { :name => name, :description => description, :display_name => display_name, :skip_autosubscribe => skip_autosubscribe, :global => global } )
       find_channel_by_name(name)
     end
 
@@ -59,7 +60,12 @@ module Protolink
 
     # Find a Channel by name
     def find_channel_by_name(name)
-      response = get("/api/v1/channels/#{name}")
+      response = get("/api/v1/channels/find_by_name/#{name}")
+      Channel.new(self, response) if response
+    end
+    
+    def find_channel_by_uuid(uuid)
+      response = get("/api/v1/channels/find_by_uuid/#{uuid}")
       Channel.new(self, response) if response
     end
     
@@ -73,6 +79,14 @@ module Protolink
       Channel.new(self, response) if response
     end
 
+    def global_channels
+      response = get('/api/v1/channels?global=true')
+      
+      response && response.map do |channel|
+        Channel.new(self, channel)
+      end
+    end
+
     # USERS
     
     # Get an array of all the available users
@@ -118,11 +132,23 @@ module Protolink
 
     # LISTENS
     def create_listen(user_id, channel_id)
-      post('/api/v1/listens', :body => {:user_id => user_id, :channel_id => channel_id } )
+      channel_query = channel_id.to_s.match("-") ? {:channel_uuid => channel_id} : {:channel_id => channel_id}
+      post('/api/v1/listens', :body => {:user_id => user_id}.merge(channel_query) )
     end
 
     def destroy_listen(user_id, channel_id)
-      delete('/api/v1/listens', :body => {:user_id => user_id, :channel_id => channel_id } )
+      channel_query = channel_id.match("-") ? {:channel_uuid => channel_id} : {:channel_id => channel_id}
+      delete('/api/v1/listens', :body => {:user_id => user_id}.merge(channel_query) )
+    end
+    
+    def couple(node_data)
+      response = post("/api/v1/couplings", :body => {:node_data => node_data})
+      [User.new(self, response[0]), response[1]] if response
+    end
+    
+    def node
+      response = get("/api/v1/nodes/1")
+      Node.new(self, response) if response
     end
     
     [:get, :post, :update, :delete].each do |method|

data/lib/protolink/user.rb

@@ -1,6 +1,6 @@
 module Protolink
   class User
-    attr_reader :id, :name, :login, :email, :avatar_url, :external_profile_url
+    attr_reader :id, :name, :login, :email, :avatar_url, :external_profile_url, :communication_token, :node_id
 
     def initialize(connection, attributes = {})
       @connection = connection
@@ -9,7 +9,9 @@ module Protolink
       @login      = attributes['login']
       @email      = attributes['email']
       @avatar_url = attributes['avatar_url']
+      @node_id    = attributes['node_id']
       @external_profile_url = attributes['external_profile_url']
+      @communication_token  = attributes['communication_token']
       @loaded     = false
     end
 

data/lib/protolink/version.rb

@@ -1,3 +1,3 @@
 module Protolink
-  VERSION = '0.2.6' unless defined?(::Protolink::VERSION)
+  VERSION = '0.2.7' unless defined?(::Protolink::VERSION)
 end

data/protolink.gemspec

@@ -26,14 +26,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<crack>, [">= 0"])
-      s.add_runtime_dependency(%q<httparty>, ["~> 0.5.1"])
+      s.add_runtime_dependency(%q<httparty>, ["~> 0.7.4"])
     else
       s.add_dependency(%q<crack>, [">= 0"])
-      s.add_dependency(%q<httparty>, ["~> 0.5.1"])
+      s.add_dependency(%q<httparty>, ["~> 0.7.4"])
     end
   else
     s.add_dependency(%q<crack>, [">= 0"])
-    s.add_dependency(%q<httparty>, ["~> 0.5.1"])
+    s.add_dependency(%q<httparty>, ["~> 0.7.4"])
   end
 end
 

data/test/all_tests.rb

@@ -8,8 +8,8 @@ require 'ruby-debug'
 Debugger.start
 # change this if you need to connect to another server
 PTN_SERVER = "http://localhost:3000"
-PTN_USER   = "dude"
-PTN_PASS   = "geheim"
+PTN_USER   = "test_suite"
+PTN_PASS   = "testtest"
 
 class TestAll < Test::Unit::TestCase
   
@@ -20,15 +20,15 @@ class TestAll < Test::Unit::TestCase
     user_4 = protonet.find_user_by_login("test_3")
 
     channel = protonet.find_rendezvous(user_3.id, user_1.id)
-    channel.delete!
+    channel && channel.delete!
 
     user_1.delete!
     user_3.delete!
     user_4.delete!
-    channel = protonet.find_channel_by_name("test_foobar")
-    channel.delete!
-    channel = protonet.find_channel_by_name("test_foobar_2")
-    channel.delete!
+    ["test_foobar", "test_foobar_2", "global"].each do |channel|
+      protonet.find_channel_by_name(channel).delete! rescue nil
+    end
+    
   end
   
   def test_all
@@ -79,5 +79,11 @@ class TestAll < Test::Unit::TestCase
     
     rendezvous = protonet.create_rendezvous(user_3.id, user_1.id)
     assert_equal [user_1.id, user_3.id], rendezvous.listener.map {|u| u.id.to_i}.sort
+    
+    channel_1 = protonet.create_channel(:name => "global", :skip_autosubscribe => true, :global => true)
+    assert_equal true, channel_1.global
+    
+    assert_equal channel_1.id, protonet.global_channels.first.id
+    assert_equal 1, protonet.global_channels.size
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: protolink
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - "Bj\xC3\xB6rn B. Dorra"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +02:00
+date: 2011-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 11
         segments: 
         - 0
-        - 5
-        - 1
-        version: 0.5.1
+        - 7
+        - 4
+        version: 0.7.4
   type: :runtime
   version_requirements: *id002
 description: A Ruby API for interfacing with Protonet, the next-gen internet infrastructure. Truly social and people-powered.
@@ -68,6 +68,7 @@ files:
 - lib/protolink.rb
 - lib/protolink/channel.rb
 - lib/protolink/listen.rb
+- lib/protolink/node.rb
 - lib/protolink/protonet.rb
 - lib/protolink/user.rb
 - lib/protolink/version.rb