lentil 0.9.1 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +5 -6
- data/app/assets/javascripts/active_admin.js +11 -0
- data/app/assets/javascripts/active_admin.js.coffee +1 -0
- data/app/assets/javascripts/lentil/addfancybox.js +5 -4
- data/app/assets/javascripts/lentil/buttonhandler.js +8 -0
- data/app/assets/javascripts/lentil/imageerrors.js +2 -0
- data/app/assets/javascripts/lentil/images.js +0 -1
- data/app/assets/javascripts/lentil.js +3 -0
- data/app/assets/stylesheets/{active_admin.css.scss → active_admin.scss} +0 -0
- data/app/assets/stylesheets/admin/{moderation.css.scss → moderation.scss} +0 -0
- data/app/assets/stylesheets/lentil/breakpoint/sass/_components.scss +0 -0
- data/app/assets/stylesheets/lentil/breakpoint/sass/_config.scss +0 -0
- data/app/assets/stylesheets/lentil/breakpoint/sass/_framework.scss +0 -0
- data/app/assets/stylesheets/lentil/breakpoint/sass/_structure.scss +0 -0
- data/app/assets/stylesheets/lentil/breakpoint/sass/config.rb +0 -0
- data/app/assets/stylesheets/lentil/breakpoint/sass/style.scss +0 -0
- data/app/assets/stylesheets/lentil/{iframe.css.scss → iframe.scss} +0 -0
- data/app/assets/stylesheets/lentil/{image_animation.css.scss → image_animation.scss} +0 -0
- data/app/assets/stylesheets/lentil/{images.css.scss → images.scss} +0 -0
- data/app/assets/stylesheets/lentil/{thisorthat.css.scss → thisorthat.scss} +0 -0
- data/app/assets/stylesheets/{lentil.css.scss → lentil.scss} +2 -1
- data/app/controllers/lentil/application_controller.rb +6 -1
- data/app/controllers/lentil/images_controller.rb +1 -0
- data/app/controllers/lentil/photographers_controller.rb +2 -2
- data/app/controllers/lentil/thisorthat_controller.rb +2 -2
- data/app/models/lentil/admin_user.rb +0 -4
- data/app/models/lentil/battle.rb +0 -2
- data/app/models/lentil/flag.rb +0 -1
- data/app/models/lentil/image.rb +7 -7
- data/app/models/lentil/license.rb +0 -2
- data/app/models/lentil/licensing.rb +0 -1
- data/app/models/lentil/like_vote.rb +0 -1
- data/app/models/lentil/service.rb +0 -2
- data/app/models/lentil/tag.rb +6 -7
- data/app/models/lentil/tagging.rb +0 -2
- data/app/models/lentil/tagset.rb +0 -3
- data/app/models/lentil/tagset_assignment.rb +0 -2
- data/app/models/lentil/user.rb +0 -2
- data/app/views/lentil/images/_flagging_modal.html.erb +2 -2
- data/app/views/lentil/thisorthat/_battle_form.html.erb +6 -6
- data/lib/generators/lentil/install_generator.rb +33 -4
- data/lib/generators/lentil/templates/README.md +7 -11
- data/lib/generators/lentil/upgrade_v1_generator.rb +54 -0
- data/lib/lentil/admin/admin_user.rb +27 -17
- data/lib/lentil/admin/images.rb +30 -9
- data/lib/lentil/admin/tags.rb +4 -0
- data/lib/lentil/admin/tagsets.rb +16 -1
- data/lib/lentil/version.rb +1 -1
- data/lib/lentil.rb +5 -2
- data/test/dummy/README.rdoc +15 -248
- data/test/dummy/Rakefile +0 -1
- data/test/dummy/app/{mailers/.gitkeep → assets/images/.keep} +0 -0
- data/test/dummy/app/assets/javascripts/application.js +4 -6
- data/test/dummy/app/controllers/application_controller.rb +3 -1
- data/test/dummy/app/{models/.gitkeep → controllers/concerns/.keep} +0 -0
- data/test/dummy/app/{views/layouts/.gitkeep → mailers/.keep} +0 -0
- data/test/dummy/{lib/assets/.gitkeep → app/models/.keep} +0 -0
- data/test/dummy/{log/.gitkeep → app/models/concerns/.keep} +0 -0
- data/test/dummy/app/views/layouts/application.html.erb +14 -0
- data/test/dummy/config/application.rb +9 -39
- data/test/dummy/config/boot.rb +4 -9
- data/test/dummy/config/database.yml +3 -1
- data/test/dummy/config/environment.rb +2 -2
- data/test/dummy/config/environments/development.rb +21 -17
- data/test/dummy/config/environments/production.rb +45 -33
- data/test/dummy/config/environments/test.rb +20 -12
- data/test/dummy/config/initializers/assets.rb +11 -0
- data/test/dummy/config/initializers/cookies_serializer.rb +3 -0
- data/test/dummy/config/initializers/filter_parameter_logging.rb +4 -0
- data/test/dummy/config/initializers/formtastic.rb +2 -0
- data/test/dummy/config/initializers/inflections.rb +6 -5
- data/test/dummy/config/initializers/mime_types.rb +0 -1
- data/test/dummy/config/initializers/session_store.rb +0 -5
- data/test/dummy/config/initializers/wrap_parameters.rb +6 -6
- data/test/dummy/config/locales/devise.en.yml +60 -0
- data/test/dummy/config/locales/en.yml +20 -2
- data/test/dummy/config/routes.rb +2 -2
- data/test/dummy/config/secrets.yml +22 -0
- data/test/dummy/db/schema.rb +120 -120
- data/test/dummy/db/seeds.rb +2 -1
- data/test/dummy/lib/assets/.keep +0 -0
- data/test/dummy/log/.keep +0 -0
- data/test/dummy/public/404.html +54 -13
- data/test/dummy/public/422.html +54 -13
- data/test/dummy/public/500.html +53 -12
- data/test/dummy/test/fixtures +1 -0
- data/test/functional/admin/flags_controller_test.rb +2 -2
- data/test/functional/admin/images_controller_test.rb +8 -8
- data/test/functional/admin/tags_controller_test.rb +2 -2
- data/test/functional/admin/tagsets_controller_test.rb +3 -3
- data/test/functional/admin/users_controller_test.rb +2 -2
- data/test/functional/lentil/flags_controller_test.rb +3 -2
- data/test/functional/lentil/images_controller_test.rb +14 -10
- data/test/functional/lentil/like_votes_controller_test.rb +3 -2
- data/test/functional/lentil/photographers_controller_test.rb +6 -2
- data/test/functional/lentil/thisorthat_controller_test.rb +5 -1
- data/test/integration/lentil/javascript/event_tracking_test.rb +3 -2
- data/test/integration/lentil/thisorthat_test.rb +1 -1
- data/test/test_helper.rb +30 -17
- data/test/unit/lentil/user_test.rb +1 -1
- data/test/vcr_cassettes/instagram_bad_image_check.yml +0 -0
- data/test/vcr_cassettes/instagram_by_tag.yml +0 -0
- data/test/vcr_cassettes/instagram_by_tag_damaged.yml +0 -0
- data/test/vcr_cassettes/instagram_good_image_check.yml +0 -0
- data/test/vcr_cassettes/instagram_image_harvest.yml +0 -0
- data/test/vcr_cassettes/instagram_image_id.yml +0 -0
- data/test/vcr_cassettes/instagram_oembed.yml +0 -0
- data/vendor/assets/javascripts/animatedimages/css/demo.css +177 -177
- data/vendor/assets/javascripts/animatedimages/css/fallback.css +0 -0
- data/vendor/assets/javascripts/animatedimages/css/style.css +0 -0
- data/vendor/assets/javascripts/animatedimages/images/bg.jpg +0 -0
- data/vendor/assets/javascripts/animatedimages/images/light.png +0 -0
- data/vendor/assets/javascripts/animatedimages/images/loading.gif +0 -0
- data/vendor/assets/javascripts/html5historyapi/README.md +0 -0
- data/vendor/assets/javascripts/html5historyapi/component.json +0 -0
- data/vendor/assets/javascripts/html5historyapi/history.iegte8.js +0 -0
- data/vendor/assets/javascripts/html5historyapi/history.iegte8.min.js +0 -0
- data/vendor/assets/javascripts/html5historyapi/history.js +0 -0
- data/vendor/assets/javascripts/html5historyapi/history.min.js +0 -0
- data/vendor/assets/javascripts/html5historyapi/readme.en.txt +0 -0
- data/vendor/assets/javascripts/html5historyapi/readme.ru.txt +0 -0
- data/vendor/assets/javascripts/infinitescroll/Readme.md +0 -0
- data/vendor/assets/javascripts/infinitescroll/ajax-loader.gif +0 -0
- data/vendor/assets/javascripts/infinitescroll/behaviors/cufon.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/behaviors/local.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/behaviors/manual-trigger.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/behaviors/masonry-isotope.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/behaviors/sausage.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/jquery.infinitescroll.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/package.json +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/anivers_regular.otf +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/buttons.psd +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/logo.psd +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/mobius-strip2.ai +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/pattern.psd +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/selector spots.psd +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/assets/sites.psd +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/buttons.png +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/infinite-scroll-pattern.gif +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/logo.jpg +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/screens.jpg +0 -0
- data/vendor/assets/javascripts/infinitescroll/site/selectors.jpg +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/debug.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/index.html +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/index2.html +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/index3.html +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/jquery-1.6.1.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/mobile.html +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/mobile2.json +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/mobile3.json +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/mobile4.json +0 -0
- data/vendor/assets/javascripts/infinitescroll/test/style.css +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/img/ajax-loader.gif +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/includes/admin.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/includes/options.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/includes/presets.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/includes/submit.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/infinite-scroll.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/js/admin/infinite-scoll.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/js/admin/infinite-scroll.dev.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/js/front-end/jquery.infinitescroll.js +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/languages/infinite-scroll.pot +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/license.html +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/readme.md +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/readme.txt +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/screenshot-1.png +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/screenshot-2.png +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/screenshot-3.png +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/templates/footer.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/templates/manage-presets.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/templates/options.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/templates/preset-prompt.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/templates/submit-prompt.php +0 -0
- data/vendor/assets/javascripts/infinitescroll/wordpress-plugin/templates/submit.php +0 -0
- data/vendor/assets/javascripts/touchswipe/README.md +0 -0
- data/vendor/assets/javascripts/touchswipe/jquery.touchSwipe.js +0 -0
- metadata +85 -96
- data/test/dummy/config/initializers/secret_token.rb +0 -7
- data/test/dummy/script/rails +0 -6
data/test/dummy/db/schema.rb
CHANGED
@@ -9,202 +9,202 @@
|
|
9
9
|
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
|
10
10
|
# you'll amass, the slower it'll run and the greater likelihood for issues).
|
11
11
|
#
|
12
|
-
# It's strongly recommended
|
12
|
+
# It's strongly recommended that you check this file into your version control system.
|
13
13
|
|
14
|
-
ActiveRecord::Schema.define(:
|
14
|
+
ActiveRecord::Schema.define(version: 20150422123522) do
|
15
15
|
|
16
|
-
create_table "active_admin_comments", :
|
17
|
-
t.string "resource_id", :null
|
18
|
-
t.string "resource_type", :null
|
16
|
+
create_table "active_admin_comments", force: :cascade do |t|
|
17
|
+
t.string "resource_id", limit: 255, null: false
|
18
|
+
t.string "resource_type", limit: 255, null: false
|
19
19
|
t.integer "author_id"
|
20
|
-
t.string "author_type"
|
20
|
+
t.string "author_type", limit: 255
|
21
21
|
t.text "body"
|
22
|
-
t.datetime "created_at",
|
23
|
-
t.datetime "updated_at",
|
24
|
-
t.string "namespace"
|
22
|
+
t.datetime "created_at", null: false
|
23
|
+
t.datetime "updated_at", null: false
|
24
|
+
t.string "namespace", limit: 255
|
25
25
|
end
|
26
26
|
|
27
|
-
add_index "active_admin_comments", ["author_type", "author_id"], :
|
28
|
-
add_index "active_admin_comments", ["namespace"], :
|
29
|
-
add_index "active_admin_comments", ["resource_type", "resource_id"], :
|
27
|
+
add_index "active_admin_comments", ["author_type", "author_id"], name: "index_active_admin_comments_on_author_type_and_author_id"
|
28
|
+
add_index "active_admin_comments", ["namespace"], name: "index_active_admin_comments_on_namespace"
|
29
|
+
add_index "active_admin_comments", ["resource_type", "resource_id"], name: "index_admin_notes_on_resource_type_and_resource_id"
|
30
30
|
|
31
|
-
create_table "lentil_admin_users", :
|
32
|
-
t.string "email", :default
|
33
|
-
t.string "encrypted_password", :default
|
34
|
-
t.string "reset_password_token"
|
31
|
+
create_table "lentil_admin_users", force: :cascade do |t|
|
32
|
+
t.string "email", limit: 255, default: "", null: false
|
33
|
+
t.string "encrypted_password", limit: 255, default: "", null: false
|
34
|
+
t.string "reset_password_token", limit: 255
|
35
35
|
t.datetime "reset_password_sent_at"
|
36
36
|
t.datetime "remember_created_at"
|
37
|
-
t.integer "sign_in_count",
|
37
|
+
t.integer "sign_in_count", default: 0
|
38
38
|
t.datetime "current_sign_in_at"
|
39
39
|
t.datetime "last_sign_in_at"
|
40
|
-
t.string "current_sign_in_ip"
|
41
|
-
t.string "last_sign_in_ip"
|
42
|
-
t.datetime "created_at",
|
43
|
-
t.datetime "updated_at",
|
40
|
+
t.string "current_sign_in_ip", limit: 255
|
41
|
+
t.string "last_sign_in_ip", limit: 255
|
42
|
+
t.datetime "created_at", null: false
|
43
|
+
t.datetime "updated_at", null: false
|
44
44
|
end
|
45
45
|
|
46
|
-
add_index "lentil_admin_users", ["email"], :
|
47
|
-
add_index "lentil_admin_users", ["reset_password_token"], :
|
46
|
+
add_index "lentil_admin_users", ["email"], name: "index_admin_users_on_email", unique: true
|
47
|
+
add_index "lentil_admin_users", ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
|
48
48
|
|
49
|
-
create_table "lentil_battles", :
|
49
|
+
create_table "lentil_battles", force: :cascade do |t|
|
50
50
|
t.integer "image_id"
|
51
51
|
t.integer "loser_id"
|
52
|
-
t.datetime "created_at", :
|
53
|
-
t.datetime "updated_at", :
|
52
|
+
t.datetime "created_at", null: false
|
53
|
+
t.datetime "updated_at", null: false
|
54
54
|
end
|
55
55
|
|
56
|
-
create_table "lentil_flags", :
|
56
|
+
create_table "lentil_flags", force: :cascade do |t|
|
57
57
|
t.integer "image_id"
|
58
|
-
t.datetime "created_at", :
|
59
|
-
t.datetime "updated_at", :
|
58
|
+
t.datetime "created_at", null: false
|
59
|
+
t.datetime "updated_at", null: false
|
60
60
|
end
|
61
61
|
|
62
|
-
add_index "lentil_flags", ["image_id"], :
|
62
|
+
add_index "lentil_flags", ["image_id"], name: "index_flags_on_image_id"
|
63
63
|
|
64
|
-
create_table "lentil_images", :
|
64
|
+
create_table "lentil_images", force: :cascade do |t|
|
65
65
|
t.text "description"
|
66
|
-
t.datetime "created_at",
|
67
|
-
t.datetime "updated_at",
|
68
|
-
t.integer "like_votes_count",
|
69
|
-
t.string "url"
|
66
|
+
t.datetime "created_at", null: false
|
67
|
+
t.datetime "updated_at", null: false
|
68
|
+
t.integer "like_votes_count", default: 0
|
69
|
+
t.string "url", limit: 255
|
70
70
|
t.integer "user_id"
|
71
|
-
t.integer "state",
|
72
|
-
t.string "external_identifier"
|
73
|
-
t.string "long_url"
|
71
|
+
t.integer "state", default: 0
|
72
|
+
t.string "external_identifier", limit: 255
|
73
|
+
t.string "long_url", limit: 255
|
74
74
|
t.text "original_metadata"
|
75
75
|
t.datetime "original_datetime"
|
76
|
-
t.boolean "staff_like",
|
76
|
+
t.boolean "staff_like", default: false
|
77
77
|
t.integer "moderator_id"
|
78
78
|
t.datetime "moderated_at"
|
79
|
-
t.boolean "second_moderation",
|
80
|
-
t.integer "wins_count",
|
81
|
-
t.integer "losses_count",
|
79
|
+
t.boolean "second_moderation", default: false
|
80
|
+
t.integer "wins_count", default: 0
|
81
|
+
t.integer "losses_count", default: 0
|
82
82
|
t.float "win_pct"
|
83
|
-
t.integer "popular_score",
|
83
|
+
t.integer "popular_score", default: 0
|
84
84
|
t.datetime "file_harvested_date"
|
85
|
-
t.integer "file_harvest_failed",
|
85
|
+
t.integer "file_harvest_failed", default: 0
|
86
86
|
t.datetime "donor_agreement_submitted_date"
|
87
|
-
t.integer "donor_agreement_failed",
|
88
|
-
t.integer "failed_file_checks",
|
87
|
+
t.integer "donor_agreement_failed", default: 0
|
88
|
+
t.integer "failed_file_checks", default: 0
|
89
89
|
t.datetime "file_last_checked"
|
90
90
|
t.datetime "donor_agreement_rejected"
|
91
|
-
t.boolean "do_not_request_donation",
|
91
|
+
t.boolean "do_not_request_donation", default: false
|
92
92
|
t.datetime "last_donor_agreement_failure_date"
|
93
|
-
t.string "media_type"
|
94
|
-
t.string "video_url"
|
95
|
-
t.boolean "suppressed",
|
93
|
+
t.string "media_type", limit: 255
|
94
|
+
t.string "video_url", limit: 255
|
95
|
+
t.boolean "suppressed", default: false
|
96
96
|
end
|
97
97
|
|
98
|
-
add_index "lentil_images", ["created_at"], :
|
99
|
-
add_index "lentil_images", ["do_not_request_donation"], :
|
100
|
-
add_index "lentil_images", ["external_identifier"], :
|
101
|
-
add_index "lentil_images", ["failed_file_checks"], :
|
102
|
-
add_index "lentil_images", ["file_last_checked"], :
|
103
|
-
add_index "lentil_images", ["last_donor_agreement_failure_date"], :
|
104
|
-
add_index "lentil_images", ["moderator_id"], :
|
105
|
-
add_index "lentil_images", ["original_datetime"], :
|
106
|
-
add_index "lentil_images", ["staff_like"], :
|
107
|
-
add_index "lentil_images", ["state"], :
|
108
|
-
add_index "lentil_images", ["suppressed"], :
|
109
|
-
add_index "lentil_images", ["updated_at"], :
|
110
|
-
add_index "lentil_images", ["user_id"], :
|
111
|
-
|
112
|
-
create_table "lentil_licenses", :
|
113
|
-
t.string "name"
|
98
|
+
add_index "lentil_images", ["created_at"], name: "index_lentil_images_on_created_at"
|
99
|
+
add_index "lentil_images", ["do_not_request_donation"], name: "index_lentil_images_on_do_not_request_donation"
|
100
|
+
add_index "lentil_images", ["external_identifier"], name: "index_images_on_external_identifier"
|
101
|
+
add_index "lentil_images", ["failed_file_checks"], name: "index_lentil_images_on_failed_file_checks"
|
102
|
+
add_index "lentil_images", ["file_last_checked"], name: "index_lentil_images_on_file_last_checked"
|
103
|
+
add_index "lentil_images", ["last_donor_agreement_failure_date"], name: "index_lentil_images_on_last_donor_agreement_failure_date"
|
104
|
+
add_index "lentil_images", ["moderator_id"], name: "index_images_on_moderator_id"
|
105
|
+
add_index "lentil_images", ["original_datetime"], name: "index_lentil_images_on_original_datetime"
|
106
|
+
add_index "lentil_images", ["staff_like"], name: "index_lentil_images_on_staff_like"
|
107
|
+
add_index "lentil_images", ["state"], name: "index_lentil_images_on_state"
|
108
|
+
add_index "lentil_images", ["suppressed"], name: "index_lentil_images_on_suppressed"
|
109
|
+
add_index "lentil_images", ["updated_at"], name: "index_lentil_images_on_updated_at"
|
110
|
+
add_index "lentil_images", ["user_id"], name: "index_lentil_images_on_user_id"
|
111
|
+
|
112
|
+
create_table "lentil_licenses", force: :cascade do |t|
|
113
|
+
t.string "name", limit: 255
|
114
114
|
t.text "description"
|
115
|
-
t.string "url"
|
116
|
-
t.datetime "created_at",
|
117
|
-
t.datetime "updated_at",
|
118
|
-
t.string "short_name"
|
115
|
+
t.string "url", limit: 255
|
116
|
+
t.datetime "created_at", null: false
|
117
|
+
t.datetime "updated_at", null: false
|
118
|
+
t.string "short_name", limit: 255
|
119
119
|
end
|
120
120
|
|
121
|
-
add_index "lentil_licenses", ["short_name"], :
|
121
|
+
add_index "lentil_licenses", ["short_name"], name: "index_licenses_on_short_name"
|
122
122
|
|
123
|
-
create_table "lentil_licensings", :
|
123
|
+
create_table "lentil_licensings", force: :cascade do |t|
|
124
124
|
t.integer "image_id"
|
125
125
|
t.integer "license_id"
|
126
|
-
t.datetime "created_at", :
|
127
|
-
t.datetime "updated_at", :
|
126
|
+
t.datetime "created_at", null: false
|
127
|
+
t.datetime "updated_at", null: false
|
128
128
|
end
|
129
129
|
|
130
|
-
add_index "lentil_licensings", ["image_id"], :
|
131
|
-
add_index "lentil_licensings", ["license_id"], :
|
130
|
+
add_index "lentil_licensings", ["image_id"], name: "index_licensings_on_image_id"
|
131
|
+
add_index "lentil_licensings", ["license_id"], name: "index_licensings_on_license_id"
|
132
132
|
|
133
|
-
create_table "lentil_like_votes", :
|
133
|
+
create_table "lentil_like_votes", force: :cascade do |t|
|
134
134
|
t.integer "image_id"
|
135
|
-
t.datetime "created_at", :
|
136
|
-
t.datetime "updated_at", :
|
135
|
+
t.datetime "created_at", null: false
|
136
|
+
t.datetime "updated_at", null: false
|
137
137
|
end
|
138
138
|
|
139
|
-
add_index "lentil_like_votes", ["image_id"], :
|
139
|
+
add_index "lentil_like_votes", ["image_id"], name: "index_like_votes_on_image_id"
|
140
140
|
|
141
|
-
create_table "lentil_services", :
|
142
|
-
t.string "name"
|
143
|
-
t.string "url"
|
144
|
-
t.datetime "created_at",
|
145
|
-
t.datetime "updated_at",
|
141
|
+
create_table "lentil_services", force: :cascade do |t|
|
142
|
+
t.string "name", limit: 255
|
143
|
+
t.string "url", limit: 255
|
144
|
+
t.datetime "created_at", null: false
|
145
|
+
t.datetime "updated_at", null: false
|
146
146
|
end
|
147
147
|
|
148
|
-
add_index "lentil_services", ["name"], :
|
148
|
+
add_index "lentil_services", ["name"], name: "index_services_on_name"
|
149
149
|
|
150
|
-
create_table "lentil_taggings", :
|
150
|
+
create_table "lentil_taggings", force: :cascade do |t|
|
151
151
|
t.integer "image_id"
|
152
152
|
t.integer "tag_id"
|
153
|
-
t.datetime "created_at",
|
154
|
-
t.datetime "updated_at",
|
155
|
-
t.boolean "staff_tag", :
|
153
|
+
t.datetime "created_at", null: false
|
154
|
+
t.datetime "updated_at", null: false
|
155
|
+
t.boolean "staff_tag", default: false
|
156
156
|
end
|
157
157
|
|
158
|
-
add_index "lentil_taggings", ["image_id"], :
|
159
|
-
add_index "lentil_taggings", ["tag_id"], :
|
158
|
+
add_index "lentil_taggings", ["image_id"], name: "index_taggings_on_image_id"
|
159
|
+
add_index "lentil_taggings", ["tag_id"], name: "index_taggings_on_tag_id"
|
160
160
|
|
161
|
-
create_table "lentil_tags", :
|
162
|
-
t.string "name"
|
163
|
-
t.datetime "created_at",
|
164
|
-
t.datetime "updated_at",
|
161
|
+
create_table "lentil_tags", force: :cascade do |t|
|
162
|
+
t.string "name", limit: 255
|
163
|
+
t.datetime "created_at", null: false
|
164
|
+
t.datetime "updated_at", null: false
|
165
165
|
end
|
166
166
|
|
167
|
-
add_index "lentil_tags", ["name"], :
|
167
|
+
add_index "lentil_tags", ["name"], name: "index_tags_on_name"
|
168
168
|
|
169
|
-
create_table "lentil_tagset_assignments", :
|
169
|
+
create_table "lentil_tagset_assignments", force: :cascade do |t|
|
170
170
|
t.integer "tag_id"
|
171
171
|
t.integer "tagset_id"
|
172
|
-
t.datetime "created_at", :
|
173
|
-
t.datetime "updated_at", :
|
172
|
+
t.datetime "created_at", null: false
|
173
|
+
t.datetime "updated_at", null: false
|
174
174
|
end
|
175
175
|
|
176
|
-
add_index "lentil_tagset_assignments", ["tag_id"], :
|
177
|
-
add_index "lentil_tagset_assignments", ["tagset_id"], :
|
176
|
+
add_index "lentil_tagset_assignments", ["tag_id"], name: "index_tagset_assignments_on_tag_id"
|
177
|
+
add_index "lentil_tagset_assignments", ["tagset_id"], name: "index_tagset_assignments_on_tagset_id"
|
178
178
|
|
179
|
-
create_table "lentil_tagsets", :
|
180
|
-
t.string "title"
|
179
|
+
create_table "lentil_tagsets", force: :cascade do |t|
|
180
|
+
t.string "title", limit: 255
|
181
181
|
t.text "description"
|
182
|
-
t.datetime "created_at",
|
183
|
-
t.datetime "updated_at",
|
184
|
-
t.boolean "harvest",
|
182
|
+
t.datetime "created_at", null: false
|
183
|
+
t.datetime "updated_at", null: false
|
184
|
+
t.boolean "harvest", default: false
|
185
185
|
end
|
186
186
|
|
187
|
-
create_table "lentil_users", :
|
188
|
-
t.string "user_name"
|
189
|
-
t.string "full_name"
|
187
|
+
create_table "lentil_users", force: :cascade do |t|
|
188
|
+
t.string "user_name", limit: 255
|
189
|
+
t.string "full_name", limit: 255
|
190
190
|
t.boolean "banned"
|
191
|
-
t.datetime "created_at",
|
192
|
-
t.datetime "updated_at",
|
191
|
+
t.datetime "created_at", null: false
|
192
|
+
t.datetime "updated_at", null: false
|
193
193
|
t.integer "service_id"
|
194
194
|
t.text "bio"
|
195
|
-
t.integer "images_count",
|
195
|
+
t.integer "images_count", default: 0
|
196
196
|
end
|
197
197
|
|
198
|
-
add_index "lentil_users", ["user_name"], :
|
198
|
+
add_index "lentil_users", ["user_name"], name: "index_users_on_user_name"
|
199
199
|
|
200
|
-
create_table "sessions", :
|
201
|
-
t.string "session_id", :null
|
200
|
+
create_table "sessions", force: :cascade do |t|
|
201
|
+
t.string "session_id", limit: 255, null: false
|
202
202
|
t.text "data"
|
203
|
-
t.datetime "created_at",
|
204
|
-
t.datetime "updated_at",
|
203
|
+
t.datetime "created_at", null: false
|
204
|
+
t.datetime "updated_at", null: false
|
205
205
|
end
|
206
206
|
|
207
|
-
add_index "sessions", ["session_id"], :
|
208
|
-
add_index "sessions", ["updated_at"], :
|
207
|
+
add_index "sessions", ["session_id"], name: "index_sessions_on_session_id"
|
208
|
+
add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at"
|
209
209
|
|
210
210
|
end
|
data/test/dummy/db/seeds.rb
CHANGED
@@ -1 +1,2 @@
|
|
1
|
-
|
1
|
+
|
2
|
+
Lentil::Engine.load_seed
|
File without changes
|
File without changes
|
data/test/dummy/public/404.html
CHANGED
@@ -2,25 +2,66 @@
|
|
2
2
|
<html>
|
3
3
|
<head>
|
4
4
|
<title>The page you were looking for doesn't exist (404)</title>
|
5
|
-
<
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
5
|
+
<meta name="viewport" content="width=device-width,initial-scale=1">
|
6
|
+
<style>
|
7
|
+
body {
|
8
|
+
background-color: #EFEFEF;
|
9
|
+
color: #2E2F30;
|
10
|
+
text-align: center;
|
11
|
+
font-family: arial, sans-serif;
|
12
|
+
margin: 0;
|
13
|
+
}
|
14
|
+
|
15
|
+
div.dialog {
|
16
|
+
width: 95%;
|
17
|
+
max-width: 33em;
|
18
|
+
margin: 4em auto 0;
|
19
|
+
}
|
20
|
+
|
21
|
+
div.dialog > div {
|
22
|
+
border: 1px solid #CCC;
|
23
|
+
border-right-color: #999;
|
24
|
+
border-left-color: #999;
|
25
|
+
border-bottom-color: #BBB;
|
26
|
+
border-top: #B00100 solid 4px;
|
27
|
+
border-top-left-radius: 9px;
|
28
|
+
border-top-right-radius: 9px;
|
29
|
+
background-color: white;
|
30
|
+
padding: 7px 12% 0;
|
31
|
+
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
32
|
+
}
|
33
|
+
|
34
|
+
h1 {
|
35
|
+
font-size: 100%;
|
36
|
+
color: #730E15;
|
37
|
+
line-height: 1.5em;
|
38
|
+
}
|
39
|
+
|
40
|
+
div.dialog > p {
|
41
|
+
margin: 0 0 1em;
|
42
|
+
padding: 1em;
|
43
|
+
background-color: #F7F7F7;
|
44
|
+
border: 1px solid #CCC;
|
45
|
+
border-right-color: #999;
|
46
|
+
border-left-color: #999;
|
47
|
+
border-bottom-color: #999;
|
48
|
+
border-bottom-left-radius: 4px;
|
49
|
+
border-bottom-right-radius: 4px;
|
50
|
+
border-top-color: #DADADA;
|
51
|
+
color: #666;
|
52
|
+
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
53
|
+
}
|
16
54
|
</style>
|
17
55
|
</head>
|
18
56
|
|
19
57
|
<body>
|
20
58
|
<!-- This file lives in public/404.html -->
|
21
59
|
<div class="dialog">
|
22
|
-
<
|
23
|
-
|
60
|
+
<div>
|
61
|
+
<h1>The page you were looking for doesn't exist.</h1>
|
62
|
+
<p>You may have mistyped the address or the page may have moved.</p>
|
63
|
+
</div>
|
64
|
+
<p>If you are the application owner check the logs for more information.</p>
|
24
65
|
</div>
|
25
66
|
</body>
|
26
67
|
</html>
|
data/test/dummy/public/422.html
CHANGED
@@ -2,25 +2,66 @@
|
|
2
2
|
<html>
|
3
3
|
<head>
|
4
4
|
<title>The change you wanted was rejected (422)</title>
|
5
|
-
<
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
5
|
+
<meta name="viewport" content="width=device-width,initial-scale=1">
|
6
|
+
<style>
|
7
|
+
body {
|
8
|
+
background-color: #EFEFEF;
|
9
|
+
color: #2E2F30;
|
10
|
+
text-align: center;
|
11
|
+
font-family: arial, sans-serif;
|
12
|
+
margin: 0;
|
13
|
+
}
|
14
|
+
|
15
|
+
div.dialog {
|
16
|
+
width: 95%;
|
17
|
+
max-width: 33em;
|
18
|
+
margin: 4em auto 0;
|
19
|
+
}
|
20
|
+
|
21
|
+
div.dialog > div {
|
22
|
+
border: 1px solid #CCC;
|
23
|
+
border-right-color: #999;
|
24
|
+
border-left-color: #999;
|
25
|
+
border-bottom-color: #BBB;
|
26
|
+
border-top: #B00100 solid 4px;
|
27
|
+
border-top-left-radius: 9px;
|
28
|
+
border-top-right-radius: 9px;
|
29
|
+
background-color: white;
|
30
|
+
padding: 7px 12% 0;
|
31
|
+
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
32
|
+
}
|
33
|
+
|
34
|
+
h1 {
|
35
|
+
font-size: 100%;
|
36
|
+
color: #730E15;
|
37
|
+
line-height: 1.5em;
|
38
|
+
}
|
39
|
+
|
40
|
+
div.dialog > p {
|
41
|
+
margin: 0 0 1em;
|
42
|
+
padding: 1em;
|
43
|
+
background-color: #F7F7F7;
|
44
|
+
border: 1px solid #CCC;
|
45
|
+
border-right-color: #999;
|
46
|
+
border-left-color: #999;
|
47
|
+
border-bottom-color: #999;
|
48
|
+
border-bottom-left-radius: 4px;
|
49
|
+
border-bottom-right-radius: 4px;
|
50
|
+
border-top-color: #DADADA;
|
51
|
+
color: #666;
|
52
|
+
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
53
|
+
}
|
16
54
|
</style>
|
17
55
|
</head>
|
18
56
|
|
19
57
|
<body>
|
20
58
|
<!-- This file lives in public/422.html -->
|
21
59
|
<div class="dialog">
|
22
|
-
<
|
23
|
-
|
60
|
+
<div>
|
61
|
+
<h1>The change you wanted was rejected.</h1>
|
62
|
+
<p>Maybe you tried to change something you didn't have access to.</p>
|
63
|
+
</div>
|
64
|
+
<p>If you are the application owner check the logs for more information.</p>
|
24
65
|
</div>
|
25
66
|
</body>
|
26
67
|
</html>
|
data/test/dummy/public/500.html
CHANGED
@@ -2,24 +2,65 @@
|
|
2
2
|
<html>
|
3
3
|
<head>
|
4
4
|
<title>We're sorry, but something went wrong (500)</title>
|
5
|
-
<
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
5
|
+
<meta name="viewport" content="width=device-width,initial-scale=1">
|
6
|
+
<style>
|
7
|
+
body {
|
8
|
+
background-color: #EFEFEF;
|
9
|
+
color: #2E2F30;
|
10
|
+
text-align: center;
|
11
|
+
font-family: arial, sans-serif;
|
12
|
+
margin: 0;
|
13
|
+
}
|
14
|
+
|
15
|
+
div.dialog {
|
16
|
+
width: 95%;
|
17
|
+
max-width: 33em;
|
18
|
+
margin: 4em auto 0;
|
19
|
+
}
|
20
|
+
|
21
|
+
div.dialog > div {
|
22
|
+
border: 1px solid #CCC;
|
23
|
+
border-right-color: #999;
|
24
|
+
border-left-color: #999;
|
25
|
+
border-bottom-color: #BBB;
|
26
|
+
border-top: #B00100 solid 4px;
|
27
|
+
border-top-left-radius: 9px;
|
28
|
+
border-top-right-radius: 9px;
|
29
|
+
background-color: white;
|
30
|
+
padding: 7px 12% 0;
|
31
|
+
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
32
|
+
}
|
33
|
+
|
34
|
+
h1 {
|
35
|
+
font-size: 100%;
|
36
|
+
color: #730E15;
|
37
|
+
line-height: 1.5em;
|
38
|
+
}
|
39
|
+
|
40
|
+
div.dialog > p {
|
41
|
+
margin: 0 0 1em;
|
42
|
+
padding: 1em;
|
43
|
+
background-color: #F7F7F7;
|
44
|
+
border: 1px solid #CCC;
|
45
|
+
border-right-color: #999;
|
46
|
+
border-left-color: #999;
|
47
|
+
border-bottom-color: #999;
|
48
|
+
border-bottom-left-radius: 4px;
|
49
|
+
border-bottom-right-radius: 4px;
|
50
|
+
border-top-color: #DADADA;
|
51
|
+
color: #666;
|
52
|
+
box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
|
53
|
+
}
|
16
54
|
</style>
|
17
55
|
</head>
|
18
56
|
|
19
57
|
<body>
|
20
58
|
<!-- This file lives in public/500.html -->
|
21
59
|
<div class="dialog">
|
22
|
-
<
|
60
|
+
<div>
|
61
|
+
<h1>We're sorry, but something went wrong.</h1>
|
62
|
+
</div>
|
63
|
+
<p>If you are the application owner check the logs for more information.</p>
|
23
64
|
</div>
|
24
65
|
</body>
|
25
66
|
</html>
|
@@ -0,0 +1 @@
|
|
1
|
+
test/dummy/test/../../fixtures
|
@@ -9,38 +9,38 @@ class AdminImagesControllerTest < ActionController::TestCase
|
|
9
9
|
end
|
10
10
|
|
11
11
|
test "should get to images index" do
|
12
|
-
get :index
|
12
|
+
get :index
|
13
13
|
assert_response :success
|
14
14
|
end
|
15
15
|
|
16
16
|
test "should get show view" do
|
17
|
-
get :show, {:id => lentil_images(:one).id
|
17
|
+
get :show, {:id => lentil_images(:one).id} #admin_lentil_image_path(lentil_images(:one)), :use_route => :lentil
|
18
18
|
assert_response :success
|
19
19
|
end
|
20
20
|
|
21
21
|
test "should get to images moderate new" do
|
22
|
-
get :moderate
|
22
|
+
get :moderate
|
23
23
|
assert_response :success
|
24
24
|
end
|
25
25
|
|
26
26
|
test "should get to images moderate skipped" do
|
27
|
-
get :moderate_skipped
|
27
|
+
get :moderate_skipped
|
28
28
|
assert_response :success
|
29
29
|
end
|
30
30
|
|
31
31
|
test "should get to moderate flagged" do
|
32
|
-
get :moderate_flagged
|
32
|
+
get :moderate_flagged
|
33
33
|
assert_response :success
|
34
34
|
end
|
35
35
|
|
36
36
|
test "should get flagging history" do
|
37
|
-
get :flagging_history
|
37
|
+
get :flagging_history
|
38
38
|
assert_response :success
|
39
39
|
end
|
40
40
|
|
41
41
|
test "should get to manual images input" do
|
42
|
-
get :manual_input
|
42
|
+
get :manual_input
|
43
43
|
assert_response :success
|
44
44
|
end
|
45
45
|
|
46
|
-
end
|
46
|
+
end
|