uploadbox 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c98593bc8ee77673827d0df2453c69faca92b38
-  data.tar.gz: 869dc96c133c8d37615901678a9c25fb2463daec
+  metadata.gz: bde58e89daaa9aaa9c7dd01ef81d9b07281b1adb
+  data.tar.gz: da4528b93e337d1d0af19ab7efc1af1113aa2aed
 SHA512:
-  metadata.gz: 1e230ef299e8a19bd3a58e98f9136c7e4bd41df72aeca4f3a53bcaa60f76d6dc6dbe072bf760031f890d4b9bbaf318cded27636b4d2f91f17f591c6f03d76c02
-  data.tar.gz: b4c694a45159cfd1785adfb26225d31b9313bccc23369e1a83b3e412dacff26a06b2d2815653912741c4ef4afaba720225383e031ba913869690c8a2bbcd1bc2
+  metadata.gz: 1d14891638c745bcdc4ef404b79527ed542426e17b47379a6b3aa541c46deec78572ef3c0f4d43df6f72b11cb8cb733e0d3e5fa67d65c52d7f320d02663e5075
+  data.tar.gz: 32515e040f6aa705d146bac3242c651b62326e8358c733389e2df2a9e80712ef73b864e4b7d9bd929462875a5c4ff5a760d3f2ab3eaeb014220f9f91cc097755

data/README.md

@@ -0,0 +1,42 @@
+# Do not use (not yet released)
+
+## Installation
+
+Add to Gemfile
+`gem 'uploadbox'`
+
+Run generators
+`rails g uploadbox:image`
+
+Add jquery and uploadbox to `application.js`
+```
+//= require jquery
+//= require jquery_ujs
+//= require uploadbox
+```
+
+Add uploadbox to `application.css`
+```
+/*
+ *= require uploadbox
+ */
+```
+
+Migrate database
+`rake db:migrate`
+
+Update `routes.rb`
+`mount Uploadbox::Engine => '/uploadbox', as: :uploadbox`
+
+## Usage
+Add `uploads_one` to your model
+`uploads_one :picture, thumb: [100, 100], regular: [300, 200]`
+
+Add field to form
+`<%= f.uploader :picture %>`
+
+Attach upload on controller
+`@post.attach_picture(params[:picture_id])`
+
+Show image
+`<%= img @post.picture.regular if @post.picture? %>`

data/Rakefile

@@ -14,21 +14,15 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test
+require 'rspec/core'
+require 'rspec/core/rake_task'
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
+task default: :spec

data/app/controllers/uploadbox/images_controller.rb

@@ -1,5 +1,7 @@
 module Uploadbox
   class ImagesController < ApplicationController
+    layout false
+
     def create
       @image = Image.create_upload(image_params)
     end

data/app/models/image.rb

@@ -2,7 +2,10 @@ class Image < ActiveRecord::Base
   belongs_to :imageable, polymorphic: true
 
   def self.create_upload(attributes)
+    attributes[:imageable_type].constantize # load class
+
     upload_class_name = attributes[:imageable_type] + attributes[:upload_name].camelize
+    attributes.delete(:upload_name)
     Uploadbox.const_get(upload_class_name).create!(attributes)
   end
 end

data/app/views/uploadbox/images/_uploader.html.slim

@@ -1,18 +1,25 @@
 = form.fields_for :image do
   div data-component="ImageUploader"
-    input name="#{upload_name}_id" data-item="id" type="hidden"
-    .fileupload data-provides="fileupload" class="fileupload-#{resource.send(upload_name).present? ? 'exists' : 'new'}"
+    - if namespace
+      input name="[#{namespace}]#{upload_name}_id" data-item="id" type="hidden"
+    - else
+      input name="#{upload_name}_id" data-item="id" type="hidden"
+    .fileupload data-provides="fileupload" class="fileupload-#{(resource.send(upload_name).present? or default) ? 'exists' : 'new'}"
       .fileupload-preview.thumbnail data-version="#{version}" data-width="#{width}" data-height="#{height}" style="width: #{width}px; height: #{height}px;"
-        = img resource.send(upload_name).send(version) if resource.send(upload_name).present?
+        - if resource.send(upload_name).present?
+          = img resource.send(upload_name).send(version)
+        - elsif default
+          = image_tag default, width: width, height: height
       div
         span.btn.btn-file
-          span.fileupload-new Escolher
-          span.fileupload-exists Alterar
+          span.fileupload-new = choose_label
+          span.fileupload-exists = update_label
           input type="file" data-url="#{uploadbox.images_path}" name="image[file]"
           input type="hidden" name="image[imageable_type]" value="#{resource.class}"
           input type="hidden" name="image[upload_name]" value="#{upload_name}"
-        - if resource.send(upload_name).present?
-          = link_to 'Excluir', uploadbox.image_path(resource.send(upload_name)), class: 'btn fileupload-exists', remote: true, method: :delete
-        - else
-          = link_to 'Excluir', '#', class: 'btn fileupload-exists', remote: true, method: :delete
+        - if removable
+          - if resource.send(upload_name).present?
+            = link_to destroy_label, uploadbox.image_path(resource.send(upload_name)), class: 'btn fileupload-exists', remote: true, method: :delete
+          - else
+            = link_to destroy_label, '#', class: 'btn fileupload-exists', remote: true, method: :delete
 

data/lib/generators/uploadbox/image/image_generator.rb

@@ -10,6 +10,8 @@ module Uploadbox
     end
 
     def update_gitignore
+      return unless File.exist?('.gitignore')
+
       append_to_file '.gitignore', 'public/uploads'
     end
 

data/lib/uploadbox/engine.rb

@@ -9,6 +9,13 @@ require 'jbuilder'
 
 module Uploadbox
   class Engine < ::Rails::Engine
+    config.generators do |g|
+      g.test_framework :rspec, fixture: false, view_specs: false
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.assets false
+      g.helper false
+    end
+
     initializer 'uploadbox.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
         helper Uploadbox::ImgHelper
@@ -21,7 +28,12 @@ end
 class ActionView::Helpers::FormBuilder
   def uploader(upload_name, options={})
     upload_model_class = "Uploadbox::#{@object.class.to_s + upload_name.to_s.camelize}".constantize
-    options.reverse_merge!(preview: upload_model_class.versions.keys.first)
+    options.reverse_merge!(preview: upload_model_class.versions.keys.first,
+                           namespace: false,
+                           default: false,
+                           update_label: 'Alterar',
+                           choose_label: 'Escolher',
+                           destroy_label: 'Excluir')
     dimensions = upload_model_class.versions[options[:preview]]
     @template.render partial: 'uploadbox/images/uploader', locals: {
       upload_name: upload_name,
@@ -29,7 +41,13 @@ class ActionView::Helpers::FormBuilder
       form: self,
       version: options[:preview],
       width: dimensions[0],
-      height: dimensions[1]
+      height: dimensions[1],
+      namespace: options[:namespace],
+      default: options[:default],
+      removable: upload_model_class.removable?,
+      update_label: options[:update_label],
+      choose_label: options[:choose_label],
+      destroy_label: options[:destroy_label]
     }
   end
 end

data/lib/uploadbox/image_uploader.rb

@@ -3,6 +3,7 @@ module Uploadbox
     def uploads_one(upload_name, options={})
       default_options = {
         default: false,
+        removable: true,
         retina: Uploadbox.retina,
         quality: Uploadbox.retina ? (Uploadbox.retina_quality || 40) : (Uploadbox.image_quality || 80)
       }
@@ -15,27 +16,45 @@ module Uploadbox
       upload_class = Class.new(Image)
       Uploadbox.const_set(upload_class_name, upload_class)
 
-      # picture?
+      # @post.picture?
       define_method("#{upload_name}?") { send(upload_name) and send(upload_name).file? }
 
-      # attach_picture
+      # @post.attach_picture
       define_method("attach_#{upload_name}") do |upload_id|
         if upload_id.present?
           self.send("attach_#{upload_name}!", upload_id)
         end
       end
 
-      # attach_picture!
+      # @post.attach_picture!
       define_method("attach_#{upload_name}!") do |upload_id|
         self.send("#{upload_name}=", upload_class.find(upload_id))
       end
 
+      # Post.update_picture_versions!
+      self.define_singleton_method "update_#{upload_name}_versions!" do
+        Uploadbox.const_get(upload_class_name).find_each{|upload| upload.file.recreate_versions!}
+      end
+
       # Uploadbox::PostPicture < Image
-      upload_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.versions
-          #{upload_versions}
-        end
-      RUBY
+      upload_class.define_singleton_method :versions do
+        upload_versions
+      end
+
+      upload_class.define_singleton_method :removable? do
+        options[:removable]
+      end
+
+      # Uploadbox::PostPicture < Image
+      # upload_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+      #   def self.versions
+      #     #{upload_versions}
+      #   end
+
+      #   def self.removable?
+      #     #{options[:removable]}
+      #   end
+      # RUBY
 
       upload_class.instance_eval do
         delegate *upload_versions.keys, to: :file

data/lib/uploadbox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -183,16 +183,58 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
 description: Uploadbox makes easy to manage files in your Rails application.
 email:
 - julio@startae.com.br
@@ -232,55 +274,7 @@ files:
 - lib/uploadbox.rb
 - MIT-LICENSE
 - Rakefile
-- test/dummy/app/assets/javascripts/application.coffee
-- test/dummy/app/assets/stylesheets/application.sass
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/posts_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/home_helper.rb
-- test/dummy/app/helpers/posts_helper.rb
-- test/dummy/app/models/post.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/posts/_form.slim
-- test/dummy/app/views/posts/edit.html.erb
-- test/dummy/app/views/posts/index.html.erb
-- test/dummy/app/views/posts/new.html.erb
-- test/dummy/app/views/posts/show.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20130624130249_create_posts.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/uploadbox_test.rb
+- README.md
 homepage: https://github.com/startae/uploadbox
 licenses:
 - MIT
@@ -305,53 +299,4 @@ rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: Ajax file uploader for Rails applications.
-test_files:
-- test/dummy/app/assets/javascripts/application.coffee
-- test/dummy/app/assets/stylesheets/application.sass
-- test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/posts_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/helpers/home_helper.rb
-- test/dummy/app/helpers/posts_helper.rb
-- test/dummy/app/models/post.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/posts/_form.slim
-- test/dummy/app/views/posts/edit.html.erb
-- test/dummy/app/views/posts/index.html.erb
-- test/dummy/app/views/posts/new.html.erb
-- test/dummy/app/views/posts/show.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/migrate/20130624130249_create_posts.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/uploadbox_test.rb
+test_files: []

data/test/dummy/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/test/dummy/Rakefile

@@ -1,6 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Dummy::Application.load_tasks

data/test/dummy/app/assets/javascripts/application.coffee

@@ -1,3 +0,0 @@
-#= require jquery
-#= require jquery_ujs
-#= require uploadbox

data/test/dummy/app/assets/stylesheets/application.sass

@@ -1,2 +0,0 @@
-@import scaffold
-@import uploadbox

data/test/dummy/app/assets/stylesheets/scaffold.css

@@ -1,56 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-div.field, div.actions {
-  margin-bottom: 10px;
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-}
-
-#error_explanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
-  margin-bottom: 0px;
-  background-color: #c00;
-  color: #fff;
-}
-
-#error_explanation ul li {
-  font-size: 12px;
-  list-style: square;
-}

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +0,0 @@
-class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
-end

data/test/dummy/app/controllers/posts_controller.rb

@@ -1,61 +0,0 @@
-class PostsController < ApplicationController
-  before_action :set_post, only: [:show, :edit, :update, :destroy]
-
-  # GET /posts
-  def index
-    @posts = Post.all
-  end
-
-  # GET /posts/1
-  def show
-  end
-
-  # GET /posts/new
-  def new
-    @post = Post.new
-  end
-
-  # GET /posts/1/edit
-  def edit
-  end
-
-  # POST /posts
-  def create
-    @post = Post.new(post_params)
-    @post.image = Image.find_by(id: params[:image_id])
-
-    if @post.save
-      redirect_to @post, notice: 'Post was successfully created.'
-    else
-      render action: 'new'
-    end
-  end
-
-  # PATCH/PUT /posts/1
-  def update
-    @post.image = Image.find_by(id: params[:image_id])
-
-    if @post.update(post_params)
-      redirect_to @post, notice: 'Post was successfully updated.'
-    else
-      render action: 'edit'
-    end
-  end
-
-  # DELETE /posts/1
-  def destroy
-    @post.destroy
-    redirect_to posts_url, notice: 'Post was successfully destroyed.'
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_post
-      @post = Post.find(params[:id])
-    end
-
-    # Only allow a trusted parameter "white list" through.
-    def post_params
-      params.require(:post).permit(:title, :body)
-    end
-end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/test/dummy/app/helpers/home_helper.rb

@@ -1,2 +0,0 @@
-module HomeHelper
-end

data/test/dummy/app/helpers/posts_helper.rb

@@ -1,2 +0,0 @@
-module PostsHelper
-end

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

@@ -1,3 +0,0 @@
-class Post < ActiveRecord::Base
-  include ImageUploadable
-end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>