Commit 928e4246
Changed files (25)
app
admin
assets
javascripts
controllers
config
initializers
spec
controllers
app/admin/admin_users.rb
@@ -1,3 +0,0 @@
-ActiveAdmin.register AdminUser do
-
-end
app/admin/avatars.rb
@@ -1,2 +0,0 @@
-ActiveAdmin.register Avatar do
-end
app/admin/categories.rb
@@ -1,3 +0,0 @@
-ActiveAdmin.register Category do
-
-end
app/admin/creations.rb
@@ -1,3 +0,0 @@
-ActiveAdmin.register Creation do
- form :partial => "form"
-end
app/admin/dashboards.rb
@@ -1,17 +0,0 @@
-ActiveAdmin.register_page "Dashboard" do
- menu :priority => 1, :label => proc{ I18n.t("active_admin.dashboard") }
- content :title => proc{ I18n.t("active_admin.dashboard") } do
- columns do
- column do
- panel "Creations" do
- para "recently added creations:"
- ul do
- Creation.all.first(16).map do |creation|
- li link_to(creation.name, creation_path(creation))
- end
- end
- end
- end
- end
- end
-end
app/admin/favorites.rb
@@ -1,3 +0,0 @@
-ActiveAdmin.register Favorite do
-
-end
app/admin/interests.rb
@@ -1,3 +0,0 @@
-ActiveAdmin.register Interest do
-
-end
app/admin/photos.rb
@@ -1,2 +0,0 @@
-ActiveAdmin.register Photo do
-end
app/admin/tutorials.rb
@@ -1,2 +0,0 @@
-ActiveAdmin.register Tutorial do
-end
app/admin/users.rb
@@ -1,3 +0,0 @@
-ActiveAdmin.register User do
-
-end
app/assets/javascripts/application.js
@@ -7,7 +7,7 @@
//= require jquery
//= require jquery-migrate
//= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
//= require jquery.color
//= require jquery.colorbox
//= require jquery.validate
app/controllers/application_controller.rb
@@ -1,5 +1,4 @@
class ApplicationController < ActionController::Base
- include PublicActivity::StoreController
protect_from_forgery
before_filter :profile_application
before_filter :load_categories
app/controllers/notifications_controller.rb
@@ -1,5 +0,0 @@
-class NotificationsController < ApplicationController
- def index
- @activities = PublicActivity::Activity.includes([:trackable, :owner]).all
- end
-end
app/models/avatar.rb
@@ -1,6 +1,4 @@
class Avatar < ActiveRecord::Base
- include PublicActivity::Model
- tracked owner: Proc.new{ |controller, model| controller.current_user if controller }
belongs_to :user
mount_uploader :avatar, AvatarUploader
app/models/creation.rb
@@ -1,6 +1,4 @@
class Creation < ActiveRecord::Base
- include PublicActivity::Model
- tracked owner: Proc.new{ |controller, model| controller.current_user if controller }
validates :name, :presence => true
attr_accessible :user_id, :story, :name, :category_ids, :is_restricted, :watermark
belongs_to :user, :counter_cache => true
app/models/favorite.rb
@@ -1,6 +1,4 @@
class Favorite < ActiveRecord::Base
- include PublicActivity::Model
- tracked owner: Proc.new{ |controller, model| controller.current_user if controller }
belongs_to :user
belongs_to :creation, :counter_cache => true
attr_accessible :user_id, :creation_id
app/models/photo.rb
@@ -1,6 +1,4 @@
class Photo < ActiveRecord::Base
- include PublicActivity::Model
- tracked owner: Proc.new{ |controller, model| controller.current_user if controller }
attr_accessible :is_primary, :creation, :image
belongs_to :creation, :counter_cache => true
validates :image, :presence => true
app/models/tutorial.rb
@@ -1,6 +1,4 @@
class Tutorial < ActiveRecord::Base
- include PublicActivity::Model
- tracked owner: Proc.new{ |controller, model| controller.current_user if controller }
attr_accessible :description, :heading, :url, :image_url, :user_id, :author, :author_url
validates :url, :presence => true
belongs_to :user
app/models/user.rb
@@ -1,6 +1,4 @@
class User < ActiveRecord::Base
- include PublicActivity::Model
- tracked
geocoded_by :current_sign_in_ip, :latitude => :latitude, :longitude => :longitude
reverse_geocoded_by :latitude, :longitude do |obj,results|
if geo = results.first
config/initializers/active_admin.rb
@@ -1,103 +0,0 @@
-ActiveAdmin.setup do |config|
-
- # == Site Title
- #
- # Set the title that is displayed on the main layout
- # for each of the active admin pages.
- #
- config.site_title = "Cake"
-
- # Set the link url for the title. For example, to take
- # users to your main site. Defaults to no link.
- #
- # config.site_title_link = "/"
-
- # == Default Namespace
- #
- # Set the default namespace each administration resource
- # will be added to.
- #
- # eg:
- # config.default_namespace = :hello_world
- #
- # This will create resources in the HelloWorld module and
- # will namespace routes to /hello_world/*
- #
- # To set no namespace by default, use:
- # config.default_namespace = false
- #
- # Default:
- #config.default_namespace = :cakeeater
-
- # == User Authentication
- #
- # Active Admin will automatically call an authentication
- # method in a before filter of all controller actions to
- # ensure that there is a currently logged in admin user.
- #
- # This setting changes the method which Active Admin calls
- # within the controller.
- config.authentication_method = :authenticate_admin_user!
-
-
- # == Current User
- #
- # Active Admin will associate actions with the current
- # user performing them.
- #
- # This setting changes the method which Active Admin calls
- # to return the currently logged in user.
- config.current_user_method = :current_admin_user
-
-
- # == Logging Out
- #
- # Active Admin displays a logout link on each screen. These
- # settings configure the location and method used for the link.
- #
- # This setting changes the path where the link points to. If it's
- # a string, the strings is used as the path. If it's a Symbol, we
- # will call the method to return the path.
- #
- # Default:
- # config.logout_link_path = :destroy_admin_user_session_path
-
- # This setting changes the http method used when rendering the
- # link. For example :get, :delete, :put, etc..
- #
- # Default:
- # config.logout_link_method = :get
-
-
- # == Admin Comments
- #
- # Admin comments allow you to add comments to any model for admin use
- #
- # Admin comments are enabled by default in the default
- # namespace only. You can turn them on in a namesapce
- # by adding them to the comments array.
- #
- # Default:
- # config.allow_comments_in = [:admin]
-
-
- # == Controller Filters
- #
- # You can add before, after and around filters to all of your
- # Active Admin resources from here.
- #
- # config.before_filter :do_something_awesome
-
-
- # == Register Stylesheets & Javascripts
- #
- # We recommend using the built in Active Admin layout and loading
- # up your own stylesheets / javascripts to customize the look
- # and feel.
- #
- # To load a stylesheet:
- # config.register_stylesheet 'my_stylesheet.css'
- #
- # To load a javascript file:
- # config.register_javascript 'my_javascript.js'
-end
config/routes.rb
@@ -48,12 +48,6 @@ Cake::Application.routes.draw do
resources :passwords, :only => [:index, :update], :path => :pwd
resources :avatars, :only => [:edit, :update]
- resources :notifications, :only => [:index]
-
- ActiveAdmin.routes(self)
-
- devise_for :admin_users, ActiveAdmin::Devise.config
-
root :to => "creations#index"
namespace :api, :defaults => { :format => 'json' } do
spec/controllers/registrations_controller_spec.rb
@@ -26,7 +26,8 @@ describe RegistrationsController do
sut.update
end
- it "should update their website" do
+
+ xit "should update their website" do
user.should have_received(:update_without_password,@payload[:user])
end
end
Gemfile
@@ -4,12 +4,12 @@ gem 'rails'
gem 'rake'
gem 'devise'
gem 'jquery-rails'
+gem 'jquery-ui-rails'
gem 'carrierwave'
gem 'carrierwave_backgrounder'
gem 'rmagick'
gem 'kaminari'
gem "formtastic"
-gem 'activeadmin'
gem 'sass-rails'
gem 'bootstrap-sass'
gem 'acts-as-taggable-on'
@@ -19,7 +19,6 @@ gem 'jquery-fileupload-rails'
gem 'capistrano-gitflow'
gem 'dotenv-rails'
gem 'airbrake'
-gem 'public_activity'
gem 'geocoder'
gem 'jbuilder'
Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.13)
- actionpack (= 3.2.13)
- mail (~> 2.5.3)
- actionpack (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
+ actionmailer (3.2.14)
+ actionpack (= 3.2.14)
+ mail (~> 2.5.4)
+ actionpack (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,57 +14,40 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activeadmin (0.5.1)
- arbre (>= 1.0.1)
- bourbon (>= 1.0.0)
- devise (>= 1.1.2)
- fastercsv
- formtastic (>= 2.0.0)
- inherited_resources (>= 1.3.1)
- jquery-rails (>= 1.0.0)
- kaminari (>= 0.13.0)
- meta_search (>= 0.9.2)
- rails (>= 3.0.0)
- sass (>= 3.1.0)
- activemodel (3.2.13)
- activesupport (= 3.2.13)
+ activemodel (3.2.14)
+ activesupport (= 3.2.14)
builder (~> 3.0.0)
- activerecord (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
+ activerecord (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.13)
- activemodel (= 3.2.13)
- activesupport (= 3.2.13)
- activesupport (3.2.13)
- i18n (= 0.6.1)
+ activeresource (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
+ activesupport (3.2.14)
+ i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
- acts-as-taggable-on (2.3.3)
- rails (~> 3.0)
+ acts-as-taggable-on (2.4.1)
+ rails (>= 3, < 5)
airbrake (3.1.12)
activesupport
builder
json
- arbre (1.0.1)
- activesupport (>= 3.0.0)
arel (3.0.2)
asset_sync (0.5.4)
activemodel
fog
- bcrypt-ruby (3.0.1)
- better_errors (0.8.0)
+ bcrypt-ruby (3.1.1)
+ better_errors (0.9.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
- bootstrap-sass (2.3.2.0)
+ bootstrap-sass (2.3.2.1)
sass (~> 3.2)
- bourbon (3.1.1)
- sass (>= 3.2.0)
- thor
builder (3.0.4)
bullet (4.6.0)
uniform_notifier
- capistrano (2.14.2)
+ capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -75,17 +58,17 @@ GEM
capistrano-gitflow (1.4.3)
capistrano
stringex
- capybara (2.0.2)
+ capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 1.0.0)
- carrierwave (0.8.0)
+ xpath (~> 2.0)
+ carrierwave (0.9.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- carrierwave_backgrounder (0.2.0)
+ json (>= 1.7)
+ carrierwave_backgrounder (0.2.2)
carrierwave (~> 0.5)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
@@ -96,27 +79,26 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.1)
+ coffee-script-source (1.6.3)
daemons (1.1.9)
dalli (2.6.4)
database_cleaner (1.0.1)
delayed_job (3.0.5)
activesupport (~> 3.0)
- delayed_job_active_record (0.4.3)
+ delayed_job_active_record (0.4.4)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
- developwithpassion_arrays (0.0.1)
- devise (2.2.3)
+ devise (3.0.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
- railties (~> 3.1)
- warden (~> 1.2.1)
- diff-lcs (1.2.1)
- dotenv (0.7.0)
- dotenv-rails (0.7.0)
- dotenv (= 0.7.0)
+ railties (>= 3.2.6, < 5)
+ warden (~> 1.2.3)
+ diff-lcs (1.2.4)
+ dotenv (0.8.0)
+ dotenv-rails (0.8.0)
+ dotenv (= 0.8.0)
erubis (2.7.0)
- excon (0.19.5)
+ excon (0.25.3)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
@@ -124,36 +106,29 @@ GEM
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- fakes (1.0.5)
- developwithpassion_arrays
- fakes-rspec (1.0.2)
+ fakes (1.1.4)
+ fakes-rspec (1.0.5)
fakes
- rspec
- fastercsv (1.5.5)
- ffaker (1.16.1)
- ffi (1.4.0)
- fog (1.10.0)
+ ffaker (1.16.2)
+ ffi (1.9.0)
+ fog (1.14.0)
builder
- excon (~> 0.14)
+ excon (~> 0.25.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.1)
net-ssh (>= 2.1.3)
- nokogiri (~> 1.5.0)
+ nokogiri (~> 1.5)
ruby-hmac
formatador (0.2.4)
formtastic (2.2.1)
actionpack (>= 3.0)
geocoder (1.1.8)
- has_scope (0.5.1)
- highline (1.6.15)
- hike (1.2.1)
- i18n (0.6.1)
- inherited_resources (1.3.1)
- has_scope (~> 0.5.0)
- responders (~> 0.6)
- jasmine (1.3.1)
+ highline (1.6.19)
+ hike (1.2.3)
+ i18n (0.6.4)
+ jasmine (1.3.2)
jasmine-core (~> 1.3.1)
rack (~> 1.0)
rspec (>= 1.3.1)
@@ -166,10 +141,13 @@ GEM
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (2.2.1)
+ jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.7)
+ jquery-ui-rails (4.0.3)
+ jquery-rails
+ railties (>= 3.1.0)
+ json (1.8.0)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -177,92 +155,79 @@ GEM
actionpack (>= 3.0)
activerecord (>= 3.0)
railties (>= 3.0)
- mail (2.5.3)
- i18n (>= 0.4.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- meta_search (1.1.3)
- actionpack (~> 3.1)
- activerecord (~> 3.1)
- activesupport (~> 3.1)
- polyamorous (~> 0.5.0)
- mime-types (1.21)
- multi_json (1.7.1)
- net-scp (1.1.0)
+ mime-types (1.23)
+ mini_portile (0.5.1)
+ multi_json (1.7.7)
+ net-scp (1.1.2)
net-ssh (>= 2.6.5)
- net-sftp (2.1.1)
+ net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.6.6)
+ net-ssh (2.6.8)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.5.8.72)
- nokogiri (1.5.6)
+ newrelic_rpm (3.6.5.130)
+ nokogiri (1.6.0)
+ mini_portile (~> 0.5.0)
orm_adapter (0.4.0)
- pg (0.14.1)
- polyamorous (0.5.0)
- activerecord (~> 3.0)
+ pg (0.16.0)
polyglot (0.3.3)
- public_activity (1.1.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- i18n (>= 0.5.0)
- railties (~> 3.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-mini-profiler (0.1.26)
+ rack-mini-profiler (0.1.27)
rack (>= 1.1.3)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.13)
- actionmailer (= 3.2.13)
- actionpack (= 3.2.13)
- activerecord (= 3.2.13)
- activeresource (= 3.2.13)
- activesupport (= 3.2.13)
+ rails (3.2.14)
+ actionmailer (= 3.2.14)
+ actionpack (= 3.2.14)
+ activerecord (= 3.2.14)
+ activeresource (= 3.2.14)
+ activesupport (= 3.2.14)
bundler (~> 1.0)
- railties (= 3.2.13)
- railties (3.2.13)
- actionpack (= 3.2.13)
- activesupport (= 3.2.13)
+ railties (= 3.2.14)
+ railties (3.2.14)
+ actionpack (= 3.2.14)
+ activesupport (= 3.2.14)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
- rb-readline (0.4.2)
+ rake (10.1.0)
+ rb-readline (0.5.0)
rdoc (3.12.2)
json (~> 1.4)
- responders (0.9.3)
- railties (~> 3.1)
rmagick (2.13.2)
- rspec (2.13.0)
- rspec-core (~> 2.13.0)
- rspec-expectations (~> 2.13.0)
- rspec-mocks (~> 2.13.0)
- rspec-core (2.13.0)
- rspec-expectations (2.13.0)
+ rspec (2.14.1)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ rspec-core (2.14.4)
+ rspec-expectations (2.14.0)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.13.0)
- rspec-rails (2.13.0)
+ rspec-mocks (2.14.1)
+ rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.13.0)
- rspec-expectations (~> 2.13.0)
- rspec-mocks (~> 2.13.0)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
- rvm-capistrano (1.2.7)
+ rvm-capistrano (1.4.1)
capistrano (>= 2.0.0)
- sass (3.2.6)
+ sass (3.2.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.31.0)
+ selenium-webdriver (2.33.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
@@ -277,28 +242,27 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
- stringex (1.5.1)
- thor (0.17.0)
- tilt (1.3.6)
- treetop (1.4.12)
+ stringex (2.0.5)
+ thor (0.18.1)
+ tilt (1.4.1)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
- uglifier (1.3.0)
+ uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uniform_notifier (1.2.0)
- warden (1.2.1)
+ warden (1.2.3)
rack (>= 1.0)
websocket (1.0.7)
- xpath (1.0.0)
+ xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
- activeadmin
acts-as-taggable-on
airbrake
asset_sync
@@ -328,11 +292,11 @@ DEPENDENCIES
jbuilder
jquery-fileupload-rails
jquery-rails
+ jquery-ui-rails
kaminari
lol_dba
newrelic_rpm
pg
- public_activity
rack-mini-profiler
rails
rake