Skip to content

Commit 9b6276f

Browse files
committed
Merge pull request #211 from aeberlin/pusher_encryption
Add encryption flag to config, template, and adapter.
2 parents 724b9f9 + 463c5d5 commit 9b6276f

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

app/assets/javascripts/sync.coffee.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $ = jQuery
77
FAYE_HOST: "<%= Sync.server %>"
88
PUSHER_API_KEY: "<%= Sync.api_key %>"
99
CLIENT_ADAPTER: "<%= Sync.adapter %>"
10+
ENCRYPTION_FLAG: "<%= Sync.encryption_flag %>"
1011

1112
init: ->
1213
return unless Sync[@CLIENT_ADAPTER]
@@ -128,7 +129,7 @@ class Sync.Pusher extends Sync.Adapter
128129
!!window.Pusher
129130

130131
connect: ->
131-
@client = new window.Pusher(Sync.PUSHER_API_KEY)
132+
@client = new window.Pusher(Sync.PUSHER_API_KEY, encrypted: Sync.ENCRYPTION_FLAG)
132133

133134
isConnected: -> @client?.connection.state is "connected"
134135

lib/generators/sync/templates/sync.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ development:
1313
# api_key: "YOUR_PUSHER_API_KEY"
1414
# auth_token: "YOUR_PUSHER_SECRET"
1515
# adapter: "Pusher"
16+
# encryption: true
1617
# async: true
1718

1819
# Disabled

lib/sync.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ def api_key
106106
config[:api_key]
107107
end
108108

109+
def encryption_flag
110+
config[:encryption] || false
111+
end
112+
109113
def reactor
110114
@reactor ||= Reactor.new
111115
end
@@ -125,4 +129,3 @@ def views_root
125129
end
126130
end
127131
end
128-

0 commit comments

Comments
 (0)