social_stream 0.26.1 → 0.26.2

data/presence/app/views/chat/_index.html.erb

@@ -82,25 +82,19 @@
 	var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
 	var user_name = '<%=current_user.name%>';
   var user_slug = '<%=current_user.slug%>';
-  var user_jid = '<%=current_user.slug%>'+"@"+domain;
+  var user_jid = PRESENCE.XMPPClient.getJidFromSlug('<%=current_user.slug%>');
 	
 
-
   $(document).ready(function () {
 			
 		//Inicial field
 		$("#chat_partial").html($("#chat_connecting").html())
 	
-    if(getRestoreUserChatStatus()!="offline"){
-			if (authByCookie()){
-				connectToChat(user_jid,cookie,null);
-			} else {
-				//Auth by password
-				connectToChat(user_jid,null,null);
-			}
-      initialTimer = setTimeout("updateChatWindow()", 10000);
+    if((PRESENCE.PERSISTENCE.getRestoreUserChatStatus()!="offline")&&(cookie)){
+			PRESENCE.XMPPClient.connectToChat(user_jid,cookie);
+      initialTimer = setTimeout("PRESENCE.UIMANAGER.updateChatWindow()", 10000);
     } else {
-      updateChatWindow();
+      PRESENCE.UIMANAGER.updateChatWindow();
     }
       
 	  PRESENCE.CORE.init();
@@ -111,8 +105,8 @@
 <% if defined?(flow)!=nil and flow %>
   <script type="text/javascript">
 	  $(document).ready(function () {
-		  createMainChatBox();
-			addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
+		  PRESENCE.WINDOW.createMainChatBox();
+			PRESENCE.WINDOW.addContentToMainChatBox(PRESENCE.WINDOW.modifyChatPartialIfMainBox($("#chat_partial")));
 			$("#chat_wrapper").find("#chat_partial").remove();
 		});
 	</script>

data/presence/config/locales/en.yml

@@ -63,4 +63,5 @@ en:
       cancel: "{{name}} cancel the invitation"
       finish: "{{name}} close the game"
       waiting: Waiting for response...
-      unknown: Unknown response
+      unknown: Unknown response
+      clientIssue: "{{name}}'s client not support games"

data/presence/config/locales/es.yml

@@ -63,4 +63,5 @@ es:
       cancel: "{{name}} canceló la partida"
       finish: "{{name}} ha cerrado el juego"
       waiting: Esperando respuesta...
-      unknown: Respuesta desconocida
+      unknown: Respuesta desconocida
+      clientIssue: "El cliente de {{name}} no tiene juegos"

data/presence/ejabberd/ejabberd_scripts/authentication_script

@@ -32,6 +32,13 @@ def getOption(option)
 end
 
 $cookie_name = getOption("cookie_name=")
+$force_ssl = getOption("force_ssl=")
+
+if $force_ssl=="true"
+	$http="https"
+else
+	$http="http"
+end
 
 
 def auth(username,domain,password)
@@ -44,7 +51,7 @@ def auth(username,domain,password)
   #  return true
   #end
 
-  accessByPasswordUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
+  accessByPasswordUrl = $http + "://" + getWebDomainUrlFromDomain(domain) + "/users/sign_in"
 
   begin
     response = RestClient.post accessByPasswordUrl, :user => { :email => username , :password => password }
@@ -70,7 +77,7 @@ end
 
 def authByCookie(username, domain, cookie)
   begin
-    accessByCookieUrl = "http://" + getWebDomainUrlFromDomain(domain) + "/api/me"
+    accessByCookieUrl = $http + "://" + getWebDomainUrlFromDomain(domain) + "/api/me"
     response = RestClient.get accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
     doc = REXML::Document.new(response.body)
 

data/presence/lib/generators/social_stream/presence/templates/initializer.rb

@@ -36,5 +36,9 @@ SocialStream::Presence.setup do |config|
   #config.opentok_api_key = ""
   #Replace with your OpenTok API secret.
   #config.opentok_api_secret = ""
+  
+  #Multiplayer Games Service
+  #Uncomment to enable Multiplayer Games Service
+  #config.games = true
 
 end

data/presence/lib/social_stream-presence.rb

@@ -40,6 +40,8 @@ module SocialStream
     
     mattr_accessor :opentok_api_key
     mattr_accessor :opentok_api_secret
+    
+    mattr_accessor :games
 
     @@auth_method = "cookie"
     @@remote_xmpp_server = false
@@ -47,6 +49,7 @@ module SocialStream
     @@enable = false
     @@social_stream_presence_username = "social_stream_presence"
     @@opentok_api_key = "default"
+    @@games = false
     
     class << self
       def setup

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.13.1"
+    VERSION = "0.13.3"
   end
 end

data/presence/lib/social_stream/presence/xmpp_server_order.rb

@@ -269,6 +269,7 @@ module SocialStream
             autoconf.push("secure_rest_api=" + SocialStream::Presence.secure_rest_api.to_s)
             autoconf.push("cookie_name=" + Rails.application.config.session_options[:key])
             autoconf.push("web_domains=[" + SocialStream::Presence.domain + "]")
+            autoconf.push("force_ssl=" + Rails.application.config.force_ssl.to_s()) 
             
             #Param options
             if options

data/release.thor

@@ -5,46 +5,66 @@ class Release < Thor
 
   default_task :bump_and_publish
 
-  method_option :test => false,
-                :desc => "Do nothing",
-                :aliases => "-t"
-
   desc "bump_and_publish", "Bump gem versions and release them"
+
+  method_options :test => false
+
   def bump_and_publish(*args)
     bump *args
     publish *args
   end
 
   desc "bump", "Bump gem versions and set SocialStream's dependencies"
+
+  method_options :test => false
+
   def bump(*args)
     # First of all, update gems
     system "bundle"
 
-    parse_args(args)
+    parse_args_and_opts(args)
 
     all.each(&:bump)
 
-    system("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }") ||
-      raise(RuntimeError.new)
+    release_cmd("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }")
   end
 
   desc "publish", "push SocialStream's gems to rubygems and create git tags"
+
+  method_options :test => false
+
   def publish(*args)
-    parse_args(args)
+    parse_args_and_opts(args)
 
     all.each(&:publish)
   end
 
   private
 
-  def parse_args(args)
-    if args.empty?
-      args = global_dependencies
+  def parse_args_and_opts(args)
+    if options[:test]
+      SocialStream::Release::Kernel.release_action = :test
     end
 
+    releases =
+      if args.empty?
+        # base documents events ...
+        global_dependencies.select{ |c|
+          ::SocialStream::Release::Component.new(c).dirty?
+        }
+      elsif args.size == 1 && [ "major", "minor" ].include?(args.first)
+        # base:minor documents:minor ... minor
+        global_dependencies.map{ |c|
+          "#{ c }:#{ args.first }"
+        } + args 
+      else
+        # custom
+        args
+      end
+
     @components = []
 
-    args.each do |a|
+    releases.each do |a|
       name, version = a.split(":")
 
       if global_dependencies.include?(name)
@@ -54,7 +74,7 @@ class Release < Thor
       end
     end
 
-    @global = ::SocialStream::Release::Global.new(@target, options)
+    @global = ::SocialStream::Release::Global.new(@target)
   end
 
   def global_dependencies

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.2')
   s.add_runtime_dependency('social_stream-documents', '~> 0.14.1')
   s.add_runtime_dependency('social_stream-events', '~> 0.12.1')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.11.1')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.13.1')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.13.3')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &70220240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.20.2
   type: :runtime
   prerelease: false
-  version_requirements: *70220240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.20.2
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &70219960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 0.14.1
   type: :runtime
   prerelease: false
-  version_requirements: *70219960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &70219710 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70219710
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &70219440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +70,31 @@ dependencies:
         version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *70219440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &70219180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.3
   type: :runtime
   prerelease: false
-  version_requirements: *70219180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70218920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +102,15 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *70218920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.9
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70218710 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218710
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70218430 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70218160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +150,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70218160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70217820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +166,15 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70217820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70216950 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +182,15 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70216950
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &70216340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +198,12 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70216340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -1145,6 +1205,7 @@ files:
 - lib/social_stream/release/dependency_update.rb
 - lib/social_stream/release/global.rb
 - lib/social_stream/release/global/version_file.rb
+- lib/social_stream/release/kernel.rb
 - lib/social_stream/version.rb
 - lib/tasks/migrations.rake
 - linkser/.gitignore
@@ -1537,7 +1598,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A core for building social network websites