social_stream 0.3.2 → 0.3.3

data/.rspec

@@ -0,0 +1 @@
+--color

data/Rakefile

@@ -4,7 +4,6 @@ require 'rake/rdoctask'
 
 require 'rubygems'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
 
 require 'bundler'
@@ -12,9 +11,7 @@ require 'bundler'
 require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'version')
 
 
-Rspec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ["--color"]
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 

data/app/views/layouts/_header.erb

@@ -1,9 +1,8 @@
 <div id="headerFront">
     <div class="banner_top">
         <div id="header_left">
-          <a href="index.htm"></a>
           <div id="logo_txt">
-              <%= link_to(t('socialstream') , root_path)%>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <%= link_to(image_tag('header-logo.png', :alt => t('socialstream')), root_path) %>   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           </div>
           <% if user_signed_in? %>
             <%=image_tag("btn/btn_home.png",:class=>"btn_config") %>

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.3.2".freeze
+  VERSION = "0.3.3".freeze
 end

data/social_stream.gemspec

@@ -17,15 +17,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('stringex', '~> 1.2.0')
   s.add_runtime_dependency('paperclip', '~> 2.3.4')
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
-  s.add_runtime_dependency('cancan', '~> 1.4.0')
+  s.add_runtime_dependency('cancan', '~> 1.5.1')
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
-  s.add_development_dependency('rails', '~> 3.0.3')
+  s.add_development_dependency('rails', '~> 3.0.4')
   s.add_development_dependency('capybara', '~> 0.3.9')
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug', '~> 0.10.3')
   end
-  s.add_development_dependency('rspec-rails', '~> 2.0.0')
+  s.add_development_dependency('rspec-rails', '~> 2.4.1')
   s.add_development_dependency('factory_girl', '~> 1.3.2')
   s.add_development_dependency('forgery', '~> 0.3.6')
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
 require "rspec/rails"
 
 ActionMailer::Base.delivery_method = :test
@@ -29,12 +28,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 require 'factory_girl'
 Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each {|f| require f}
 
-Rspec.configure do |config|
-  # Remove this line if you don't want Rspec's should and should_not
-  # methods or matchers
-  require 'rspec/expectations'
-  config.include Rspec::Matchers
-
+RSpec.configure do |config|
   # == Mock Framework
   config.mock_with :rspec
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 +01:00
+date: 2011-02-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,12 +155,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -187,12 +187,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 3
         - 0
-        - 3
-        version: 3.0.3
+        - 4
+        version: 3.0.4
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 29
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 4
+        - 1
+        version: 2.4.1
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -299,6 +299,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - .yardopts
 - Gemfile
 - LICENSE
@@ -523,6 +524,7 @@ files:
 - lib/generators/social_stream/templates/public/images/frontpage/share.png
 - lib/generators/social_stream/templates/public/images/frontpage/tags.png
 - lib/generators/social_stream/templates/public/images/frontpage/yellow_sq.png
+- lib/generators/social_stream/templates/public/images/header-logo.png
 - lib/generators/social_stream/templates/public/images/left.png
 - lib/generators/social_stream/templates/public/images/logo.png
 - lib/generators/social_stream/templates/public/images/logos/actor/group.png