innowhite 0.1.2 → 0.1.3

data/innowhite.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innowhite}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{bainur}]

data/lib/innowhite.rb

@@ -1,20 +1,20 @@
+require 'open-uri'
 require 'nokogiri'
 class Innowhite
 
   attr_accessor :mod_name, :org_name, :sub, :server_address, :private_key
 
-  def initialize(mod_name, org_name = nil, parent_org = "innowhite")
+  def initialize(mod_name, org_name = nil)
     load_settings
     @mod_name = mod_name.gsub(/ /,'')
-    @org_name = org_name unless org_name.blank?
-    @parent_org = parent_org
+    @org_name = org_name.nil? ? @parent_org : org_name
   end
 
   def load_settings
     settings = YAML.load_file('config/innowhite.yml')
     @server_address = settings["innowhite"]["server_address"]
     @private_key = settings["innowhite"]["private_key"]
-    @org_name = settings["innowhite"]["organization"]
+    @parent_org = settings["innowhite"]["organization"]
   end
 
   def create_room
@@ -25,7 +25,7 @@ class Innowhite
 
   def set_room_id
     room_id = ""
-    doc = Nokogiri::XML(open("#{@server_address}CreateRoom?parentOrg=innowhite&orgName=#{@sub_name}&user=#{@mod_name}&checksum=#{generate_checksum("innowhite",@sub_name, @mod_name)}"))
+    doc = Nokogiri::XML(open("#{@server_address}CreateRoom?parentOrg=#{@parent_org}&orgName=#{@org_name}&user=#{@mod_name}&checksum=#{generate_checksum(@parent_org,@org_name, @mod_name)}"))
     status = doc.xpath('//returnStatus').text.gsub("\n","") rescue ""
     if status.include?('SUCCESS')
       room_id = doc.xpath('//roomId').text.gsub("\n","").to_i
@@ -36,7 +36,7 @@ class Innowhite
     elsif status.include?('OUT_OF_SERVICE')
       room_id = 'OUT_OF_SERVICE'
     else
-      room_id = "Error With the Server #{@server_address}CreateRoom?parentOrg=innowhite&orgName=#{@sub_name}&user=#{@mod_name}&checksum=#{generate_checksum("innowhite",@sub_name, @mod_name)}"
+      room_id = "Error With the Server #{@server_address}CreateRoom?parentOrg=#{@parent_org}&orgName=#{@org_name}&user=#{@mod_name}&checksum=#{generate_checksum(@parent_org,@org_name, @mod_name)}"
     end
     return room_id
   end
@@ -49,8 +49,10 @@ class Innowhite
   def get_sessions(status)
     ids = []
     descs = []
-    res = []    
-    x = Nokogiri::XML(open("http://innowhite.com/get_active_session?orgName=#{@org_name}&status=#{status}"))
+    res = []
+    url = URI.escape("http://innowhite.com/get_active_session?orgName=#{@org_name}&status=#{status}")
+
+    x = Nokogiri::XML(open(url))
     x.xpath('//web-session/session-id').each{|m| ids << m.text}
     x.xpath('//web-session/session-desc').each{|m| descs << m.text}
 
@@ -64,7 +66,7 @@ class Innowhite
 
   def join_room_helper(server_addr, org_name, room_id,user, is_teacher)
     action = "#{server_addr}JoinRoom?"
-    address = "parentOrg=innowhite&orgName=#{org_name}&roomId=#{room_id}&user=#{user}&roomLeader=#{is_teacher}"
+    address = "parentOrg=#{@parent_org}&orgName=#{org_name}&roomId=#{room_id}&user=#{user}&roomLeader=#{is_teacher}"
     checksum = address+@private_key
     return "#{action}#{address}&checksum=#{generating_checksum(checksum)}"
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - bainur