Merge pull request #21 from harukasan/feature/brand-new-idobata

Adopt to brand-new Idobata(TM)

Author: harukasan

Gemfile.lock

@@ -1,24 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     bubble-wrap (1.5.0)
     colored (1.2)
-    i18n (0.6.11)
-    ib (0.4.9)
+    i18n (0.7.0)
+    ib (0.7.2)
       thor (~> 0.15.4)
       tilt (~> 1.4.1)
       xcodeproj (~> 0.17)
-    multi_json (1.10.1)
-    rake (10.3.2)
+    json (1.8.2)
+    minitest (5.5.1)
+    rake (10.4.2)
     thor (0.15.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
-    xcodeproj (0.18.0)
-      CFPropertyList (~> 2.2)
-      activesupport (~> 3.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.23.1)
+      activesupport (>= 3)
       colored (~> 1.2)
 
 PLATFORMS

Rakefile

@@ -19,7 +19,7 @@ Motion::Project::App.setup do |app|
   app.name = 'Butter'
   app.icon = 'icon.icns'
   app.identifier = 'jp.harukasan.butter'
-  app.version = '0.1.5'
+  app.version = '0.2.0'
   app.frameworks << 'WebKit'
 end
 

app/main_controller.rb

@@ -52,7 +52,7 @@ def initWebView
     @web_view.setUIDelegate self
     @web_view.setPolicyDelegate self
 
-    url = NSURL.URLWithString "https://idobata.io/users/sign_in"
+    url = NSURL.URLWithString "https://idobata.io/#/"
     request = NSURLRequest.requestWithURL url
     @web_view.mainFrame.loadRequest request
   end
@@ -61,20 +61,16 @@ def notify(data)
     data = BW::JSON.parse data.to_s.dataUsingEncoding(NSUTF8StringEncoding)
 
     notification = NSUserNotification.alloc.init.tap do |n|
-      n.title = "#{data['sender_name']} \u25b8 #{data['room_name']}"
-      n.informativeText = data['body_plain']
+      n.title = "#{data['sender']} \u25b8 #{data['roomName']}"
+      n.informativeText = data['text']
       n.soundName = NSUserNotificationDefaultSoundName
-      keys = [
-        "organization_slug",
-        "room_name",
-      ]
-      n.userInfo = data.select {|key, val| keys.include? key }
+      n.userInfo = { "url" => data['url'] }
     end
 
-    sender_icon_url = data['sender_icon_url']
-    if sender_icon_url.length > 0
-      notification.contentImage = fetchIconImage sender_icon_url
-    end
+   sender_icon_url = data['iconUrl']
+   if sender_icon_url
+     notification.contentImage = fetchIconImage sender_icon_url
+   end
 
     NSUserNotificationCenter.defaultUserNotificationCenter.tap do |center|
       center.delegate = self
@@ -113,19 +109,19 @@ def fetchIconImage(url)
     return image
   end
 
-  def locateToRoom(organization, room_name)
+  def locateTo(url)
     window_object = @web_view.windowScriptObject
     window_object.evaluateWebScript <<-CODE
-      location.href = "#/organization/#{organization}/room/#{room_name}";
+      location.href = '#{url}';
     CODE
     @web_view.display
   end
 
   # called when frame loading finished
-  def webView(sender, didFinishLoadForFrame:frame)
+  def webView(sender, didStartProvisionalLoadForFrame:frame)
     sender.windowScriptObject.evaluateWebScript <<-CODE
       (function(){
-        var onMessageCreated = function(user) {
+        var onMessageCreated = function(user, store, router) {
           return function(data){
             var notify = false;
             var mode = window.butter.notificationMode();
@@ -137,7 +133,18 @@ def webView(sender, didFinishLoadForFrame:frame)
               }
             }
             if (notify) {
-              butter.notify(JSON.stringify(data.message));
+              store.find('message', data.message.id).then(function(message) {
+                var roomUrl = '/' + router.generate('room.index', message.get('room'));
+                var roomName = message.get('room.organization.name').toString() + ' / ' + message.get('room.name').toString();
+                var payload = {
+                  sender: data.message.senderName,
+                  roomName: roomName,
+                  text: data.message.bodyPlain,
+                  iconUrl: data.message.senderIconUrl,
+                  url: roomUrl
+                };
+                window.butter.notify(JSON.stringify(payload));
+              });
             }
           };
         };
@@ -151,8 +158,10 @@ def webView(sender, didFinishLoadForFrame:frame)
 
           var pusher = container.lookup('pusher:main');
           var user   = container.lookup('service:session').get('user');
+          var store  = container.lookup('store:main');
+          var router = container.lookup('router:main');
 
-          pusher.bind('message:created', onMessageCreated(user));
+          pusher.bind('message:created', onMessageCreated(user, store, router));
           user.addObserver('totalUnreadMessagesCount', onUnreadCountUpdated);
           onUnreadCountUpdated.apply(user);
         });
@@ -188,7 +197,7 @@ def webView(sender, decidePolicyForNewWindowAction:info, request:request, frame:
 
   def webView(sender, runJavaScriptAlertPanelWithMessage:message, initiatedByFrame:frame)
     puts "ALERT: #{message}"
-    NSRunAlertPanel "alert", message, "OK", nil, nil
+    # NSRunAlertPanel "alert", message, "OK", nil, nil
   end
 
   def webView(sender, runJavaScriptConfirmPanelWithMessage:message, initiatedByFrame:frame)
@@ -216,7 +225,7 @@ def userNotificationCenter(center, shouldPresentNotification:notification)
 
   def userNotificationCenter(center, didActivateNotification:notification)
     info = notification.userInfo
-    locateToRoom info["organization_slug"], info["room_name"]
+    locateTo info['url']
     center.removeDeliveredNotification notification
   end
 end