Skip to content

Commit

Permalink
Removed all cloudfuji code from kandan
Browse files Browse the repository at this point in the history
  • Loading branch information
gabceb committed Mar 1, 2013
1 parent 73ffc08 commit 211cc51
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 191 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ gem 'rails', '3.2.12'
# Database adapters
gem 'pg'

# Auth/Cloudfuji gems
# Auth gems
gem 'devise'
gem 'devise_cloudfuji_authenticatable'
gem 'cloudfuji'

# Server/transport gems
gem 'thin'
Expand Down
20 changes: 0 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
airbrake (3.1.8)
activesupport
builder
json
arel (3.0.2)
awesome_print (1.1.0)
aws-sdk (1.8.1.2)
Expand All @@ -62,11 +58,6 @@ GEM
builder (3.0.4)
childprocess (0.3.8)
ffi (~> 1.0, >= 1.0.11)
cloudfuji (0.0.46)
highline (>= 1.6.1)
json (>= 1.4.6)
orm_adapter (~> 0.0.3)
rest-client (>= 1.6.1)
cocaine (0.4.2)
coderay (1.0.8)
coffee-rails (3.2.2)
Expand All @@ -91,9 +82,6 @@ GEM
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
devise_cloudfuji_authenticatable (1.0.5)
devise (= 1.5.3)
rubycas-client (>= 2.2.1)
diff-lcs (1.1.3)
eco (1.0.0)
coffee-script
Expand Down Expand Up @@ -131,7 +119,6 @@ GEM
guard-rspec (2.4.0)
guard (>= 1.1)
rspec (~> 2.11)
highline (1.6.15)
hike (1.2.1)
http_parser.rb (0.5.3)
i18n (0.6.2)
Expand Down Expand Up @@ -207,8 +194,6 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
remotipart (1.0.5)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
Expand All @@ -224,8 +209,6 @@ GEM
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubycas-client (2.3.9)
activesupport
rubyzip (0.9.9)
sass (3.2.5)
sass-rails (3.2.6)
Expand Down Expand Up @@ -276,19 +259,16 @@ PLATFORMS

DEPENDENCIES
_bushido-faye (= 0.8.2)
airbrake
awesome_print
aws-sdk
better_errors
binding_of_caller
bootstrap-sass (~> 2.3.0.1)
bourbon (~> 1.4.0)
cloudfuji
coffee-rails
database_cleaner
debugger
devise
devise_cloudfuji_authenticatable
eco
enumerize
execjs
Expand Down
7 changes: 0 additions & 7 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ def full_name_or_username
self.full_name.blank? ? self.username : self.full_name
end

def cloudfuji_extra_attributes(extra_attributes)
self.first_name = extra_attributes["first_name"].to_s
self.last_name = extra_attributes["last_name"].to_s
self.email = extra_attributes["email"]
self.locale = extra_attributes["locale"]
end

# Callback to mark the user registration status depending on the settings of the app
def mark_registration_status_depending_on_app_settings
# If the site is public we will make the user active. Otherwise we will make the user as waiting_approval
Expand Down
14 changes: 1 addition & 13 deletions app/views/main/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,4 @@
<ul class="audio_channels" style="display:none;">
<audio class="audio_private"></audio>
<audio class="audio_common"></audio>
</ul>

<%- if user_signed_in? && Cloudfuji::Platform.on_cloudfuji? %>
<%= javascript_tag do %>
<%- cloudfuji_help_vars = {
"HUBOT_KANDAN_TOKEN" => User.find_by_email("hubot@cloudfuji.com").try(:authentication_token),
"HUBOT_KANDAN_HOST" => ENV['CLOUDFUJI_DOMAIN']
}
%>

window._cloudfuji_help = <%= cloudfuji_help_vars.to_json.html_safe %>;
<%- end %>
<%- end %>
</ul>
1 change: 0 additions & 1 deletion config/initializers/cloudfuji.rb

This file was deleted.

2 changes: 0 additions & 2 deletions config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
# note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"

config.cas_base_url = "https://noshido.com:5000/cas" if Rails.env.development?

# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"

Expand Down
6 changes: 0 additions & 6 deletions config/initializers/kandan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@

module Kandan
def self.devise_modules

standard = [:database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable,
:token_authenticatable]

cloudfuji = [:cloudfuji_authenticatable, :trackable,
:token_authenticatable]

::Cloudfuji::Platform.on_cloudfuji? ? cloudfuji : standard
end
end
42 changes: 0 additions & 42 deletions lib/cloudfuji/cloudfuji_bootstrap.rb

This file was deleted.

10 changes: 0 additions & 10 deletions lib/cloudfuji/cloudfuji_hooks/app_hooks.rb

This file was deleted.

37 changes: 0 additions & 37 deletions lib/cloudfuji/cloudfuji_hooks/user_hooks.rb

This file was deleted.

50 changes: 0 additions & 50 deletions lib/tasks/cloudfuji.rake

This file was deleted.

0 comments on commit 211cc51

Please sign in to comment.