social_stream-base 0.7.9 → 0.7.10

data/app/assets/stylesheets/base.css

@@ -17,7 +17,7 @@ h2{padding-left:10px;}
 /******* Main Structure SECTION***************************/
 body{font-size:1.0em;  color:#2A3890;  background-color:#ffffff; }
 #wrapper { 	background-color: #f5f5f5;	width: 100%; margin: 0px auto;	  }
-#wrapper_body{min-height: 552px;	width: 960px; margin:0px auto;	margin-left: auto;	margin-right: auto;
+#wrapper_body{min-height: 552px; width: 960px; margin:0px auto;	margin-left: auto;	margin-right: auto;
 margin-top: auto; margin-bottom:auto;}
 
 
@@ -189,6 +189,7 @@ textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
   /* For IE 8 */
   -MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
 }
+
 .logo_full .logo_caption {
   top: 119px;
   left: 23px;

data/app/assets/stylesheets/groups.css

@@ -1,5 +1,4 @@
 /*
  *= require jqcloud
  *= require fcbkComplete
- *= require smoothness/jquery-ui-1.8.4.custom
  */

data/app/assets/stylesheets/home.css

@@ -14,7 +14,7 @@
 #sponsor{background-color:#fff}
 #toolbar {	width: 160px;	border-color: #000;	vertical-align: top;	display: table-cell;padding: 5px 5px 5px 5px;}
 #toolbarContent{}
-#wrapper_body{}
+#wrapper_body{ background-color: #ffffff; }
 #content_logo{/*width: 779px*/}
 
 

data/app/views/layouts/frontpage.html.erb

@@ -25,10 +25,11 @@
         <%= render :partial => "frontpage/header" %>
       </header>
       <section>
-        <div id="flash">
-          <%= render :partial => "layouts/flash", :locals => {:flash => flash} %>
-        </div>
         <div id="wrapper_body">
+          <div class="space_center"></div>
+          <div id="flash">
+            <%= render :partial => "layouts/flash", :locals => {:flash => flash} %>
+          </div>
           <%= yield %>
         </div>
         <%= render :partial => "frontpage/sponsor" %>

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.7.9".freeze
+    VERSION = "0.7.10".freeze
   end
 end

data/lib/social_stream/migrations/base.rb

@@ -0,0 +1,55 @@
+require 'social_stream/migrations/finder'
+
+module SocialStream
+  module Migrations
+    class Base
+      def initialize
+        find_old_migration 'acts-as-taggable-on',
+                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
+
+        @mailboxer_migration = find_migration 'mailboxer'
+        @base_migration = find_migration 'social_stream-base'
+      end
+
+      def up
+        ActsAsTaggableOnMigration.up
+
+        ActiveRecord::Migrator.migrate @mailboxer_migration
+
+        # Run any available migration
+        ActiveRecord::Migrator.migrate @base_migration
+      end
+
+      def down
+        begin
+          ActiveRecord::Migrator.migrate @base_migration, 0
+        rescue
+          puts "WARNING: Social Stream Base failed to rollback"
+        end
+
+        begin
+          ActiveRecord::Migrator.migrate @mailboxer_migration, 0
+        rescue
+          puts "WARNING: Mailboxer migration failed to rollback"
+        end
+
+        begin
+          ActsAsTaggableOnMigration.down
+        rescue
+          puts "WARNING: ActsAsTaggableOnMigration failed to rollback"
+        end
+      end
+
+      protected
+
+      def find_migration(gem)
+        path = Gem::GemPathSearcher.new.find(gem).full_gem_path
+        File.join([path,'db', 'migrate'])
+      end
+
+      def find_old_migration(gem, path)
+        SocialStream::Migrations::Finder.new gem, path
+      end
+    end
+  end
+end

data/lib/social_stream/migrations/finder.rb

@@ -0,0 +1,20 @@
+module SocialStream
+  module Migrations
+    # Searches for migrations in a gem and requires them.
+    # Example:
+    #
+    #   MigrationFinder.new 'acts-as-taggable-on',
+    #                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
+    #   ActsAsTaggableOnMigration.up
+    class Finder
+      def initialize gem, path
+        finder = Gem::GemPathSearcher.new
+        taggable_spec = finder.find(gem)
+        taggable_migration = finder.matching_files(taggable_spec,
+                                                   File.join(*path)).first
+
+        require taggable_migration
+      end
+    end
+  end
+end

data/spec/controllers/relation_customs_controller_spec.rb

@@ -101,11 +101,9 @@ describe Relation::CustomsController do
       end
 
       it "should allow destroying" do
-        pending "Delete relations"
-
         count = Relation::Custom.count
 
-        delete :destroy, :id => @relation.to_param, :format => :js
+        delete :destroy, :id => @relation.to_param
 
         Relation::Custom.count.should eq(count - 1)
       end

data/spec/support/db.rb

@@ -1,33 +1,7 @@
-require File.join(File.dirname(__FILE__), 'migrations')
+require 'social_stream/migrations/base'
 
+SocialStream::Migrations::Base.new.down
 
-begin
-  ActsAsTaggableOnMigration.down
-rescue
-  puts "WARNING: ActsAsTaggableOnMigration failed to rollback"
-end
-
-mailboxer_path = Gem::GemPathSearcher.new.find('mailboxer').full_gem_path
-mailboxer_migration = File.join([mailboxer_path,'db', 'migrate'])
-
-begin
-  ActiveRecord::Migrator.migrate mailboxer_migration, 0
-rescue
-  puts "WARNING: Mailboxer migration failed to rollback"
-end
-
-begin
-  ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__), 0
-rescue
-  puts "WARNING: Social Stream Base failed to rollback"
-end
-
-
-ActsAsTaggableOnMigration.up
-
-ActiveRecord::Migrator.migrate mailboxer_migration
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__)
+SocialStream::Migrations::Base.new.up
 
 require File.expand_path("../../dummy/db/seeds", __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 7
-  - 9
-  version: 0.7.9
+  - 10
+  version: 0.7.10
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 +02:00
+date: 2011-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -882,7 +882,8 @@ files:
 - lib/social_stream/base.rb
 - lib/social_stream/base/version.rb
 - lib/social_stream/controllers/helpers.rb
-- lib/social_stream/migration_finder.rb
+- lib/social_stream/migrations/base.rb
+- lib/social_stream/migrations/finder.rb
 - lib/social_stream/models/object.rb
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/supertype.rb
@@ -966,7 +967,6 @@ files:
 - spec/support/cancan.rb
 - spec/support/db.rb
 - spec/support/devise.rb
-- spec/support/migrations.rb
 - spec/support/mock.rb
 - vendor/assets/javascripts/ajax.paginate.js
 - vendor/assets/javascripts/chosen.jquery.js

data/lib/social_stream/migration_finder.rb

@@ -1,19 +0,0 @@
-module SocialStream
-  # Searches for migrations in a gem and requires them.
-  # Example:
-  #
-  #   MigrationFinder.new 'acts-as-taggable-on',
-  #                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
-  #   ActsAsTaggableOnMigration.up
-class MigrationFinder
-    def initialize gem, path
-      finder = Gem::GemPathSearcher.new
-      taggable_spec = finder.find(gem)
-      taggable_migration = finder.matching_files(taggable_spec,
-                                                 File.join(*path)).first
-
-      require taggable_migration
-    end
-end
-
-end

data/spec/support/migrations.rb

@@ -1,6 +0,0 @@
-require 'social_stream/migration_finder'
-
-# acts-as-taggable-on
-SocialStream::MigrationFinder.new 'acts-as-taggable-on',
-                    ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
-