From 526f4c9543be1e8aac074686f045f9c2d3bb7f69 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Fri, 10 Apr 2015 18:31:43 -0700 Subject: [PATCH 001/122] add migrations --- migrations/057_add_paypal_data.rb | 11 +++++++++++ migrations/058_add_paypal_status.rb | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100644 migrations/057_add_paypal_data.rb create mode 100644 migrations/058_add_paypal_status.rb diff --git a/migrations/057_add_paypal_data.rb b/migrations/057_add_paypal_data.rb new file mode 100644 index 00000000..684d637a --- /dev/null +++ b/migrations/057_add_paypal_data.rb @@ -0,0 +1,11 @@ +Sequel.migration do + up { + DB.add_column :sites, :paypal_profile_id, String + DB.add_column :sites, :paypal_token, String + } + + down { + DB.drop_column :sites, :paypal_profile_id + DB.drop_column :sites, :paypal_token + } +end diff --git a/migrations/058_add_paypal_status.rb b/migrations/058_add_paypal_status.rb new file mode 100644 index 00000000..12391a22 --- /dev/null +++ b/migrations/058_add_paypal_status.rb @@ -0,0 +1,9 @@ +Sequel.migration do + up { + DB.add_column :sites, :paypal_active, :boolean, default: false + } + + down { + DB.drop_column :sites, :paypal_active + } +end From 0acbcbb235dd1df22ed2085e0e45ec3940cc64e5 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 15 Apr 2015 15:27:24 -0700 Subject: [PATCH 002/122] fix copy on plan info --- views/plan/_pricing.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index 6eda3f0f..2a4b2ca9 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -134,7 +134,7 @@ It's safe. We use Stripe for payments, and never store your credit card information directly.
  • - It's affordable. As low as $<%= Site::PLAN_FEATURES[:supporter][:price] %>/month (billed once every year). Higher tiers are optional (and appreciated!) + It's affordable, only $<%= Site::PLAN_FEATURES[:supporter][:price] %> per month.
  • You can cancel or change plans anytime. If you do, we'll refund or credit the amount you didn't use. From 8b32946b19cd66bf5b09be1a7c32b7be1626947d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 18 Apr 2015 18:48:38 -0700 Subject: [PATCH 003/122] Quick fix to pricing bullet --- views/plan/_pricing.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb index 2a4b2ca9..a6ffac10 100644 --- a/views/plan/_pricing.erb +++ b/views/plan/_pricing.erb @@ -134,7 +134,7 @@ It's safe. We use Stripe for payments, and never store your credit card information directly.
  • - It's affordable, only $<%= Site::PLAN_FEATURES[:supporter][:price] %> per month. + It's affordable. Only $<%= Site::PLAN_FEATURES[:supporter][:price] %> per month.
  • You can cancel or change plans anytime. If you do, we'll refund or credit the amount you didn't use. From eba8a307bd952a5df9686a7f74dcc4c9187687e3 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 18 Apr 2015 18:50:51 -0700 Subject: [PATCH 004/122] Add GeoIP, will be used for stats --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index b5a3e08c..3aaebd78 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ gem 'thread' gem 'scrypt' gem 'rack-cache' gem 'rest-client' +gem 'geoip' platform :mri, :rbx do gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic diff --git a/Gemfile.lock b/Gemfile.lock index e726b123..b3d69511 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,7 @@ GEM ffi (>= 1.0.0) rake filesize (0.0.3) + geoip (1.5.0) google-api-client (0.7.1) addressable (>= 2.3.2) autoparse (>= 0.3.3) @@ -242,6 +243,7 @@ DEPENDENCIES fabrication faker filesize + geoip google-api-client hiredis jdbc-postgres From ec4a3b444003d580278f334492d08bdfb320c506 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 19 Apr 2015 06:51:40 -0700 Subject: [PATCH 005/122] More signup reporting --- app_helpers.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app_helpers.rb b/app_helpers.rb index 638f1c48..7a1ea067 100644 --- a/app_helpers.rb +++ b/app_helpers.rb @@ -41,13 +41,24 @@ end def require_unbanned_ip if session[:banned] || Site.banned_ip?(request.ip) signout - session[:banned] = true - flash[:error] = 'Site creation has been banned due to ToS violation/spam. '+ + session[:banned] = request.ip if !session[:banned] + send_banned_report + flash[:error] = 'Site creation has been banned due to a Terms of Service violation. '+ 'If you believe this to be in error, contact the site admin.' return {result: 'error'}.to_json end end +def send_banned_report + EmailWorker.perform_async({ + from: 'web@neocities.org', + reply_to: 'contact@neocities.org', + to: 'errors@neocities.org', + subject: "[Neocities] Ban report", + body: "IP: #{request.ip}\n\nSession: #{session.inspect}\n\nParams:#{params.inspect}" + }) +end + def title out = "Neocities" return out if request.path == '/' From 0552eb88338d6b51f5f7109341b2d1075bce501b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 22 Apr 2015 16:50:24 +0000 Subject: [PATCH 006/122] push free space to 100MB --- models/site.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/site.rb b/models/site.rb index a91ab51c..0efc80f7 100644 --- a/models/site.rb +++ b/models/site.rb @@ -103,7 +103,7 @@ class Site < Sequel::Model PLAN_FEATURES[:free] = PLAN_FEATURES[:supporter].merge( name: 'Free', - space: Filesize.from('50MB').to_i, + space: Filesize.from('100MB').to_i, bandwidth: Filesize.from('50GB').to_i, price: 0, unlimited_site_creation: false, From bf59b986311a75213542103ee946646f5b1f7f60 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 22 Apr 2015 12:36:39 -0700 Subject: [PATCH 007/122] Copy changes --- views/index.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/views/index.erb b/views/index.erb index 184b60a7..02b720b0 100644 --- a/views/index.erb +++ b/views/index.erb @@ -210,7 +210,7 @@ -
      +
        <% Site.featured.each do |site| %>
      • @@ -232,17 +232,17 @@

        HTML editor, right in your browser

        -

        No tools needed! With our easy-to-use HTML editor, you're ready to start building your awesome web site right now.

        -

        If you'd rather use your favorite desktop editor, no problem! Uploading files is as easy as drag-and-drop. We also support WebDAV uploading for supporter accounts.

        +

        No tools needed. With our easy-to-use HTML editor, you're ready to start building your awesome web site right now.

        +

        If you'd rather use your favorite desktop editor, no problem. Uploading files is as easy as drag-n-drop.

        -

        It's time to bring back web surfing!

        -

        We collect all Neocities sites in our website gallery. We make it easy to browse sites with our optional surf bar.

        -

        Using tags, our version of web rings, you can easily discover new sites related to your interests.

        +

        It's time to bring back web surfing.

        +

        All Neocities sites are viewable in our website gallery. And it's easy to browse sites with our optional surf bar.

        +

        Using tags (our version of Web Rings) you can easily discover new sites related to your interests.

        @@ -250,7 +250,7 @@

        Follow your favorite Neocities sites

        -

        Once you find some interesting sites in our website gallery, you can keep track of all new updates by following them. Any changes to the sites show up in your news feed. You'll also see what sites are followed by your favorite site builders.

        +

        Keep track of all your favorite sites by following them. Any changes to the sites automatically show up in your news feed. You'll also see what sites they follow.

        @@ -258,7 +258,7 @@

        Web creativity plus community

        -

        Interact with your favorite web builders by posting comments, liking updates, and sharing their sites on your social network of choice!

        +

        Interact with your favorite web builders by posting comments, and sharing their sites on your social network of choice.

        From c7649a9292ad548ed9e5b9e2c588ffcbb350b8b6 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 22 Apr 2015 22:26:02 -0700 Subject: [PATCH 008/122] Fix view site for header link --- views/_header.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/_header.erb b/views/_header.erb index 58c43454..285d79a4 100644 --- a/views/_header.erb +++ b/views/_header.erb @@ -40,7 +40,7 @@
      • Edit Site
        • -
      • View Site
        • +
      • View Site
      • Settings
        • From 1145bc6bff0a3b0193c1cc0e89dbd40473827a78 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 27 Apr 2015 19:52:14 -0700 Subject: [PATCH 009/122] Uri link, not default https for custom domains --- views/home.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.erb b/views/home.erb index 40143d66..2986a581 100644 --- a/views/home.erb +++ b/views/home.erb @@ -104,7 +104,7 @@ - +
        Profile From 1ed9fbeaf9cfa902eebb17334bb6fe6cb1ae46d0 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 27 Apr 2015 19:53:19 -0700 Subject: [PATCH 010/122] Mention the @ dealie --- views/settings/site/custom_domain.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/settings/site/custom_domain.erb b/views/settings/site/custom_domain.erb index d22174d4..893329dc 100644 --- a/views/settings/site/custom_domain.erb +++ b/views/settings/site/custom_domain.erb @@ -17,7 +17,7 @@

        Step 1

        - First, you need to add an "A record" to point your root domain (catsknitting.com) to the following IP address: + First, you need to add an "A record" to point your root domain (sometimes shown with an @ symbol) (catsknitting.com) to the following IP address:

        54.68.34.66

        @@ -81,4 +81,4 @@ <% end %> ---> \ No newline at end of file +--> From 33892c515e0e3180d8142acc659ba3fc66db5e0b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 28 Apr 2015 02:55:45 +0000 Subject: [PATCH 011/122] fix for view site in header --- views/_header.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/_header.erb b/views/_header.erb index 285d79a4..a598d43f 100644 --- a/views/_header.erb +++ b/views/_header.erb @@ -40,7 +40,7 @@
      • Edit Site
        • -
      • View Site
        • +
      • View Site
      • Settings
        • From 10ce4c058f83b4cf19746a246cb0b7bed84b0872 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Tue, 28 Apr 2015 03:00:11 +0000 Subject: [PATCH 012/122] missed another https link --- views/home.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.erb b/views/home.erb index 2986a581..ea9fc7cb 100644 --- a/views/home.erb +++ b/views/home.erb @@ -87,7 +87,7 @@
        -

        <%= site.title %>

        +

        <%= site.title %>

        <% if site.updated_at %> From ddf7dd7ca2d9d9b1908a45f3d3aac56af7815e12 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 28 Apr 2015 15:44:31 -0700 Subject: [PATCH 013/122] Initial work on education page --- app/index.rb | 4 + sass/_project-sass/_project-Header.scss | 13 + sass/_project-sass/_project-Main.scss | 22 ++ views/education.erb | 317 ++++++++++++++++++++++++ 4 files changed, 356 insertions(+) create mode 100644 views/education.erb diff --git a/app/index.rb b/app/index.rb index bb2eff39..d50ed3ea 100644 --- a/app/index.rb +++ b/app/index.rb @@ -43,6 +43,10 @@ get '/welcome' do erb :'welcome', locals: {site: current_site} end +get '/education' do + erb :education, layout: false +end + get '/tutorials' do erb :'tutorials' end diff --git a/sass/_project-sass/_project-Header.scss b/sass/_project-sass/_project-Header.scss index 2d5edbc3..2d4c4c78 100644 --- a/sass/_project-sass/_project-Header.scss +++ b/sass/_project-sass/_project-Header.scss @@ -83,6 +83,19 @@ } } } +.hp.education { + .col.intro { + padding-top: 20px; + img { + @include vendor(transform, scaleX(-1)); + width: 100px; + margin-right: 20px; + } + .intro-text { + font-size: 1.1em; + } + } +} .intro-List{ @extend %kill-List; diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index b2cd02fa..2cf6935f 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1193,6 +1193,28 @@ a.tag:hover { background-image:url(/img/hpgallery-next.png); right: 0; } +.section.instructor-quotes { + background: #971D31; + + h2, h3, p { + color: #fff; + text-align: left; + } + h2 { + margin-left: 20px; + } + p { + font-size: 1em; + font-style: italic; + margin-right: 30px; + margin-top: 20px; + clear: both; + } + .image { + float: left; + margin-right: 22px; + } +} .section.features { background: #4F7E89; text-align: center; diff --git a/views/education.erb b/views/education.erb new file mode 100644 index 00000000..92816e27 --- /dev/null +++ b/views/education.erb @@ -0,0 +1,317 @@ + + + + + + + + Neocities: Create your free website now! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + + + +
        + +
        +

        What Instructors Say

        +
        +
        +
        +

        Instructor Name
        + Location
        + Class name

        + +

        "Neocities was an excellent resource for my students - it made everything very easy. + The Neocities team did a great job responding to any questions I had."

        +
        +
        +
        +

        Instructor Name
        + Location
        + Class name

        + +

        "Neocities was an excellent resource for my students - it made everything very easy. + The Neocities team did a great job responding to any questions I had."

        +
        +
        +
        +

        Instructor Name
        + Location
        + Class name

        + +

        "Neocities was an excellent resource for my students - it made everything very easy. + The Neocities team did a great job responding to any questions I had."

        +
        +
        +
        + +
        +

        Support Us

        +

        Neocities is funded directly by our community through supporter plans and donations. We will never sell users' personal data or embed advertising on member sites.

        +

        Your support allows us to pay for server costs and continue working on Neocities full-time. You can support us on a subscription basis for $5/month or make a one-time donation.

        +
        +
        + +
        +
        +
        +
        +
        +
        + +

        Support Us

        +

        + Neocities is funded by supporters and donations. If you’d like to contribute, you can help us pay our server costs using credit card, Bitcoin, or PayPal. +

        + Donate Today +
        +
        +
        +
        + +

        About Us

        +

        + Neocities is here to bring back the creativity and + free expression to the world wide web that made it great. +

        + More About Us +
        +
        +
        +
        + +

        Latest News

        +

        + The latest news on Neocities can be found on our blog. +

        + Read More +
        +
        +
        +
        +
        + + <%== erb :'_footer', layout: false %> +
        + +
        + + + + + From 44e3d276f4af065b45335411b2de9bedb3d504ff Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 28 Apr 2015 16:53:00 -0700 Subject: [PATCH 014/122] More work on education page --- public/img/neocities-logo-education.png | Bin 0 -> 62046 bytes sass/_project-sass/_project-Header.scss | 2 +- sass/_project-sass/_project-Main.scss | 12 +++++++++--- views/education.erb | 18 ++++++++++-------- 4 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 public/img/neocities-logo-education.png diff --git a/public/img/neocities-logo-education.png b/public/img/neocities-logo-education.png new file mode 100644 index 0000000000000000000000000000000000000000..85898db98fe2a2419b595417db92e0dfb0a9f5cc GIT binary patch literal 62046 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

        tpILHOv+Ydwh1l9H;}4UUmO%t?y9ms1rG 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

        #h~< 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 lp#k8=5&gwL{(paPq$vFOR>OKV*(L&Bn(8`g - Neocities: Create your free website now! + Neocities for Education @@ -93,8 +93,8 @@

        - - Neocities.org + + Neocities.org

        @@ -226,10 +226,13 @@
        -
        -

        Support Us

        -

        Neocities is funded directly by our community through supporter plans and donations. We will never sell users' personal data or embed advertising on member sites.

        -

        Your support allows us to pay for server costs and continue working on Neocities full-time. You can support us on a subscription basis for $5/month or make a one-time donation.

        +
        +

        Support Us

        +
        +
        +

        Neocities is funded directly by our community through supporter plans and donations. We will never sell users' personal data or embed advertising on member sites. Your support allows us to pay for server costs and continue working on Neocities full-time. You can support us by making a one-time donation or by subscribing for $5/month.

        +
        +
        @@ -276,7 +279,6 @@
        - + + + + + +
        +
        +
        +

        Your Stats

        +
        + <% if !@events.empty? && (site.followings_dataset.count > 0) %> + class="selected"<% end %>>All + class="selected"<% end %>>Profile Activity + <% end %> + Global Activity +
        +
        +
        +

        Your Site

        + Edit Site +
        +
        +
        + +
        +
        +
        +
        +
        +
        +

        Latest Visitors

        +
        +
        +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        LocationReferrerTime
        San Francisco, CAneocities.org4/27/15 7:11PM
        Portland, ORGoogle search4/27/15 7:15PM
        New York, NYviolasong.com4/28/15 8:22PM
        Seattle, WAFacebook URL4/28/15 9:22PM
        Portland, ORGoogle search4/30/15 7:15PM
        San Francisco, CAneocities.org4/27/15 7:11PM
        Portland, ORGoogle search4/27/15 7:15PM
        New York, NYviolasong.com4/28/15 8:22PM
        Seattle, WATwitter URL4/28/15 9:22PM
        Portland, ORGoogle search4/30/15 7:15PM
        +
        +
        + +
        +
        +

        Top Referrers

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        ReferrerVisits
        Google search22
        Google search22
        Google search22
        Google search22
        Google search22
        +
        + +
        +

        Top Locations

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        LocationsVisits
        Portland130
        Portland130
        Portland130
        Portland130
        Portland130
        +
        +
        +
        + +
        +
        +

        <%= site.title %>

        +
        +
        + <% if site.updated_at %> + Last updated
        <%= site.updated_at.ago %> + <% else %> + Your new website!
        Start Building + <% end %> +
        +
        +
        <%= site.views.format_large_number %> views
        + <% follows_count = site.follows_dataset.count %> +
        <%= follows_count.format_large_number %> follower<%= follows_count == 1 ? '' : 's' %>
        +
        +
        +
        + + + +
        + Profile + '> Share +
        + + <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %> + + <%== erb :'_tags', layout: false, locals: {site: site, is_current_site: site == current_site} %> +
        +
        +
        +
        From 227b123fc9f49438ef1c8f9539f568e2e69900c0 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 02:34:24 -0700 Subject: [PATCH 024/122] stat referrers, locations, and paths --- migrations/060_separate_stat_timestamps.rb | 18 +++++ migrations/061_add_site_ids.rb | 16 +++++ migrations/062_fix_latlng.rb | 12 ++++ migrations/063_add_bandwidth_to_stats.rb | 9 +++ models/site.rb | 5 ++ models/stat.rb | 49 +++++++++---- models/stat_location.rb | 22 +++++- models/stat_path.rb | 14 +++- models/stat_referrer.rb | 14 +++- tests/stat_tests.rb | 83 ++++++++++++++-------- 10 files changed, 195 insertions(+), 47 deletions(-) create mode 100644 migrations/060_separate_stat_timestamps.rb create mode 100644 migrations/061_add_site_ids.rb create mode 100644 migrations/062_fix_latlng.rb create mode 100644 migrations/063_add_bandwidth_to_stats.rb diff --git a/migrations/060_separate_stat_timestamps.rb b/migrations/060_separate_stat_timestamps.rb new file mode 100644 index 00000000..1243c6b3 --- /dev/null +++ b/migrations/060_separate_stat_timestamps.rb @@ -0,0 +1,18 @@ +# This migration detaches stat_referrers, stat_locations and stat_paths +# from stats. Instead of stat_id, we'll add a created_at timestamp and remove +# after 7 days for both free and supporter plans (for now). +Sequel.migration do + up { + [:stat_referrers, :stat_paths, :stat_locations].each do |stat_table| + drop_column stat_table, :stat_id + add_column stat_table, :created_at, :date, index: true + end + } + + down { + [:stat_referrers, :stat_paths, :stat_locations].each do |stat_table| + drop_column stat_table, :created_at + add_column stat_table, :stat_id, :integer, index: true + end + } +end diff --git a/migrations/061_add_site_ids.rb b/migrations/061_add_site_ids.rb new file mode 100644 index 00000000..c9bf8741 --- /dev/null +++ b/migrations/061_add_site_ids.rb @@ -0,0 +1,16 @@ +# This migration detaches stat_referrers, stat_locations and stat_paths +# from stats. Instead of stat_id, we'll add a created_at timestamp and remove +# after 7 days for both free and supporter plans (for now). +Sequel.migration do + up { + [:stat_referrers, :stat_paths, :stat_locations].each do |stat_table| + add_column stat_table, :site_id, :integer, index: true + end + } + + down { + [:stat_referrers, :stat_paths, :stat_locations].each do |stat_table| + drop_column stat_table, :site_id + end + } +end diff --git a/migrations/062_fix_latlng.rb b/migrations/062_fix_latlng.rb new file mode 100644 index 00000000..6bdbce48 --- /dev/null +++ b/migrations/062_fix_latlng.rb @@ -0,0 +1,12 @@ +Sequel.migration do + up { + drop_column :stat_locations, :latitude + drop_column :stat_locations, :longitude + add_column :stat_locations, :latitude, :float + add_column :stat_locations, :longitude, :float + } + + down { + # meh. + } +end diff --git a/migrations/063_add_bandwidth_to_stats.rb b/migrations/063_add_bandwidth_to_stats.rb new file mode 100644 index 00000000..f3877a5d --- /dev/null +++ b/migrations/063_add_bandwidth_to_stats.rb @@ -0,0 +1,9 @@ +Sequel.migration do + up { + add_column :stats, :bandwidth, :bigint, default: 0 + } + + down { + drop_column :stats, :bandwidth + } +end diff --git a/models/site.rb b/models/site.rb index 64bab1a2..acc7def6 100644 --- a/models/site.rb +++ b/models/site.rb @@ -161,6 +161,11 @@ class Site < Sequel::Model one_to_many :site_files + one_to_many :stats + one_to_many :stat_referrers + one_to_many :stat_locations + one_to_many :stat_paths + def account_sites_dataset Site.where(Sequel.|({id: owner.id}, {parent_site_id: owner.id})).order(:parent_site_id.desc, :username) end diff --git a/models/stat.rb b/models/stat.rb index bee46a22..5ba31416 100644 --- a/models/stat.rb +++ b/models/stat.rb @@ -1,6 +1,6 @@ class Stat < Sequel::Model - GEOCITY_PATH = './files/GeoLiteCity.dat' FREE_RETAINMENT_DAYS = 7 + REFERRAL_RETAINMENT_DAYS = 7 many_to_one :site one_to_many :stat_referrers @@ -9,13 +9,23 @@ class Stat < Sequel::Model class << self def prune! - DB[ - "DELETE FROM stats WHERE created_at < ? AND site_id NOT IN (SELECT id FROM sites WHERE plan_type IS NOT NULL OR plan_type != 'free')", - (FREE_RETAINMENT_DAYS-1).days.ago.to_date.to_s - ].first + supporter_site_ids = DB["select id from sites where plan_type is not null or plan_type != 'free'"].all.collect {|s| s[:id]} - binding.pry + delete_stats_dataset = where{created_at < (FREE_RETAINMENT_DAYS-1).days.ago.to_date.to_s}.exclude(site_id: supporter_site_ids) + deleted_stat_ids = delete_stats_dataset.select(:id).all.collect {|s| s.id} + delete_stats_dataset.delete + + puts "TODO: stat_referrers/paths/locations needs created_at timestamp for pruning." + + StatReferrer.where(stat_id: deleted_stat_ids).delete + + #DB[ + # "DELETE FROM stats WHERE created_at < ? AND site_id NOT IN (SELECT id FROM sites WHERE plan_type IS NOT NULL OR plan_type != 'free')", + # (FREE_RETAINMENT_DAYS-1).days.ago.to_date.to_s + #].first + + #binding.pry end def parse_logfiles(path) @@ -31,6 +41,7 @@ class Stat < Sequel::Model site_logs[username] = { hits: 0, views: 0, + bandwidth: 0, view_ips: [], ips: [], referrers: {}, @@ -38,6 +49,7 @@ class Stat < Sequel::Model } unless site_logs[username] site_logs[username][:hits] += 1 + site_logs[username][:bandwidth] += size.to_i unless site_logs[username][:view_ips].include?(ip) site_logs[username][:views] += 1 @@ -76,19 +88,28 @@ class Stat < Sequel::Model DB[:stats].lock('EXCLUSIVE') { stat = Stat.create opts } if stat.nil? DB[ - 'update stats set hits=hits+?, views=views+? where site_id=?', + 'update stats set hits=hits+?, views=views+?, bandwidth=bandwidth+? where site_id=?', site_log[:hits], site_log[:views], + site_log[:bandwidth], site_log[:id] ].first - site_log[:referrers].each do |referrer,views| - opts = {stat_id: stat.id, url: referrer} - stat_referrer = StatReferrer.select(:id).where(opts).first - DB[:stat_referrers].lock('EXCLUSIVE') { - stat_referrer = StatReferrer.create opts - } if stat_referrer.nil? - DB['update stat_referrers set views=views+? where stat_id=?', views, stat.id].first + site_log[:referrers].each do |referrer, views| + stat_referrer = StatReferrer.create_or_get site_log[:id], referrer + DB['update stat_referrers set views=views+? where site_id=?', views, site_log[:id]].first + end + + site_log[:view_ips].each do |ip| + site_location = StatLocation.create_or_get site_log[:id], ip + next if site_location.nil? + DB['update stat_locations set views=views+1 where id=?', site_location.id].first + end + + site_log[:paths].each do |path, views| + site_path = StatPath.create_or_get site_log[:id], path + next if site_path.nil? + DB['update stat_paths set views=views+? where id=?', views, site_path.id].first end end end diff --git a/models/stat_location.rb b/models/stat_location.rb index df3fcb8c..02398ab1 100644 --- a/models/stat_location.rb +++ b/models/stat_location.rb @@ -1,3 +1,23 @@ +require 'geoip' + class StatLocation < Sequel::Model - many_to_one :stat + GEOCITY_PATH = './files/GeoLiteCity.dat' + RETAINMENT_PERIOD = 7.days + + many_to_one :site + + def self.create_or_get(site_id, ip) + geoip = GeoIP.new GEOCITY_PATH + city = geoip.city ip + + return nil if city.nil? + + opts = {site_id: site_id, country_code2: city.country_code2, region_name: city.region_name, city_name: city.city_name} + stat_location = where(opts).where{created_at > RETAINMENT_PERIOD.ago}.first + DB[table_name].lock('EXCLUSIVE') { + stat_location = create opts.merge(latitude: city.latitude, longitude: city.longitude, created_at: Date.today) + } if stat_location.nil? + + stat_location + end end diff --git a/models/stat_path.rb b/models/stat_path.rb index 0270d3f8..64fefb55 100644 --- a/models/stat_path.rb +++ b/models/stat_path.rb @@ -1,3 +1,15 @@ class StatPath < Sequel::Model - many_to_one :stat + RETAINMENT_PERIOD = 7.days + + many_to_one :site + + def self.create_or_get(site_id, name) + opts = {site_id: site_id, name: name} + stat_path = where(opts).where{created_at > RETAINMENT_PERIOD.ago}.first + DB[table_name].lock('EXCLUSIVE') { + stat_path = create opts.merge created_at: Date.today + } if stat_path.nil? + + stat_path + end end diff --git a/models/stat_referrer.rb b/models/stat_referrer.rb index f17a33bd..e5119bc0 100644 --- a/models/stat_referrer.rb +++ b/models/stat_referrer.rb @@ -1,3 +1,15 @@ class StatReferrer < Sequel::Model - many_to_one :stat + many_to_one :site + RETAINMENT_PERIOD = 7.days + + def self.create_or_get(site_id, url) + opts = {site_id: site_id, url: url} + stat_referrer = where(opts).where{created_at > RETAINMENT_PERIOD.ago}.first + + DB[table_name].lock('EXCLUSIVE') { + stat_referrer = create opts.merge(created_at: Date.today) + } if stat_referrer.nil? + + stat_referrer + end end diff --git a/tests/stat_tests.rb b/tests/stat_tests.rb index 0b4fc901..a3ec7d31 100644 --- a/tests/stat_tests.rb +++ b/tests/stat_tests.rb @@ -9,11 +9,24 @@ describe 'stats' do @site_one = Fabricate :site @site_two = Fabricate :site - @t = Time.now.iso8601 - @s1u = @site_one.username - @s2u = @site_two.username - end + @time = Time.now + @time_iso8601 = @time.iso8601 + log = [ + "#{@time_iso8601} #{@site_one.username} 5000 / 67.180.75.140 http://example.com", + "#{@time_iso8601} #{@site_one.username} 5000 / 67.180.75.140 http://example.com", + "#{@time_iso8601} #{@site_one.username} 5000 / 172.56.16.152 http://example.com", + "#{@time_iso8601} #{@site_one.username} 5000 / 172.56.16.152 -", + "#{@time_iso8601} #{@site_two.username} 5000 / 67.180.75.140 http://example.com", + "#{@time_iso8601} #{@site_two.username} 5000 / 127.0.0.1 -", + "#{@time_iso8601} #{@site_two.username} 5000 /derp.html 127.0.0.2 https://example.com" + ] + + File.open("tests/stat_logs/#{SecureRandom.uuid}.log", 'w') do |file| + file.write log.join("\n") + end + end +=begin it 'prunes logs for free sites' do @free_site = Fabricate :site @supporter_site = Fabricate :site, plan_type: 'supporter' @@ -29,28 +42,20 @@ describe 'stats' do count_site_ids = [@free_site.id, @supporter_site.id] expected_stat_count = (Stat::FREE_RETAINMENT_DAYS+1)*2 + [@free_site, @supporter_site].each do |site| + site.stats.last.add_stat_referrer url: 'https://example.com' + end + Stat.where(site_id: count_site_ids).count.must_equal expected_stat_count Stat.prune! Stat.where(site_id: count_site_ids).count.must_equal expected_stat_count-1 Stat.where(site_id: @supporter_site.id).count.must_equal expected_stat_count/2 + + @free_site.stats.last.stat_referrers.length.must_equal 0 + @supporter_site.stats.last.stat_referrers.length.must_equal 1 end - +=end it 'parses logfile' do - time = Time.now.iso8601 - log = [ - "#{time} #{@site_one.username} 5000 / 67.180.75.140 http://example.com", - "#{time} #{@site_one.username} 5000 / 67.180.75.140 http://example.com", - "#{time} #{@site_one.username} 5000 / 172.56.16.152 http://example.com", - "#{time} #{@site_one.username} 5000 / 172.56.16.152 -", - "#{time} #{@site_two.username} 5000 / 67.180.75.140 http://example.com", - "#{time} #{@site_two.username} 5000 / 127.0.0.1 -", - "#{time} #{@site_two.username} 5000 / 127.0.0.2 https://example.com" - ] - - File.open("tests/stat_logs/#{SecureRandom.uuid}.log", 'w') do |file| - file.write log.join("\n") - end - Stat.parse_logfiles STAT_LOGS_PATH @site_one.reload @@ -59,9 +64,24 @@ describe 'stats' do stat = @site_one.stats.first stat.hits.must_equal 4 stat.views.must_equal 2 - referrer = stat.stat_referrers.first - referrer.url.must_equal 'http://example.com' - referrer.views.must_equal 2 + stat.bandwidth.must_equal 20_000 + @site_one.stat_referrers.count.must_equal 1 + stat_referrer = @site_one.stat_referrers.first + stat_referrer.url.must_equal 'http://example.com' + stat_referrer.created_at.must_equal @time.to_date + stat_referrer.views.must_equal 2 + + @site_one.stat_paths.length.must_equal 1 + stat_path = @site_one.stat_paths.first + stat_path.name.must_equal '/' + stat_path.views.must_equal 4 + + @site_one.stat_locations.length.must_equal 2 + stat_location = @site_one.stat_locations.first + stat_location.country_code2.must_equal 'US' + stat_location.region_name.must_equal 'CA' + stat_location.city_name.must_equal 'Menlo Park' + stat_location.views.must_equal 1 @site_two.reload @site_two.hits.must_equal 3 @@ -69,13 +89,16 @@ describe 'stats' do stat = @site_two.stats.first stat.hits.must_equal 3 stat.views.must_equal 3 - stat.stat_referrers.length.must_equal 2 - referrer = stat.stat_referrers.first - referrer.url.must_equal 'http://example.com' - referrer.views.must_equal 2 - referrer = stat.stat_referrers.last - referrer.url.must_equal 'https://example.com' - referrer.views.must_equal 1 + stat.bandwidth.must_equal 15_000 + @site_two.stat_referrers.count.must_equal 2 + stat_referrer = @site_two.stat_referrers.first + stat_referrer.url.must_equal 'http://example.com' + stat_referrer.views.must_equal 2 + + stat_paths = @site_two.stat_paths + stat_paths.length.must_equal 2 + stat_paths.first.name.must_equal '/' + stat_paths.last.name.must_equal '/derp.html' # [geoip.city('67.180.75.140'), geoip.city('172.56.16.152')] end From 704011a1c03550dc680697b37c09a49b2baab005 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 14:34:21 -0700 Subject: [PATCH 025/122] finish up pruning for stats --- Rakefile | 5 ++++- models/stat.rb | 24 +++++------------------ models/stat_location.rb | 8 ++++++-- models/stat_path.rb | 8 ++++++-- models/stat_referrer.rb | 8 ++++++-- tests/stat_tests.rb | 43 ++++++++++++++++++++++++++++++++--------- 6 files changed, 61 insertions(+), 35 deletions(-) diff --git a/Rakefile b/Rakefile index c7fc9814..6533fe95 100644 --- a/Rakefile +++ b/Rakefile @@ -31,8 +31,11 @@ end desc "parse logs" task :parse_logs => [:environment] do - Stat.parse_logfiles $config['logs_path'] Stat.prune! + StatLocation.prune! + StatReferrer.prune! + StatPath.prune! + Stat.parse_logfiles $config['logs_path'] end desc 'Update banned IPs list' diff --git a/models/stat.rb b/models/stat.rb index 5ba31416..c6b6932b 100644 --- a/models/stat.rb +++ b/models/stat.rb @@ -1,6 +1,5 @@ class Stat < Sequel::Model - FREE_RETAINMENT_DAYS = 7 - REFERRAL_RETAINMENT_DAYS = 7 + FREE_RETAINMENT_DAYS = 30 many_to_one :site one_to_many :stat_referrers @@ -9,23 +8,10 @@ class Stat < Sequel::Model class << self def prune! - supporter_site_ids = DB["select id from sites where plan_type is not null or plan_type != 'free'"].all.collect {|s| s[:id]} - - delete_stats_dataset = where{created_at < (FREE_RETAINMENT_DAYS-1).days.ago.to_date.to_s}.exclude(site_id: supporter_site_ids) - - deleted_stat_ids = delete_stats_dataset.select(:id).all.collect {|s| s.id} - delete_stats_dataset.delete - - puts "TODO: stat_referrers/paths/locations needs created_at timestamp for pruning." - - StatReferrer.where(stat_id: deleted_stat_ids).delete - - #DB[ - # "DELETE FROM stats WHERE created_at < ? AND site_id NOT IN (SELECT id FROM sites WHERE plan_type IS NOT NULL OR plan_type != 'free')", - # (FREE_RETAINMENT_DAYS-1).days.ago.to_date.to_s - #].first - - #binding.pry + DB[ + "DELETE FROM stats WHERE created_at < ? AND site_id NOT IN (SELECT id FROM sites WHERE plan_type IS NOT NULL OR plan_type != 'free')", + (FREE_RETAINMENT_DAYS-1).days.ago.to_date.to_s + ].first end def parse_logfiles(path) diff --git a/models/stat_location.rb b/models/stat_location.rb index 02398ab1..f1a8e863 100644 --- a/models/stat_location.rb +++ b/models/stat_location.rb @@ -2,10 +2,14 @@ require 'geoip' class StatLocation < Sequel::Model GEOCITY_PATH = './files/GeoLiteCity.dat' - RETAINMENT_PERIOD = 7.days + RETAINMENT_DAYS = 7 many_to_one :site + def self.prune! + where{created_at < (RETAINMENT_DAYS-2).days.ago.to_date}.delete + end + def self.create_or_get(site_id, ip) geoip = GeoIP.new GEOCITY_PATH city = geoip.city ip @@ -13,7 +17,7 @@ class StatLocation < Sequel::Model return nil if city.nil? opts = {site_id: site_id, country_code2: city.country_code2, region_name: city.region_name, city_name: city.city_name} - stat_location = where(opts).where{created_at > RETAINMENT_PERIOD.ago}.first + stat_location = where(opts).where{created_at > RETAINMENT_DAYS.days.ago}.first DB[table_name].lock('EXCLUSIVE') { stat_location = create opts.merge(latitude: city.latitude, longitude: city.longitude, created_at: Date.today) } if stat_location.nil? diff --git a/models/stat_path.rb b/models/stat_path.rb index 64fefb55..8dcd6308 100644 --- a/models/stat_path.rb +++ b/models/stat_path.rb @@ -1,11 +1,15 @@ class StatPath < Sequel::Model - RETAINMENT_PERIOD = 7.days + RETAINMENT_DAYS = 7 many_to_one :site + def self.prune! + where{created_at < (RETAINMENT_DAYS-2).days.ago.to_date}.delete + end + def self.create_or_get(site_id, name) opts = {site_id: site_id, name: name} - stat_path = where(opts).where{created_at > RETAINMENT_PERIOD.ago}.first + stat_path = where(opts).where{created_at > RETAINMENT_DAYS.days.ago}.first DB[table_name].lock('EXCLUSIVE') { stat_path = create opts.merge created_at: Date.today } if stat_path.nil? diff --git a/models/stat_referrer.rb b/models/stat_referrer.rb index e5119bc0..edeb52c8 100644 --- a/models/stat_referrer.rb +++ b/models/stat_referrer.rb @@ -1,10 +1,14 @@ class StatReferrer < Sequel::Model many_to_one :site - RETAINMENT_PERIOD = 7.days + RETAINMENT_DAYS = 7 + + def self.prune! + where{created_at < (RETAINMENT_DAYS-2).days.ago.to_date}.delete + end def self.create_or_get(site_id, url) opts = {site_id: site_id, url: url} - stat_referrer = where(opts).where{created_at > RETAINMENT_PERIOD.ago}.first + stat_referrer = where(opts).where{created_at > RETAINMENT_DAYS.days.ago}.first DB[table_name].lock('EXCLUSIVE') { stat_referrer = create opts.merge(created_at: Date.today) diff --git a/tests/stat_tests.rb b/tests/stat_tests.rb index a3ec7d31..8b85021e 100644 --- a/tests/stat_tests.rb +++ b/tests/stat_tests.rb @@ -26,7 +26,7 @@ describe 'stats' do file.write log.join("\n") end end -=begin + it 'prunes logs for free sites' do @free_site = Fabricate :site @supporter_site = Fabricate :site, plan_type: 'supporter' @@ -42,19 +42,44 @@ describe 'stats' do count_site_ids = [@free_site.id, @supporter_site.id] expected_stat_count = (Stat::FREE_RETAINMENT_DAYS+1)*2 - [@free_site, @supporter_site].each do |site| - site.stats.last.add_stat_referrer url: 'https://example.com' - end - Stat.where(site_id: count_site_ids).count.must_equal expected_stat_count Stat.prune! Stat.where(site_id: count_site_ids).count.must_equal expected_stat_count-1 Stat.where(site_id: @supporter_site.id).count.must_equal expected_stat_count/2 - - @free_site.stats.last.stat_referrers.length.must_equal 0 - @supporter_site.stats.last.stat_referrers.length.must_equal 1 end -=end + + it 'prunes referrers' do + stat_referrer_now = @site_one.add_stat_referrer created_at: Date.today, url: 'http://example.com/now' + stat_referrer = @site_one.add_stat_referrer created_at: (StatReferrer::RETAINMENT_DAYS-1).days.ago, url: 'http://example.com' + StatReferrer[stat_referrer.id].wont_be_nil + @site_one.stat_referrers_dataset.count.must_equal 2 + StatReferrer.prune! + @site_one.stat_referrers_dataset.count.must_equal 1 + StatReferrer[stat_referrer.id].must_be_nil + end + + it 'prunes locations' do + stat_location = @site_one.add_stat_location( + created_at: (StatLocation::RETAINMENT_DAYS-1).days.ago, + country_code2: 'US', + region_name: 'Minnesota', + city_name: 'Minneapolis' + ) + StatLocation[stat_location.id].wont_be_nil + StatLocation.prune! + StatLocation[stat_location.id].must_be_nil + end + + it 'prunes paths' do + stat_path = @site_one.add_stat_path( + created_at: (StatPath::RETAINMENT_DAYS-1).days.ago, + name: '/derpie.html' + ) + StatPath[stat_path.id].wont_be_nil + StatPath.prune! + StatPath[stat_path.id].must_be_nil + end + it 'parses logfile' do Stat.parse_logfiles STAT_LOGS_PATH From e08a1362e11f1d0b5ef65218ef9d018d2e0f8ee8 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 22:33:50 -0700 Subject: [PATCH 026/122] delete returns to directory user was in --- app/site_files.rb | 7 +++++-- tests/site_file_tests.rb | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/site_files.rb b/app/site_files.rb index 4a3a8349..627728ff 100644 --- a/app/site_files.rb +++ b/app/site_files.rb @@ -87,9 +87,12 @@ end post '/site_files/delete' do require_login current_site.delete_file params[:filename] - flash[:success] = "Deleted #{params[:filename]}." - redirect '/dashboard' + + dirname = Pathname(params[:filename]).dirname + dir_query = dirname.nil? || dirname.to_s == '.' ? '' : "?dir=#{Rack::Utils.escape dirname}" + + redirect "/dashboard#{dir_query}" end get '/site_files/:username.zip' do |username| diff --git a/tests/site_file_tests.rb b/tests/site_file_tests.rb index 625cbc5c..cf6a1241 100644 --- a/tests/site_file_tests.rb +++ b/tests/site_file_tests.rb @@ -32,7 +32,7 @@ describe 'site_files' do SiteFile[site_id: @site.id, path: 'test.jpg'].must_be_nil end - it 'deletes all files in a directory' do + it 'deletes a directory and all files in it' do upload( 'dir' => 'test', 'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') @@ -45,6 +45,21 @@ describe 'site_files' do @site.site_files.select {|f| f.path =~ /^test\//}.length.must_equal 0 @site.site_files.select {|f| f.path =~ /^test/}.length.must_equal 1 end + + it 'goes back to deleting directory' do + upload( + 'dir' => 'test', + 'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + ) + delete_file filename: 'test/test.jpg' + last_response.headers['Location'].must_equal "http://example.org/dashboard?dir=test" + + upload( + 'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + ) + delete_file filename: 'test.jpg' + last_response.headers['Location'].must_equal "http://example.org/dashboard" + end end describe 'upload' do From 1fa734f679ab1618aa4bdc0e787fa8d17c008314 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 22:50:08 -0700 Subject: [PATCH 027/122] Fix for bad link for domains --- views/dashboard.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/dashboard.erb b/views/dashboard.erb index 8e136027..b0385756 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -30,7 +30,7 @@

        <%= current_site.title %>

        - <%= current_site.host %> + <%= current_site.host %> '> Share

          From b90ebd19c131a28a68a7d6713c86be7d356b65a9 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 22:50:52 -0700 Subject: [PATCH 028/122] Helps when you use the right method --- views/dashboard.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/dashboard.erb b/views/dashboard.erb index b0385756..73ade6ed 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -30,7 +30,7 @@

          <%= current_site.title %>

          - <%= current_site.host %> + <%= current_site.host %> '> Share

            From 0b6111e197793464baf1db855be9db729ff0491b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 23:23:57 -0700 Subject: [PATCH 029/122] editor path breadcrumbs --- views/site_files/text_editor.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb index 304933a7..b211ba98 100644 --- a/views/site_files/text_editor.erb +++ b/views/site_files/text_editor.erb @@ -27,7 +27,12 @@
            - Dashboard > <%= @filename %> + Dashboard > + + <% dir_array = Pathname(@filename).dirname.to_s.split '/' %> + <% dir_array = [] if dir_array == ['.'] %> + <% dir_array.each_with_index do |dir,i| %><%= dir %>/<% end %><%= Pathname(@filename).basename %> +
            From 8d24b0fe09e282e467932113b732fa02ff94aa4c Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 2 May 2015 23:56:44 -0700 Subject: [PATCH 030/122] Fix link for view on domains --- views/site_files/text_editor.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb index b211ba98..95ab7d05 100644 --- a/views/site_files/text_editor.erb +++ b/views/site_files/text_editor.erb @@ -75,7 +75,7 @@
            Save - View + View '>Share
          '};i.Type.extend({name:"Doughnut",defaults:s,initialize:function(t){this.segments=[],this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.calculateTotal(t),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({value:t.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:t.color,highlightColor:t.highlight||t.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(t.value),label:t.label})),e||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(Math.abs(t)/this.total)},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=Math.abs(t.value)},this)},update:function(){this.calculateTotal(this.segments),e.each(this.activeElements,function(t){t.restore(["fillColor"])}),e.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,e.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},draw:function(t){var i=t?t:1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},i),t.endAngle=t.startAngle+t.circumference,t.draw(),0===e&&(t.startAngle=1.5*Math.PI),e<% for (var i=0; i
        • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
          • <%}%>
        '};i.Type.extend({name:"Line",defaults:s,initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)0&&ithis.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.ythis.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y0&&(s.lineTo(h[h.length-1].x,this.scale.endPoint),s.lineTo(h[0].x,this.scale.endPoint),s.fillStyle=t.fillColor,s.closePath(),s.fill()),e.each(h,function(t){t.draw()})},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowLabelBackdrop:!0,scaleBackdropColor:"rgba(255,255,255,0.75)",scaleBeginAtZero:!0,scaleBackdropPaddingY:2,scaleBackdropPaddingX:2,scaleShowLine:!0,segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'
          <% for (var i=0; i
        • <%if(segments[i].label){%><%=segments[i].label%><%}%>
          • <%}%>
        '};i.Type.extend({name:"PolarArea",defaults:s,initialize:function(t){this.segments=[],this.SegmentArc=i.Arc.extend({showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,ctx:this.chart.ctx,innerRadius:0,x:this.chart.width/2,y:this.chart.height/2}),this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,lineArc:!0,width:this.chart.width,height:this.chart.height,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,valuesCount:t.length}),this.updateScaleRange(t),this.scale.update(),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({fillColor:t.color,highlightColor:t.highlight||t.color,label:t.label,value:t.value,outerRadius:this.options.animateScale?0:this.scale.calculateCenterOffset(t.value),circumference:this.options.animateRotate?0:this.scale.getCircumference(),startAngle:1.5*Math.PI})),e||(this.reflow(),this.update())},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this),this.scale.valuesCount=this.segments.length},updateScaleRange:function(t){var i=[];e.each(t,function(t){i.push(t.value)});var s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s,{size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})},update:function(){this.calculateTotal(this.segments),e.each(this.segments,function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.updateScaleRange(this.segments),this.scale.update(),e.extend(this.scale,{xCenter:this.chart.width/2,yCenter:this.chart.height/2}),e.each(this.segments,function(t){t.update({outerRadius:this.scale.calculateCenterOffset(t.value)})},this)},draw:function(t){var i=t||1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.scale.getCircumference(),outerRadius:this.scale.calculateCenterOffset(t.value)},i),t.endAngle=t.startAngle+t.circumference,0===e&&(t.startAngle=1.5*Math.PI),e<% for (var i=0; i
      • <%if(datasets[i].label){%><%=datasets[i].label%><%}%>
        • <%}%>
      '},initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx}),this.datasets=[],this.buildScale(t),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){var o;this.scale.animation||(o=this.scale.getPointPosition(n,this.scale.calculateCenterOffset(e))),s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,x:this.options.animation?this.scale.xCenter:o.x,y:this.options.animation?this.scale.yCenter:o.y,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this)},this),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=e.getRelativePosition(t),s=e.getAngleFromPoint({x:this.scale.xCenter,y:this.scale.yCenter},i),n=2*Math.PI/this.scale.valuesCount,o=Math.round((s.angle-1.5*Math.PI)/n),a=[];return(o>=this.scale.valuesCount||0>o)&&(o=0),s.distance<=this.scale.drawingArea&&e.each(this.datasets,function(t){a.push(t.points[o])}),a},buildScale:function(t){this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,angleLineColor:this.options.angleLineColor,angleLineWidth:this.options.angleShowLineOut?this.options.angleLineWidth:0,pointLabelFontColor:this.options.pointLabelFontColor,pointLabelFontSize:this.options.pointLabelFontSize,pointLabelFontFamily:this.options.pointLabelFontFamily,pointLabelFontStyle:this.options.pointLabelFontStyle,height:this.chart.height,width:this.chart.width,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,labels:t.labels,valuesCount:t.datasets[0].data.length}),this.scale.setScaleSize(),this.updateScaleRange(t.datasets),this.scale.buildYLabels()},updateScaleRange:function(t){var i=function(){var i=[];return e.each(t,function(t){t.data?i=i.concat(t.data):e.each(t.points,function(t){i.push(t.value)})}),i}(),s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s)},addData:function(t,i){this.scale.valuesCount++,e.each(t,function(t,e){var s=this.scale.getPointPosition(this.scale.valuesCount,this.scale.calculateCenterOffset(t));this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:s.x,y:s.y,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.labels.push(i),this.reflow(),this.update()},removeData:function(){this.scale.valuesCount--,this.scale.labels.shift(),e.each(this.datasets,function(t){t.points.shift()},this),this.reflow(),this.update()},update:function(){this.eachPoints(function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.scale,{width:this.chart.width,height:this.chart.height,size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2}),this.updateScaleRange(this.datasets),this.scale.setScaleSize(),this.scale.buildYLabels()},draw:function(t){var i=t||1,s=this.chart.ctx;this.clear(),this.scale.draw(),e.each(this.datasets,function(t){e.each(t.points,function(t,e){t.hasValue()&&t.transition(this.scale.getPointPosition(e,this.scale.calculateCenterOffset(t.value)),i)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(t.points,function(t,i){0===i?s.moveTo(t.x,t.y):s.lineTo(t.x,t.y)},this),s.closePath(),s.stroke(),s.fillStyle=t.fillColor,s.fill(),e.each(t.points,function(t){t.hasValue()&&t.draw()})},this)}})}.call(this); \ No newline at end of file diff --git a/views/stats_mockup.erb b/views/stats_mockup.erb index 3998a7c8..d0a703b6 100644 --- a/views/stats_mockup.erb +++ b/views/stats_mockup.erb @@ -93,8 +93,8 @@ -

      Last 7 Days

      - +

      Last 7 Days (Upgrade to see up to 90 days)

      +
      @@ -235,9 +235,10 @@
      + - - \ No newline at end of file + \ No newline at end of file From 4805dbcdf3d27e4832fe0f2d01feab29246f87f1 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Mon, 4 May 2015 17:18:06 -0700 Subject: [PATCH 035/122] Better latest visitors table, added time filter for chart --- sass/_project-sass/_project-Main.scss | 14 ++- views/stats_mockup.erb | 126 +++++++++++++++++--------- 2 files changed, 97 insertions(+), 43 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index d2a8c2f8..4c8929d6 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1882,10 +1882,22 @@ a.tag:hover { } } table#latest-visitors { - td:nth-child(1), td:nth-child(2) { + width: 100%; + color: #777; + font-size: .8em; + + td { white-space: nowrap; text-overflow: ellipsis; } + span { + display: block; + } + .location { + color: #2f4149; + font-weight: bold; + font-size: 1.2em; + } } #earth_div { width: 100%; diff --git a/views/stats_mockup.erb b/views/stats_mockup.erb index d0a703b6..373b49e0 100644 --- a/views/stats_mockup.erb +++ b/views/stats_mockup.erb @@ -24,77 +24,119 @@
      +

      Latest Visitors

      -
      +
      - - - - - - - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - - - + +
      LocationReferrerTime
      San Francisco, CAneocities.org4/27/15 7:11PM + San Francisco, CA + neocities.org + + 7:11PM + /index, /links, /art +
      Portland, ORGoogle search4/27/15 7:15PM + Portland, OR + Google search + + 7:11PM + /index +
      New York, NYviolasong.com4/28/15 8:22PM + London, UK + Twitter URL + + 7:11PM + /index, /about +
      Seattle, WAFacebook URL4/28/15 9:22PM + Hong Kong, China + Google search + + 7:11PM + /index, /links, /art, /music +
      Portland, ORGoogle search4/30/15 7:15PM + San Francisco, CA + Facebook URL + + 7:11PM - 4/27/15 + /index +
      San Francisco, CAneocities.org4/27/15 7:11PM + San Francisco, CA + neocities.org + + 7:11PM - 4/27/15 + /index, /links, /art +
      Portland, ORGoogle search4/27/15 7:15PM + Portland, OR + Google search + + 7:11PM - 4/27/15 + /index +
      New York, NYviolasong.com4/28/15 8:22PM + London, UK + Twitter URL + + 7:11PM - 4/27/15 + /index, /about +
      Seattle, WATwitter URL4/28/15 9:22PM
      Portland, ORGoogle search4/30/15 7:15PM + Hong Kong, China + Google search + + 7:11PM - 4/27/15 + /index, /links, /art, /music +
      -

      Last 7 Days (Upgrade to see up to 90 days)

      - +

      Last 7 Days

      +

      (Upgrade to see up to see stats for all time)

      + + +
      From 830bc28aed2dba345c6b4d219a261f02475e69cc Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 5 May 2015 08:58:42 -0700 Subject: [PATCH 036/122] Improvements to latest visitors table --- sass/_project-sass/_project-Main.scss | 6 +++++- views/stats_mockup.erb | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 4c8929d6..8b4bfccc 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1888,7 +1888,7 @@ table#latest-visitors { td { white-space: nowrap; - text-overflow: ellipsis; + max-width: 0; } span { display: block; @@ -1898,6 +1898,10 @@ table#latest-visitors { font-weight: bold; font-size: 1.2em; } + .paths { + overflow: hidden; + text-overflow: ellipsis; + } } #earth_div { width: 100%; diff --git a/views/stats_mockup.erb b/views/stats_mockup.erb index 373b49e0..8bee1aa3 100644 --- a/views/stats_mockup.erb +++ b/views/stats_mockup.erb @@ -89,7 +89,7 @@ 7:11PM - 4/27/15 - /index, /links, /art + /index, /links, /art, /music, /about @@ -112,6 +112,16 @@ /index, /about + + + Hong Kong, China + Google search + + + 7:11PM - 4/27/15 + /index, /links, /art, /music, /tech, /about + + Hong Kong, China From 1a67da05e9e4d98609cea6eb679e7152200f7523 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 5 May 2015 15:28:03 -0700 Subject: [PATCH 037/122] Tweaks to visitor globe --- sass/_project-sass/_project-Main.scss | 2 +- views/stats_mockup.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 8b4bfccc..1111eceb 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1905,5 +1905,5 @@ table#latest-visitors { } #earth_div { width: 100%; - height: 500px + height: 400px; } \ No newline at end of file diff --git a/views/stats_mockup.erb b/views/stats_mockup.erb index 8bee1aa3..75f4656c 100644 --- a/views/stats_mockup.erb +++ b/views/stats_mockup.erb @@ -25,7 +25,7 @@
      -
      +

      Latest Visitors

      @@ -292,7 +292,7 @@ //OpenGL globe $(document).ready(function() { var earth = new WE.map('earth_div'); - earth.setView([20, -100], 2.65); + earth.setView([20, -100], 2.07); WE.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',{ attribution: '© OpenStreetMap' }).addTo(earth); From 4f2b9ff3cb2737fdf4914c258c92d0d3a4a04d33 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Tue, 5 May 2015 16:56:23 -0700 Subject: [PATCH 038/122] Fixes to stats page on mobile --- sass/_project-sass/_project-Main.scss | 9 +++++++++ views/stats_mockup.erb | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 1111eceb..28ab1e23 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -1906,4 +1906,13 @@ table#latest-visitors { #earth_div { width: 100%; height: 400px; +} +.content.misc-page.columns .col.globe { + padding-right: 0; + padding-top: 4px; +} +.news-feed .content.misc-page .col-50 { + @media (max-device-width:480px), screen and (max-width:800px) { + width: 100%; + } } \ No newline at end of file diff --git a/views/stats_mockup.erb b/views/stats_mockup.erb index 75f4656c..8c9a9c33 100644 --- a/views/stats_mockup.erb +++ b/views/stats_mockup.erb @@ -25,7 +25,7 @@
      -
      +

      Latest Visitors

      From 49defcd0c74d664c24535dcba932f9d0bd270dbd Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 6 May 2015 14:22:55 -0700 Subject: [PATCH 039/122] fix tag tests, start on education site creation, updated test code --- Gemfile.lock | 26 +- app/api.rb | 1 + app/create.rb | 14 +- app/index.rb | 5 +- migrations/064_add_education_to_sites.rb | 9 + models/site.rb | 14 +- tests/acceptance/education_tests.rb | 61 +++ tests/acceptance/environment.rb | 4 +- tests/acceptance/signup_tests.rb | 21 +- tests/api_tests.rb | 8 - views/_index_signup_script.erb | 37 ++ views/education.erb | 455 ++++++++----------- views/index.erb | 550 ++++++++++------------- views/index_layout.erb | 45 ++ 14 files changed, 627 insertions(+), 623 deletions(-) create mode 100644 migrations/064_add_education_to_sites.rb create mode 100644 tests/acceptance/education_tests.rb create mode 100644 views/_index_signup_script.erb create mode 100644 views/index_layout.erb diff --git a/Gemfile.lock b/Gemfile.lock index 56045876..6e6aa062 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,15 +20,15 @@ GEM byebug (2.7.0) columnize (~> 0.3) debugger-linecache (~> 1.2) - capybara (2.4.1) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara_minitest_spec (1.0.1) + capybara_minitest_spec (1.0.5) capybara (>= 2) - minitest (>= 2) + minitest (>= 4) celluloid (0.15.2) timers (~> 1.1.0) climate_control (0.0.3) @@ -99,8 +99,8 @@ GEM metaclass (0.0.4) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.0) - minitest (5.3.1) + mini_portile (0.6.2) + minitest (5.6.1) minitest-reporters (1.0.2) ansi builder @@ -108,14 +108,14 @@ GEM powerbar mocha (1.0.0) metaclass (~> 0.0.1) - multi_json (1.10.1) + multi_json (1.11.0) multipart-post (2.0.0) netrc (0.10.3) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) pg (0.17.1) phantomjs (1.9.7.1) - poltergeist (1.5.1) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) @@ -133,14 +133,14 @@ GEM pry (~> 0.9.12) puma (2.8.1) rack (>= 1.1, < 2.0) - rack (1.5.2) + rack (1.6.0) rack-cache (1.2) rack (>= 0.4) rack-protection (1.5.2) rack rack-recaptcha (0.6.6) json - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rack_session_access (0.1.1) builder (>= 2.0.0) @@ -226,7 +226,9 @@ GEM webmock (1.17.4) addressable (>= 2.2.7) crack (>= 0.3.2) - websocket-driver (0.3.4) + websocket-driver (0.5.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) zipruby (0.3.6) diff --git a/app/api.rb b/app/api.rb index b2907260..9a10751c 100644 --- a/app/api.rb +++ b/app/api.rb @@ -7,6 +7,7 @@ end post '/api/upload' do require_api_credentials + files = [] params.each do |k,v| next unless v.is_a?(Hash) && v[:tempfile] diff --git a/app/create.rb b/app/create.rb index 05403947..a9df8649 100644 --- a/app/create.rb +++ b/app/create.rb @@ -16,9 +16,11 @@ def new_recaptcha_valid? end end +CREATE_MATCH_REGEX = /^username$|^password$|^email$|^new_tags_string$|^is_education$/ + post '/create_validate_all' do content_type :json - fields = params.select {|p| p.match /^username$|^password$|^email$|^new_tags_string$/} + fields = params.select {|p| p.match CREATE_MATCH_REGEX} site = Site.new fields @@ -33,11 +35,12 @@ end post '/create_validate' do content_type :json - if !params[:field].match /^username$|^password$|^email$|^new_tags_string$/ + if !params[:field].match CREATE_MATCH_REGEX return {error: 'not a valid field'}.to_json - end + end site = Site.new(params[:field] => params[:value]) + site.is_education = params[:is_education] site.valid? field_sym = params[:field].to_sym @@ -58,7 +61,8 @@ post '/create' do username: params[:username], password: params[:password], email: params[:email], - new_tags_string: params[:tags], + new_tags_string: params[:new_tags_string], + is_education: params[:is_education] == 'true' ? true : false, ip: request.ip ) @@ -85,4 +89,4 @@ post '/create' do session[:id] = @site.id {result: 'ok'}.to_json -end \ No newline at end of file +end diff --git a/app/index.rb b/app/index.rb index d50ed3ea..eb7ec230 100644 --- a/app/index.rb +++ b/app/index.rb @@ -34,7 +34,7 @@ get '/?' do @sites_count = SimpleCache.get :sites_count end - erb :index, layout: false + erb :index, layout: :index_layout end get '/welcome' do @@ -44,7 +44,8 @@ get '/welcome' do end get '/education' do - erb :education, layout: false + redirect '/' if signed_in? + erb :education, layout: :index_layout end get '/tutorials' do diff --git a/migrations/064_add_education_to_sites.rb b/migrations/064_add_education_to_sites.rb new file mode 100644 index 00000000..f5c3fb48 --- /dev/null +++ b/migrations/064_add_education_to_sites.rb @@ -0,0 +1,9 @@ +Sequel.migration do + up { + add_column :sites, :is_education, :boolean, default: false + } + + down { + drop_column :sites, :is_education + } +end diff --git a/models/site.rb b/models/site.rb index acc7def6..6833d00a 100644 --- a/models/site.rb +++ b/models/site.rb @@ -835,6 +835,18 @@ class Site < Sequel::Model new_tags.compact! @new_filtered_tags = [] + if values[:is_education] == true + if new? + if @new_tags_string.nil? || @new_tags_string.empty? + errors.add :new_tags_string, 'A Class Tag is required.' + end + + if new_tags.length > 1 + errors.add :new_tags_string, 'Must only have one tag' + end + end + end + if ((new? ? 0 : tags_dataset.count) + new_tags.length > 5) errors.add :new_tags_string, 'Cannot have more than 5 tags for your site.' end @@ -861,7 +873,7 @@ class Site < Sequel::Model break end - next if tags.collect {|t| t.name}.include? tag + next if !new? && tags.collect {|t| t.name}.include?(tag) @new_filtered_tags << tag @new_filtered_tags.uniq! diff --git a/tests/acceptance/education_tests.rb b/tests/acceptance/education_tests.rb new file mode 100644 index 00000000..449890ca --- /dev/null +++ b/tests/acceptance/education_tests.rb @@ -0,0 +1,61 @@ +require_relative './environment.rb' + +Capybara.register_driver :poltergeist do |app| + Capybara::Poltergeist::Driver.new(app, js_errors: false) +end + +describe 'signup' do + include Capybara::DSL + + def fill_in_valid + @site = Fabricate.attributes_for(:site) + @class_tag = SecureRandom.uuid.gsub('-', '')[0..Tag::NAME_LENGTH_MAX-1] + fill_in 'username', with: @site[:username] + fill_in 'password', with: @site[:password] + fill_in 'email', with: @site[:email] + fill_in 'new_tags_string', with: @class_tag + end + + before do + Capybara.default_driver = :poltergeist + Capybara.reset_sessions! + visit '/education' + page.must_have_content 'Neocities' # Used to force load wait + end + + after do + Capybara.default_driver = :rack_test + end + + it 'succeeds with valid data' do + fill_in_valid + click_button 'Create My Site' + page.must_have_content 'Welcome to Neocities' + + index_file_path = File.join Site::SITE_FILES_ROOT, @site[:username], 'index.html' + File.exist?(index_file_path).must_equal true + + site = Site[username: @site[:username]] + site.site_files.length.must_equal 4 + site.site_changed.must_equal false + site.site_updated_at.must_equal nil + site.is_education.must_equal true + site.tags.length.must_equal 1 + site.tags.first.name.must_equal @class_tag + end + + it 'fails to create for existing site' do + @existing_site = Fabricate :site + fill_in_valid + fill_in :username, with: @existing_site.username + click_button 'Create My Site' + page.must_have_content 'already taken' + end + + it 'fails for multiple tags' do + fill_in_valid + fill_in :new_tags_string, with: 'derp, ie' + click_button 'Create My Site' + page.must_have_content 'Must only have one tag' + end +end diff --git a/tests/acceptance/environment.rb b/tests/acceptance/environment.rb index b0f3379b..352aeafd 100644 --- a/tests/acceptance/environment.rb +++ b/tests/acceptance/environment.rb @@ -4,4 +4,6 @@ Capybara.app = Sinatra::Application def teardown Capybara.reset_sessions! -end \ No newline at end of file +end + +Capybara.default_wait_time = 5 diff --git a/tests/acceptance/signup_tests.rb b/tests/acceptance/signup_tests.rb index 6e2a6719..d5018b26 100644 --- a/tests/acceptance/signup_tests.rb +++ b/tests/acceptance/signup_tests.rb @@ -30,6 +30,7 @@ describe 'signup' do Capybara.default_driver = :poltergeist Capybara.reset_sessions! visit_signup + page.must_have_content 'Neocities' # Used to force load wait end after do @@ -48,19 +49,15 @@ describe 'signup' do site.site_files.length.must_equal 4 site.site_changed.must_equal false site.site_updated_at.must_equal nil + site.is_education.must_equal false site.ip.must_equal Site.hash_ip('127.0.0.1') end it 'fails to create for existing site' do + @existing_site = Fabricate :site fill_in_valid - click_signup_button - page.must_have_content 'Welcome to Neocities' - Capybara.reset_sessions! - visit_signup - sleep 0.3 - fill_in 'username', with: @site[:username] - fill_in 'password', with: @site[:password] + fill_in 'username', with: @existing_site.username click_signup_button page.must_have_content 'already taken' end @@ -113,9 +110,6 @@ describe 'signup' do page.must_have_content /email.+exists/ end -puts "$$$$$$$$$$$$$$$$$$$$$$ TODO FIX TAGS TESTS" - -=begin it 'succeeds with no tags' do fill_in_valid fill_in 'new_tags_string', with: '' @@ -139,7 +133,7 @@ puts "$$$$$$$$$$$$$$$$$$$$$$ TODO FIX TAGS TESTS" Site.last.tags.collect {|t| t.name}.must_equal ['derpie', 'shoujo'] end - it 'fails with invalid tag chars' do + it 'fails with invalid tag chars' do fill_in_valid fill_in 'new_tags_string', with: '$POLICE OFFICER$$$$$, derp' click_signup_button @@ -179,9 +173,10 @@ puts "$$$$$$$$$$$$$$$$$$$$$$ TODO FIX TAGS TESTS" fill_in 'new_tags_string', with: 'one, one' click_signup_button - site = Site.last + page.must_have_content /Welcome to Neocities/ + + site = Site[username: @site[:username]] site.tags.length.must_equal 1 site.tags.first.name.must_equal 'one' end -=end end diff --git a/tests/api_tests.rb b/tests/api_tests.rb index 5f94665a..6eaedc66 100644 --- a/tests/api_tests.rb +++ b/tests/api_tests.rb @@ -167,14 +167,6 @@ describe 'api upload' do '/' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') } res[:error_type].must_equal 'invalid_file_type' - - create_site - basic_authorize @user, @pass - post '/api/upload', { - '' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') - } - - res[:error_type].must_equal 'missing_files' end it 'fails for file with no extension' do diff --git a/views/_index_signup_script.erb b/views/_index_signup_script.erb new file mode 100644 index 00000000..71939735 --- /dev/null +++ b/views/_index_signup_script.erb @@ -0,0 +1,37 @@ + + + diff --git a/views/education.erb b/views/education.erb index 3b9f7c3c..15a1082d 100644 --- a/views/education.erb +++ b/views/education.erb @@ -1,189 +1,148 @@ - - - - - - + + - Neocities for Education - - - - +
      - +
      - - - - - +
      + <%== erb :'_index_signup_script', layout: false %> + diff --git a/views/index_layout.erb b/views/index_layout.erb new file mode 100644 index 00000000..25a7c874 --- /dev/null +++ b/views/index_layout.erb @@ -0,0 +1,45 @@ + + + + + + + + Neocities: Create your free website now! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%== yield %> + + From f8f8fe1a22db5774fda6d0e84261bcd00b4abb9f Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 6 May 2015 14:29:43 -0700 Subject: [PATCH 040/122] featured browse option closes #158 --- app/browse.rb | 3 +++ views/browse.erb | 1 + 2 files changed, 4 insertions(+) diff --git a/app/browse.rb b/app/browse.rb index 87d1f86a..ab195b9b 100644 --- a/app/browse.rb +++ b/app/browse.rb @@ -30,6 +30,9 @@ def browse_sites_dataset end case params[:sort_by] + when 'featured' + site_dataset.exclude! featured_at: nil + site_dataset.order! :featured_at.desc when 'hits' site_dataset.where!{views > 100} site_dataset.order!(:hits.desc, :site_updated_at.desc) diff --git a/views/browse.erb b/views/browse.erb index 4ed9e979..a7b0bcaf 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -25,6 +25,7 @@
      + + + + - + $('#createDir').on('shown', function () { + $('#newDirInput').focus(); + }) + From 93b5b94f1489e7d57d2f6c9e22c52e9b094f2167 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 7 May 2015 14:32:52 -0700 Subject: [PATCH 044/122] better file create --- app/site_files.rb | 57 +++++++++++++++++++++++------ models/site.rb | 12 +++++- tests/acceptance/dashboard_tests.rb | 16 +++++++- views/dashboard.erb | 25 ++++++++++++- views/site_files/new_page.erb | 6 +-- views/site_files/text_editor.erb | 3 +- 6 files changed, 97 insertions(+), 22 deletions(-) diff --git a/app/site_files.rb b/app/site_files.rb index 5b9f2fbf..baa52c79 100644 --- a/app/site_files.rb +++ b/app/site_files.rb @@ -9,32 +9,67 @@ get '/site_files/new' do redirect '/site_files/new_page' end -post '/site_files/create_page' do +post '/site_files/create' do require_login @errors = [] - params[:pagefilename].gsub!(/[^a-zA-Z0-9_\-.]/, '') - params[:pagefilename].gsub!(/\.html$/i, '') + filename = params[:pagefilename] || params[:filename] - if params[:pagefilename].nil? || params[:pagefilename].strip.empty? - @errors << 'You must provide a file name.' - halt erb(:'site_files/new_page') + filename.gsub!(/[^a-zA-Z0-9_\-.]/, '') + + redirect_uri = '/dashboard' + redirect_uri += "?dir=#{Rack::Utils.escape params[:dir]}" if params[:dir] + + if filename.nil? || filename.strip.empty? + flash[:error] = 'You must provide a file name.' + redirect redirect_uri end - name = "#{params[:pagefilename]}.html" + name = "#{filename}" name = "#{params[:dir]}/#{name}" if params[:dir] + name = current_site.scrubbed_path name + if current_site.file_exists?(name) - @errors << %{Web page "#{name}" already exists! Choose another name.} - halt erb(:'site_files/new_page') + flash[:error] = %{Web page "#{name}" already exists! Choose another name.} + redirect redirect_uri end - current_site.install_new_html_file name + extname = File.extname name + + unless extname.match /^\.#{Site::EDITABLE_FILE_EXT}/i + flash[:error] = "Must be an text editable file type (#{Site::VALID_EDITABLE_EXTENSIONS.join(', ')})." + redirect redirect_uri + end + + site_file = current_site.site_files_dataset.where(path: name).first + + if site_file + flash[:error] = 'File already exists, cannot create.' + redirect redirect_uri + end + + if extname.match(/^\.html|^\.htm/i) + current_site.install_new_html_file name + else + file_path = current_site.files_path(name) + FileUtils.touch file_path + File.chmod 0640, file_path + + site_file ||= SiteFile.new site_id: current_site.id, path: name + + site_file.set_all( + size: 0, + sha1_hash: Digest::SHA1.hexdigest(''), + updated_at: Time.now + ) + site_file.save + end flash[:success] = %{#{name} was created! Click here to edit it.} - redirect params[:dir] ? "/dashboard?dir=#{Rack::Utils.escape params[:dir]}" : '/dashboard' + redirect redirect_uri end def file_upload_response(error=nil) diff --git a/models/site.rb b/models/site.rb index 6833d00a..f8dc9043 100644 --- a/models/site.rb +++ b/models/site.rb @@ -36,6 +36,10 @@ class Site < Sequel::Model html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff woff2 json geojson csv tsv mf ico pdf asc key pgp xml mid midi manifest otf webapp } + VALID_EDITABLE_EXTENSIONS = %w{ + html htm txt js css md manifest + } + MINIMUM_PASSWORD_LENGTH = 5 BAD_USERNAME_REGEX = /[^\w-]/i VALID_HOSTNAME = /^[a-z0-9][a-z0-9-]+?[a-z0-9]$/i # http://tools.ietf.org/html/rfc1123 @@ -73,7 +77,7 @@ class Site < Sequel::Model PHISHING_FORM_REGEX = /www.formbuddy.com\/cgi-bin\/form.pl/i SPAM_MATCH_REGEX = ENV['RACK_ENV'] == 'test' ? /pillz/ : /#{$config['spam_smart_filter'].join('|')}/i EMAIL_SANITY_REGEX = /.+@.+\..+/i - EDITABLE_FILE_EXT = /html|htm|txt|js|css|md|manifest/i + EDITABLE_FILE_EXT = /#{VALID_EDITABLE_EXTENSIONS.join('|')}/i BANNED_TIME = 2592000 # 30 days in seconds TITLE_MAX = 100 @@ -692,8 +696,12 @@ class Site < Sequel::Model end def install_new_html_file(path) - File.write files_path(path), render_template('index.erb') + tmpfile = Tempfile.new 'neocities_html_template' + tmpfile.write render_template('index.erb') + tmpfile.close + store_file path, tmpfile purge_cache path + tmpfile.unlink end def file_exists?(path) diff --git a/tests/acceptance/dashboard_tests.rb b/tests/acceptance/dashboard_tests.rb index cf4b60a6..7c86c332 100644 --- a/tests/acceptance/dashboard_tests.rb +++ b/tests/acceptance/dashboard_tests.rb @@ -17,10 +17,22 @@ describe 'dashboard' do visit '/dashboard' click_link 'New Folder' fill_in 'name', with: 'testimages' - click_button 'Create' + #click_button 'Create' + all('#createDir button[type=submit]').first.click page.must_have_content /testimages/ File.directory?(@site.files_path('testimages')).must_equal true end + + it 'creates a new file' do + random = SecureRandom.uuid.gsub('-', '') + visit '/dashboard' + click_link 'New Page / File' + fill_in 'filename', with: "#{random}.html" + #click_button 'Create' + all('#createFile button[type=submit]').first.click + page.must_have_content /#{random}\.html/ + File.exist?(@site.files_path("#{random}.html")).must_equal true + end end end -end \ No newline at end of file +end diff --git a/views/dashboard.erb b/views/dashboard.erb index 802a1ab5..d99ce60e 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -18,7 +18,6 @@
      - + diff --git a/views/site_files/new_page.erb b/views/site_files/new_page.erb index 28fa090d..31839b31 100644 --- a/views/site_files/new_page.erb +++ b/views/site_files/new_page.erb @@ -17,11 +17,11 @@ <% end %>
      -
      + <%== csrf_token_input_html %>

      What's the name of your page?

      -

      .html

      +

      .html

      Note: We will automatically scrub any characters not matching: a-z A-Z 0-9 _ - .

      @@ -29,4 +29,4 @@

      If you want to make this the index page (and an index page doesn't exist), name it index.html.

      -
      \ No newline at end of file +
      diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb index 95ab7d05..1f122b85 100644 --- a/views/site_files/text_editor.erb +++ b/views/site_files/text_editor.erb @@ -90,8 +90,7 @@
      -
      <%==encoding_fix(@file_data) %> -
      +
      <%==encoding_fix(@file_data) %>
      From cc519c00d68ecd7e4d1d0f4eca18021d3ee707af Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Fri, 8 May 2015 15:12:58 -0700 Subject: [PATCH 045/122] Lightening up file listing background color --- sass/_project-sass/_project-Main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 28ab1e23..2b26c73d 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -233,7 +233,7 @@ } .files { float:left; - background: #E4D8CB; + background: #EAE1D5; width: 100%; position: relative; margin-top: 7px; From 439710b9d51d197a851421310635f2baf37cd509 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Fri, 8 May 2015 15:20:21 -0700 Subject: [PATCH 046/122] Tweaks to dashboard wording, padding --- sass/_project-sass/_project-Main.scss | 2 +- views/dashboard.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 2b26c73d..f0beca13 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -278,7 +278,7 @@ padding: 10px; -webkit-border-radius: 8px; -moz-border-radius: 8px; - border-radius: 8px; + border-radius: 6px; min-height: 300px; } .files .list .upload-Boundary.with-instruction { diff --git a/views/dashboard.erb b/views/dashboard.erb index d99ce60e..9abe3d91 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -101,7 +101,7 @@ <% end %>
      - New Page / File + New File New Folder Upload
      From 9affb83a2cc118fa6a5b8cc767c7cae264bb37ad Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 9 May 2015 00:48:23 -0700 Subject: [PATCH 047/122] Fix stats for paths with spaces in them --- models/stat.rb | 15 ++++++++++++++- tests/stat_tests.rb | 12 ++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/models/stat.rb b/models/stat.rb index 45a9d79b..9a05fdf9 100644 --- a/models/stat.rb +++ b/models/stat.rb @@ -20,7 +20,20 @@ class Stat < Sequel::Model logfile = File.open log_path, 'r' while hit = logfile.gets - time, username, size, path, ip, referrer = hit.split ' ' + hit_array = hit.split ' ' + + # If > 6, then the path has a space in it, combine. + if hit_array.length > 6 + time = hit_array[0] + username = hit_array[1] + size = hit_array[2] + path_end_length = 3 + (hit_array.length - 6) + path = hit_array[3..path_end_length].join ' ' + ip = hit_array[path_end_length+1] + referrer = hit_array[path_end_length+2] + else + time, username, size, path, ip, referrer = hit_array + end next if !referrer.nil? && referrer.match(/bot/i) diff --git a/tests/stat_tests.rb b/tests/stat_tests.rb index 8b85021e..5199db5d 100644 --- a/tests/stat_tests.rb +++ b/tests/stat_tests.rb @@ -27,6 +27,18 @@ describe 'stats' do end end + it 'deals with spaces in paths' do + @site = Fabricate :site + File.open("tests/stat_logs/#{SecureRandom.uuid}.log", 'w') do |file| + file.write "2015-05-02T21:16:35+00:00 #{@site.username} 612917 /images/derpie space.png 67.180.75.140 http://derp.com\n" + end + + Stat.parse_logfiles STAT_LOGS_PATH + @site.stats.first.bandwidth.must_equal 612917 + @site.stat_referrers.first.url.must_equal 'http://derp.com' + @site.stat_locations.first.city_name.must_equal 'Menlo Park' + end + it 'prunes logs for free sites' do @free_site = Fabricate :site @supporter_site = Fabricate :site, plan_type: 'supporter' From c5d62b19a399f3b6b871f1c6cf20ac2aa9eaea59 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 9 May 2015 16:52:22 -0700 Subject: [PATCH 048/122] New stats needs to escape gets newline --- models/stat.rb | 17 ++++------------- tests/stat_tests.rb | 28 +++++++++++++++++++--------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/models/stat.rb b/models/stat.rb index 9a05fdf9..b5ad3d22 100644 --- a/models/stat.rb +++ b/models/stat.rb @@ -20,20 +20,11 @@ class Stat < Sequel::Model logfile = File.open log_path, 'r' while hit = logfile.gets - hit_array = hit.split ' ' + hit_array = hit.strip.split "\t" - # If > 6, then the path has a space in it, combine. - if hit_array.length > 6 - time = hit_array[0] - username = hit_array[1] - size = hit_array[2] - path_end_length = 3 + (hit_array.length - 6) - path = hit_array[3..path_end_length].join ' ' - ip = hit_array[path_end_length+1] - referrer = hit_array[path_end_length+2] - else - time, username, size, path, ip, referrer = hit_array - end + raise ArgumentError, hit.inspect if hit_array.length > 6 + + time, username, size, path, ip, referrer = hit_array next if !referrer.nil? && referrer.match(/bot/i) diff --git a/tests/stat_tests.rb b/tests/stat_tests.rb index 5199db5d..49450fc1 100644 --- a/tests/stat_tests.rb +++ b/tests/stat_tests.rb @@ -13,13 +13,13 @@ describe 'stats' do @time_iso8601 = @time.iso8601 log = [ - "#{@time_iso8601} #{@site_one.username} 5000 / 67.180.75.140 http://example.com", - "#{@time_iso8601} #{@site_one.username} 5000 / 67.180.75.140 http://example.com", - "#{@time_iso8601} #{@site_one.username} 5000 / 172.56.16.152 http://example.com", - "#{@time_iso8601} #{@site_one.username} 5000 / 172.56.16.152 -", - "#{@time_iso8601} #{@site_two.username} 5000 / 67.180.75.140 http://example.com", - "#{@time_iso8601} #{@site_two.username} 5000 / 127.0.0.1 -", - "#{@time_iso8601} #{@site_two.username} 5000 /derp.html 127.0.0.2 https://example.com" + "#{@time_iso8601}\t#{@site_one.username}\t5000\t/\t67.180.75.140\thttp://example.com", + "#{@time_iso8601}\t#{@site_one.username}\t5000\t/\t67.180.75.140\thttp://example.com", + "#{@time_iso8601}\t#{@site_one.username}\t5000\t/\t172.56.16.152\thttp://example.com", + "#{@time_iso8601}\t#{@site_one.username}\t5000\t/\t172.56.16.152\t-", + "#{@time_iso8601}\t#{@site_two.username}\t5000\t/\t67.180.75.140\thttp://example.com", + "#{@time_iso8601}\t#{@site_two.username}\t5000\t/\t127.0.0.1\t-", + "#{@time_iso8601}\t#{@site_two.username}\t5000\t/derp.html\t127.0.0.2\thttps://example.com" ] File.open("tests/stat_logs/#{SecureRandom.uuid}.log", 'w') do |file| @@ -30,15 +30,25 @@ describe 'stats' do it 'deals with spaces in paths' do @site = Fabricate :site File.open("tests/stat_logs/#{SecureRandom.uuid}.log", 'w') do |file| - file.write "2015-05-02T21:16:35+00:00 #{@site.username} 612917 /images/derpie space.png 67.180.75.140 http://derp.com\n" + file.write "2015-05-02T21:16:35+00:00\t#{@site.username}\t612917\t/images/derpie space.png\t67.180.75.140\thttp://derp.com\n" + file.write "2015-05-02T21:16:35+00:00\t#{@site.username}\t612917\t/images/derpie space.png\t67.180.75.140\thttp://derp.com\n" end Stat.parse_logfiles STAT_LOGS_PATH - @site.stats.first.bandwidth.must_equal 612917 + @site.stats.first.bandwidth.must_equal 612917*2 @site.stat_referrers.first.url.must_equal 'http://derp.com' @site.stat_locations.first.city_name.must_equal 'Menlo Park' end + it 'deals with spaces in referrer' do + @site = Fabricate :site + File.open("tests/stat_logs/#{SecureRandom.uuid}.log", 'w') do |file| + file.write "2015-05-02T21:16:35+00:00\t#{@site.username}\t612917\t/images/derpie space.png\t67.180.75.140\thttp://derp.com?q=what the lump\n" + end + + Stat.parse_logfiles STAT_LOGS_PATH + end + it 'prunes logs for free sites' do @free_site = Fabricate :site @supporter_site = Fabricate :site, plan_type: 'supporter' From 977ba19610b00432a258590c4fc823d82924a076 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 9 May 2015 22:16:15 -0700 Subject: [PATCH 049/122] implement education version of Neocities --- app/browse.rb | 23 ++++++++--- app/index.rb | 2 + app/site.rb | 2 + app_helpers.rb | 4 ++ tests/acceptance/education_tests.rb | 2 +- views/_footer.erb | 8 ++-- views/_header.erb | 20 +++++----- views/_header_links.erb | 4 ++ views/_index_signup_script.erb | 6 ++- views/browse.erb | 59 ++++++++++++++++------------- views/dashboard.erb | 8 ++-- views/settings/account.erb | 2 +- 12 files changed, 91 insertions(+), 49 deletions(-) diff --git a/app/browse.rb b/app/browse.rb index ab195b9b..1b9c5c4e 100644 --- a/app/browse.rb +++ b/app/browse.rb @@ -1,6 +1,16 @@ get '/browse/?' do + @current_page = params[:current_page] + @current_page = @current_page.to_i + @current_page = 1 if @current_page == 0 + params.delete 'tag' if params[:tag].nil? || params[:tag].strip.empty? - site_dataset = browse_sites_dataset + + if is_education? + site_dataset = education_sites_dataset + else + site_dataset = browse_sites_dataset + end + site_dataset = site_dataset.paginate @current_page, Site::BROWSE_PAGINATION_LENGTH @page_count = site_dataset.page_count || 1 @sites = site_dataset.all @@ -10,11 +20,14 @@ get '/browse/?' do erb :browse end -def browse_sites_dataset - @current_page = params[:current_page] - @current_page = @current_page.to_i - @current_page = 1 if @current_page == 0 +def education_sites_dataset + site_dataset = Site.filter is_deleted: false + site_dataset = site_dataset.association_join(:tags).select_all(:sites) + params[:tag] = current_site.tags.first.name + site_dataset.where! ['tags.name = ?', params[:tag]] +end +def browse_sites_dataset site_dataset = Site.filter(is_deleted: false, is_banned: false, is_crashing: false).filter(site_changed: true) if current_site diff --git a/app/index.rb b/app/index.rb index eb7ec230..6d113dfa 100644 --- a/app/index.rb +++ b/app/index.rb @@ -2,6 +2,8 @@ get '/?' do if current_site require_login + redirect '/dashboard' if current_site.is_education + @suggestions = current_site.suggestions @current_page = params[:current_page].to_i diff --git a/app/site.rb b/app/site.rb index 4f019533..7e6654f0 100644 --- a/app/site.rb +++ b/app/site.rb @@ -9,6 +9,8 @@ get '/site/:username/?' do |username| # TODO: There should probably be a "this site was deleted" page. not_found if site.nil? || site.is_banned || site.is_deleted + redirect '/' if site.is_education + @title = site.title @current_page = params[:current_page] diff --git a/app_helpers.rb b/app_helpers.rb index 7a1ea067..44f58907 100644 --- a/app_helpers.rb +++ b/app_helpers.rb @@ -15,6 +15,10 @@ def csrf_token session[:_csrf_token] ||= SecureRandom.base64(32) end +def is_education? + current_site && current_site.is_education +end + def require_login redirect '/' unless signed_in? if session[:banned] || current_site.is_banned || parent_site.is_banned diff --git a/tests/acceptance/education_tests.rb b/tests/acceptance/education_tests.rb index 449890ca..27f5276b 100644 --- a/tests/acceptance/education_tests.rb +++ b/tests/acceptance/education_tests.rb @@ -30,7 +30,7 @@ describe 'signup' do it 'succeeds with valid data' do fill_in_valid click_button 'Create My Site' - page.must_have_content 'Welcome to Neocities' + page.must_have_content /Welcome to your new site/ index_file_path = File.join Site::SITE_FILES_ROOT, @site[:username], 'index.html' File.exist?(index_file_path).must_equal true diff --git a/views/_footer.erb b/views/_footer.erb index d3409177..cd67fe04 100644 --- a/views/_footer.erb +++ b/views/_footer.erb @@ -10,9 +10,11 @@
      @@ -142,12 +147,14 @@ <% end %> <% end %> +<% unless is_education? %>
      -

      Popular Tags

      -

      - <% Tag.popular_names(100).each do |tag| %> - <%= tag[:name] %>   - <% end %> -

      +

      Popular Tags

      +

      + <% Tag.popular_names(100).each do |tag| %> + <%= tag[:name] %>   + <% end %> +

      +<% end %>
      diff --git a/views/dashboard.erb b/views/dashboard.erb index d99ce60e..04696e23 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -38,7 +38,7 @@ <% end %>
    • Using <%= current_site.space_percentage_used %>% (<%= current_site.total_space_used.to_space_pretty %>) of your <%= current_site.maximum_space.to_space_pretty %>.
      - <% if !current_site.supporter? %>Need more space? Become a Supporter!<% end %>
      • + <% unless current_site.is_education || current_site.supporter? %>Need more space? Become a Supporter!<% end %>
    • <%= current_site.views.format_large_number %> views
    @@ -188,8 +188,10 @@ <% if !current_site.plan_feature(:no_file_restrictions) %> Allowed file types | <% end %> - Download entire site | - Mount your site as a drive on your computer! + Download entire site + <% unless is_education? %> + | Mount your site as a drive on your computer! + <% end %> diff --git a/views/settings/account.erb b/views/settings/account.erb index 223fe031..a6c305c1 100644 --- a/views/settings/account.erb +++ b/views/settings/account.erb @@ -75,4 +75,4 @@ $(document).ready(function() { return location.hash = $(e.target).attr('href').substr(1); }); }); - \ No newline at end of file + From 5d89cb305dcacc953c22527840f75324554e1fc9 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 10 May 2015 00:01:07 -0700 Subject: [PATCH 050/122] browse by supporters --- app/browse.rb | 4 ++++ views/browse.erb | 1 + 2 files changed, 5 insertions(+) diff --git a/app/browse.rb b/app/browse.rb index 1b9c5c4e..13359f41 100644 --- a/app/browse.rb +++ b/app/browse.rb @@ -43,6 +43,10 @@ def browse_sites_dataset end case params[:sort_by] + when 'supporters' + site_dataset.exclude! plan_type: nil + site_dataset.exclude! plan_type: 'free' + site_dataset.order! :views.desc, :site_updated_at.desc when 'featured' site_dataset.exclude! featured_at: nil site_dataset.order! :featured_at.desc diff --git a/views/browse.erb b/views/browse.erb index 729e5247..e8078b57 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -26,6 +26,7 @@
    + @@ -48,7 +49,7 @@
    - <% unless is_education? %> + <% unless is_education? || params[:sort_by] == 'followers' %> From 864903aa1f6a63b605b1a790f8286649ea366f1e Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 6 Jun 2015 22:47:12 -0700 Subject: [PATCH 084/122] remove redundant archive requests from queue --- workers/archive_worker.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/workers/archive_worker.rb b/workers/archive_worker.rb index 63df8a07..d7d0de15 100644 --- a/workers/archive_worker.rb +++ b/workers/archive_worker.rb @@ -1,8 +1,19 @@ +require 'sidekiq/api' + class ArchiveWorker include Sidekiq::Worker - sidekiq_options queue: :archive, retry: 10, backtrace: true + sidekiq_options queue: :archive, retry: 2, backtrace: true def perform(site_id) - Site[site_id].archive! + site = Site[site_id] + return if site.nil? || site.is_banned? + + queue = Sidekiq::Queue.new self.class.sidekiq_options_hash['queue'] + + queue.each do |job| + job.delete if job.args == [site_id] && job.jid != jid + end + + site.archive! end end From 11927f027d9434e8a4233599ff7f37885eed6323 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 7 Jun 2015 03:05:13 -0700 Subject: [PATCH 085/122] patch up space used bug --- models/site.rb | 41 ++++++++++++++++++++++++++++------------ tests/site_file_tests.rb | 13 +++++++++++-- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/models/site.rb b/models/site.rb index 0ea7af86..89e09635 100644 --- a/models/site.rb +++ b/models/site.rb @@ -613,11 +613,6 @@ class Site < Sequel::Model true end - def increment_changed_count - self.changed_count += 1 - save_changes(validate: false) - end - def files_zip zip_name = "neocities-#{username}" @@ -663,8 +658,14 @@ class Site < Sequel::Model path = path[1..path.length] if path[0] == '/' - site_files_dataset.where(path: path).delete - SiteChangeFile.filter(site_id: self.id, filename: path).delete + DB.transaction do + site_file = site_files_dataset.where(path: path).first + if site_file + DB['update sites set space_used=space_used-? where id=?', site_file.size, self.id].first + site_file.delete + end + SiteChangeFile.filter(site_id: self.id, filename: path).delete + end true end @@ -1098,16 +1099,32 @@ class Site < Sequel::Model # array of hashes: filename, tempfile, opts. def store_files(files, opts={}) results = [] + new_size = 0 + html_uploaded = false + files.each do |file| + new_size += file[:tempfile].size + html_uploaded = true if file[:filename].match HTML_REGEX results << store_file(file[:filename], file[:tempfile], file[:opts] || opts) end if results.include? true && opts[:new_install] != true - self.site_changed = true - self.site_updated_at = Time.now - self.updated_at = Time.now - save_changes validate: false - increment_changed_count + time = Time.now + DB['update sites set site_changed=?, site_updated_at=?, updated_at=?, changed_count=changed_count+1, space_used=space_used+? where id=?', + html_uploaded, + time, + time, + new_size, + self.id + ].first + + #self.site_changed = true + #self.site_updated_at = Time.now + #self.updated_at = Time.now + #self.changed_count += 1 + #save_changes validate: false + reload + #SiteChange.record self, relative_path unless opts[:new_install] ArchiveWorker.perform_async self.id end diff --git a/tests/site_file_tests.rb b/tests/site_file_tests.rb index bd2052ab..77278c6f 100644 --- a/tests/site_file_tests.rb +++ b/tests/site_file_tests.rb @@ -24,12 +24,15 @@ describe 'site_files' do describe 'delete' do it 'works' do - upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + uploaded_file = Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + upload 'files[]' => uploaded_file + @site.reload.space_used.must_equal uploaded_file.size file_path = @site.files_path 'test.jpg' File.exists?(file_path).must_equal true delete_file filename: 'test.jpg' File.exists?(file_path).must_equal false SiteFile[site_id: @site.id, path: 'test.jpg'].must_be_nil + @site.reload.space_used.must_equal 0 end it 'deletes a directory and all files in it' do @@ -113,7 +116,9 @@ describe 'site_files' do end it 'succeeds with valid file' do - upload 'files[]' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + uploaded_file = Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + puts uploaded_file.size + upload 'files[]' => uploaded_file last_response.body.must_match /successfully uploaded/i File.exists?(@site.files_path('test.jpg')).must_equal true @@ -121,6 +126,10 @@ describe 'site_files' do queue_args['site'].must_equal @site.username queue_args['path'].must_equal '/test.jpg' + @site.reload + @site.space_used.wont_equal 0 + @site.space_used.must_equal uploaded_file.size + ThumbnailWorker.jobs.length.must_equal 1 ThumbnailWorker.drain From 092eb4536fe792e0e57846d4b27cca1df320ba5a Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 7 Jun 2015 16:27:30 -0700 Subject: [PATCH 086/122] browse pagination length to 100 --- models/site.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/site.rb b/models/site.rb index 89e09635..76fff365 100644 --- a/models/site.rb +++ b/models/site.rb @@ -132,7 +132,7 @@ class Site < Sequel::Model plan_five: 5 } - BROWSE_PAGINATION_LENGTH = 300 + BROWSE_PAGINATION_LENGTH = 100 many_to_many :tags From 397f34a014d9a218bd8cbff8fdb7c8f5425ba15d Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sun, 7 Jun 2015 21:54:25 -0700 Subject: [PATCH 087/122] Fix bug allowing you to delete your own site directory --- app/api.rb | 4 ++++ models/site.rb | 1 + tests/api_tests.rb | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/app/api.rb b/app/api.rb index 1143cee3..57950539 100644 --- a/app/api.rb +++ b/app/api.rb @@ -48,6 +48,10 @@ post '/api/delete' do api_error 400, 'bad_filename', "#{path} is not a valid filename, canceled deleting" end + if current_site.files_path(path) == current_site.files_path + api_error 400, 'cannot_delete_site_directory', 'cannot delete the root directory of the site' + end + if !current_site.file_exists?(path) api_error 400, 'missing_files', "#{path} was not found on your site, canceled deleting" end diff --git a/models/site.rb b/models/site.rb index 76fff365..2b7086c8 100644 --- a/models/site.rb +++ b/models/site.rb @@ -637,6 +637,7 @@ class Site < Sequel::Model end def delete_file(path) + return false if files_path(path) == files_path begin FileUtils.rm files_path(path) rescue Errno::EISDIR diff --git a/tests/api_tests.rb b/tests/api_tests.rb index ca368d75..f12af381 100644 --- a/tests/api_tests.rb +++ b/tests/api_tests.rb @@ -107,6 +107,27 @@ describe 'api delete' do res[:error_type].must_equal 'missing_files' end + it 'fails to delete site directory' do + create_site + basic_authorize @user, @pass + post '/api/delete', filenames: ['/'] + res[:error_type].must_equal 'cannot_delete_site_directory' + File.exist?(@site.files_path).must_equal true + end + + it 'fails to delete other directories' do + create_site + @other_site = @site + create_site + basic_authorize @user, @pass + post '/api/delete', filenames: ["../#{@other_site.username}"] + File.exist?(@other_site.base_files_path).must_equal true + res[:error_type].must_equal 'missing_files' + post '/api/delete', filenames: ["../#{@other_site.username}/index.html"] + File.exist?(@other_site.base_files_path+'/index.html').must_equal true + res[:error_type].must_equal 'missing_files' + end + it 'succeeds with valid filenames' do create_site basic_authorize @user, @pass From 784ba447856f4e03bd9412a20d2c8eca39193ac6 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 8 Jun 2015 20:49:30 -0700 Subject: [PATCH 088/122] Restrict amount of files created per site --- app/api.rb | 4 ++++ app/site_files.rb | 4 ++++ tests/api_tests.rb | 13 +++++++++++++ tests/site_tests.rb | 6 ++++-- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/api.rb b/app/api.rb index 57950539..1387c659 100644 --- a/app/api.rb +++ b/app/api.rb @@ -23,6 +23,10 @@ post '/api/upload' do api_error 400, 'too_large', 'files are too large to fit in your space, try uploading smaller (or less) files' end + if current_site.too_many_files?(files.length) + api_error 400, 'too_many_files', "cannot exceed the maximum site files limit (#{current_site.plan_feature(:maximum_site_files)}), #{current_site.supporter? ? 'please contact support' : 'please upgrade to a supporter account'}" + end + files.each do |file| if !current_site.okay_to_upload?(file) api_error 400, 'invalid_file_type', "#{file[:filename]} is not a valid file type (or contains not allowed content) for this site, files have not been uploaded" diff --git a/app/site_files.rb b/app/site_files.rb index 80ca6130..aa7107dc 100644 --- a/app/site_files.rb +++ b/app/site_files.rb @@ -124,6 +124,10 @@ post '/site_files/upload' do file_upload_response "File(s) do not fit in your available space, upload cancelled." end + if current_site.too_many_files? params[:files].length + file_upload_response "Too many files, cannot upload" + end + results = current_site.store_files params[:files] file_upload_response end diff --git a/tests/api_tests.rb b/tests/api_tests.rb index f12af381..668589f8 100644 --- a/tests/api_tests.rb +++ b/tests/api_tests.rb @@ -160,6 +160,19 @@ describe 'api upload' do res[:error_type].must_equal 'missing_files' end + it 'fails with too many files' do + create_site + basic_authorize @user, @pass + @site.plan_feature(:maximum_site_files).times { + uuid = SecureRandom.uuid.gsub('-', '')+'.html' + @site.add_site_file path: uuid + } + post '/api/upload', { + '/lol.jpg' => Rack::Test::UploadedFile.new('./tests/files/test.jpg', 'image/jpeg') + } + res[:error_type].must_equal 'too_many_files' + end + it 'resists directory traversal attack' do create_site basic_authorize @user, @pass diff --git a/tests/site_tests.rb b/tests/site_tests.rb index c42d1d49..e72a685e 100644 --- a/tests/site_tests.rb +++ b/tests/site_tests.rb @@ -53,10 +53,12 @@ describe Site do end it 'should match plan_type' do - %w{supporter neko catbus fatcat}.each do |plan_type| + %w{supporter free}.each do |plan_type| site = Fabricate :site, plan_type: plan_type site.plan_type.must_equal plan_type end + site = Fabricate :site, plan_type: nil + site.plan_type.must_equal 'free' end end @@ -77,4 +79,4 @@ describe Site do site.suggestions.length.must_equal Site::SUGGESTIONS_LIMIT end end -end \ No newline at end of file +end From 5b13244712d022c3d634268fe89b1786b6305e24 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 8 Jun 2015 20:50:02 -0700 Subject: [PATCH 089/122] Site model for file limit fix --- models/site.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/models/site.rb b/models/site.rb index 2b7086c8..6c214361 100644 --- a/models/site.rb +++ b/models/site.rb @@ -102,7 +102,8 @@ class Site < Sequel::Model unlimited_site_creation: true, custom_ssl_certificates: true, no_file_restrictions: true, - custom_domains: true + custom_domains: true, + maximum_site_files: 25000 } PLAN_FEATURES[:free] = PLAN_FEATURES[:supporter].merge( @@ -113,9 +114,14 @@ class Site < Sequel::Model unlimited_site_creation: false, custom_ssl_certificates: false, no_file_restrictions: false, - custom_domains: false + custom_domains: false, + maximum_site_files: 1000 ) + def too_many_files?(file_count=0) + (site_files_dataset.count + file_count) > plan_feature(:maximum_site_files) + end + def plan_feature(key) PLAN_FEATURES[plan_type.to_sym][key.to_sym] end @@ -1103,6 +1109,11 @@ class Site < Sequel::Model new_size = 0 html_uploaded = false + if too_many_files?(files.length) + results << false + return results + end + files.each do |file| new_size += file[:tempfile].size html_uploaded = true if file[:filename].match HTML_REGEX From bf61a5384e477ea7ef243b54ca817bab7f688180 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 8 Jun 2015 20:50:37 -0700 Subject: [PATCH 090/122] show stats by days --- app/site.rb | 15 ++++++++++++++- views/site/stats.erb | 8 ++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/site.rb b/app/site.rb index 4291edce..32e4e577 100644 --- a/app/site.rb +++ b/app/site.rb @@ -82,8 +82,21 @@ get '/site/:username/stats' do location_hash end - @stats[:stat_days] = @site.stats_dataset.order(:created_at.desc).limit(7).all.reverse + stats_dataset = @site.stats_dataset.order(:created_at.desc) + if @site.supporter? + unless params[:days].to_s == 'sincethebigbang' + if params[:days] + stats_dataset.limit! params[:days] + else + stats_dataset.limit! 7 + end + end + else + stats_dataset.limit! 7 + end + + @stats[:stat_days] = stats_dataset.all.reverse @multi_tooltip_template = "<%= datasetLabel %> - <%= value %>" erb :'site/stats', locals: {site: @site} diff --git a/views/site/stats.erb b/views/site/stats.erb index 3d5b16d7..c907cdd4 100644 --- a/views/site/stats.erb +++ b/views/site/stats.erb @@ -139,10 +139,10 @@ <% if current_site.supporter? %> <% else %>

    (Upgrade to see up to see stats for all time)

    From d3eda71447fd3a69c1690bea39237e3bd0a15e6a Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 8 Jun 2015 21:07:05 -0700 Subject: [PATCH 091/122] exclude stats from the current day --- app/site.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/site.rb b/app/site.rb index 32e4e577..d716ec56 100644 --- a/app/site.rb +++ b/app/site.rb @@ -82,7 +82,7 @@ get '/site/:username/stats' do location_hash end - stats_dataset = @site.stats_dataset.order(:created_at.desc) + stats_dataset = @site.stats_dataset.order(:created_at.desc).exclude(created_at: Date.today) if @site.supporter? unless params[:days].to_s == 'sincethebigbang' From b11350b04fe196c8120d1beecaff4f8ede485c64 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Mon, 8 Jun 2015 21:16:54 -0700 Subject: [PATCH 092/122] most followed default browse --- app/browse.rb | 8 +++++--- views/browse.erb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/browse.rb b/app/browse.rb index 9e7dda14..744e67e7 100644 --- a/app/browse.rb +++ b/app/browse.rb @@ -79,9 +79,11 @@ def browse_sites_dataset params[:sort_by] = 'views' site_dataset.order!(:views.desc, :site_updated_at.desc) else - params[:sort_by] = 'last_updated' - site_dataset.where!{views > 100} - site_dataset.order!(:site_updated_at.desc, :views.desc) + site_dataset = site_dataset.association_left_join :follows + site_dataset.select_all! :sites + site_dataset.select_append! Sequel.lit("count(follows.site_id) AS follow_count") + site_dataset.group! :sites__id + site_dataset.order! :follow_count.desc, :updated_at.desc end end diff --git a/views/browse.erb b/views/browse.erb index 672b08ef..6fe5da75 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -25,8 +25,8 @@