jegolize 0.1.6 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.8

data/app/controllers/jegol_controller.rb

@@ -40,4 +40,15 @@ class JegolController < ApplicationController
     client.close
     return username
   end
+  
+  def demo
+    @room = 'demo_room'
+    @active = true
+    @room = session[:room] if !session[:room].nil? && !session[:room].empty?
+    @active = !session[:active].nil? && session[:active].downcase == 'true' 
+    
+    respond_to do |format|
+      format.html #demo.html.erb
+    end
+  end
 end

data/app/views/{_jegol.html.erb → jegol/_jegol.html.erb}

@@ -1,6 +1,6 @@
 
 <%= stylesheet_link_tag "jegol", "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" %>
-<%= javascript_include_tag 'jegol', 'strophe', 'jegol.tag', 'jegol/plugin/viewer.default', 'jegol/plugin/update.tag', 'jegol/plugin/viewer.image', 'jegol/plugin/viewer.youtube', 'jegol/plugin/viewer.poll', 'jegol/plugin/update.subject', 'jegol/plugin/update.notify', 'http://platform.twitter.com/widgets.js', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js'%>
+<%= javascript_include_tag 'https://ajax.googleapis.com/ajax/libs/jquery/1.5.0/jquery.min.js', 'jegol', 'strophe', 'jegol.tag', 'jegol.plugin/viewer.default', 'jegol.plugin/update.tag', 'jegol.plugin/viewer.image', 'jegol.plugin/viewer.youtube', 'jegol.plugin/viewer.poll', 'jegol.plugin/update.subject', 'jegol.plugin/update.notify', 'http://platform.twitter.com/widgets.js', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js'%>
 <div id="jegol_box">
   <input type='hidden' id='jegol_service_url' value='<%= service %>'  />
   <div>

data/app/views/jegol/demo.html.erb

@@ -0,0 +1,3 @@
+<div>
+	<%= render "jegol", :service => "/jegol/boshsession/#{Jegol.get_MUC_name(@room)}", :readonly => !@active , :tweeturl => "https://github.com/alemyis/jegolize/wiki"%>
+</div>

data/config/initializers/jegol.rb

@@ -1,3 +1 @@
-if __FILE__ == $0
-  JEGOL_CONFIG = YAML.load_file("#{Rails.root}/config/jegol.yml")
-end
+JEGOL_CONFIG = YAML.load_file("#{Rails.root}/config/jegol.yml")

data/config/jegol.yml

@@ -26,6 +26,4 @@
   muc_namespace: conference.<TODO: XMPP.MYSERVER.COM>
   
   #chat rooms are named [jegolizating_<ID>]
-  muc_name_constant: jegolizing_
-  
-  
+  muc_name_constant: jegolizing_

data/jegolize.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jegolize}
-  s.version = "0.1.6"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alemeshet Alemu"]
@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/jegol_controller.rb",
-    "app/views/_jegol.html.erb",
-    "app/views/jebol_demo.html.erb",
+    "app/views/jegol/_jegol.html.erb",
+    "app/views/jegol/demo.html.erb",
     "config/initializers/jegol.rb",
     "config/jegol.yml",
     "jegolize.gemspec",

data/lib/generators/jegolize/scaffold/USAGE

@@ -1,8 +1,8 @@
 Description:
-	TODO - 
+	Generate's jebol files - controllers  
 
 Usage:
-	TODO -
+	rails g jegolize:scaffold
 
 Examples:
-	TODO -
+	rails g jegolize:scaffold

data/lib/generators/jegolize/scaffold/scaffold_generator.rb

@@ -10,9 +10,9 @@ module Jegolize
         puts '-----------------------------------------------------'
         
         # Copy views
-        filename_pattern = File.join self.class.source_root, "app/views/*.html.erb"
+        filename_pattern = File.join self.class.source_root, "app/views/jegol/*.html.erb"
         Dir.glob(filename_pattern).map {|f| File.basename f}.each do |f|
-          copy_file "#{self.class.source_root}/app/views/#{f}", "app/views/jegol/#{f}"
+          copy_file "#{self.class.source_root}/app/views/jegol/#{f}", "app/views/jegol/#{f}"
         end
         
         # Copy server side components - controller, config, init, 
@@ -37,6 +37,7 @@ module Jegolize
       
       def create_route
         route "match 'jegol/boshsession/:room_jid' => 'jegol#new_boshsession', :conditions => {:method => :get }"
+        route "match 'jegol/demo/:room/:active' => 'jegol#demo', :conditions => {:method => :get }"
       end
     end
   end

data/public/javascripts/jegol.js

@@ -8,6 +8,9 @@ var JeGol = {
     participants: null,
     lastmessagefrom: null,
     autoReconnect: true,
+	reconnectionDelay: 1000, //delay this many msec before trying to reconnect
+	reconnectionAttempt: 0,
+	reconnectionAttemptLimit: 10,
     viewerPlugins: {},
     updatePlugins: {},
 	/**
@@ -518,7 +521,13 @@ $(document).bind('disconnected', function(){
     
     if(JeGol.autoReconnect == true)
     {
-		$(document).trigger('connect');
+		JeGol.reconnectionAttempt += 1;
+		//incrementally delay connection attempt
+		if (JeGol.reconnectionAttempt < JeGol.reconnectionAttemptLimit) {
+			setTimeout(function(){
+				$(document).trigger('connect');
+			}, JeGol.reconnectionAttempt * JeGol.reconnectionDelay);
+		}
     }
 });
 

metadata

@@ -2,7 +2,7 @@
 name: jegolize
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors: 
 - Alemeshet Alemu
@@ -108,8 +108,8 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/jegol_controller.rb
-- app/views/_jegol.html.erb
-- app/views/jebol_demo.html.erb
+- app/views/jegol/_jegol.html.erb
+- app/views/jegol/demo.html.erb
 - config/initializers/jegol.rb
 - config/jegol.yml
 - jegolize.gemspec
@@ -157,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -535598431
+      hash: -748024717
       segments: 
       - 0
       version: "0"

data/app/views/jebol_demo.html.erb

@@ -1,3 +0,0 @@
-<div>
-	<%= render "jegol", :service => "/jegol/boshsession/#{Jegol.get_MUC_name(@meeting.id.to_s)}", :readonly => !@meeting.active? , :tweeturl => "https://github.com/alemyis/jegolize/wiki"%>
-</div>