aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authordima2011-12-10 17:21:59 +0100
committerdima2011-12-10 17:21:59 +0100
commit932790890a583cf877ef06a218316b82a7014b60 (patch)
treeaa037487e22d6a2c5fa35cce705ee9277f6b200b /lib
parent58ebf1bc9762a4fc05ecae776253560026b5b030 (diff)
downloadinboxes-932790890a583cf877ef06a218316b82a7014b60.tar.bz2
fix readme and remove whitespacetrailing
Diffstat (limited to 'lib')
-rw-r--r--lib/generators/inboxes/install_generator.rb4
-rw-r--r--lib/generators/inboxes/templates/install.rb6
-rw-r--r--lib/generators/inboxes/views_generator.rb2
-rw-r--r--lib/inboxes.rb8
-rw-r--r--lib/inboxes/ability.rb6
-rw-r--r--lib/inboxes/active_record_extension.rb2
-rw-r--r--lib/inboxes/engine.rb2
-rw-r--r--lib/inboxes/railtie.rb4
8 files changed, 17 insertions, 17 deletions
diff --git a/lib/generators/inboxes/install_generator.rb b/lib/generators/inboxes/install_generator.rb
index d5d2a97..a3169a2 100644
--- a/lib/generators/inboxes/install_generator.rb
+++ b/lib/generators/inboxes/install_generator.rb
@@ -5,9 +5,9 @@ module Inboxes
module Generators
class InstallGenerator < Rails::Generators::Base
include Rails::Generators::Migration
-
+
source_root File.expand_path("../templates", __FILE__)
-
+
# desc "Generates migration for Discussion, Message, Speaker and DiscussionView models"
def self.orm
diff --git a/lib/generators/inboxes/templates/install.rb b/lib/generators/inboxes/templates/install.rb
index 91fded7..436ac98 100644
--- a/lib/generators/inboxes/templates/install.rb
+++ b/lib/generators/inboxes/templates/install.rb
@@ -9,14 +9,14 @@ class InstallInboxes < ActiveRecord::Migration
t.references :user
t.references :discussion
t.text :body
-
+
t.timestamps
end
-
+
create_table :speakers do |t|
t.references :user
t.references :discussion
-
+
t.timestamps
end
end
diff --git a/lib/generators/inboxes/views_generator.rb b/lib/generators/inboxes/views_generator.rb
index 117c05d..e9a8818 100644
--- a/lib/generators/inboxes/views_generator.rb
+++ b/lib/generators/inboxes/views_generator.rb
@@ -5,7 +5,7 @@ module Inboxes
class ViewsGenerator < Rails::Generators::Base
source_root File.expand_path('../../../../app/views', __FILE__)
#class_option :template_engine, :type => :string, :aliases => '-e', :desc => 'Template engine for the views. Available options are "erb" and "haml".'
-
+
# TODO support of both haml and erb
def copy_or_fetch
filename_pattern = File.join self.class.source_root, "*" #/*.html.#{template_engine}"
diff --git a/lib/inboxes.rb b/lib/inboxes.rb
index f1b9c7a..57dc9a0 100644
--- a/lib/inboxes.rb
+++ b/lib/inboxes.rb
@@ -6,7 +6,7 @@ require "inboxes/active_record_extension"
module Inboxes
-
+
def self.configure(&block)
yield @config ||= Inboxes::Configuration.new
end
@@ -25,11 +25,11 @@ module Inboxes
config_accessor :faye_enabled
def param_name
- config.param_name.respond_to?(:call) ? config.param_name.call() : config.param_name
+ config.param_name.respond_to?(:call) ? config.param_name.call() : config.param_name
end
end
-
+
# adding method inboxes for models
ActiveRecord::Base.extend(Inboxes::ActiveRecordExtension)
-
+
end
diff --git a/lib/inboxes/ability.rb b/lib/inboxes/ability.rb
index 3ed216b..c9f8d6b 100644
--- a/lib/inboxes/ability.rb
+++ b/lib/inboxes/ability.rb
@@ -13,17 +13,17 @@ module Inboxes
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/active_record_extension.rb b/lib/inboxes/active_record_extension.rb
index 34fd387..2a5bac8 100644
--- a/lib/inboxes/active_record_extension.rb
+++ b/lib/inboxes/active_record_extension.rb
@@ -3,7 +3,7 @@ module Inboxes
def has_inboxes(options = {})
# field = options[:as] || name
# prefix = options[:prefix] || "with"
-
+
has_many :speakers, :dependent => :destroy
has_many :discussions, :through => :speakers
end
diff --git a/lib/inboxes/engine.rb b/lib/inboxes/engine.rb
index 01f63b5..b61eebc 100644
--- a/lib/inboxes/engine.rb
+++ b/lib/inboxes/engine.rb
@@ -5,7 +5,7 @@ module Inboxes
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 673784e..1626b20 100644
--- a/lib/inboxes/railtie.rb
+++ b/lib/inboxes/railtie.rb
@@ -4,7 +4,7 @@ require "inboxes/ability"
module Inboxes
class Railtie < ::Rails::Railtie
config.inboxes = ActiveSupport::OrderedOptions.new
-
+
initializer "inboxes.configure" do |app|
Inboxes.configure do |config|
config.user_name = app.config.inboxes[:user_name] || "email"
@@ -15,7 +15,7 @@ module Inboxes
# app.config.middleware.insert_before "::Rails::Rack::Logger", "Inboxes::Middleware"
end
-
+
# def self.activate
# Ability.register_ability(InboxesAbility)
# end