simple_dragonfly_preview 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd77c01a2fdba859592fa980124b445e9b25967
-  data.tar.gz: 2073d0c558b450a1f16548027e8056712ea2351b
+  metadata.gz: edd1965a94a50bc8738d36c93e8f2020f120cb54
+  data.tar.gz: 4620d14c805ba2726303c6eca986f4cc2d1c4ab8
 SHA512:
-  metadata.gz: cc69d5670770d90c81d1b6ec56317a3287207d0aba2e5bb6c5cfbf4aaf71b08b7a76a0f6e6f0afbc8fef8400e48490c656e3645475d9d3954bf7938430e83971
-  data.tar.gz: cf1fed576fae32fa507dd017787a4772253ee9c8814ee2889e7c199fd3f0d6084895e057c274215394ebc0c1a987ed77c5f17ec905b85cdc0e9fff6eac9eb3c0
+  metadata.gz: edfb6997cb3d9265cf37d2d99ea03207438a54015830129ce40c2b88a0973fca4e1786c8ad696536a9caa3f4298f0e5ce7064b41b7a125c208db7666a7123de6
+  data.tar.gz: c00dd173b0e1bb3b7ceb007cc4dfe5a11532221b4e7e2030f4176b96f1ad72d1e8db4e84e07b2268f23b0cd2553b525632471e03082db23753809ebad405ead1

data/app/controllers/simple_dragonfly_preview/image_controller.rb

@@ -5,8 +5,10 @@ class SimpleDragonflyPreview::ImageController < ApplicationController
     if params[:image].present?
       app = Dragonfly.app
       uid = app.store(params[:image].tempfile)
+      filename = params[:image].original_filename
       @image = app.fetch(uid)
-      @retained_image = Dragonfly::Serializer.json_b64_encode(uid: @image.uid) if @image 
+      @retained_image = Dragonfly::Serializer.json_b64_encode(uid: uid, name: filename) if @image 
+      @resize = params[:resize]
     end
     render :iframe
   end

data/app/inputs/image_preview_input.rb

@@ -1,7 +1,7 @@
 
 class ImagePreviewInput < SimpleForm::Inputs::Base
   def input
-    resize = options.delete(:size) || '100x80#'
+    resize = options.delete(:size) || '350x100>'
     size = resize.sub(/\D$/,'')
     
     template.render("simple_dragonfly_preview/image/form", 

data/app/views/simple_dragonfly_preview/image/_form.html.erb

@@ -2,17 +2,19 @@
   <tr>
     <td>
       <% if f.object.send("#{attribute_name}_uid") %>
-        <%= image_tag f.object.send(attribute_name).thumb(resize).url, size: size, id: image_id %>
+        <%= image_tag f.object.send(attribute_name).thumb(resize).url, id: image_id %>
         <div>
           <%= f.label("remove_#{attribute_name}", "Remove?") %>
           <%= f.check_box("remove_#{attribute_name}") %>
         </div>
       <% else %>
-        <%= image_tag "simple_dragonfly_preview/default.png", size: size, id: image_id %>
+        <%= image_tag "simple_dragonfly_preview/default.png", id: image_id %>
       <% end %>
     </td>
+  </tr>
+  <tr>
     <td>
-      <%= content_tag(:iframe, nil, src: main_app.simple_dragonfly_preview_iframe_path(retained_id: retained_id, image_id: image_id), width:"400", height:"50", frameborder:"0") %>
+      <%= content_tag(:iframe, nil, src: main_app.simple_dragonfly_preview_iframe_path(retained_id: retained_id, image_id: image_id, resize: resize), width:"400", height:"50", frameborder:"0") %>
     </td>
   </tr>
 </table>

data/app/views/simple_dragonfly_preview/image/iframe.html.erb

@@ -6,6 +6,7 @@
     <%= form_tag simple_dragonfly_preview_upload_path, multipart: true, id: "image_preview_form" do %>
       <%= hidden_field_tag :retained_id, params[:retained_id] %>
       <%= hidden_field_tag :image_id, params[:image_id] %>
+      <%= hidden_field_tag :resize, params[:resize] %>
       <%= file_field_tag :image %>
     <% end %>
      
@@ -19,7 +20,7 @@
       <% if @image %>
         //update the retained image field
         window.parent.document.getElementById("<%= params[:retained_id] %>").value = "<%= @retained_image %>";
-        window.parent.document.getElementById("<%= params[:image_id] %>").src = "<%= @image.thumb('145x145#').url %>";
+        window.parent.document.getElementById("<%= params[:image_id] %>").src = "<%= @image.thumb(@resize).url %>";
       <% end %>
     </script>
   </body>

data/lib/simple_dragonfly_preview/version.rb

@@ -1,3 +1,3 @@
 module SimpleDragonflyPreview
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/dummy/app/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  image_accessor :avatar
+  dragonfly_accessor :avatar
 
   validates :email, :name, presence: true
 end

data/test/dummy/app/views/users/_form.html.erb

@@ -14,7 +14,7 @@
  
   <%= f.input :name %>
   <%= f.input :email %>
-  <%= f.input :avatar, as: :image_preview, size: "100x100#" %>
+  <%= f.input :avatar, as: :image_preview %>
 
   <div class="actions">
     <%= f.submit %>

data/test/dummy/app/views/users/index.html.erb

@@ -17,7 +17,7 @@
       <tr>
         <td><%= user.name %></td>
         <td><%= user.email %></td>
-        <td><%= user.avatar_uid %></td>
+        <td><%= image_tag user.avatar.thumb("100x100").url if  user.avatar_uid %></td>
         <td><%= link_to 'Show', user %></td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
         <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>

data/test/dummy/app/views/users/show.html.erb

@@ -14,6 +14,10 @@
   <strong>Avatar uid:</strong>
   <%= @user.avatar_uid %>
 </p>
+<p>
+  <strong>Avatar file name:</strong>
+  <%= @user.avatar_name %>
+</p>
 
 <%= link_to 'Edit', edit_user_path(@user) %> |
 <%= link_to 'Back', users_path %>

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

@@ -1 +1,27 @@
-require 'dragonfly/rails/images'
+require 'dragonfly'
+
+# Configure
+Dragonfly.app.configure do
+  plugin :imagemagick
+
+  protect_from_dos_attacks true
+  secret "1zk3xegugs8c9wsyoh32b"
+
+  url_format "/media/:job/:name"
+
+  datastore :file,
+    root_path: Rails.root.join('public/system/dragonfly', Rails.env),
+    server_root: Rails.root.join('public')
+end
+
+# Logger
+Dragonfly.logger = Rails.logger
+
+# Mount as middleware
+Rails.application.middleware.use Dragonfly::Middleware
+
+# Add model functionality
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.extend Dragonfly::Model
+  ActiveRecord::Base.extend Dragonfly::Model::Validations
+end

data/test/dummy/config/routes.rb

@@ -5,7 +5,7 @@ Dummy::Application.routes.draw do
   # See how all your routes lay out with "rake routes".
 
   # You can have the root of your site routed with "root"
-  # root 'welcome#index'
+  root 'users#index'
 
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'

data/test/dummy/db/migrate/20131106190012_create_users.rb

@@ -4,6 +4,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string :name
       t.string :email
       t.string :avatar_uid
+      t.string :avatar_name
 
       t.timestamps
     end

data/test/dummy/db/schema.rb

@@ -17,6 +17,7 @@ ActiveRecord::Schema.define(version: 20131106190012) do
     t.string   "name"
     t.string   "email"
     t.string   "avatar_uid"
+    t.string   "avatar_name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end