remove rails_admin - let users install it if they want it
Andrew Cantino
共有 9 個文件被更改，包括 5 次插入 和 187 次删除
+ 5
- 3
CHANGES.md
@@ -1,5 +1,7 @@ |
||
| 1 | 1 |
# Changes |
| 2 | 2 |
|
| 3 |
-* March 24, 2013 (Huginn 0.1) - Refactored loading of Agents for `check` and `receive` to use ids instead of full objects. This should fix the too-large delayed_job issues. Added `system_timer` and `fastercsv` to the Gemfile for the Ruby 1.8 platform. |
|
| 4 |
-* March 18, 2013 - Added Wiki page about the [Agent API](https://github.com/cantino/huginn/wiki/Creating-a-new-agent). |
|
| 5 |
-* March 17, 2013 - Switched to JSONPath for defining paths through JSON structures. The WebsiteAgent can now scrape and parse JSON. |
|
| 3 |
+* June 29, 2013 - Removed rails\_admin because it was causing deployment issues. Better to have people install their favorite admin tool if they want one. |
|
| 4 |
+* June, 2013 - A number of new agents have been contributed, including interfaces to Weibo, Twitter, and Twilio, as well as Agents for translation, sentiment analysis, and for posting and receiving webhooks. |
|
| 5 |
+* March 24, 2013 (0.1) - Refactored loading of Agents for `check` and `receive` to use ids instead of full objects. This should fix the too-large delayed_job issues. Added `system_timer` and `fastercsv` to the Gemfile for the Ruby 1.8 platform. |
|
| 6 |
+* March 18, 2013 - Added Wiki page about the [Agent API](https://github.com/cantino/huginn/wiki/Creating-a-new-agent). |
|
| 7 |
+* March 17, 2013 - Switched to JSONPath for defining paths through JSON structures. The WebsiteAgent can now scrape and parse JSON. |
+ 0
- 1
Gemfile
@@ -4,7 +4,6 @@ gem 'rails' |
||
| 4 | 4 |
gem 'rake' |
| 5 | 5 |
gem 'mysql2' |
| 6 | 6 |
gem 'devise' |
| 7 |
-gem 'rails_admin' |
|
| 8 | 7 |
gem 'kaminari' |
| 9 | 8 |
gem 'bootstrap-kaminari-views' |
| 10 | 9 |
gem "rufus-scheduler", :require => false |
+ 0
- 32
Gemfile.lock
@@ -41,8 +41,6 @@ GEM |
||
| 41 | 41 |
bootstrap-kaminari-views (0.0.2) |
| 42 | 42 |
kaminari (>= 0.13) |
| 43 | 43 |
rails (>= 3.1) |
| 44 |
- bootstrap-sass (2.3.1.0) |
|
| 45 |
- sass (~> 3.2) |
|
| 46 | 44 |
bourne (1.4.0) |
| 47 | 45 |
mocha (~> 0.13.2) |
| 48 | 46 |
builder (3.0.4) |
@@ -88,9 +86,6 @@ GEM |
||
| 88 | 86 |
multipart-post (~> 1.1) |
| 89 | 87 |
fastercsv (1.5.5) |
| 90 | 88 |
ffi (1.3.1) |
| 91 |
- font-awesome-sass-rails (3.0.2.2) |
|
| 92 |
- railties (>= 3.1.1) |
|
| 93 |
- sass-rails (>= 3.1.1) |
|
| 94 | 89 |
foreman (0.62.0) |
| 95 | 90 |
thor (>= 0.13.6) |
| 96 | 91 |
geokit (1.6.5) |
@@ -98,8 +93,6 @@ GEM |
||
| 98 | 93 |
geokit-rails3 (0.1.5) |
| 99 | 94 |
geokit (~> 1.5) |
| 100 | 95 |
rails (~> 3.0) |
| 101 |
- haml (4.0.2) |
|
| 102 |
- tilt |
|
| 103 | 96 |
hashie (2.0.5) |
| 104 | 97 |
hike (1.2.1) |
| 105 | 98 |
http_parser.rb (0.5.3) |
@@ -112,9 +105,6 @@ GEM |
||
| 112 | 105 |
jquery-rails (2.2.1) |
| 113 | 106 |
railties (>= 3.0, < 5.0) |
| 114 | 107 |
thor (>= 0.14, < 2.0) |
| 115 |
- jquery-ui-rails (3.0.1) |
|
| 116 |
- jquery-rails |
|
| 117 |
- railties (>= 3.1.0) |
|
| 118 | 108 |
json (1.7.7) |
| 119 | 109 |
jsonpath (0.5.1) |
| 120 | 110 |
multi_json |
@@ -137,7 +127,6 @@ GEM |
||
| 137 | 127 |
multi_xml (0.5.3) |
| 138 | 128 |
multipart-post (1.2.0) |
| 139 | 129 |
mysql2 (0.3.11) |
| 140 |
- nested_form (0.3.2) |
|
| 141 | 130 |
nokogiri (1.5.9) |
| 142 | 131 |
oauth2 (0.9.1) |
| 143 | 132 |
faraday (~> 0.8) |
@@ -155,9 +144,6 @@ GEM |
||
| 155 | 144 |
rack (1.4.5) |
| 156 | 145 |
rack-cache (1.2) |
| 157 | 146 |
rack (>= 0.4) |
| 158 |
- rack-pjax (0.7.0) |
|
| 159 |
- nokogiri (~> 1.5) |
|
| 160 |
- rack (~> 1.3) |
|
| 161 | 147 |
rack-ssl (1.3.3) |
| 162 | 148 |
rack |
| 163 | 149 |
rack-test (0.6.2) |
@@ -170,21 +156,6 @@ GEM |
||
| 170 | 156 |
activesupport (= 3.2.13) |
| 171 | 157 |
bundler (~> 1.0) |
| 172 | 158 |
railties (= 3.2.13) |
| 173 |
- rails_admin (0.4.6) |
|
| 174 |
- bootstrap-sass (~> 2.2) |
|
| 175 |
- builder (~> 3.0) |
|
| 176 |
- coffee-rails (~> 3.1) |
|
| 177 |
- font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) |
|
| 178 |
- haml (~> 4.0) |
|
| 179 |
- jquery-rails (~> 2.1) |
|
| 180 |
- jquery-ui-rails (~> 3.0) |
|
| 181 |
- kaminari (~> 0.14) |
|
| 182 |
- nested_form (~> 0.3) |
|
| 183 |
- rack-pjax (~> 0.6) |
|
| 184 |
- rails (~> 3.1) |
|
| 185 |
- remotipart (~> 1.0) |
|
| 186 |
- safe_yaml (~> 0.6) |
|
| 187 |
- sass-rails (~> 3.1) |
|
| 188 | 159 |
railties (3.2.13) |
| 189 | 160 |
actionpack (= 3.2.13) |
| 190 | 161 |
activesupport (= 3.2.13) |
@@ -195,7 +166,6 @@ GEM |
||
| 195 | 166 |
rake (10.0.4) |
| 196 | 167 |
rdoc (3.12.2) |
| 197 | 168 |
json (~> 1.4) |
| 198 |
- remotipart (1.0.5) |
|
| 199 | 169 |
rest-client (1.6.7) |
| 200 | 170 |
mime-types (>= 1.16) |
| 201 | 171 |
rr (1.0.4) |
@@ -216,7 +186,6 @@ GEM |
||
| 216 | 186 |
rspec-mocks (~> 2.13.0) |
| 217 | 187 |
rufus-scheduler (2.0.18) |
| 218 | 188 |
tzinfo (>= 0.3.23) |
| 219 |
- safe_yaml (0.9.0) |
|
| 220 | 189 |
sass (3.2.7) |
| 221 | 190 |
sass-rails (3.2.6) |
| 222 | 191 |
railties (~> 3.2.0) |
@@ -298,7 +267,6 @@ DEPENDENCIES |
||
| 298 | 267 |
nokogiri |
| 299 | 268 |
pry |
| 300 | 269 |
rails |
| 301 |
- rails_admin |
|
| 302 | 270 |
rake |
| 303 | 271 |
rr |
| 304 | 272 |
rspec |
+ 0
- 2
Rakefile
@@ -2,8 +2,6 @@ |
||
| 2 | 2 |
# Add your own tasks in files placed in lib/tasks ending in .rake, |
| 3 | 3 |
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. |
| 4 | 4 |
|
| 5 |
-ENV['SKIP_RAILS_ADMIN_INITIALIZER'] = 'true' |
|
| 6 |
- |
|
| 7 | 5 |
require File.expand_path('../config/application', __FILE__)
|
| 8 | 6 |
|
| 9 | 7 |
Huginn::Application.load_tasks |
+ 0
- 8
app/views/layouts/_navigation.html.erb
@@ -8,14 +8,6 @@ |
||
| 8 | 8 |
<% end %> |
| 9 | 9 |
|
| 10 | 10 |
<ul class="nav pull-right"> |
| 11 |
- <% if current_user.try(:admin?) %> |
|
| 12 |
- <li> |
|
| 13 |
- <%= link_to 'Admin', rails_admin_path %> |
|
| 14 |
- </li> |
|
| 15 |
- |
|
| 16 |
- <li class='divider-vertical'></li> |
|
| 17 |
- <% end %> |
|
| 18 |
- |
|
| 19 | 11 |
<% if user_signed_in? %> |
| 20 | 12 |
<li id='job-indicator'> |
| 21 | 13 |
<a href="/delayed_job"> |
+ 0
- 121
config/initializers/rails_admin.rb
@@ -1,121 +0,0 @@ |
||
| 1 |
-# RailsAdmin config file. Generated on July 28, 2012 14:28 |
|
| 2 |
-# See github.com/sferik/rails_admin for more informations |
|
| 3 |
- |
|
| 4 |
-RailsAdmin.config do |config| |
|
| 5 |
- |
|
| 6 |
- # If your default_local is different from :en, uncomment the following 2 lines and set your default locale here: |
|
| 7 |
- # require 'i18n' |
|
| 8 |
- # I18n.default_locale = :de |
|
| 9 |
- |
|
| 10 |
- config.current_user_method { current_user } # auto-generated
|
|
| 11 |
- |
|
| 12 |
- # If you want to track changes on your models: |
|
| 13 |
- config.audit_with :history, User |
|
| 14 |
- |
|
| 15 |
- # Or with a PaperTrail: (you need to install it first) |
|
| 16 |
- # config.audit_with :paper_trail, User |
|
| 17 |
- |
|
| 18 |
- # Set the admin name here (optional second array element will appear in a beautiful RailsAdmin red ©) |
|
| 19 |
- config.main_app_name = ['Huginn', 'Admin'] |
|
| 20 |
- # or for a dynamic name: |
|
| 21 |
- # config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.titleize, controller.params['action'].titleize] }
|
|
| 22 |
- |
|
| 23 |
- config.authenticate_with do |
|
| 24 |
- authenticate_user! |
|
| 25 |
- end |
|
| 26 |
- |
|
| 27 |
- config.authorize_with do |
|
| 28 |
- redirect_to "/" unless warden.user.admin? |
|
| 29 |
- end |
|
| 30 |
- |
|
| 31 |
- config.attr_accessible_role do |
|
| 32 |
- if _current_user.admin? |
|
| 33 |
- :admin |
|
| 34 |
- else |
|
| 35 |
- :default |
|
| 36 |
- end |
|
| 37 |
- end |
|
| 38 |
- |
|
| 39 |
- # ==> Global show view settings |
|
| 40 |
- # Display empty fields in show views |
|
| 41 |
- # config.compact_show_view = false |
|
| 42 |
- |
|
| 43 |
- # ==> Global list view settings |
|
| 44 |
- # Number of default rows per-page: |
|
| 45 |
- # config.default_items_per_page = 20 |
|
| 46 |
- |
|
| 47 |
- # ==> Included models |
|
| 48 |
- # Add all excluded models here: |
|
| 49 |
- config.excluded_models = [Contact] |
|
| 50 |
- |
|
| 51 |
- # Add models here if you want to go 'whitelist mode': |
|
| 52 |
- # config.included_models = [User] |
|
| 53 |
- |
|
| 54 |
- # Application wide tried label methods for models' instances |
|
| 55 |
- # config.label_methods << :description # Default is [:name, :title] |
|
| 56 |
- |
|
| 57 |
- # ==> Global models configuration |
|
| 58 |
- # config.models do |
|
| 59 |
- # # Configuration here will affect all included models in all scopes, handle with care! |
|
| 60 |
- # |
|
| 61 |
- # list do |
|
| 62 |
- # # Configuration here will affect all included models in list sections (same for show, export, edit, update, create) |
|
| 63 |
- # |
|
| 64 |
- # fields_of_type :date do |
|
| 65 |
- # # Configuration here will affect all date fields, in the list section, for all included models. See README for a comprehensive type list. |
|
| 66 |
- # end |
|
| 67 |
- # end |
|
| 68 |
- # end |
|
| 69 |
- # |
|
| 70 |
- # ==> Model specific configuration |
|
| 71 |
- # Keep in mind that *all* configuration blocks are optional. |
|
| 72 |
- # RailsAdmin will try his best to provide the best defaults for each section, for each field. |
|
| 73 |
- # Try to override as few things as possible, in the most generic way. Try to avoid setting labels for models and attributes, use ActiveRecord I18n API instead. |
|
| 74 |
- # Less code is better code! |
|
| 75 |
- # config.model MyModel do |
|
| 76 |
- # # Cross-section field configuration |
|
| 77 |
- # object_label_method :name # Name of the method called for pretty printing an *instance* of ModelName |
|
| 78 |
- # label 'My model' # Name of ModelName (smartly defaults to ActiveRecord's I18n API) |
|
| 79 |
- # label_plural 'My models' # Same, plural |
|
| 80 |
- # weight -1 # Navigation priority. Bigger is higher. |
|
| 81 |
- # parent OtherModel # Set parent model for navigation. MyModel will be nested below. OtherModel will be on first position of the dropdown |
|
| 82 |
- # navigation_label # Sets dropdown entry's name in navigation. Only for parents! |
|
| 83 |
- # # Section specific configuration: |
|
| 84 |
- # list do |
|
| 85 |
- # filters [:id, :name] # Array of field names which filters should be shown by default in the table header |
|
| 86 |
- # items_per_page 100 # Override default_items_per_page |
|
| 87 |
- # sort_by :id # Sort column (default is primary key) |
|
| 88 |
- # sort_reverse true # Sort direction (default is true for primary key, last created first) |
|
| 89 |
- # # Here goes the fields configuration for the list view |
|
| 90 |
- # end |
|
| 91 |
- # end |
|
| 92 |
- |
|
| 93 |
- # Your model's configuration, to help you get started: |
|
| 94 |
- |
|
| 95 |
- # All fields marked as 'hidden' won't be shown anywhere in the rails_admin unless you mark them as visible. (visible(true)) |
|
| 96 |
- |
|
| 97 |
- # config.model User do |
|
| 98 |
- # # Found associations: |
|
| 99 |
- # # Found columns: |
|
| 100 |
- # configure :id, :integer |
|
| 101 |
- # configure :email, :string |
|
| 102 |
- # configure :password, :password # Hidden |
|
| 103 |
- # configure :password_confirmation, :password # Hidden |
|
| 104 |
- # configure :reset_password_token, :string # Hidden |
|
| 105 |
- # configure :reset_password_sent_at, :datetime |
|
| 106 |
- # configure :remember_created_at, :datetime |
|
| 107 |
- # configure :sign_in_count, :integer |
|
| 108 |
- # configure :current_sign_in_at, :datetime |
|
| 109 |
- # configure :last_sign_in_at, :datetime |
|
| 110 |
- # configure :current_sign_in_ip, :string |
|
| 111 |
- # configure :last_sign_in_ip, :string |
|
| 112 |
- # configure :created_at, :datetime |
|
| 113 |
- # configure :updated_at, :datetime # # Sections: |
|
| 114 |
- # list do; end |
|
| 115 |
- # export do; end |
|
| 116 |
- # show do; end |
|
| 117 |
- # edit do; end |
|
| 118 |
- # create do; end |
|
| 119 |
- # update do; end |
|
| 120 |
- # end |
|
| 121 |
-end |
+ 0
- 1
config/routes.rb
@@ -18,7 +18,6 @@ Huginn::Application.routes.draw do |
||
| 18 | 18 |
post "/users/:user_id/update_location/:secret" => "user_location_updates#create" |
| 19 | 19 |
post "/users/:user_id/webhooks/:agent_id/:secret" => "webhooks#create" |
| 20 | 20 |
|
| 21 |
- mount RailsAdmin::Engine => '/admin', :as => 'rails_admin' |
|
| 22 | 21 |
# match "/delayed_job" => DelayedJobWeb, :anchor => false |
| 23 | 22 |
devise_for :users, :sign_out_via => [ :post, :delete ] |
| 24 | 23 |
|
+ 0
- 18
db/migrate/20120728212820_create_rails_admin_histories_table.rb
@@ -1,18 +0,0 @@ |
||
| 1 |
-class CreateRailsAdminHistoriesTable < ActiveRecord::Migration |
|
| 2 |
- def self.up |
|
| 3 |
- create_table :rails_admin_histories do |t| |
|
| 4 |
- t.text :message # title, name, or object_id |
|
| 5 |
- t.string :username |
|
| 6 |
- t.integer :item |
|
| 7 |
- t.string :table |
|
| 8 |
- t.integer :month, :limit => 2 |
|
| 9 |
- t.integer :year, :limit => 5 |
|
| 10 |
- t.timestamps |
|
| 11 |
- end |
|
| 12 |
- add_index(:rails_admin_histories, [:item, :table, :month, :year], :name => 'index_rails_admin_histories' ) |
|
| 13 |
- end |
|
| 14 |
- |
|
| 15 |
- def self.down |
|
| 16 |
- drop_table :rails_admin_histories |
|
| 17 |
- end |
|
| 18 |
-end |
+ 0
- 1
deployment/site-cookbooks/huginn_production/files/default/Gemfile
@@ -4,7 +4,6 @@ gem 'rails' |
||
| 4 | 4 |
gem 'rake' |
| 5 | 5 |
gem 'mysql2' |
| 6 | 6 |
gem 'devise' |
| 7 |
-gem 'rails_admin' |
|
| 8 | 7 |
gem 'kaminari' |
| 9 | 8 |
gem 'bootstrap-kaminari-views' |
| 10 | 9 |
gem "rufus-scheduler", :require => false |