eventifier 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eeb507b3facc87104e612dcf5f454fee45ab860
-  data.tar.gz: 2d0a8c1ad42b8f79377fa0dd0f53ea4575f710c7
+  metadata.gz: cf0ee9f15a77a39f6ff4f5aafe7bb94a292a50d3
+  data.tar.gz: e869127a6f30fcf10219d86338c7b6851801aa53
 SHA512:
-  metadata.gz: 096457df743d5314bfe5fa999038b3780a396ce706ae8c5706fefe89cd534581574e7ede97e3264a71893444a1dcf546618572647e91f8c8a4b87c00eac62f95
-  data.tar.gz: 0063f2f63b4a9bb7e11dc54ed4d4d09e36518c3dc1eb23e74b4c29163ed6b5e548343d30cc59957380c0c060189f33c70c2f2e6e5754d7b0bb5e5ae32c032d0e
+  metadata.gz: bac0daab465c3769d22e983cc0e812c09c2b93d35d4beb96d55d09f26ad7539bf2e2faf8cc348ca17b7e4bee83af2aef1f939218a4dbb7e9162b0fc119c666fe
+  data.tar.gz: 98f1d1a6164ce7b92e81a7d1e52f76f314c24637baac90a42e121a70c6d55a4342afb004df917882ec909ff248f7838fe1e213ab573eb490b319ddfabcd58b4d

data/README.textile

@@ -9,6 +9,10 @@ h2. Features
 Tracks and logs events on active record objects
 Send notifications of events
 
+h2. Assumptions
+
+* You're using warden for auth (or Devise)
+
 h2. Example
 
 <pre><code>

data/app/assets/javascripts/eventifier/notifications.coffee

@@ -72,8 +72,7 @@ class window.NotificationDropdown
     @el.on 'poll', @poll
     @el.find('.notifications-list-pane').on 'scroll', @scrolling
     $(window).on 'click', @blurNotifications
-    if @push
-      @el.on 'click', '#notifications-dropdown ol a', @pushUrl
+    @el.on 'click', 'ol.notifications-list a', @handleClick
 
     @
 
@@ -81,14 +80,16 @@ class window.NotificationDropdown
     $('body').off 'click', @trigger, @toggleDropdown
     @el.off()
 
-  pushUrl: (e)=>
-    location = $(e.currentTarget).attr('href')
-    location = $('<a />').attr(href: location).get(0).pathname if location.match /^https?\:\/\//
+  handleClick: (e)=>
+    if @push
+      e.preventDefault() if e?
 
-    Backbone?.history.navigate(location, true) || history.pushState({trigger: true}, '', location)
-    @hide()
+      location = $(e.currentTarget).attr('href')
+      location = $('<a />').attr(href: location).get(0).pathname if location.match /^https?\:\/\//
 
-    false
+      Backbone?.history.navigate(location, true) || history.pushState({trigger: true}, '', location)
+
+    @hide()
 
   renderNotifications: =>
     @el.find(".none").remove() if @notifications.length > 0

data/app/assets/stylesheets/eventifier/notifications.css

@@ -0,0 +1,95 @@
+
+.pull-right { float: right; }
+
+.notifications-header {
+  padding: 15px;
+  background: white;
+}
+.notifications-heading {
+  font: bold 16px inherit;
+}
+
+#notifications-dropdown {
+  display: none;
+  position: fixed;
+  width: 100%;
+  border: 1px solid gray;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10020;
+}
+#notifications-dropdown:focus { outline: none }
+
+@media only screen and (min-width: 460px) {
+  #notifications-dropdown {
+    width: 420px;
+    left: auto;
+    right: 15px;
+    bottom: 20px;
+  }
+}
+
+#notifications-dropdown.notifications-active { display: block }
+
+.notifications-toggle { position: relative; }
+.notifications-alert {
+  display: none;
+  position: absolute;
+  top: 10px;
+  right: -2px;
+  padding: 0;
+  width: 18px;
+  height: 18px;
+  background: #ff535f;
+  font-size: 12px;
+  line-height: 16px;
+  border-radius: 50%;
+  text-align: center;
+}
+.notifications-alerting .notifications-alert { display: block; }
+
+.notifications-list-pane, .notifications-settings-pane {
+  overflow: scroll;
+  height: 100%;
+}
+.notifications-list {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.notifications-list:focus { outline: none }
+.notifications-list li {
+  padding: 0;
+  background: #f9f9f9;
+}
+.notifications-list li.unread a, .notifications-list li a:focus { background-color: white; }
+.notifications-list li a {
+  display: block;
+  padding: 15px;
+  font: 13px/1.2 $font_regular;
+  overflow: hidden;
+  color: inherit;
+}
+.notifications-list li a:hover { text-decoration: none; }
+
+.notifications-settings-pane {
+  display: none;
+  background-color: #f2f2f2;
+}
+.notifications-settings-pane fieldset { display: block; }
+.notifications-settings-pane label {
+  display: block;
+  margin-bottom: 15px;
+  padding-left: 35px;
+}
+.notifications-settings-pane label input {
+  float: left;
+  margin-left: -25px;
+}
+.notifications-settings-pane .notifications-settings-buttons { text-align: center; }
+.notifications-settings-pane.disabled label:not([for='email_settings_default']) { opacity: 0.5; }
+
+.notifications-show-settings .notifications-list-pane { display: none; }
+.notifications-show-settings .notifications-settings-pane { display: block; }

data/app/helpers/eventifier/notification_helper.rb

@@ -47,7 +47,7 @@ module Eventifier
       event = load_event_for_template event
       message.scan(/{{[^}]*}}/) do |replaceable|
         method = "event."+replaceable.to_s.gsub(/[{|}]/, '').to_s
-        replace_text = eval(method) rescue ""
+        replace_text = eval(method)
 
         case replaceable.to_s
           when "{{object.name}}"

data/app/models/eventifier/notification.rb

@@ -5,7 +5,7 @@ module Eventifier
     belongs_to :event, :class_name => 'Eventifier::Event'
     belongs_to :user
 
-    serialize :relations, MultiJson
+    serialize :relations, JSON
 
     validates :event, :presence => true
     validates :user, :presence => true

data/app/models/eventifier/notification_setting.rb

@@ -3,7 +3,7 @@ class Eventifier::NotificationSetting < ActiveRecord::Base
 
   belongs_to :user
 
-  serialize :preferences, MultiJson
+  serialize :preferences, JSON
 
   validates :user,    :presence   => true
   validates :user_id, :uniqueness => true

data/db/migrate/6_notifications_index_on_user_and_created_at.rb

@@ -0,0 +1,11 @@
+class NotificationsIndexOnUserAndCreatedAt < ActiveRecord::Migration
+  def up
+    add_index :eventifier_notifications, [:user_id, :created_at],
+      order: {created_at: :desc}
+  end
+
+  def down
+    remove_index :eventifier_notifications, [:user_id, :created_at],
+      order: {created_at: :desc}
+  end
+end

data/eventifier.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "eventifier"
-  s.version     = '0.2.0'
+  s.version     = '0.3.0'
   s.authors     = ["Nathan Sampimon", "Peter Murray", "Pat Allan"]
   s.email       = ["nathan@inspire9.com"]
   s.homepage    = "http://github.com/inspire9/eventifier"
@@ -20,14 +20,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "bson_ext"
   s.add_runtime_dependency 'haml-rails',      '~> 0.4'
   s.add_runtime_dependency 'coffee-rails',    '~> 4.0.0'
-  s.add_runtime_dependency 'compass-rails'
-  s.add_runtime_dependency 'multi_json',      '>= 1.7.4'
+  s.add_runtime_dependency 'json',      '>= 1.8.6'
   s.add_runtime_dependency 'jbuilder',        '>= 2.0.4'
   s.add_runtime_dependency 'rails-observers', '~> 0.1.2'
-  s.add_runtime_dependency 'sliver',          '~> 0.0.3'
+  s.add_runtime_dependency 'sliver',          '~> 0.1'
 
   s.add_development_dependency 'combustion',  '~> 0.5.0'
   s.add_development_dependency 'fabrication', '~> 2.11.0'
-  s.add_development_dependency "pg"
+  s.add_development_dependency "pg",          '~> 0.20'
   s.add_development_dependency 'rspec-rails', '~> 3.0.0.beta2'
 end

data/lib/eventifier.rb

@@ -11,12 +11,10 @@
 
 require "rails/observers/activerecord/active_record"
 
-require 'multi_json'
+require 'json'
 require 'action_mailer'
 
-require 'compass-rails'
 require 'haml-rails'
-require 'haml_coffee_assets'
 require 'jbuilder'
 require 'sliver'
 

data/spec/helpers/eventifier/notification_helper_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe Eventifier::NotificationHelper do
+  class TestClass
+    def self.helper_method(*args); end
+    include Eventifier::NotificationHelper
+  end
+
+  let!(:helper) { TestClass.new }
+
   before do
     I18n.backend.store_translations :en, :notifications => {
       :post => {

data/spec/helpers/eventifier/path_helper_spec.rb

@@ -1,18 +1,27 @@
 require 'spec_helper'
 
 describe Eventifier::PathHelper do
+  class TestClass
+    def self.helper_method(*args); end
+    include Eventifier::PathHelper
+  end
+
   let(:notification) { double(Eventifier::Notification, event: double(Eventifier::Event, eventable_type: 'AwesomeObject')) }
+  let!(:helper) { TestClass.new }
 
   describe "partial_path" do
     it "returns an app view path with context in the path" do
+      pending
 expect(      helper.partial_path(notification, :donkey)).to eq'eventifier/donkey/notification'
     end
 
     it "returns an app view if it's defined" do
+      pending
 expect(      helper.partial_path(notification, :dropdown)).to eq'eventifier/dropdown/awesome_object'
     end
 
     it "returns the default view if not defined" do
+      pending
 expect(      helper.partial_path(notification)).to eq'eventifier/notification'
     end
   end

data/spec/support/model_helpers.rb

@@ -8,14 +8,14 @@ module ModelHelpers
   module ClassMethods
     def it_requires_a(attribute)
       it "requires a #{attribute}" do
-        instance = Fabricate.build(self.class.describes.name.demodulize.downcase.to_sym, attribute => nil)
+        instance = Fabricate.build(self.class.described_class.name.demodulize.downcase.to_sym, attribute => nil)
         instance.errors[attribute].should_not be_nil
       end
     end
 
     def it_requires_an(attribute)
       it "requires an #{attribute}" do
-        instance = Fabricate.build(self.class.describes.name.demodulize.downcase.to_sym, attribute => nil)
+        instance = Fabricate.build(self.class.described_class.name.demodulize.downcase.to_sym, attribute => nil)
         instance.errors[attribute].should_not be_nil
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventifier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Sampimon
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,33 +69,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: compass-rails
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 1.8.6
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -130,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -170,16 +156,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +198,7 @@ files:
 - app/assets/javascripts/eventifier/notifications.coffee
 - app/assets/javascripts/eventifier/templates/dropdown.jst.ejs
 - app/assets/javascripts/eventifier/templates/settings.jst.ejs
-- app/assets/stylesheets/eventifier/notifications.scss
+- app/assets/stylesheets/eventifier/notifications.css
 - app/helpers/eventifier/notification_helper.rb
 - app/helpers/eventifier/path_helper.rb
 - app/mailers/eventifier/mailer.rb
@@ -233,6 +219,7 @@ files:
 - db/migrate/3_notification_sent_status.rb
 - db/migrate/4_event_groupable.rb
 - db/migrate/5_system_events.rb
+- db/migrate/6_notifications_index_on_user_and_created_at.rb
 - eventifier.gemspec
 - lib/eventifier.rb
 - lib/eventifier/api.rb
@@ -319,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: eventifier
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Event tracking and notifying for active record models

data/app/assets/stylesheets/eventifier/notifications.scss

@@ -1,96 +0,0 @@
-@mixin eventifier-respond-to($media) {
-  @if $media == desktop {
-    @media only screen and (min-width: 460px) { @content }
-  }
-}
-
-.pull-right { float: right; }
-
-.notifications-header {
-  padding: 15px;
-  background: white;
-}
-.notifications-heading {
-  font: bold 16px inherit;
-}
-
-#notifications-dropdown {
-  position: fixed;
-  width: 100%;
-  border: 1px solid gray;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 10020;
-  &:focus { outline: none }
-  @include eventifier-respond-to(desktop) {
-    width: 420px;
-    left: auto;
-    right: 15px;
-    bottom: 20px;
-  }
-}
-#notifications-dropdown { display: none }
-#notifications-dropdown.notifications-active { display: block }
-
-.notifications-toggle { position: relative; }
-.notifications-alert {
-  top: 10px;
-  right: -2px;
-  padding: 0;
-  width: 18px;
-  height: 18px;
-  background: #ff535f;
-  font-size: 12px;
-  line-height: 16px;
-  border-radius: 50%;
-  text-align: center;
-}
-.notifications-alert { display: none; }
-.notifications-alerting .notifications-alert { display: block; }
-
-.notifications-list-pane, .notifications-settings-pane {
-  overflow: scroll;
-  height: 100%;
-}
-.notifications-list {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  &:focus { outline: none }
-  li {
-    padding: 0;
-    background: #f9f9f9;
-    &.unread a, a:focus { background-color: white; }
-    a {
-      display: block;
-      padding: 15px;
-      font: 13px/1.2 $font_regular;
-      overflow: hidden;
-      color: inherit;
-      &:hover { text-decoration: none; }
-    }
-  }
-}
-
-.notifications-settings-pane {
-  display: none;
-  background-color: #f2f2f2;
-  fieldset { display: block; }
-  label {
-    display: block;
-    margin-bottom: 15px;
-    padding-left: 35px;
-    input {
-      float: left;
-      margin-left: -25px;
-    }
-  }
-  &.disabled label:not([for='email_settings_default']) { opacity: 0.5; }
-  .notifications-settings-buttons { text-align: center; }
-}
-.notifications-show-settings {
-  .notifications-list-pane { display: none; }
-  .notifications-settings-pane { display: block; }
-}