lolita-file-upload 0.4.2 → 0.4.7

data/Gemfile

@@ -1,8 +1,9 @@
 source "http://rubygems.org"
 
-gem "lolita", "~>3.2.0.rc2"
+gem "lolita", "~>3.2.0.rc.3"
 gem "carrierwave", "~> 0.5.7"
 gem "mini_magick"
+gem 'jquery-rails', '>= 1.0.12'
 group :test do
   gem "rspec-rails", "~> 2.6"
   gem "ffaker"
@@ -14,9 +15,9 @@ group :test do
 end
 
 group :development do
-  gem "cucumber", "~> 0.10"
-  gem "cucumber-rails", "~> 0.5.2"
+  gem "cucumber", "~> 1.0"
+  gem "cucumber-rails", "~> 1.0"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.5"
+  gem "jeweler", "~> 1.6"
 end
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.7

data/app/uploaders/file_uploader.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 class FileUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
     storage :file
@@ -27,7 +28,7 @@ class FileUploader < CarrierWave::Uploader::Base
 
     def delete_empty_upstream_dirs
       path = ::File.expand_path(store_dir, root)
-      Dir.delete(path) # fails if path not empty dir
+      FileUtils.rm_rf path # always remove
       
      # path = ::File.expand_path(base_store_dir, root)
      # Dir.delete(path) # fails if path not empty dir

data/app/views/components/lolita/configuration/tab/files/_cells.html.erb

@@ -7,6 +7,6 @@
   <% end %>
 </td>
 <td style="margin-top: 3px; border-bottom: 2px solid #E1E1E1; width: 55px;text-align: center; font-size: 14px; padding: 7px 20px; vertical-align: middle;">
-  <%= link_to  image_tag("lolita/file-upload/edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:remote=>true %>
-  <%= link_to image_tag("lolita/file-upload/delete-picture.png"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
+  <%= link_to  image_tag("lolita/upload/edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:remote=>true %>
+  <%= link_to image_tag("lolita/upload/delete-picture.png"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => (resource.nil? || resource.new_record?) ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
 </td>

data/app/views/components/lolita/configuration/tab/files/_upload_script.html.erb

@@ -1,7 +1,6 @@
   <%= stylesheet_link_tag "lolita/upload/jquery-ui/overcast/jquery-ui-1.8.16.custom.css" %>
-  <%= stylesheet_link_tag "lolita/upload/application.css" %>
-  <%= javascript_include_tag "jquery-ui" %>
-  <%= javascript_include_tag "lolita/upload/application.js" %>
+  <%= stylesheet_link_tag "lolita/upload/application_vendor.css" %>
+  <%= javascript_include_tag "lolita/upload/application_vendor.js" %>
 <% unless Lolita.locale.to_s.downcase=="en" %>
   <%= javascript_include_tag "lolita/upload/I18n/#{Lolita.locale}.js"%>
 <% end %>

data/lib/lolita-file-upload/rails.rb

@@ -2,7 +2,14 @@ if defined?(Rails)
   require "lolita-file-upload/rails/file_upload_routes"
   module LolitaFileUpload
     class Engine < Rails::Engine
-
+      initializer "remove assets directories from pipeline" do |app|
+       app.config.assets.precompile += [
+         "lolita/upload/application_vendor.js",
+         "lolita/upload/application_vendor.css",
+         "lolita/upload/I18n/lv.js",
+         "lolita/upload/I18n/ru.js"
+        ]
+      end
     end
   end
 end

data/lolita-file-upload.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita-file-upload"
-  s.version = "0.4.2"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = "2011-09-06"
+  s.date = "2011-09-09"
   s.description = "File upload gem for Lolita with with fulll integration - models, controller, views"
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "app/assets/images/lolita/file-upload/delete-picture.png",
-    "app/assets/images/lolita/file-upload/edit.png",
+    "app/assets/images/lolita/upload/delete-picture.png",
+    "app/assets/images/lolita/upload/edit.png",
     "app/controllers/lolita/uploads_controller.rb",
     "app/models/lolita/upload/file.rb",
     "app/uploaders/file_uploader.rb",
@@ -111,11 +111,11 @@ Gem::Specification.new do |s|
     "vendor/assets/images/lolita/upload/plupload/transp50.png",
     "vendor/assets/javascripts/lolita/upload/I18n/lv.js",
     "vendor/assets/javascripts/lolita/upload/I18n/ru.js",
-    "vendor/assets/javascripts/lolita/upload/application.js",
+    "vendor/assets/javascripts/lolita/upload/application_vendor.js",
     "vendor/assets/javascripts/lolita/upload/jquery.ui.plupload.js",
     "vendor/assets/javascripts/lolita/upload/plupload.flash.swf",
     "vendor/assets/javascripts/lolita/upload/plupload.full.js",
-    "vendor/assets/stylesheets/lolita/upload/application.css",
+    "vendor/assets/stylesheets/lolita/upload/application_vendor.css",
     "vendor/assets/stylesheets/lolita/upload/jquery-ui/overcast/jquery-ui-1.8.16.custom.css.erb",
     "vendor/assets/stylesheets/lolita/upload/jquery.ui.plupload.css.erb",
     "vendor/assets/stylesheets/lolita/upload/plupload.queue.css"
@@ -130,30 +130,33 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<lolita>, ["~> 3.2.0.rc2"])
+      s.add_runtime_dependency(%q<lolita>, ["~> 3.2.0.rc.3"])
       s.add_runtime_dependency(%q<carrierwave>, ["~> 0.5.7"])
       s.add_runtime_dependency(%q<mini_magick>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, ["~> 0.10"])
-      s.add_development_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
+      s.add_runtime_dependency(%q<jquery-rails>, [">= 1.0.12"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1.0"])
+      s.add_development_dependency(%q<cucumber-rails>, ["~> 1.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6"])
     else
-      s.add_dependency(%q<lolita>, ["~> 3.2.0.rc2"])
+      s.add_dependency(%q<lolita>, ["~> 3.2.0.rc.3"])
       s.add_dependency(%q<carrierwave>, ["~> 0.5.7"])
       s.add_dependency(%q<mini_magick>, [">= 0"])
-      s.add_dependency(%q<cucumber>, ["~> 0.10"])
-      s.add_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
+      s.add_dependency(%q<jquery-rails>, [">= 1.0.12"])
+      s.add_dependency(%q<cucumber>, ["~> 1.0"])
+      s.add_dependency(%q<cucumber-rails>, ["~> 1.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6"])
     end
   else
-    s.add_dependency(%q<lolita>, ["~> 3.2.0.rc2"])
+    s.add_dependency(%q<lolita>, ["~> 3.2.0.rc.3"])
     s.add_dependency(%q<carrierwave>, ["~> 0.5.7"])
     s.add_dependency(%q<mini_magick>, [">= 0"])
-    s.add_dependency(%q<cucumber>, ["~> 0.10"])
-    s.add_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
+    s.add_dependency(%q<jquery-rails>, [">= 1.0.12"])
+    s.add_dependency(%q<cucumber>, ["~> 1.0"])
+    s.add_dependency(%q<cucumber-rails>, ["~> 1.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6"])
   end
 end
 

data/vendor/assets/javascripts/lolita/upload/application_vendor.js

@@ -0,0 +1,3 @@
+//= require jquery-ui
+//= require lolita/upload/plupload.full
+//= require lolita/upload/jquery.ui.plupload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &81667780 !ruby/object:Gem::Requirement
+  requirement: &86675440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc2
+        version: 3.2.0.rc.3
   type: :runtime
   prerelease: false
-  version_requirements: *81667780
+  version_requirements: *86675440
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &81667050 !ruby/object:Gem::Requirement
+  requirement: &86674710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *81667050
+  version_requirements: *86674710
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &81666350 !ruby/object:Gem::Requirement
+  requirement: &86586780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,32 +44,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81666350
+  version_requirements: *86586780
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &86586100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: *86586100
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &81665570 !ruby/object:Gem::Requirement
+  requirement: &86585130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *81665570
+  version_requirements: *86585130
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &81664940 !ruby/object:Gem::Requirement
+  requirement: &86584250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *81664940
+  version_requirements: *86584250
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81664000 !ruby/object:Gem::Requirement
+  requirement: &86583240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,18 +88,18 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *81664000
+  version_requirements: *86583240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81623970 !ruby/object:Gem::Requirement
+  requirement: &86582290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *81623970
+  version_requirements: *86582290
 description: File upload gem for Lolita with with fulll integration - models, controller,
   views
 email: support@ithouse.lv
@@ -105,8 +116,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/assets/images/lolita/file-upload/delete-picture.png
-- app/assets/images/lolita/file-upload/edit.png
+- app/assets/images/lolita/upload/delete-picture.png
+- app/assets/images/lolita/upload/edit.png
 - app/controllers/lolita/uploads_controller.rb
 - app/models/lolita/upload/file.rb
 - app/uploaders/file_uploader.rb
@@ -192,11 +203,11 @@ files:
 - vendor/assets/images/lolita/upload/plupload/transp50.png
 - vendor/assets/javascripts/lolita/upload/I18n/lv.js
 - vendor/assets/javascripts/lolita/upload/I18n/ru.js
-- vendor/assets/javascripts/lolita/upload/application.js
+- vendor/assets/javascripts/lolita/upload/application_vendor.js
 - vendor/assets/javascripts/lolita/upload/jquery.ui.plupload.js
 - vendor/assets/javascripts/lolita/upload/plupload.flash.swf
 - vendor/assets/javascripts/lolita/upload/plupload.full.js
-- vendor/assets/stylesheets/lolita/upload/application.css
+- vendor/assets/stylesheets/lolita/upload/application_vendor.css
 - vendor/assets/stylesheets/lolita/upload/jquery-ui/overcast/jquery-ui-1.8.16.custom.css.erb
 - vendor/assets/stylesheets/lolita/upload/jquery.ui.plupload.css.erb
 - vendor/assets/stylesheets/lolita/upload/plupload.queue.css
@@ -215,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 92784289
+      hash: 615027629
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/vendor/assets/javascripts/lolita/upload/application.js

@@ -1,3 +0,0 @@
-//= require lolita/upload/plupload.full
-//= require lolita/upload/jquery.ui.plupload
-//= require_directory ./I18n