community_engine 2.1.0 → 2.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTUxNzQzYzY5OGRjZDgzZjRiNDIxNmMyNDg1NmUxNTFiN2NkOGFlNg==
+  data.tar.gz: !binary |-
+    NGE1ODk0ODU2MjhmNmNiZWVkMWI2NGU5MDdhMzNlMDY2ZDJiZDIxOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    M2M0MTBmMWIyMGIxZDAxMGMwMDVhMWYwZGVlZDVjZTE3YmYzMGZhNDIxNjdh
+    M2RjYTFiODk4OTY2NzJiZjFiZWY3ZDg1Yzc4NzBmMjljOGZhN2MwMGE2Mzc1
+    MTNhMzcxZGJjYmQ4ZTBlN2E3ZGZmY2M1OGRjY2UwYzk1YmY2ZmY=
+  data.tar.gz: !binary |-
+    MGQ3YTNmYmUwMjJhYTc3OWE3OTRmMjM5YWVkNTJiYjI5YzA2OGIzYTAyNjQ1
+    ZWQxOTFjYzkzOTg2Y2ZjZmU5NjJlNDM1ZWI1MjgyZjRjNGI4ZWJmYTQ1NDRh
+    ZTYzYmZlMjhiMzVkZmUyYTQzYTNkMzg2NmM1NzhjMzdlMDdiMzc=

data/.travis.yml

@@ -2,8 +2,7 @@ bundler_args: --binstubs
 
 rvm:
   - 1.9.2
-  
+  - 2.0.0  
 env: "RAILS_ENV='test' "
   
 script: "bundle exec rake db:drop db:create db:migrate test"
-  

data/CHANGELOG

@@ -3,9 +3,12 @@
 * fix photo uploading from welcome_photo page
 * add back searching to users index
 * swap jquery for prototype
+* Upgrade to bcrybt crypto method
 
 
-* Upgrade to bcrybt crypto method
+=2.3.0
+* Upgrade omniauth to 1.1
+
 
 =2.0.0.beta4
 * Replace white_list plugin with Sanitize gem (white_list.rb initizlizer format has changed)
@@ -97,4 +100,4 @@
 = 0.10.7
 
 * Updating CE to be compatible with Rails 2.1.2
-* Lots of il8n refactoring, mainly using symbol tokens instead of string for localization in views. 
+* Lots of il8n refactoring, mainly using symbol tokens instead of string for localization in views.

data/Gemfile

@@ -1,5 +1,7 @@
 source 'http://rubygems.org'
 
+gem 'omniauth-facebook'
+
 group :test do
   gem 'sqlite3'
 end

data/README.markdown

@@ -59,6 +59,12 @@ You can allow users to sign up and log in using their accounts from other social
 	  provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
 	end
 
+You must also add the corresponding provider gem, for example to use facebook login you will need to add
+
+		gem 'omniauth-facebook'
+
+to your gemfile
+
 See the [OmniAuth Github repository](https://github.com/intridea/omniauth) for more information and configuration options.
 
 

data/UPGRADING.markdown

@@ -44,7 +44,7 @@ Make sure you have the following in your `environment.rb`:
         config.gem 'authlogic'
         config.gem 'icalendar'
         config.gem 'calendar_date_select'
-        
+
 Run `rake db:migrate`
 That's it!
 
@@ -53,7 +53,7 @@ That's it!
 Upgrading v1.0.2
 ================
 
-Beginning with CE v.1.0.2, we have started using the Desert gem instead of the Engines plugin. Desert does many of the things the Engines plugin did, but also allows model code mixing. Also, in light of Engine's inclusion into Rails core, it appeared many of the features CE loves about Engines (plugin migrations, asset helpers, code mixing) were going to be dropped. 
+Beginning with CE v.1.0.2, we have started using the Desert gem instead of the Engines plugin. Desert does many of the things the Engines plugin did, but also allows model code mixing. Also, in light of Engine's inclusion into Rails core, it appeared many of the features CE loves about Engines (plugin migrations, asset helpers, code mixing) were going to be dropped.
 
 Upgrading an Engines-based CE app to use the new Desert-based CE is easy:
 
@@ -66,7 +66,7 @@ Upgrading an Engines-based CE app to use the new Desert-based CE is easy:
         Run git rm --cached vendor/plugins/engines (no trailing slash).
         Run rm -rf vendor/plugins/engines
         Commit your changes
-        
+
 
 2. run `rake:rails:update` (coming from anything < Rails 2.3)
 
@@ -82,12 +82,12 @@ If you have old migrations from the Engines-based CE, you may experience some pr
 
 Here's a regex that might help you in doing that:
 
-Find: 
+Find:
 
         (Engines|Rails)\.plugins\[\"community_engine\"\]\.migrate\(([0-9]+)\)
-        
-Replace: 
 
-        migrate_plugin(:community_engine, $2)  
+Replace:
+
+        migrate_plugin(:community_engine, $2)
 
-Also, you need to run `rake community_engine:db:migrate:upgrade_desert_plugin_migrations` before you migrate any _new_ CE migrations, to ensure your plugin migrations are listed in the correct table. Please note that you'll have to do this (carefully, and with backups) in production as well. Please post any questions to the CE Google Group.
+Also, you need to run `rake community_engine:db:migrate:upgrade_desert_plugin_migrations` before you migrate any _new_ CE migrations, to ensure your plugin migrations are listed in the correct table. Please note that you'll have to do this (carefully, and with backups) in production as well. Please post any questions to the CE Google Group.

data/app/controllers/messages_controller.rb

@@ -45,8 +45,8 @@ class MessagesController < BaseController
       @message.valid?
       render :action => :new and return
     else
-      @message = Message.new(params[:message])          
-      @message.recipient = User.find_by_login(params[:message][:to].strip)
+      @message = Message.new(params[:message])
+      @message.recipient= User.where('lower(login) = ?', params[:message][:to].strip.downcase).first
       @message.sender = @user
       unless @message.valid?
         render :action => :new and return        

data/app/controllers/topics_controller.rb

@@ -7,7 +7,7 @@ class TopicsController < BaseController
   end
 
   def index
-    @forum = Forum.find(params[:forum_id])    
+    @forum = Forum.find(params[:forum_id])
     respond_to do |format|
       format.html { redirect_to forum_path(params[:forum_id]) }
       format.xml do
@@ -21,7 +21,7 @@ class TopicsController < BaseController
     @topic = Topic.new(params[:topic])
     @topic.sb_posts.build
   end
-  
+
   def show
     respond_to do |format|
       format.html do
@@ -42,40 +42,40 @@ class TopicsController < BaseController
       end
       format.rss do
         @posts = @topic.sb_posts.recent.limit(25)
-        render :action => 'show.xml.builder', :layout => false
+        render :action => 'show', :layout => false, :formats => [:xml]
       end
     end
   end
-  
+
   def create
     @topic = @forum.topics.new(params[:topic])
     assign_protected
-      
+
     @post = @topic.sb_posts.first
     if (!@post.nil?)
       @post.user = current_user
     end
-      
+
     @topic.tag_list = params[:tag_list] || ''
 
     if !@topic.save
       respond_to do |format|
-        format.html { 
+        format.html {
           render :action => 'new' and return
         }
       end
     else
       respond_to do |format|
-        format.html { 
-          redirect_to forum_topic_path(@forum, @topic) 
+        format.html {
+          redirect_to forum_topic_path(@forum, @topic)
         }
-        format.xml  { 
-          head :created, :location => forum_topic_url(:forum_id => @forum, :id => @topic, :format => :xml) 
+        format.xml  {
+          head :created, :location => forum_topic_url(:forum_id => @forum, :id => @topic, :format => :xml)
         }
       end
     end
   end
-  
+
   def update
     assign_protected
     @topic.tag_list = params[:tag_list] || ''
@@ -85,30 +85,30 @@ class TopicsController < BaseController
       format.xml  { head 200 }
     end
   end
-  
+
   def destroy
     @topic.destroy
-    flash[:notice] = :topic_deleted.l_with_args(:topic => CGI::escapeHTML(@topic.title)) 
+    flash[:notice] = :topic_deleted.l_with_args(:topic => CGI::escapeHTML(@topic.title))
     respond_to do |format|
       format.html { redirect_to forum_path(@forum) }
       format.xml  { head 200 }
     end
   end
-  
-  protected  
+
+  protected
     def assign_protected
       @topic.sticky = @topic.locked = 0
       @topic.forum_id = @forum.id
       @topic.user = current_user if @topic.new_record?
-      
+
       # admins and moderators can sticky and lock topics
       return unless admin? or current_user.moderator_of?(@topic.forum)
-      @topic.sticky, @topic.locked = params[:topic][:sticky], params[:topic][:locked] 
+      @topic.sticky, @topic.locked = params[:topic][:sticky], params[:topic][:locked]
       # only admins can move
       return unless admin?
       @topic.forum_id = params[:topic][:forum_id] if params[:topic][:forum_id]
     end
-    
+
     def find_forum_and_topic
       @forum = Forum.find(params[:forum_id])
       @topic = @forum.topics.find(params[:id]) if params[:id]

data/app/models/ad.rb

@@ -4,33 +4,36 @@ class Ad < ActiveRecord::Base
 
   validates_presence_of :html
   validates_inclusion_of :audience, :in => AUDIENCES
-  validates_inclusion_of :frequency, :in => FREQUENCIES  
-  
+  validates_inclusion_of :frequency, :in => FREQUENCIES
+
+  attr_accessible :html, :name, :frequency, :audience, :published, :time_constrained, :start_date, :end_date, :location
+
+
   def self.display(location, logged_in = false)
     return nil if location.blank?
-    ads = find(:all, 
-      :conditions => ["location = ? 
-        AND published = ? 
+    ads = find(:all,
+      :conditions => ["location = ?
+        AND published = ?
         AND (time_constrained = ? OR (start_date > ? AND end_date < ?))
-        AND (audience IN (?) )", 
+        AND (audience IN (?) )",
         location.to_s, true, false, Time.now, Time.now, audiences_for(logged_in) ])
-        
+
     ad = random_weighted(ads.map{|a| [a, a.frequency] })
     ad ? ad.html.html_safe : ''
   end
-    
+
   def self.audiences_for(logged_in)
     ["all", "logged_#{logged_in ? 'in' : 'out'}"]
   end
-  
+
   def self.frequencies_for_select
     FREQUENCIES.map{|f| [f, f.to_s]}
   end
-  
+
   def self.audiences_for_select
     AUDIENCES.map{|a| [a, a.to_s]}
-  end  
-  
+  end
+
   def self.random_weighted(items)
     total = 0
     pick = nil
@@ -38,6 +41,6 @@ class Ad < ActiveRecord::Base
       pick = item if rand(total += weight) < weight
     end
     pick
-  end    
+  end
 
-end
+end

data/app/models/authorization.rb

@@ -47,10 +47,10 @@ class Authorization < ActiveRecord::Base
   def assign_account_info(auth_hash)
     self.uid                 = auth_hash['uid']
     self.provider            = auth_hash['provider']
-    self.nickname            = auth_hash['user_info']['nickname']
-    self.email               = auth_hash['user_info']['email']    
-    self.picture_url         = auth_hash['user_info']['image']
-    self.name                = auth_hash['user_info']['name']
+    self.nickname            = auth_hash['info']['nickname']
+    self.email               = auth_hash['info']['email']
+    self.picture_url         = auth_hash['info']['image']
+    self.name                = auth_hash['info']['name']
     if auth_hash['credentials']
       self.access_token        = auth_hash['credentials']['token']
       self.access_token_secret = auth_hash['credentials']['secret']

data/app/models/metro_area.rb

@@ -3,7 +3,7 @@ class MetroArea < ActiveRecord::Base
   belongs_to :state
   belongs_to :country
 
-  attr_accessible :name, :state, :country_id
+  attr_accessible :name, :state, :country_id, :state_id
 
   #validates_presence_of :state, :if => Proc.new { |user| user.country.eql?(Country.get(:us)) }
   validates_presence_of :country_id

data/app/models/page.rb

@@ -1,7 +1,9 @@
 class Page < ActiveRecord::Base
   acts_as_publishable :live, :draft, :members_only, :public
   validates_presence_of :title, :body
-  
+
+  attr_accessible :title, :body, :published_as, :page_public
+
   def to_param
     id.to_s << "-" << (title ? title.parameterize : '')
   end

data/app/models/photo.rb

@@ -1,28 +1,30 @@
 class Photo < ActiveRecord::Base
+  include UrlUpload
+
   acts_as_commentable
   belongs_to :album
-  
+
   has_attached_file :photo, configatron.photo.paperclip_options.to_hash
-  validates_attachment_presence :photo
+  validates_attachment_presence :photo, :unless => Proc.new{|record| record.photo_remote_url }
   validates_attachment_content_type :photo, :content_type => configatron.photo.validation_options.content_type
   validates_attachment_size :photo, :less_than => configatron.photo.validation_options.max_size.to_i.megabytes
 
-  attr_accessor :crop_x, :crop_y, :crop_w, :crop_h
+  attr_accessor :crop_x, :crop_y, :crop_w, :crop_h, :photo_remote_url
   after_update :reprocess_photo, :if => :cropping?
-  
+
   acts_as_taggable
 
   acts_as_activity :user, :if => Proc.new{|record| record.album_id.nil?}
-  
+
   validates_presence_of :user
-  
+
   belongs_to :user
   has_one :user_as_avatar, :class_name => "User", :foreign_key => "avatar_id", :inverse_of => :avatar
-  
+
   #Named scopes
   scope :recent, :order => "photos.created_at DESC"
   scope :new_this_week, :order => "photos.created_at DESC", :conditions => ["photos.created_at > ?", 7.days.ago.iso8601]
-  attr_accessible :name, :description, :photo, :crop_x, :crop_y, :crop_w, :crop_h, :user_id
+  attr_accessible :name, :description, :photo, :photo_remote_url, :crop_x, :crop_y, :crop_w, :crop_h, :user_id
 
   def display_name
     (self.name && self.name.length>0) ? self.name : "#{:created_at.l.downcase}: #{I18n.l(self.created_at, :format => :published_date)}"
@@ -56,10 +58,10 @@ class Photo < ActiveRecord::Base
   def self.find_recent(options = {:limit => 3})
     self.new_this_week.find(:all, :limit => options[:limit])
   end
-  
+
   def self.find_related_to(photo, options = {})
-    options.reverse_merge!({:limit => 8, 
-        :order => 'created_at DESC', 
+    options.reverse_merge!({:limit => 8,
+        :order => 'created_at DESC',
         :conditions => ['photos.id != ?', photo.id]
     })
     limit(options[:limit]).order(options[:order]).where(options[:conditions]).tagged_with(photo.tags.collect{|t| t.name }, :any => true)
@@ -74,6 +76,11 @@ class Photo < ActiveRecord::Base
     @geometry[style] ||= Paperclip::Geometry.from_file(photo.path(style))
   end
 
+  def photo_remote_url=(url_value)
+    data = self.data_from_url(url_value)
+    self.photo = data
+  end
+
   private
 
   def reprocess_photo

data/app/models/user.rb

@@ -49,8 +49,8 @@ class User < ActiveRecord::Base
 
   #validation
   validates_presence_of     :metro_area, :if => Proc.new { |user| user.state }
-  validates_uniqueness_of   :login
-  validates_exclusion_of    :login, :in => configatron.reserved_logins
+  validates_uniqueness_of   :login, :if => :requires_unique_login?
+  validates_exclusion_of    :login, :in => Proc.new{ configatron.reserved_logins }
 
   validate :valid_birthday, :if => :requires_valid_birthday?
   validate :check_spam
@@ -255,7 +255,7 @@ class User < ActiveRecord::Base
   end
 
   def avatar_photo_url(size = :original)
-    if avatar
+    if avatar_id
       avatar.photo.url(size)
     elsif facebook?
       facebook_authorization.picture_url
@@ -478,6 +478,10 @@ class User < ActiveRecord::Base
       !omniauthed?
     end
 
+    def requires_unique_login?
+      true
+    end
+
     def omniauthed?
       authorizing_from_omniauth || authorizations.any?
     end

data/app/views/pages/index.html.haml

@@ -25,10 +25,10 @@
                 = link_to page.title, edit_admin_page_path(page)
                 = link_to("(#{:preview.l})", preview_admin_page_path(page), :target => '_blank') unless page.is_live?
               %td
-                -if page.is_public? 
-                  = t(:yes)
+                -if page.page_public? 
+                  = t(:yes_status)
                 -else
-                  = t(:no)
+                  = t(:no_status)
               %td= page.is_live? ? link_to(:published.l, pages_path(page)) : :draft.l
         
       =paginate @pages

data/app/views/posts/edit.html.haml

@@ -7,12 +7,12 @@
 
 #yui-main
   .yui-b
-    -box do 
+    -box do
       %h3=:editing_post.l
 
       = error_messages_for :post
       = form_for(:post, :url => user_post_path(@user, @post), :html => { :method => :put, :class =>'MainForm' }) do |f|
-        %label 
+        %label
           =:title.l
           %em= '('+:required.l+')'
         = f.text_field :title
@@ -27,19 +27,19 @@
         %label
           =:tags.l
           %em="(#{:optional_keywords_describing_this_post_separated_by_commas.l})"
-        = text_field_tag 'tag_list', @post.tag_list, {:autocomplete => "off", :size => 35}
+        = text_field_tag 'tag_list', @post.tag_list.to_s, {:autocomplete => "off", :size => 35}
         #tag_list_auto_complete.auto_complete
         -content_for :end_javascript do
           = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
-          
+
         %label=:save_post_as.l
         = f.select(:published_as, [[:published.l, 'live'], [:draft.l, 'draft']])
-        
+
         %label
-          = f.check_box :send_comment_notifications        
-          =:send_comment_notifications.l        
+          = f.check_box :send_comment_notifications
+          =:send_comment_notifications.l
+
 
-        
         %p
           = submit_tag :update.l
           = :or.l