notifly 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199c4354275abe7fdd5dfbc605a68a17205477ec
-  data.tar.gz: 83ab9a0f55faaba7ff98f6fbf6e68919fbf8d963
+  metadata.gz: 2df7100faee398ad9ac50aaab87ad063ddcf7d0a
+  data.tar.gz: 72790782b041b4ac81bbad981267fede31588f56
 SHA512:
-  metadata.gz: e78062c032b1bab6bb4ca30983d91ce80564051deac0ba68dc044aa9d49012f8aa828684bedeb154e450abc1b348e46b3ed6bcd0747ac9cbfa93873181e97b8e
-  data.tar.gz: bbb624c480c39326c2fef39a1b5028223c08a7220ba4aec51241cd3bdea3b19b10cfdf84b40a7df5fe10d17eba3a8743a0bb6939ad81cfb8eef775544d451e30
+  metadata.gz: 2846b60d22749bfc7a23b60d07386d0b70a3e30c3ade0a941e5d6921cdf695545bcd9dcd47969c7bc8ecd8b87ad635b9cfb674c34fac8771a296c282ff55a200
+  data.tar.gz: 07eed94adc40047e73b626795e38d487c8ef71c5f24124ea57340081c7b70860c8e97b8994c8defd34c0693f0646e960c11daa1ef09ef3efb2ff66d35e148f56

data/app/models/notifly/notification.rb

@@ -42,7 +42,7 @@ module Notifly
       end
 
       def send_to_receiver
-        Notifly::NotificationChannel.new(self.receiver_id).trigger(self)
+        Notifly::NotificationChannel.new(self.receiver_id).trigger(self) if self.kind == 'notification'
       end
   end
 end

data/app/views/notifly/layouts/_empty.html.erb

@@ -1,3 +1,3 @@
 <div class="notifly-empty">
-  <% t('notifly.view.no_notifications') %>
-</div>
+  <%= t('notifly.view.no_notifications') %>
+</div>

data/lib/services/action_view_helper.rb

@@ -1,18 +1,32 @@
-class ActionViewHelper
-  attr_reader :action_view
-  delegate *ActionView::Base.instance_methods, to: :action_view
+module Notifly
+  class ActionViewHelper
+    attr_reader :action_view
+    delegate *ActionView::Base.instance_methods.reject { |m| [:object_id, :__send__].include? m }, to: :action_view
 
-  def initialize
-    notifly_path = File.expand_path(File.dirname(File.dirname(__FILE__))) + '../../app/views/notifly'
-    ActionController::Base.prepend_view_path(notifly_path)
-    @action_view = ActionView::Base.new(ActionController::Base.view_paths)
-    @action_view.extend ApplicationHelper
+    def initialize
+      notifly_path = File.expand_path(File.dirname(File.dirname(__FILE__))) + '../../app/views/notifly'
+      rails_path = File.join(Rails.root, 'app/views/notifly')
 
-    @action_view.class_eval do
-      include Notifly::Engine.routes.url_helpers
+      ActionController::Base.prepend_view_path(notifly_path)
+      ActionController::Base.prepend_view_path(rails_path)
 
-      def protect_against_forgery?
-        false
+      @action_view = ActionView::Base.new(ActionController::Base.view_paths)
+      @action_view.extend ApplicationHelper
+
+      @action_view.class_eval do
+        include Notifly::Engine.routes.url_helpers
+        Dir[File.join(Rails.root, 'app/helpers/**/*.rb')].each do |f|
+          require f
+          include f.split('/').last.split('.').first.camelize.constantize
+        end
+
+        def protect_against_forgery?
+          false
+        end
+
+        def main_app
+          Rails.application.routes.url_helpers
+        end
       end
     end
   end

data/lib/services/notification_channel.rb

@@ -3,7 +3,7 @@ module Notifly
     def initialize(user_id)
       @user_id = user_id
       @channel = WebsocketRails.users[@user_id.to_s]
-      @action_view = ActionViewHelper.new
+      @action_view = Notifly::ActionViewHelper.new
     end
 
     def trigger(notification)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifly
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Pedro Passalini
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails