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
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 06a5c5e336b477d67cbbcfb421f23a7232ff13c0
|
4
|
+
data.tar.gz: 8cade0283c5c3aaa9cbbd4854874b9c0622e5d3e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3801a2db27015adfab01a1de57e2d80ce79adca4c3e0218e83221e06fc77713823edfc07d5abd102c3c4ceea16c270ff8e3658da74551eda7a48d291185f53c2
|
7
|
+
data.tar.gz: 415e66078b508188a6c6e49716f50bf86b39435cc3bed86e57eb42b659bd9ff705145cc2a45beb583c1f5d8f28a070d0c085e4eda86e15d88dcb83fb13ac8b16
|
data/README.md
CHANGED
@@ -17,16 +17,16 @@ Although we are using this gem in production, **this gem should be considered an
|
|
17
17
|
|
18
18
|
## Installation
|
19
19
|
|
20
|
-
lentil has been tested under Ruby
|
20
|
+
lentil has been tested under Ruby 2.2.x through 2.3.x.
|
21
21
|
|
22
|
-
### Create a new Rails app with Rails
|
22
|
+
### Create a new Rails app with Rails 4.2.x
|
23
23
|
|
24
24
|
```sh
|
25
|
-
gem install rails -v '~>
|
26
|
-
rails
|
25
|
+
gem install rails -v '~> 4.2.7'
|
26
|
+
rails _4.2.7.1_ new --skip-turbolinks your_app_name
|
27
27
|
cd your_app_name
|
28
28
|
```
|
29
|
-
> In the example above, `
|
29
|
+
> In the example above, `4.2.7.1` should be the version of Rails 4.x that is installed by the `gem` command.
|
30
30
|
|
31
31
|
### Add lentil and therubyracer (or another ExecJS runtime) to your Gemfile and run `bundle update`
|
32
32
|
|
@@ -187,7 +187,6 @@ bundle install
|
|
187
187
|
|
188
188
|
```sh
|
189
189
|
RAILS_ENV=test bundle exec rake app:db:migrate
|
190
|
-
RAILS_ENV=test bundle exec rake app:db:test:prepare
|
191
190
|
```
|
192
191
|
|
193
192
|
- Run the tests
|
@@ -5,6 +5,17 @@
|
|
5
5
|
$(document).ready(function() {
|
6
6
|
var url;
|
7
7
|
|
8
|
+
// Fix subdirectory deployment nav links
|
9
|
+
// https://github.com/activeadmin/activeadmin/issues/101#issuecomment-244028956
|
10
|
+
$('#header li a').each(function() {
|
11
|
+
var current_location, href, location_prefix, url_suffix;
|
12
|
+
href = $(this).attr('href');
|
13
|
+
url_suffix = href.replace(/.*\/admin\//, '');
|
14
|
+
current_location = document.location.pathname;
|
15
|
+
location_prefix = current_location.replace(/admin\/?.*/, "admin/");
|
16
|
+
return $(this).attr('href', location_prefix + url_suffix);
|
17
|
+
});
|
18
|
+
|
8
19
|
if (window.location.pathname.indexOf('/lentil_tagsets/new') > -1) {
|
9
20
|
url = '../lentil_tags/tags_api';
|
10
21
|
} else {
|
@@ -0,0 +1 @@
|
|
1
|
+
#= require active_admin/base
|
@@ -32,7 +32,7 @@ function listenforpopstate() {
|
|
32
32
|
};
|
33
33
|
}
|
34
34
|
|
35
|
-
function pushimageurl() {
|
35
|
+
function pushimageurl(imageId) {
|
36
36
|
|
37
37
|
// extract application root url
|
38
38
|
var approot = FancyBoxCloseFunctionState.pathname.replace(/(photographers\/\d+|images|thisorthat\/battle|thisorthat\/battle_leaders)\/\D*\/?/, "");
|
@@ -104,8 +104,9 @@ function addfancybox() {
|
|
104
104
|
window.history.pushState(null,null,FancyBoxCloseFunctionState.pathname);
|
105
105
|
},
|
106
106
|
beforeShow : function() {
|
107
|
-
|
108
|
-
|
107
|
+
var imgContainer = $(this.element).closest("div.battle-image-tile, div.image-tile");
|
108
|
+
this.title = $(imgContainer).find(".text-overlay").html();
|
109
|
+
imageId = $(imgContainer).attr("id");
|
109
110
|
$(".fancybox-wrap").attr('id', imageId);
|
110
111
|
pushimageurl(imageId);
|
111
112
|
},
|
@@ -129,7 +130,7 @@ function addfancybox() {
|
|
129
130
|
// this is to check that the fancybox is really visible
|
130
131
|
// afterClose is fired off on fancybox open -- a bug
|
131
132
|
FancyBoxCloseFunctionState.fancyboxvisible = true;
|
132
|
-
imageId = $(this.element).
|
133
|
+
imageId = $(this.element).closest("div.image-tile, div.battle-image-tile").attr("id");
|
133
134
|
|
134
135
|
// check whether we're on the last image in the gallery
|
135
136
|
// and whether there's more than one page of images
|
@@ -3,6 +3,7 @@ function buttonhandler() {
|
|
3
3
|
$("body").on("click", ".like-btn, .flag-confirm", function(e) {
|
4
4
|
button = $(this);
|
5
5
|
imageId = $(".fancybox-wrap, .image-show").attr("id");
|
6
|
+
|
6
7
|
if (!$(button).is(".already-clicked")) {
|
7
8
|
url = $(button).attr("href");
|
8
9
|
$.post(url, function() {
|
@@ -20,4 +21,11 @@ function buttonhandler() {
|
|
20
21
|
}
|
21
22
|
e.preventDefault();
|
22
23
|
});
|
24
|
+
|
25
|
+
// Show flag modal
|
26
|
+
$("body").on("click", ".flag-btn", function (e) {
|
27
|
+
var imageId = $(".fancybox-wrap, .image-show").attr("id");
|
28
|
+
var modalId = "#myModal-" + imageId;
|
29
|
+
$(modalId).modal('show');
|
30
|
+
});
|
23
31
|
}
|
@@ -1,4 +1,6 @@
|
|
1
1
|
function addimageerrors() {
|
2
|
+
$("a[target=_blank]").attr("rel", "noopener noreferrer");
|
3
|
+
|
2
4
|
$(".instagram-img, .battle-img, .fancybox-img, .fancybox-video").off("error").on("error", function () {
|
3
5
|
$(this).parents("div.image-tile, li.image-animate-tile").remove();
|
4
6
|
});
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -2,5 +2,10 @@ module Lentil
|
|
2
2
|
class ApplicationController < ActionController::Base
|
3
3
|
# FIXME: I don't know why the engine isn't using its own application layout like it is supposed to.
|
4
4
|
layout "lentil/application"
|
5
|
+
|
6
|
+
private
|
7
|
+
def allow_iframe
|
8
|
+
response.headers.delete "X-Frame-Options"
|
9
|
+
end
|
5
10
|
end
|
6
|
-
end
|
11
|
+
end
|
@@ -25,7 +25,7 @@ module Lentil
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def get_images
|
28
|
-
images = Image.approved.
|
28
|
+
images = Image.approved.order_by_rand.limit(20).sort_by{|i| i.battles_count}
|
29
29
|
images = test_urls(images, 2).sort_by{ |i| i.id }
|
30
30
|
|
31
31
|
session[:battle_images] = []
|
@@ -116,4 +116,4 @@ module Lentil
|
|
116
116
|
end
|
117
117
|
end
|
118
118
|
end
|
119
|
-
end
|
119
|
+
end
|
@@ -24,9 +24,5 @@ class Lentil::AdminUser < ActiveRecord::Base
|
|
24
24
|
devise :database_authenticatable,
|
25
25
|
:recoverable, :rememberable, :trackable, :validatable
|
26
26
|
|
27
|
-
# Setup accessible (or protected) attributes for your model
|
28
|
-
attr_accessible :email, :password, :password_confirmation, :remember_me
|
29
|
-
# attr_accessible :title, :body
|
30
|
-
|
31
27
|
has_many :moderated_images, :class_name => Lentil::Image, :foreign_key => :moderator_id
|
32
28
|
end
|
data/app/models/lentil/battle.rb
CHANGED
@@ -10,8 +10,6 @@
|
|
10
10
|
#
|
11
11
|
|
12
12
|
class Lentil::Battle < ActiveRecord::Base
|
13
|
-
attr_accessible :image_id, :loser_id, :loser
|
14
|
-
|
15
13
|
belongs_to :image, :counter_cache => :wins_count, :autosave => true
|
16
14
|
belongs_to :loser, :class_name => "Image", :counter_cache => :losses_count, :autosave => true
|
17
15
|
|
data/app/models/lentil/flag.rb
CHANGED
data/app/models/lentil/image.rb
CHANGED
@@ -33,11 +33,6 @@
|
|
33
33
|
#
|
34
34
|
|
35
35
|
class Lentil::Image < ActiveRecord::Base
|
36
|
-
attr_accessible :description, :title, :user_id, :state, :staff_like, :url, :long_url, :external_identifier,
|
37
|
-
:original_datetime, :popular_score, :taggings, :tag_id, :moderator, :moderated_at, :second_moderation,
|
38
|
-
:do_not_request_donation, :donor_agreement_rejected, :media_type, :video_url, :suppressed
|
39
|
-
|
40
|
-
attr_protected :original_metadata
|
41
36
|
stores_emoji_characters :description
|
42
37
|
|
43
38
|
has_many :won_battles, :class_name => "Battle"
|
@@ -59,7 +54,7 @@ class Lentil::Image < ActiveRecord::Base
|
|
59
54
|
|
60
55
|
belongs_to :moderator, :class_name => Lentil::AdminUser
|
61
56
|
|
62
|
-
default_scope where("failed_file_checks < 3")
|
57
|
+
default_scope { where("failed_file_checks < 3") }
|
63
58
|
|
64
59
|
validates_uniqueness_of :external_identifier, :scope => :user_id
|
65
60
|
validates :url, :format => URI::regexp(%w(http https))
|
@@ -192,6 +187,11 @@ class Lentil::Image < ActiveRecord::Base
|
|
192
187
|
end
|
193
188
|
|
194
189
|
def original_metadata=(meta)
|
195
|
-
write_attribute(:original_metadata, meta.to_hash)
|
190
|
+
write_attribute(:original_metadata, Oj.load(Emojimmy.emoji_to_token(meta.to_hash.to_json)))
|
191
|
+
end
|
192
|
+
|
193
|
+
def original_metadata
|
194
|
+
Oj.load(Emojimmy.token_to_emoji(super.to_json))
|
196
195
|
end
|
196
|
+
|
197
197
|
end
|
data/app/models/lentil/tag.rb
CHANGED
@@ -9,20 +9,19 @@
|
|
9
9
|
#
|
10
10
|
|
11
11
|
class Lentil::Tag < ActiveRecord::Base
|
12
|
-
attr_accessible :name, :staff_tag
|
13
|
-
|
14
12
|
stores_emoji_characters :name
|
13
|
+
|
15
14
|
has_many :tagset_assignments
|
16
|
-
has_many :tagsets, :through
|
15
|
+
has_many :tagsets, :through => :tagset_assignments
|
17
16
|
|
18
17
|
has_many :taggings
|
19
|
-
has_many :images, :through
|
18
|
+
has_many :images, :through => :taggings
|
20
19
|
|
21
20
|
validates_presence_of :name
|
22
21
|
|
23
|
-
scope :harvestable, where(:lentil_tagsets => {:harvest => true}).includes(:tagsets)
|
24
|
-
scope :not_harvestable, where(:lentil_tagsets => {:harvest => false}).includes(:tagsets)
|
25
|
-
scope :no_tagsets, where(:lentil_tagset_assignments => {:tag_id => nil}).includes(:tagset_assignments)
|
22
|
+
scope :harvestable, -> {where(:lentil_tagsets => {:harvest => true}).includes(:tagsets)}
|
23
|
+
scope :not_harvestable, -> {where(:lentil_tagsets => {:harvest => false}).includes(:tagsets)}
|
24
|
+
scope :no_tagsets, -> {where(:lentil_tagset_assignments => {:tag_id => nil}).includes(:tagset_assignments)}
|
26
25
|
|
27
26
|
#Stripping tags on write
|
28
27
|
def name=(new_name)
|
data/app/models/lentil/tagset.rb
CHANGED
data/app/models/lentil/user.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
<!-- Flagging Modal -->
|
2
|
-
<div id="myModal
|
2
|
+
<div id="myModal-image_<%= image.id %>" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
3
3
|
<div class="modal-header">
|
4
4
|
<h3 id="myModalLabel"><%= t 'lentil.flagging_modal.header' %></h3>
|
5
5
|
</div>
|
@@ -11,4 +11,4 @@
|
|
11
11
|
<button href="<%= tally_flag_path(image.id) %>" method="post" type="submit" class="btn btn-danger flag-confirm" data-image-id="<%= image.id %>">
|
12
12
|
<%= t 'lentil.flagging_modal.yes_report_title' %></button>
|
13
13
|
</div>
|
14
|
-
</div>
|
14
|
+
</div>
|
@@ -14,9 +14,9 @@
|
|
14
14
|
<% end %>
|
15
15
|
</a>
|
16
16
|
</div>
|
17
|
-
<div class="battle-image-desc trunc-small"><div class="battle-image-inner-desc"><%= truncate(image.description, :length =>
|
18
|
-
<div class="battle-image-desc trunc-medium"><div class="battle-image-inner-desc"><%= truncate(image.description, :length =>
|
19
|
-
<div class="battle-image-desc trunc-large"><div class="battle-image-inner-desc"><%= truncate(image.description, :length =>
|
17
|
+
<div class="battle-image-desc trunc-small"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 22) %></div></div>
|
18
|
+
<div class="battle-image-desc trunc-medium"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 35) %></div></div>
|
19
|
+
<div class="battle-image-desc trunc-large"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 45) %></div></div>
|
20
20
|
<%= render "/layouts/lentil/image_popup", :image => image %>
|
21
21
|
<%= f.input :id, :as => :hidden %>
|
22
22
|
|
@@ -41,9 +41,9 @@
|
|
41
41
|
<% end %>
|
42
42
|
</a>
|
43
43
|
</div>
|
44
|
-
<div class="battle-image-desc trunc-small"><div class="battle-image-inner-desc"><%= truncate(image.description, :length =>
|
45
|
-
<div class="battle-image-desc trunc-medium"><div class="battle-image-inner-desc"><%= truncate(image.description, :length =>
|
46
|
-
<div class="battle-image-desc trunc-large"><div class="battle-image-inner-desc"><%= truncate(image.description, :length =>
|
44
|
+
<div class="battle-image-desc trunc-small"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 22) %></div></div>
|
45
|
+
<div class="battle-image-desc trunc-medium"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 35) %></div></div>
|
46
|
+
<div class="battle-image-desc trunc-large"><div class="battle-image-inner-desc"><%= truncate(image.description, :length => 45) %></div></div>
|
47
47
|
</a>
|
48
48
|
<%= render "/layouts/lentil/image_popup", :image => image %>
|
49
49
|
</div>
|
@@ -13,9 +13,31 @@ module Lentil
|
|
13
13
|
insert_into_file "config/application.rb", "\n # Inserted by lentil\n # End of lentil changes\n\n", :after => "class Application < Rails::Application\n"
|
14
14
|
end
|
15
15
|
|
16
|
+
desc "Remove test/performance/browsing_test.rb"
|
17
|
+
def remove_test_performance_browsing_test
|
18
|
+
remove_file("test/performance/browsing_test.rb")
|
19
|
+
end
|
20
|
+
|
21
|
+
desc "Remove gems"
|
22
|
+
def lentil_remove_gems
|
23
|
+
gsub_file "Gemfile", /^.*rails-perftest.*$/, ""
|
24
|
+
gsub_file "Gemfile", /^.*ruby-prof.*$/, ""
|
25
|
+
gsub_file "Gemfile", /^.*ruby-prof.*$/, ""
|
26
|
+
end
|
27
|
+
|
28
|
+
desc "Enable raise_in_transactions_callbacks"
|
29
|
+
def enable_raise_trans_cb
|
30
|
+
insert_into_file "config/application.rb", " config.active_record.raise_in_transactional_callbacks = true", :after => "# Inserted by lentil\n"
|
31
|
+
end
|
32
|
+
|
33
|
+
desc "Randomize tests"
|
34
|
+
def randomize_tests
|
35
|
+
insert_into_file "config/environments/test.rb", " config.active_support.test_order = :random", :before => "end"
|
36
|
+
end
|
37
|
+
|
16
38
|
desc 'precompile additional assets'
|
17
39
|
def precompile_assets
|
18
|
-
|
40
|
+
append_to_file "config/initializers/assets.rb", "Rails.application.config.assets.precompile += %w( *.js ^[^_]*.css *.css.erb lentil/iframe.js lentil/iframe.css addanimatedimages.js animatedimages/css/style.css )\n"
|
19
41
|
end
|
20
42
|
|
21
43
|
desc 'do not enforce available locales'
|
@@ -50,12 +72,12 @@ module Lentil
|
|
50
72
|
routes = <<-ROUTES
|
51
73
|
|
52
74
|
root :to => 'lentil/images#index'
|
53
|
-
ActiveAdmin.routes(self)
|
54
75
|
devise_for :admin_users, ActiveAdmin::Devise.config.merge(:class_name => 'Lentil::AdminUser')
|
76
|
+
ActiveAdmin.routes(self)
|
55
77
|
mount Lentil::Engine => "/"
|
56
78
|
|
57
79
|
ROUTES
|
58
|
-
insert_into_file "config/routes.rb", routes, :after => "
|
80
|
+
insert_into_file "config/routes.rb", routes, :after => "Rails.application.routes.draw do\n"
|
59
81
|
end
|
60
82
|
|
61
83
|
desc 'create application configuration file'
|
@@ -76,7 +98,14 @@ ROUTES
|
|
76
98
|
|
77
99
|
desc 'add javascript'
|
78
100
|
def add_javascript
|
79
|
-
gsub_file('app/assets/javascripts/application.js', '//= require_tree .',
|
101
|
+
gsub_file('app/assets/javascripts/application.js', '//= require_tree .',
|
102
|
+
'//= require lentil')
|
103
|
+
end
|
104
|
+
|
105
|
+
desc 'disable turbolinks'
|
106
|
+
def disable_turbolinks
|
107
|
+
gsub_file "app/assets/javascripts/application.js", "//= require turbolinks", ""
|
108
|
+
gsub_file "Gemfile", /^.*turbolinks.*$/, ""
|
80
109
|
end
|
81
110
|
|
82
111
|
desc 'add a dummy admin user to the development database?'
|
@@ -4,22 +4,18 @@
|
|
4
4
|
|
5
5
|
You will need to make the following changes:
|
6
6
|
|
7
|
-
1.
|
7
|
+
1. Re-run `bundle update`.
|
8
8
|
|
9
|
-
2.
|
9
|
+
2. If you haven't already, create an administrative user in development. See the project README.md.
|
10
10
|
|
11
|
-
3.
|
11
|
+
3. You may need to configure config/initializers/devise.rb
|
12
|
+
|
13
|
+
4. From the Devise documentation: "Ensure you have defined default url options in your environments files. Here is an example of default_url_options appropriate for a development environment in config/environments/development.rb:
|
12
14
|
|
13
15
|
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
|
14
16
|
|
15
17
|
In production, :host should be set to the actual host of your application."
|
16
18
|
|
17
|
-
|
18
|
-
|
19
|
-
4. Look at the README.md for how to begin harvesting images and customizing your application.
|
20
|
-
|
21
|
-
5. Enjoy!
|
22
|
-
|
23
|
-
|
24
|
-
|
19
|
+
5. Update that config/lentil_config.yml with your information. It is probably a good idea to add that file to your .gitignore too. You'll definitely want to change your instagram values and the default_image_search_tag.
|
25
20
|
|
21
|
+
6. Look at the README.md for how to begin harvesting images and customizing your application.
|
@@ -0,0 +1,54 @@
|
|
1
|
+
module Lentil
|
2
|
+
module Generators
|
3
|
+
class UpgradeV1Generator < Rails::Generators::Base
|
4
|
+
source_root File.expand_path('../templates', __FILE__)
|
5
|
+
|
6
|
+
desc "Remove test/performance/browsing_test.rb"
|
7
|
+
def remove_test_performance_browsing_test
|
8
|
+
remove_file("test/performance/browsing_test.rb")
|
9
|
+
end
|
10
|
+
|
11
|
+
desc "Update gems"
|
12
|
+
def lentil_update_gems
|
13
|
+
gsub_file "Gemfile", /^.*sass-rails.*$/, "gem 'sass-rails'"
|
14
|
+
gsub_file "Gemfile", /^.*coffee-rails.*$/, "gem 'coffee-rails'"
|
15
|
+
end
|
16
|
+
|
17
|
+
desc "Remove gems"
|
18
|
+
def lentil_remove_gems
|
19
|
+
gsub_file "Gemfile", /^.*rails-perftest.*$/, ""
|
20
|
+
gsub_file "Gemfile", /^.*ruby-prof.*$/, ""
|
21
|
+
end
|
22
|
+
|
23
|
+
desc "Enable raise_in_transactions_callbacks"
|
24
|
+
def enable_raise_trans_cb
|
25
|
+
insert_into_file "config/application.rb", " config.active_record.raise_in_transactional_callbacks = true", :after => "# Inserted by lentil\n"
|
26
|
+
end
|
27
|
+
|
28
|
+
desc "Randomize tests"
|
29
|
+
def randomize_tests
|
30
|
+
insert_into_file "config/environments/test.rb", " config.active_support.test_order = :random", :before => "end"
|
31
|
+
end
|
32
|
+
|
33
|
+
desc "Update precompilation paths"
|
34
|
+
def update_precompilation_paths
|
35
|
+
gsub_file "config/application.rb", /^.*Rails.application.config.assets.precompile.*$/, ""
|
36
|
+
append_to_file "config/initializers/assets.rb", "Rails.application.config.assets.precompile += %w( *.js ^[^_]*.css *.css.erb lentil/iframe.js lentil/iframe.css addanimatedimages.js animatedimages/css/style.css )\n"
|
37
|
+
end
|
38
|
+
|
39
|
+
desc 'insert routes'
|
40
|
+
def insert_routes
|
41
|
+
routes = <<-ROUTES
|
42
|
+
|
43
|
+
root :to => 'lentil/images#index'
|
44
|
+
devise_for :admin_users, ActiveAdmin::Devise.config.merge(:class_name => 'Lentil::AdminUser')
|
45
|
+
ActiveAdmin.routes(self)
|
46
|
+
mount Lentil::Engine => "/"
|
47
|
+
|
48
|
+
ROUTES
|
49
|
+
insert_into_file "config/routes.rb", routes, :after => "Rails.application.routes.draw do\n"
|
50
|
+
end
|
51
|
+
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
@@ -1,24 +1,34 @@
|
|
1
1
|
if defined?(ActiveAdmin)
|
2
2
|
ActiveAdmin.register Lentil::AdminUser do
|
3
|
-
|
3
|
+
permit_params :email, :password, :password_confirmation
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
5
|
+
index do
|
6
|
+
selectable_column
|
7
|
+
id_column
|
8
|
+
column :email
|
9
|
+
column :current_sign_in_at
|
10
|
+
column :sign_in_count
|
11
|
+
column :created_at
|
12
|
+
actions
|
13
|
+
end
|
12
14
|
|
13
|
-
|
15
|
+
filter :email
|
16
|
+
filter :current_sign_in_at
|
17
|
+
filter :sign_in_count
|
18
|
+
filter :created_at
|
14
19
|
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
f.
|
20
|
+
controller do
|
21
|
+
resources_configuration[:self][:instance_name] = 'admin_user'
|
22
|
+
end
|
23
|
+
|
24
|
+
form do |f|
|
25
|
+
f.inputs "Admin Details" do
|
26
|
+
f.input :email
|
27
|
+
f.input :password
|
28
|
+
f.input :password_confirmation
|
22
29
|
end
|
30
|
+
f.actions
|
23
31
|
end
|
24
|
-
|
32
|
+
|
33
|
+
end
|
34
|
+
end
|