community_engine 2.3.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: b9de87bef90a83355c574952e438ec062645ae69
-  data.tar.gz: 8d5b30da07b1907ddf84009ef4f23b8babb1ce27
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmIwMTFiZjVmN2I3MzMzNmJmMDBmZTkzYzRkMTY0YTMwYTMzZTdjNA==
+  data.tar.gz: !binary |-
+    NDJlMTkwMWRlZWU4ZjZiNmZjNDFhMjMxY2NkYzMxMDliODk3MzgyYg==
 SHA512:
-  metadata.gz: 39d7289ca53c143fe0add0222ecabb3b3c474375f1b39e436fd022e32795261117ecb6b9b2adafdf5005fef927260a9fd70641f12306199c775e1a0f6e2b13f2
-  data.tar.gz: f5448eb0f8fa19a45098cf884fc82075c6ac19de9e7704c677ea0b58ab1d4a2ed72b219a5f6e51e35d105c3f1f8f6af7b8a13ae6b30415963cccd45cf9e75e18
+  metadata.gz: !binary |-
+    YWIwOTM3MjhiNGY3YjVjODFlNzU4NTI3Yzg1ZjdjNTkwMDI5ZjMzOWI0Y2Y1
+    NmJlMDNkYWQ4MGU0OTNmZTNlZjAzYWM2ODY2NTcwMWY4OTJhYmE4Nzk1Yjgy
+    Y2JjNzNjMzk2Mzg3MDA1NDkwMDczNDA5MmZjMDYwZGExOTg5NTI=
+  data.tar.gz: !binary |-
+    NWRjMWNiMWFlYmY2MjM2YzA1ZDA4OTFlMTBiZmIxZTcwZDUwYTNjMjczYWQ0
+    NjMxMWJiMGE3YzBiOWZkY2EzMWVjMWFhYjVmZjFkYjQ4MGMyMGYzZWMwNzgy
+    M2ZiMTBkYTY5ZjVhOGI3YTZhOTgxYTUxOTliMDUxNDhhNzY2ZWY=

data/.travis.yml

@@ -1,10 +1,11 @@
+language: ruby
+
 bundler_args: --binstubs
 
 rvm:
-  - 1.9.3
   - 2.0.0
-env:
-  - "RAILS_ENV='test' RAILS_VERSION=3.2.0"
-  - "RAILS_ENV='test' RAILS_VERSION=3.2.19"
+  - 2.1.1
+env: "RAILS_ENV='test' RAILS_VERSION=4.0.0"
+env: "RAILS_ENV='test' RAILS_VERSION=4.0.8"
 
 script: "bundle exec rake db:drop db:create db:migrate test"

data/CHANGELOG

@@ -1,14 +1,52 @@
 = TODO
-* replace old multiple uploader
-* fix photo uploading from welcome_photo page
-* add back searching to users index
-* swap jquery for prototype
-* Upgrade to bcrybt crypto method
+* datepicker for events
+
+=3.0.0            -- Trevor Bullock  02 Dec 2014
+* Upgraded to Bootstrap 3
+* Upgraded to Font Awesome 4
+* Upgraded to Configatron 4
+* Various bug fixes
+
+=3.0.0.pre3       -- BB  Nov 2013
+* Merged in the jquery-bootstrap branch
+* Removed old prototype.js code
+
+=3.0.0.pre2       -- Polar Humenn   20 Sep 2013
+* Upgraded to tinyMCE 4.0.2 ; made fix to mce_options to make it work.
+* Removed curblyadvimage from tinymce plugins (not working)
+* Made fix for Users params when nothing is modified.
+
+=3.0.0.pre1        -- Polar Humenn   15 Aug 2013
+* Moved forms and links to unobtrusive javascript. Still using Prototype.
+* Addressed almost all 4.0/4.1 deprecation issues
+* Migrated to ActiveRecord Query syntax.
+* Replaced :method => :put with :method => :patch
+* Removed attr_accessible and attr_protected in favor of StrongParameters
+* Replaced some 2.3 style plugins with bona fide gems, removed, or moved to lib
+    activity_tracker          ---> lib
+    acts_as_list              ---> gem acts_as_list
+    acts_as_commentable       ---> gem acts_as_commentable, requires db:migrate
+    acts_as_publishable       ---> lib
+    auto_complete             ---> lib
+    bborn-acts-as-taggable-on ---> gem acts_as_taggable-on
+    enumerations_mixin        ---> gem power_num
+    prototype_legacy_helper   ---> lib  (about to be removed)
+    resource_feeder           ---> lib
+    responds_to_parent        ---> removed
+    white_list                ---> lib
+* Replaced or Upgraded gems
+    gem ransak       replaces       gem meta_search
+    gem friendly_id  upgrade requires a db:migrate and syntactical changes
+* Added gems as per directions supporting caching in Rails 4
+    gem actionpack-action_caching
+    gem actionpack-page_caching
+    gem rails-observers
 
 =2.3.1
 * Remove automatic loading of omniauth middleware, in favor of letting users load it themselves as specified in the README (this was causing bugs with duplicate inits of omniauth-facebook middleware)
 * Add spam comment moderation (comments identified as spam as held in 'pending status')
 
+
 =2.3.0
 * Upgrade omniauth to 1.1
 

data/Gemfile

@@ -1,25 +1,10 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'omniauth-facebook'
-gem 'acts_as_commentable', :git => 'https://github.com/jackdempsey/acts_as_commentable'
 
 group :test do
   gem 'sqlite3'
   gem 'mocha', :require => false
 end
 
-rails_version = ENV["RAILS_VERSION"] || "default"
-
-rails = case rails_version
-when "master"
-  {github: "rails/rails"}
-when "default"
-  ">= 3.2.0"
-else
-  "~> #{rails_version}"
-end
-
-gem "rails", rails
-
-
 gemspec

data/README.markdown

@@ -4,15 +4,18 @@ CommunityEngine
 [![Build Status](https://travis-ci.org/bborn/communityengine.svg?branch=master)](https://travis-ci.org/bborn/communityengine)
 [![Gem Version](https://badge.fury.io/rb/community_engine.svg)](https://badge.fury.io/rb/community_engine)
 
+
 Information at: [http://www.communityengine.org](http://www.communityengine.org)
 
 **Requirements:**
 
-	- RAILS VERSION 3.2.8
+	- RAILS VERSION 4.0.0
+	- RUBY  2.0.0
 
 For Rails 2.x use the [rails2.x branch](https://github.com/bborn/communityengine/tree/rails2.x)
 
-For Rails 4.x use the [rails4 branch](https://github.com/bborn/communityengine/tree/rails4)
+For Rails 3.x use the [rails3.x branch](https://github.com/bborn/communityengine/tree/rails3.x)
+
 
 Getting CommunityEngine Running
 --------------------------------
@@ -20,7 +23,7 @@ Getting CommunityEngine Running
 1. Copy the following into your `Gemfile`:
 
   ```ruby
-  gem 'community_engine'
+  gem 'community_engine', '~> 3.0.0'
   ```
 
 2. Add a file called `application_config.rb` to your `config` directory. In it put (at least):
@@ -33,9 +36,9 @@ Getting CommunityEngine Running
 3. From your app's root directory run:
 
   ```
-	$ bundle install --binstubs
-	$ bin/rake community_engine:install:migrations
-	$ bin/rake db:migrate
+  $ bundle install --binstubs
+  $ bin/rake community_engine:install:migrations
+  $ bin/rake db:migrate
   ```
 
 4. Mount CommunityEngine in your `config/routes.rb` file:
@@ -49,7 +52,7 @@ Getting CommunityEngine Running
 6. Start your server!
 
   ```
-	$ bin/rails server
+  $ bin/rails server
   ```
 
 Optional Configuration
@@ -95,7 +98,6 @@ You'll need to change your configuration in your `application_config.rb` to tell
 Finally, you'll need an S3 account for S3 photo uploading.
 
 
-
 Roles
 ------
 
@@ -166,7 +168,7 @@ Ads
 
 Ads are snippets of HTML that will be inserted into your templates. You have to declare where they show up in your view. For example, if you wanted a sidebar ad slot, add ```Ad.display()``` in your application template (or wherever your sidebar is):
 
-```haml
+```ruby
 #sidebar
   %h1 This is the sidebar
 
@@ -184,7 +186,7 @@ To make a controller from your application use CE's layout and inherit CE's help
 ```ruby
 class RecipesController < BaseController
 
-	before_filter :login_required
+	before_action :login_required
 
 	uses_tiny_mce do
 		{:only => [:show], :options => configatron.default_mce_options}
@@ -196,18 +198,18 @@ end
 To override or modify a controller, helper, or model from CE, you can use the `require_from_ce` helper method. For example, to override a method in CE's `User` model, create `app/models/user.rb`:
 
 ```ruby
-class User < ActiveRecord::Base
-	require_from_ce('models/user')
+	class User < ActiveRecord::Base
+		require_from_ce('models/user')
 
-	#add a new association
-	has_many :recipes
+		#add a new association
+		has_many :recipes
 
-	#override an existing method
-	def	display_name
-		login.capitalize
-	end
+		#override an existing method
+		def	display_name
+			login.capitalize
+		end
 
-end
+	end
 ```
 
 
@@ -234,6 +236,7 @@ Contributors - Thanks! :)
 - [Juan de Frías](http://github.com/juafrlo) static pages, photo albums, message_controller tests
 - [Joel Nimety](http://github.com/jnimety) authlogic authentication
 - [Stephane Decleire](http://github.com/sdecleire) i18n, fr-FR locale
+- [Polar Humenn](http://github.com/polar) Rails 4 port, and other slight improvements
 
 
 

data/UPGRADING.markdown

@@ -1,3 +1,13 @@
+Upgrading to v3.0.0
+===================
+Follow the various guides for converting to Rails 4 from Rails 3.x
+
+Run `bundle exec rake app:community_engine:install:migrations`
+Run `rake db:migrate`
+Run `rake test && take community_engine:test`
+
+Somethings may not be compatible. Some of the views and forms have changed.
+
 Upgrading to v1.2.1
 ===================
 Run `ruby script/generate plugin_migration`

data/about.yml

@@ -4,4 +4,4 @@ homepage: http://www.missingmethod.com
 summary: A social networking engine
 description: Adds basic social networking capabilities to your existing application, including users, blogs, photos, clippings, favorites, and more.
 license: MIT
-version: 2.3.2
+version: 2.0.0.beta3

data/app/assets/javascripts/community_engine.js

@@ -1,20 +1,189 @@
-//= require prototype
-//= require rails
-//= require effects
-//= require builder
-//= require dragdrop
-//= require controls
-//= require lightbox
-//= require prototip-min
-//= require tinymce
-
-function scrollToAnchor(anchor){
-  loc = document.location.toString();
-  if (loc.indexOf("#") != -1){
-    parts = loc.split('#')
-    loc = parts[0] + '#' + anchor
-  } else {
-    loc = loc + '#' + anchor
+///////////////////////////////////////////
+// BASE JAVASCRIPT FUNCTIONALITY         //
+///////////////////////////////////////////
+//= require jquery
+//= require jquery.migrate
+//= require jquery_ujs
+//= require jquery-ui
+//= require bootstrap-sprockets
+//
+///////////////////////////////////////////
+// UTILITIES                             //
+///////////////////////////////////////////
+//= require tinymce-jquery
+
+(function($){
+
+  $.CE = {};
+
+  jQuery.fn.RichTextEditor = function (options) {
+    $this = $(this);
+    // fix tinymce bug with html5 and required fields
+    if($this.is("[required]")){
+        options.oninit = function(editor){
+            $this.closest("form").find(":submit").on("click", function(){
+              editor.save();
+            });
+        }
+    }
+    $this.tinymce(options);
   }
-  document.location.href = loc;
+
+  jQuery.fn.scrollTo = function () {
+    space_at_top = $('.navbar').height() + 20;
+    $('html,body').animate({scrollTop: $(this).offset().top - space_at_top},'slow');
+  }
+
+  jQuery.fn.keepUpdatedFromUrl = function (url_to_load, frequency) {
+    updateElementFromUrl($(this), url_to_load);
+    setInterval(
+      function() {
+        $(this).updateFromUrl(url_to_load);
+      },
+      frequency
+    );
+  }
+
+  jQuery.fn.updateFromUrl = function(url_to_load) {
+    element = this;
+    $.get(url_to_load, function(data) {
+      $(element).html(data);
+    });
+  }
+
+  $(document).on('click', '.delete-via-ajax', function(event){
+    event.preventDefault();
+    if(confirm($(this).attr('data-manual-confirm'))) {
+      console.log('Attempting to delete via AJAX...');
+      $.ajax({
+        type: 'POST',
+        data: {'_method': 'delete'},
+        beforeSend: function(xhr, settings) {
+          xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+        },
+        url: $(this).attr('href') + '.js',
+          dataType: 'script',
+          success: function(response) {
+            if(response) {
+              console.log('Return script received.');
+            } else {
+              console.log('Failed to receive return script.');
+            }
+          },
+          error: logError
+      });
+    }
+  })
+
+  $(document).on('submit', '.submit-via-ajax', function(event){
+    event.preventDefault();
+    submitViaAjax($(this));
+  });
+
+  $('.submit-via-ajax').on('form-pre-serialize', function(e) {
+    tinyMCE.triggerSave();
+  });
+
+  $(document).on('click', '.edit-via-ajax', function(){
+    event.preventDefault();
+    console.log('Attempting to retrieve edit form via AJAX...');
+    $('#'+ $(this).attr('id') + '_spinner').removeClass('hide');
+    $.ajax({
+      type: $(this).attr('method'),
+      url: $(this).attr('href').replace('?', '.js?'),
+      dataType: 'script',
+      success: function(response) {
+        if(response) {
+          console.log('Return script received.');
+        } else {
+          console.log('Failed to receive return script.');
+        }
+      },
+      error: logError
+    });
+  });
+
+  $(document).on('click', '.act-via-ajax', function(event){
+    event.preventDefault();
+    console.log('Attempting to act via AJAX...');
+    $this = $(this);
+    $('#'+ $this.attr('id') + '_spinner').removeClass('hide');
+    if($this.is("input") || $this.is("button")) {
+      action = $this.closest('form').attr('action');
+      method = $this.closest('form').attr('method');
+    } else if ($this.is("a")) {
+      action = $this.attr('href');
+      method = $this.attr('data-method');
+    } else {
+      console.log('Could not identify element type.');
+      return false;
+    }
+    $.ajax({
+      type: method,
+      url: action.replace('?', '.js?'),
+      dataType: 'js',
+      success: function(response) {
+        if(response) {
+          $this.effect("pulsate", { times:1 }, 250);
+          $this.replaceWith(response);
+          $('#' + $this.attr('id')).effect("pulsate", { times:2 }, 500);
+        } else {
+          console.log('Failed to receive return script.');
+        }
+      },
+      error: logError
+    });
+  });
+
+  $(document).on('click', '.check-all', function(e){
+    e.preventDefault();
+    first_val = $(this).closest('form').find(':checkbox').attr('checked');
+    if(first_val) {
+      new_val = false
+    } else {
+      new_val = 'checked'
+    }
+    $(this).closest('form').find(':checkbox').attr('checked', new_val);
+  });
+
+})(jQuery);
+
+
+function updateElementFromPost(element, url_to_load) {
+  $('#'+element.attr('id')+'_spinner').removeClass('hide');
+  $.ajax({
+    type: 'POST',
+    url: url_to_load,
+    dataType: 'html',
+    success: function(data) {
+    element.html(data);
+      $('#'+element.attr('id')+'_spinner').addClass('hide');
+  },
+    error: logError
+  });
+}
+
+function submitViaAjax(form) {
+  $('#'+ form.attr('id') + '_spinner').removeClass('hide');
+  console.log('Attempting to save via AJAX...');
+  $.ajax({
+    type: form.attr('method'),
+    url: form.attr('action').replace('?', '.js?'),
+    data: form.serialize(),
+    dataType: 'script',
+    success: function(response) {
+      if(response) {
+        console.log('Return script received.');
+      } else {
+        console.log('Failed to receive return script.');
+      }
+    },
+    error: logError
+  });
+}
+
+function logError(jqXHR, textStatus, errorThrown) {
+  console.log(jqXHR);
+  console.log(textStatus);
+  console.log(errorThrown);
 }