Merge branch 'master' of github.com:diaspora/diaspora_rails

app/controllers/photos_controller.rb

@@ -8,7 +8,6 @@ class PhotosController < ApplicationController
   def create
     @photo = Photo.new(params[:photo])
     @photo.person = current_user
-    
     if @photo.save
       flash[:notice] = "Successfully uploaded photo."
       redirect_to photos_url

app/views/photos/_photo.haml

@@ -9,7 +9,7 @@
   = link_to (image_tag post.image.url(:thumb_medium)), object_path(post)
     
   %div.time
-    = link_to(how_long_ago(post), status_message_path(post))
+    = link_to(how_long_ago(post), photo_path(post))
     \--
     = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
   = render   "comments/comments", :post => post 

app/views/photos/show.html.haml

@@ -1,6 +1,7 @@
 - title "Photo"
 
-= image_tag @photo.image.url
+#show_photo
+  = image_tag @photo.image.url
 
 %h4= "comments (#{@photo.comments.count})"
 = render "comments/comments", :post => @photo

config/sprinkle/provision.rb

@@ -44,6 +44,7 @@ policy :diaspora, :roles => [:tom, :backer] do
   requires :scm
 end
 =begin
+
 policy :ci, :roles => :ci do
   requires :tools
   requires :rubygems
@@ -54,6 +55,7 @@ policy :ci, :roles => :ci do
   requires :scm
   #add sqlite
 end
+
 =end
 # Deployment
 #

lib/encryptable.rb

@@ -21,14 +21,12 @@
     
     protected
     def sign_if_mine
-      puts "In sign_if_mine"
       if self.person == User.owner
         self.creator_signature = sign
       end
     end
 
     def sign
-      puts "signing"
       sign_with_key(User.owner.key)
     end
 

public/stylesheets/application.css

@@ -17,6 +17,9 @@ a {
   a:hover {
     color: #018790; }
 
+#show_photo img {
+  width: 100%; }
+
 #flash_notice,
 #flash_error,
 #flash_alert {

public/stylesheets/sass/application.sass

@@ -17,6 +17,7 @@ a
   &:hover
     :color #018790
 
+
 #flash_notice,
 #flash_error,
 #flash_alert
@@ -271,6 +272,11 @@ li.comment > img.person_picture
     &:first-child
       :margin-right 1em
 
+#show_photo
+  img
+    :width 100%
+
+
 
 #debug_info
   :margin-top 20px

spec/models/photo_spec.rb

@@ -4,20 +4,35 @@ describe Photo do
   before do
     @user = Factory.create(:user)
     @fixture_name = File.dirname(__FILE__) + '/../fixtures/bp.jpeg'
+    @fail_fixture_name = File.dirname(__FILE__) + '/../fixtures/msg.xml'
+    @photo = Photo.new(:person => @user)
   end
-  it 'should save a photo to GridFS' do
+  it 'should save a @photo to GridFS' do
-    photo = Photo.new(:person => @user)
     file = File.open(@fixture_name)
-    photo.image = file
+    @photo.image = file
-    photo.save.should == true
+    @photo.save.should == true
-    binary = photo.image.read
+    binary = @photo.image.read
     fixture_binary = File.open(@fixture_name).read
     binary.should == fixture_binary
   end
+  describe 'non-image files' do
+    it 'should not store' do
+      file = File.open(@fail_fixture_name)
+      @photo.image.should_receive(:check_whitelist!)
+      lambda {
+        @photo.image.store! file
+      }.should raise_error
+    end
 
-  it 'should create thumbnails' do
+    it 'should not save' do
-    pending('need to figure this out... tearing issue')
+      pending "We need to figure out the difference between us and the example app"
+      file = File.open(@fail_fixture_name)
+      @photo.image.should_receive(:check_whitelist!)
+      @photo.image = file
+      @photo.save.should == false
+    end
   end
+
   describe 'with encryption' do
     
     before do
@@ -28,11 +43,10 @@ describe Photo do
       stub_signature_verification
     end
 
-    it 'should save a signed photo to GridFS' do
+    it 'should save a signed @photo to GridFS' do
-      photo = Photo.new(:person => @user)
+      @photo.image = File.open(@fixture_name)
-      photo.image = File.open(@fixture_name)
+      @photo.save.should == true
-      photo.save.should == true
+      @photo.verify_creator_signature.should be true
-      photo.verify_creator_signature.should be true
     end
     
   end