innowhite 0.1.4 → 0.1.5

data/innowhite.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innowhite}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{bainur}]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{innowhite}
   s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Innowhite Api}
+  s.summary = %q{Gem for Innowhite Api}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/innowhite.rb

@@ -41,10 +41,11 @@ class Innowhite
     user = params[:user]
     tags = params[:tags]
     desc = params[:desc]
-    parent_org = params[:parentOrg]
+    #parent_org = params[:parentOrg]
+    @org_name = @parent_org if @org_name.nil?
     room_id = set_room_id
     address = join_room_helper(@server_address,@org_name, room_id, user,true)
-    res = create_room_info(room_id,user,tags,desc, parent_org,address)
+    res = create_room_info(room_id,user,tags,desc, @org_name,address)
     res = res.include?("Missing")
     if res == true
       return "Failed to fetch, maybe you have entered wrong username / organization name .."
@@ -54,9 +55,14 @@ class Innowhite
   end
 
   def create_room_info(room_id,user,tags,desc, parent_org,address)
+    checksum_tmp = "parentOrg=#{parent_org}&orgName=#{parent_org}"
+    checksum = generating_checksum(URI.escape(checksum_tmp))
+    
     res = RestClient.post("#{@api_address}create_room_info",
       {:roomId => room_id, :user => user, :tags => tags,:desc => desc,
-        :parentOrg => parent_org, :address => address, :orgName => parent_org}
+        :parentOrg => parent_org, :address => address, :orgName => parent_org,
+        :checksum => checksum
+        }
     )
     return res
   end
@@ -89,7 +95,7 @@ class Innowhite
     end    
     address = join_room_helper(@server_address,@org_name, room_id, user, false)
     if missing
-      return "Room is not exist / Expired"
+      raise "Room is not exist / Expired"
     else
       return address
     end
@@ -143,9 +149,10 @@ class Innowhite
       descs = []
       res = []
       tmp = "parentOrg=#{parent_org}&orgName=#{org_name1}&user=#{user}&tags=#{tags}"
-      checksum = generating_checksum(URI.escape(tmp))
-      pp  "#{@api_address}list_sessions?#{tmp}&cheksum=#{checksum}"
-      url = URI.escape("#{@api_address}past_sessions?#{tmp}&cheksum=#{checksum}")
+      checksum_tmp = "parentOrg=#{parent_org}&orgName=#{org_name1}"
+      checksum = generating_checksum(URI.escape(checksum_tmp))
+     # pp  "#{@api_address}list_sessions?#{tmp}&cheksum=#{checksum}"
+      url = URI.escape("#{@api_address}past_sessions?#{tmp}&checksum=#{checksum}")
 
       x = Nokogiri::XML(open(url))
       x.xpath('//web-session/session-id').each{|m| ids << m.text}
@@ -156,23 +163,29 @@ class Innowhite
       end
       return res
     rescue => e
-      return "Error fetching sessions #{e.inspect}"
+      return "Error fetching sessions check the organization and private key .."
     end
   end
   def get_sessions(params = {})
     begin
     params[:parentOrg] ||= @parent_org
-    org_name1 = params[:parentOrg] if params[:orgName].nil?
+    if params[:orgName].nil?
+      org_name1 = params[:parentOrg]
+    else
+      org_name1 = params[:orgName]
+    end
     ids = []
     parent_org = params[:parentOrg]
+    org_name1 = parent_org if org_name1.blank?
     user = params[:user]
     tags = params[:tags]
     descs = []
     res = []
+    checksum_tmp = "parentOrg=#{parent_org}&orgName=#{org_name1}"    
     tmp = "parentOrg=#{parent_org}&orgName=#{org_name1}&user=#{user}&tags=#{tags}"
-    checksum = generating_checksum(URI.escape(tmp))
-    pp  "#{@api_address}list_sessions?#{tmp}&cheksum=#{checksum}"
-    url = URI.escape("#{@api_address}list_sessions?#{tmp}&cheksum=#{checksum}")
+    checksum = generating_checksum(URI.escape(checksum_tmp))
+    #pp  "#{@api_address}list_sessions?#{tmp}&cheksum=#{checksum}"
+    url = URI.escape("#{@api_address}list_sessions?#{tmp}&checksum=#{checksum}")
 
     x = Nokogiri::XML(open(url))
     x.xpath('//web-session/session-id').each{|m| ids << m.text}
@@ -183,7 +196,7 @@ class Innowhite
     end
     return res
     rescue => e
-      return "Error fetching sessions #{e.inspect}"
+      return "Error fetching sessions check the organization and private key .."
     end
   end
 
@@ -196,8 +209,8 @@ class Innowhite
     return "#{action}#{address}&checksum=#{generating_checksum(checksum)}"
   end
 
-  def generating_checksum(params)
-    Digest::SHA1.hexdigest(params)
+  def generating_checksum(params)    
+    Digest::SHA1.hexdigest(params+@private_key)
   end
 
   def generate_checksum(parent_org, org_name,user_name)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: innowhite
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - bainur
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-08-11 00:00:00 -04:00
+default_executable: 
 dependencies: []
 
 description: Innowhite Api
@@ -33,6 +33,7 @@ files:
 - lib/innowhite.rb
 - Manifest
 - innowhite.gemspec
+has_rdoc: true
 homepage: http://github.com/bainur/innowhite
 licenses: []
 
@@ -51,7 +52,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -60,7 +60,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
       segments: 
       - 1
       - 2
@@ -68,9 +67,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: innowhite
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Innowhite Api
+summary: Gem for Innowhite Api
 test_files: []