saphira 0.1.0.beta2 → 0.1.0.beta3

data/README.md

@@ -14,16 +14,22 @@ Features
 
 To-Do
 -----
-* Link for file download
-* Manage authorizations
+* Image manipulation
+  * A form helper for image cropping
+  * Multiple named image versions
 * WebDav access
 * Search files
 
 Requirements
 ------------
-* Rails 3.1.x
-* Some gems - check Gemfile
+* [Rails 3.1.x](http://rubyonrails.org/)
+* [dragonfly](https://github.com/markevans/dragonfly/): A Ruby Rack-based gem for on-the-fly processing - suitable for image uploading in Rails, Sinatra and much more! 
+* [awesome\_nested\_set](https://github.com/collectiveidea/awesome_nested_set): An awesome replacement for acts\_as\_nested\_set and better\_nested\_set.
+* [exifr](https://github.com/remvee/exifr/): EXIF Reader
+* [friendly_id](https://github.com/norman/friendly_id): It allows you to create pretty URL’s and work with human-friendly strings as if they were numeric ids for ActiveRecord models.
+* [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on): A tagging plugin for Rails applications that allows for custom tagging along dynamic contexts.
+* _And some more gems in development mode_
 
 Installation
 ------------
-Add the gem to your gemfile: `gem 'saphira', :git => 'git://github.com/spieker/saphira.git'` and add `mount Saphira::Engine => "/saphira", :as => 'saphira'` to your `routes.rb` file to mount the engine. The file manager should be available at `http://localhost:3000/saphira` then.
+Add the gem to your gemfile: `gem 'saphira', '~> 0.1.0.beta2'` and add `mount Saphira::Engine => "/saphira", :as => 'saphira'` to your `routes.rb` file to mount the engine. The file manager should be available at `http://localhost:3000/saphira` then.

data/app/controllers/saphira/file_items_controller.rb

@@ -8,7 +8,7 @@ module Saphira
       
       respond_to do |format|
         format.html # index.html.erb
-        format.json { render json: @file_items }
+        format.json { render :json => @file_items }
       end
     end
 
@@ -27,7 +27,7 @@ module Saphira
             render
           end
         end
-        format.json { render json: @file_item }
+        format.json { render :json => @file_item }
       end
     end
 
@@ -40,7 +40,7 @@ module Saphira
 
       respond_to do |format|
         format.html { render :action => "new_#{@file_item.item_type}" }
-        format.json { render json: @file_item }
+        format.json { render :json => @file_item }
       end
     end
 
@@ -50,7 +50,7 @@ module Saphira
 
       respond_to do |format|
         format.html { render :action => "edit_#{@file_item.item_type}" }
-        format.json { render json: @file_item }
+        format.json { render :json => @file_item }
       end
     end
 
@@ -61,11 +61,11 @@ module Saphira
 
       respond_to do |format|
         if @file_item.save
-          format.html { redirect_to @file_item, notice: 'File item was successfully created.' }
-          format.json { render json: @file_item, status: :created, location: @file_item }
+          format.html { redirect_to @file_item, :notice => 'File item was successfully created.' }
+          format.json { render :json => @file_item, :status => :created, :location => @file_item }
         else
-          format.html { render action: "new_#{@file_item.item_type}" }
-          format.json { render json: @file_item.errors, status: :unprocessable_entity }
+          format.html { render :action => "new_#{@file_item.item_type}" }
+          format.json { render :json => @file_item.errors, :status => :unprocessable_entity }
         end
       end
     end
@@ -77,11 +77,11 @@ module Saphira
 
       respond_to do |format|
         if @file_item.update_attributes(params[:file_item])
-          format.html { redirect_to @file_item, notice: 'File item was successfully updated.' }
+          format.html { redirect_to @file_item, :notice => 'File item was successfully updated.' }
           format.json { head :ok }
         else
-          format.html { render action: "edit_#{@file_item.item_type}" }
-          format.json { render json: @file_item.errors, status: :unprocessable_entity }
+          format.html { render :action => "edit_#{@file_item.item_type}" }
+          format.json { render :json => @file_item.errors, :status => :unprocessable_entity }
         end
       end
     end

data/app/views/saphira/file_items/index.html.erb

@@ -14,7 +14,7 @@
     <td><%= link_to image_tag('saphira/icons/32x32/'+file_item.item_type+'.png'), file_item %></td>
     <td><%= link_to file_item.name, file_item %></td>
     <td><%= file_item.file.mime_type if file_item.file %></td>
-    <td class="actions"><%= link_to 'Destroy', file_item, confirm: 'Are you sure?', method: :delete, id: "saphira-action-destroy-#{file_item.slug}" %></td>
+    <td class="actions"><%= link_to 'Destroy', file_item, :confirm => 'Are you sure?', :method => :delete, :id => "saphira-action-destroy-#{file_item.slug}" %></td>
   </tr>
 <% end %>
 </table>

data/lib/saphira/version.rb

@@ -1,3 +1,3 @@
 module Saphira
-  VERSION = "0.1.0.beta2"
+  VERSION = "0.1.0.beta3"
 end

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/test/dummy/log/test.log

@@ -497,3 +497,140 @@ Started GET "/admin/saphira/files/my-first-image" for 127.0.0.1 at 2011-09-05 09
   Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."id" IS NULL LIMIT 1
 Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/show.html.erb within layouts/saphira/application (18.3ms)
 Completed 200 OK in 24ms (Views: 21.0ms | ActiveRecord: 0.9ms)
+
+
+Started GET "/admin/saphira/files" for 127.0.0.1 at 2011-09-06 17:27:53 +0200
+  Processing by Saphira::FileItemsController#index as HTML
+  Saphira::FileItem Load (0.9ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/index.html.erb within layouts/saphira/application (83.3ms)
+Completed 200 OK in 171ms (Views: 154.9ms | ActiveRecord: 1.1ms)
+
+
+Started GET "/admin/saphira/files/new?type=folder" for 127.0.0.1 at 2011-09-06 17:27:53 +0200
+  Processing by Saphira::FileItemsController#new as HTML
+  Parameters: {"type"=>"folder"}
+  ActsAsTaggableOn::Tag Load (0.6ms)  SELECT "tags".* FROM "tags" INNER JOIN "taggings" ON "tags"."id" = "taggings"."tag_id" WHERE "taggings"."taggable_id" IS NULL AND "taggings"."taggable_type" = 'Saphira::FileItem' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/_form.html.erb (245.0ms)
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/new_folder.html.erb within layouts/saphira/application (262.6ms)
+Completed 200 OK in 265ms (Views: 263.4ms | ActiveRecord: 1.0ms)
+
+
+Started POST "/admin/saphira/files" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#create as HTML
+  Parameters: {"utf8"=>"✓", "file_item"=>{"name"=>"My first folder", "tag_list"=>"", "item_type"=>"folder", "parent_id"=>""}, "commit"=>"Create"}
+   (0.1ms)  SAVEPOINT active_record_1
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL AND ("slug" = 'my-first-folder' OR "slug" LIKE 'my-first-folder--%') ORDER BY LENGTH("slug") DESC, "slug" DESC LIMIT 1
+   (0.1ms)  SELECT 1 FROM "saphira_file_items" WHERE ("saphira_file_items"."name" = 'My first folder' AND "saphira_file_items"."parent_id" IS NULL) LIMIT 1
+   (0.5ms)  SELECT MAX("saphira_file_items"."rgt") AS max_id FROM "saphira_file_items" 
+  SQL (9.0ms)  INSERT INTO "saphira_file_items" ("created_at", "dynamic_attributes", "file_name", "file_uid", "item_type", "lft", "name", "parent_id", "path", "rgt", "slug", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["dynamic_attributes", "--- \n"], ["file_name", nil], ["file_uid", nil], ["item_type", "folder"], ["lft", 1], ["name", "My first folder"], ["parent_id", nil], ["path", "my-first-folder"], ["rgt", 2], ["slug", "my-first-folder"], ["updated_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00]]
+  ActsAsTaggableOn::Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "taggings" ON "tags"."id" = "taggings"."tag_id" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
+  ActsAsTaggableOn::Tagging Load (0.1ms)  SELECT "taggings".* FROM "taggings" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND "taggings"."tagger_type" IS NULL AND "taggings"."tagger_id" IS NULL AND "taggings"."context" = 'tags' AND "taggings"."tag_id" IN (NULL)
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://www.example.com/admin/saphira/files/my-first-folder
+Completed 302 Found in 253ms
+
+
+Started GET "/admin/saphira/files/my-first-folder" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#show as HTML
+  Parameters: {"id"=>"my-first-folder"}
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."path" = 'my-first-folder' LIMIT 1
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."id" IS NULL LIMIT 1
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" = 1 ORDER BY "lft"
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/index.html.erb within layouts/saphira/application (20.5ms)
+Completed 200 OK in 23ms (Views: 21.3ms | ActiveRecord: 0.5ms)
+   (0.0ms)  SAVEPOINT active_record_1
+  Saphira::FileItem Load (0.3ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL AND ("slug" = 'my-first-folder' OR "slug" LIKE 'my-first-folder--%') ORDER BY LENGTH("slug") DESC, "slug" DESC LIMIT 1
+   (0.1ms)  SELECT 1 FROM "saphira_file_items" WHERE ("saphira_file_items"."name" = 'My first folder' AND "saphira_file_items"."parent_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT MAX("saphira_file_items"."rgt") AS max_id FROM "saphira_file_items" 
+  SQL (1.2ms)  INSERT INTO "saphira_file_items" ("created_at", "dynamic_attributes", "file_name", "file_uid", "item_type", "lft", "name", "parent_id", "path", "rgt", "slug", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["dynamic_attributes", "--- \n"], ["file_name", nil], ["file_uid", nil], ["item_type", "folder"], ["lft", 1], ["name", "My first folder"], ["parent_id", nil], ["path", "my-first-folder"], ["rgt", 2], ["slug", "my-first-folder"], ["updated_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL AND ("slug" = 'my-second-folder' OR "slug" LIKE 'my-second-folder--%') ORDER BY LENGTH("slug") DESC, "slug" DESC LIMIT 1
+   (0.1ms)  SELECT 1 FROM "saphira_file_items" WHERE ("saphira_file_items"."name" = 'My second folder' AND "saphira_file_items"."parent_id" IS NULL) LIMIT 1
+   (0.1ms)  SELECT MAX("saphira_file_items"."rgt") AS max_id FROM "saphira_file_items" 
+  SQL (0.7ms)  INSERT INTO "saphira_file_items" ("created_at", "dynamic_attributes", "file_name", "file_uid", "item_type", "lft", "name", "parent_id", "path", "rgt", "slug", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["dynamic_attributes", "--- \n"], ["file_name", nil], ["file_uid", nil], ["item_type", "folder"], ["lft", 3], ["name", "My second folder"], ["parent_id", nil], ["path", "my-second-folder"], ["rgt", 4], ["slug", "my-second-folder"], ["updated_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+
+
+Started GET "/admin/saphira/files" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#index as HTML
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/index.html.erb within layouts/saphira/application (70.5ms)
+Completed 200 OK in 73ms (Views: 71.7ms | ActiveRecord: 0.2ms)
+
+
+Started DELETE "/admin/saphira/files/my-first-folder" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#destroy as HTML
+  Parameters: {"id"=>"my-first-folder"}
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."path" = 'my-first-folder' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  DELETE FROM "saphira_file_items" WHERE ("lft" > 1 AND "rgt" < 2)
+  SQL (0.2ms)  UPDATE "saphira_file_items" SET "lft" = ("lft" - 2) WHERE "saphira_file_items"."id" IN (SELECT "saphira_file_items"."id" FROM "saphira_file_items" WHERE ("lft" > 2) ORDER BY "lft")
+  SQL (0.1ms)  UPDATE "saphira_file_items" SET "rgt" = ("rgt" - 2) WHERE "saphira_file_items"."id" IN (SELECT "saphira_file_items"."id" FROM "saphira_file_items" WHERE ("rgt" > 2) ORDER BY "lft")
+  ActsAsTaggableOn::Tagging Load (0.1ms)  SELECT "taggings".* FROM "taggings" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem'
+  SQL (0.2ms)  SELECT "taggings"."id" AS t0_r0, "taggings"."tag_id" AS t0_r1, "taggings"."taggable_id" AS t0_r2, "taggings"."taggable_type" AS t0_r3, "taggings"."tagger_id" AS t0_r4, "taggings"."tagger_type" AS t0_r5, "taggings"."context" AS t0_r6, "taggings"."created_at" AS t0_r7, "tags"."id" AS t1_r0, "tags"."name" AS t1_r1 FROM "taggings" LEFT OUTER JOIN "tags" ON "tags"."id" = "taggings"."tag_id" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND (taggings.tag_id = tags.id AND taggings.context = 'tags')
+  SQL (0.2ms)  DELETE FROM "saphira_file_items" WHERE "saphira_file_items"."id" = ?  [["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://www.example.com/admin/saphira/files
+Completed 302 Found in 23ms
+
+
+Started GET "/admin/saphira/files" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#index as HTML
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/index.html.erb within layouts/saphira/application (4.9ms)
+Completed 200 OK in 7ms (Views: 6.1ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/admin/saphira/files" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#index as HTML
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/index.html.erb within layouts/saphira/application (1.3ms)
+Completed 200 OK in 4ms (Views: 2.4ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/admin/saphira/files/new?type=file" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#new as HTML
+  Parameters: {"type"=>"file"}
+  ActsAsTaggableOn::Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "taggings" ON "tags"."id" = "taggings"."tag_id" WHERE "taggings"."taggable_id" IS NULL AND "taggings"."taggable_type" = 'Saphira::FileItem' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/_form.html.erb (5.0ms)
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/new_file.html.erb within layouts/saphira/application (6.3ms)
+Completed 200 OK in 9ms (Views: 7.9ms | ActiveRecord: 0.2ms)
+
+
+Started POST "/admin/saphira/files" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#create as HTML
+  Parameters: {"utf8"=>"✓", "file_item"=>{"name"=>"My first image", "file"=>#<ActionDispatch::Http::UploadedFile:0x000001009b3218 @original_filename="eos-550d-wrong-orientation.jpg", @content_type="image/jpeg", @headers="Content-Disposition: form-data; name=\"file_item[file]\"; filename=\"eos-550d-wrong-orientation.jpg\"\r\nContent-Type: image/jpeg\r\nContent-Length: 77008\r\n", @tempfile=#<File:/var/folders/j5/j5YeT6owHCOVwWrGfycQx++++TI/-Tmp-/RackMultipart20110906-51442-1oocr6l>>, "tag_list"=>"Trash, Orange, Berlin", "item_type"=>"file", "parent_id"=>""}, "commit"=>"Create"}
+   (0.2ms)  SAVEPOINT active_record_1
+  Saphira::FileItem Load (0.3ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."parent_id" IS NULL AND ("slug" = 'my-first-image' OR "slug" LIKE 'my-first-image--%') ORDER BY LENGTH("slug") DESC, "slug" DESC LIMIT 1
+   (0.1ms)  SELECT 1 FROM "saphira_file_items" WHERE ("saphira_file_items"."name" = 'My first image' AND "saphira_file_items"."parent_id" IS NULL) LIMIT 1
+   (0.4ms)  SELECT MAX("saphira_file_items"."rgt") AS max_id FROM "saphira_file_items" 
+  SQL (1.4ms)  INSERT INTO "saphira_file_items" ("created_at", "dynamic_attributes", "file_name", "file_uid", "item_type", "lft", "name", "parent_id", "path", "rgt", "slug", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["dynamic_attributes", "--- \n:field_image_capture_date: 2011-08-26 14:04:10 +02:00\n:field_image_exposure_time: !ruby/object:Rational \n  denominator: 40\n  numerator: 1\n:field_image_f_number: !ruby/object:Rational \n  denominator: 1\n  numerator: 10\n:field_image_make: Canon\n:field_image_model: Canon EOS 550D\n:field_image_orientation: 8\n:field_image_orientation_transformed: true\n"], ["file_name", "eos-550d-wrong-orientation.jpg"], ["file_uid", "2011/09/06/17_27_54_786_eos_550d_wrong_orientation.jpg"], ["item_type", "file"], ["lft", 1], ["name", "My first image"], ["parent_id", nil], ["path", "my-first-image"], ["rgt", 2], ["slug", "my-first-image"], ["updated_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00]]
+  ActsAsTaggableOn::Tag Load (0.2ms)  SELECT "tags".* FROM "tags" WHERE (name LIKE 'Trash' OR name LIKE 'Orange' OR name LIKE 'Berlin')
+   (0.1ms)  SELECT 1 FROM "tags" WHERE "tags"."name" = 'Trash' LIMIT 1
+  SQL (0.2ms)  INSERT INTO "tags" ("name") VALUES (?)  [["name", "Trash"]]
+   (0.1ms)  SELECT 1 FROM "tags" WHERE "tags"."name" = 'Orange' LIMIT 1
+  SQL (0.0ms)  INSERT INTO "tags" ("name") VALUES (?)  [["name", "Orange"]]
+   (0.1ms)  SELECT 1 FROM "tags" WHERE "tags"."name" = 'Berlin' LIMIT 1
+  SQL (0.0ms)  INSERT INTO "tags" ("name") VALUES (?)  [["name", "Berlin"]]
+  ActsAsTaggableOn::Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "taggings" ON "tags"."id" = "taggings"."tag_id" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
+  ActsAsTaggableOn::Tagging Load (0.1ms)  SELECT "taggings".* FROM "taggings" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND "taggings"."tagger_type" IS NULL AND "taggings"."tagger_id" IS NULL AND "taggings"."context" = 'tags' AND "taggings"."tag_id" IN (NULL)
+   (0.2ms)  SELECT 1 FROM "taggings" WHERE ("taggings"."tag_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND "taggings"."taggable_id" = 1 AND "taggings"."context" = 'tags' AND "taggings"."tagger_id" IS NULL AND "taggings"."tagger_type" IS NULL) LIMIT 1
+  SQL (1.0ms)  INSERT INTO "taggings" ("context", "created_at", "tag_id", "taggable_id", "taggable_type", "tagger_id", "tagger_type") VALUES (?, ?, ?, ?, ?, ?, ?)  [["context", "tags"], ["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["tag_id", 1], ["taggable_id", 1], ["taggable_type", "Saphira::FileItem"], ["tagger_id", nil], ["tagger_type", nil]]
+   (0.5ms)  SELECT 1 FROM "taggings" WHERE ("taggings"."tag_id" = 2 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND "taggings"."taggable_id" = 1 AND "taggings"."context" = 'tags' AND "taggings"."tagger_id" IS NULL AND "taggings"."tagger_type" IS NULL) LIMIT 1
+  SQL (0.8ms)  INSERT INTO "taggings" ("context", "created_at", "tag_id", "taggable_id", "taggable_type", "tagger_id", "tagger_type") VALUES (?, ?, ?, ?, ?, ?, ?)  [["context", "tags"], ["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["tag_id", 2], ["taggable_id", 1], ["taggable_type", "Saphira::FileItem"], ["tagger_id", nil], ["tagger_type", nil]]
+   (0.2ms)  SELECT 1 FROM "taggings" WHERE ("taggings"."tag_id" = 3 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND "taggings"."taggable_id" = 1 AND "taggings"."context" = 'tags' AND "taggings"."tagger_id" IS NULL AND "taggings"."tagger_type" IS NULL) LIMIT 1
+  SQL (1.0ms)  INSERT INTO "taggings" ("context", "created_at", "tag_id", "taggable_id", "taggable_type", "tagger_id", "tagger_type") VALUES (?, ?, ?, ?, ?, ?, ?)  [["context", "tags"], ["created_at", Tue, 06 Sep 2011 15:27:54 UTC +00:00], ["tag_id", 3], ["taggable_id", 1], ["taggable_type", "Saphira::FileItem"], ["tagger_id", nil], ["tagger_type", nil]]
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+Redirected to http://www.example.com/admin/saphira/files/my-first-image
+Completed 302 Found in 283ms
+
+
+Started GET "/admin/saphira/files/my-first-image" for 127.0.0.1 at 2011-09-06 17:27:54 +0200
+  Processing by Saphira::FileItemsController#show as HTML
+  Parameters: {"id"=>"my-first-image"}
+  Saphira::FileItem Load (0.3ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."path" = 'my-first-image' LIMIT 1
+  ActsAsTaggableOn::Tag Load (0.2ms)  SELECT "tags".* FROM "tags" INNER JOIN "taggings" ON "tags"."id" = "taggings"."tag_id" WHERE "taggings"."taggable_id" = 1 AND "taggings"."taggable_type" = 'Saphira::FileItem' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
+  Saphira::FileItem Load (0.2ms)  SELECT "saphira_file_items".* FROM "saphira_file_items" WHERE "saphira_file_items"."id" IS NULL LIMIT 1
+Rendered /Users/spieker/Sites/gems-projects/saphira/app/views/saphira/file_items/show.html.erb within layouts/saphira/application (19.7ms)
+Completed 200 OK in 25ms (Views: 22.0ms | ActiveRecord: 0.7ms)

data/test/dummy/system/files/test/2011/09/06/17_27_54_786_eos_550d_wrong_orientation.jpg.meta

@@ -0,0 +1 @@
+{:	nameI"#eos-550d-wrong-orientation.jpg:ET:model_classI"Saphira::FileItem;F:model_attachment:	file

data/test/functional/saphira/file_items_controller_test.rb

@@ -19,30 +19,30 @@ module Saphira
   
     test "should create file_item" do
       assert_difference('FileItem.count') do
-        post :create, file_item: @file_item.attributes
+        post :create, :file_item => @file_item.attributes
       end
   
       assert_redirected_to file_item_path(assigns(:file_item))
     end
   
     test "should show file_item" do
-      get :show, id: @file_item.to_param
+      get :show, :id => @file_item.to_param
       assert_response :success
     end
   
     test "should get edit" do
-      get :edit, id: @file_item.to_param
+      get :edit, :id => @file_item.to_param
       assert_response :success
     end
   
     test "should update file_item" do
-      put :update, id: @file_item.to_param, file_item: @file_item.attributes
+      put :update, :id => @file_item.to_param, :file_item => @file_item.attributes
       assert_redirected_to file_item_path(assigns(:file_item))
     end
   
     test "should destroy file_item" do
       assert_difference('FileItem.count', -1) do
-        delete :destroy, id: @file_item.to_param
+        delete :destroy, :id => @file_item.to_param
       end
   
       assert_redirected_to file_items_path

metadata

@@ -2,7 +2,7 @@
 name: saphira
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.1.0.beta2
+  version: 0.1.0.beta3
 platform: ruby
 authors: 
 - Paul Spieker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-05 00:00:00 Z
+date: 2011-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -363,6 +363,8 @@ files:
 - test/dummy/system/files/test/2011/09/04/20_14_52_22_eos_550d_wrong_orientation.jpg.meta
 - test/dummy/system/files/test/2011/09/05/09_42_46_972_eos_550d_wrong_orientation.jpg
 - test/dummy/system/files/test/2011/09/05/09_42_46_972_eos_550d_wrong_orientation.jpg.meta
+- test/dummy/system/files/test/2011/09/06/17_27_54_786_eos_550d_wrong_orientation.jpg
+- test/dummy/system/files/test/2011/09/06/17_27_54_786_eos_550d_wrong_orientation.jpg.meta
 - test/dummy/tmp/cache/assets/C54/230/sprockets%2F63597bd80af49501176a9c782c200818
 - test/dummy/tmp/cache/assets/C8A/C90/sprockets%2Fb0034d98e259fe21084231df778476e5
 - test/dummy/tmp/cache/assets/CBB/220/sprockets%2Fe50398a56291b292932098dbaf6f60e7
@@ -476,6 +478,8 @@ test_files:
 - test/dummy/system/files/test/2011/09/04/20_14_52_22_eos_550d_wrong_orientation.jpg.meta
 - test/dummy/system/files/test/2011/09/05/09_42_46_972_eos_550d_wrong_orientation.jpg
 - test/dummy/system/files/test/2011/09/05/09_42_46_972_eos_550d_wrong_orientation.jpg.meta
+- test/dummy/system/files/test/2011/09/06/17_27_54_786_eos_550d_wrong_orientation.jpg
+- test/dummy/system/files/test/2011/09/06/17_27_54_786_eos_550d_wrong_orientation.jpg.meta
 - test/dummy/tmp/cache/assets/C54/230/sprockets%2F63597bd80af49501176a9c782c200818
 - test/dummy/tmp/cache/assets/C8A/C90/sprockets%2Fb0034d98e259fe21084231df778476e5
 - test/dummy/tmp/cache/assets/CBB/220/sprockets%2Fe50398a56291b292932098dbaf6f60e7