community_engine 2.0.0.beta2 → 2.0.0.beta3

data/test/test_helper.rb

@@ -53,7 +53,7 @@ class ActiveSupport::TestCase
   end 
   
   def authorize_as(user, mime_type = 'application/xml')
-    @request.env["HTTP_AUTHORIZATION"] = user ? "Basic #{Base64.encode64("#{users(user).login}:testy")}" : nil
+    @request.env["HTTP_AUTHORIZATION"] = user ? "Basic #{Base64.encode64("#{users(user).login}:test")}" : nil
   end
 
   def content_type(type)

data/test/testapp/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.

data/test/unit/tag_test.rb

@@ -10,13 +10,13 @@ class TagTest < ActiveSupport::TestCase
   
   test "should get popular tags of one type" do
     popular = Tag.popular(20, 'clipping')
-    assert_equal popular.to_a.size, 1
+    assert_equal popular.to_a.size, 2
     assert_equal popular.first['count'], 2
   end
   
   test "should get related tags" do
     related = tags(:misc).related_tags
-    assert_equal(related, [tags(:general)])
+    assert_equal(related, [tags(:related_to_misc)])
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: community_engine
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -13,29 +13,29 @@ date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160606300 !ruby/object:Gem::Requirement
+  requirement: &2158845860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160606300
+  version_requirements: *2158845860
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2160605800 !ruby/object:Gem::Requirement
+  requirement: &2158845360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2160605800
+  version_requirements: *2158845360
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &2160605300 !ruby/object:Gem::Requirement
+  requirement: &2158844860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160605300
+  version_requirements: *2158844860
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &2160604660 !ruby/object:Gem::Requirement
+  requirement: &2158844360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160604660
+  version_requirements: *2158844360
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &2160604080 !ruby/object:Gem::Requirement
+  requirement: &2158843880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160604080
+  version_requirements: *2158843880
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &2160603400 !ruby/object:Gem::Requirement
+  requirement: &2158843380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160603400
+  version_requirements: *2158843380
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &2160602540 !ruby/object:Gem::Requirement
+  requirement: &2158842880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160602540
+  version_requirements: *2158842880
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2160601840 !ruby/object:Gem::Requirement
+  requirement: &2158842380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160601840
+  version_requirements: *2158842380
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2160601080 !ruby/object:Gem::Requirement
+  requirement: &2158841880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160601080
+  version_requirements: *2158841880
 - !ruby/object:Gem::Dependency
   name: ri_cal
-  requirement: &2160600340 !ruby/object:Gem::Requirement
+  requirement: &2158841380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160600340
+  version_requirements: *2158841380
 - !ruby/object:Gem::Dependency
   name: rakismet
-  requirement: &2160599660 !ruby/object:Gem::Requirement
+  requirement: &2158840880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160599660
+  version_requirements: *2158840880
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &2160598940 !ruby/object:Gem::Requirement
+  requirement: &2158840380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160598940
+  version_requirements: *2158840380
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2160597860 !ruby/object:Gem::Requirement
+  requirement: &2158839880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160597860
+  version_requirements: *2158839880
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &2160587200 !ruby/object:Gem::Requirement
+  requirement: &2158839400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160587200
+  version_requirements: *2158839400
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &2160585880 !ruby/object:Gem::Requirement
+  requirement: &2158838900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,10 +175,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160585880
+  version_requirements: *2158838900
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2160584780 !ruby/object:Gem::Requirement
+  requirement: &2158838420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -186,10 +186,10 @@ dependencies:
         version: 2.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160584780
+  version_requirements: *2158838420
 - !ruby/object:Gem::Dependency
   name: acts_as_commentable
-  requirement: &2160583300 !ruby/object:Gem::Requirement
+  requirement: &2158837900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -197,10 +197,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160583300
+  version_requirements: *2158837900
 - !ruby/object:Gem::Dependency
   name: recaptcha
-  requirement: &2160581940 !ruby/object:Gem::Requirement
+  requirement: &2158837380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160581940
+  version_requirements: *2158837380
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &2160581140 !ruby/object:Gem::Requirement
+  requirement: &2158836880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -219,10 +219,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160581140
+  version_requirements: *2158836880
 - !ruby/object:Gem::Dependency
   name: prototype-rails
-  requirement: &2160580320 !ruby/object:Gem::Requirement
+  requirement: &2158836380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160580320
+  version_requirements: *2158836380
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &2160579340 !ruby/object:Gem::Requirement
+  requirement: &2158835900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160579340
+  version_requirements: *2158835900
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &2160568600 !ruby/object:Gem::Requirement
+  requirement: &2158835400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -252,10 +252,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160568600
+  version_requirements: *2158835400
 - !ruby/object:Gem::Dependency
   name: koala
-  requirement: &2160567720 !ruby/object:Gem::Requirement
+  requirement: &2158834900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160567720
+  version_requirements: *2158834900
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &2160566800 !ruby/object:Gem::Requirement
+  requirement: &2158834380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -274,29 +274,18 @@ dependencies:
         version: 3.4.7
   type: :runtime
   prerelease: false
-  version_requirements: *2160566800
+  version_requirements: *2158834380
 - !ruby/object:Gem::Dependency
   name: bborn-acts_as_taggable_on_steroids
-  requirement: &2160566000 !ruby/object:Gem::Requirement
+  requirement: &2158833880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.beta3
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2160566000
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2160564920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2160564920
+  version_requirements: *2158833880
 description: CommunityEngine is a free, open-source social network platform for Ruby
   on Rails applications. Drop it into your new or existing application, and you’ll
   instantly have all the features of a basic community site.
@@ -390,7 +379,6 @@ files:
 - app/assets/javascripts/builder.js
 - app/assets/javascripts/calendarview.js
 - app/assets/javascripts/community_engine.js
-- app/assets/javascripts/cropper.css
 - app/assets/javascripts/cropper.js
 - app/assets/javascripts/forum.js
 - app/assets/javascripts/lightbox.js
@@ -404,7 +392,26 @@ files:
 - app/assets/javascripts/tinymce/plugins/curblyadvimage/js/functions.js
 - app/assets/javascripts/tinymce/plugins/curblyadvimage/langs/en.js
 - app/assets/javascripts/tinymce/plugins/curblyadvimage/langs/en_dlg.js
+- app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin.js
+- app/assets/javascripts/tinymce/plugins/tinyautosave/editor_plugin_src.js
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress10.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress11.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress12.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress2.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress3.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress4.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress5.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress6.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress7.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress8.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/progress9.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.gif
+- app/assets/javascripts/tinymce/plugins/tinyautosave/images/restore.png
+- app/assets/javascripts/tinymce/plugins/tinyautosave/langs/da.js
+- app/assets/javascripts/tinymce/plugins/tinyautosave/langs/en.js
 - app/assets/stylesheets/community_engine.css
+- app/assets/stylesheets/cropper.css
 - app/assets/stylesheets/forum.css
 - app/assets/stylesheets/lightbox.css
 - app/assets/stylesheets/prototip.css
@@ -490,6 +497,7 @@ files:
 - app/models/rsvp.rb
 - app/models/sb_post.rb
 - app/models/state.rb
+- app/models/tag.rb
 - app/models/topic.rb
 - app/models/twitter_profile.rb
 - app/models/user.rb
@@ -638,7 +646,6 @@ files:
 - app/views/sb_posts/edit.html.erb
 - app/views/sb_posts/edit.js.rjs
 - app/views/sb_posts/index.html.haml
-- app/views/sb_posts/index.xml.builder
 - app/views/sb_posts/monitored.html.erb
 - app/views/sb_posts/monitored.xml.builder
 - app/views/sb_posts/update.js.rjs
@@ -821,7 +828,6 @@ files:
 - lib/community_engine/url_upload.rb
 - lib/community_engine/version.rb
 - lib/community_engine/viewable.rb
-- lib/tag_hacks.rb
 - lib/tasks/community_engine_tasks.rake
 - public/favicon.ico
 - sample_files/s3.yml
@@ -1057,7 +1063,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -540871512927780281
+      hash: -1264984574564723755
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/sb_posts/index.xml.builder

@@ -1,20 +0,0 @@
-xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
-
-xml.rss "version" => "2.0",
-  'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
-  'xmlns:atom'       => "http://www.w3.org/2005/Atom" do
-  xml.channel do
-    xml.title "#{search_posts_title}"
-    xml.link "http://#{request.host_with_port}#{search_all_sb_posts_path}"
-    xml.language "en-us"
-    xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/open_search.xml"
-    unless params[:q].blank?
-      xml.tag! "opensearch:totalResults", @post_pages.item_count
-      xml.tag! "opensearch:startIndex", (((params[:page] || 1).to_i - 1) * @post_pages.items_per_page)
-      xml.tag! "opensearch:itemsPerPage", @post_pages.items_per_page
-      xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:q], :startPage => (params[:page] || 1)
-    end
-    render :partial => "sb_posts/post.xml", :collection => @posts, :locals => {:xm => xml}
-  end
-end