aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/inboxes.rb3
-rw-r--r--lib/inboxes/ability.rb29
-rw-r--r--lib/inboxes/engine.rb7
-rw-r--r--lib/inboxes/railtie.rb1
-rw-r--r--lib/inboxes/version.rb2
5 files changed, 2 insertions, 40 deletions
diff --git a/lib/inboxes.rb b/lib/inboxes.rb
index 57dc9a0..e9ecad7 100644
--- a/lib/inboxes.rb
+++ b/lib/inboxes.rb
@@ -1,10 +1,9 @@
+require "cancan"
require "inboxes/version"
require "inboxes/railtie"
-require "inboxes/ability"
require "inboxes/engine"
require "inboxes/active_record_extension"
-
module Inboxes
def self.configure(&block)
diff --git a/lib/inboxes/ability.rb b/lib/inboxes/ability.rb
deleted file mode 100644
index c9f8d6b..0000000
--- a/lib/inboxes/ability.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "cancan"
-
-module Inboxes
- class InboxesAbility
- include ::CanCan::Ability
-
- def initialize(user)
- # Discussion
- # raise "Registered!"
- if user
- can [:index, :create], Discussion
- can :read, Discussion do |discussion|
- discussion.can_participate?(user)
- end
- end
-
- # Message
- # can :create, Message do |message|
- # message.discussion.can_participate?(user)
- # end
- #
- # # Speaker
- # can [:create, :destroy], Speaker do |speaker|
- # speaker.discussion.can_participate?(user)
- # end
- end
- end
-
-end \ No newline at end of file
diff --git a/lib/inboxes/engine.rb b/lib/inboxes/engine.rb
index b61eebc..061694e 100644
--- a/lib/inboxes/engine.rb
+++ b/lib/inboxes/engine.rb
@@ -1,11 +1,4 @@
-require "inboxes/ability"
-
module Inboxes
class Engine < ::Rails::Engine
- def self.activate
- Ability.register_ability(InboxesAbility)
- end
-
- config.to_prepare &method(:activate).to_proc
end
end \ No newline at end of file
diff --git a/lib/inboxes/railtie.rb b/lib/inboxes/railtie.rb
index 1626b20..f99cd06 100644
--- a/lib/inboxes/railtie.rb
+++ b/lib/inboxes/railtie.rb
@@ -1,5 +1,4 @@
require 'rails'
-require "inboxes/ability"
module Inboxes
class Railtie < ::Rails::Railtie
diff --git a/lib/inboxes/version.rb b/lib/inboxes/version.rb
index ee23565..c4b3908 100644
--- a/lib/inboxes/version.rb
+++ b/lib/inboxes/version.rb
@@ -1,3 +1,3 @@
module Inboxes
- VERSION = "0.2.0"
+ VERSION = "0.2.1"
end