lolita-file-upload 0.3.0 → 0.3.0.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.0.1

data/app/uploaders/file_uploader.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 class FileUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
     storage :file
@@ -27,10 +28,10 @@ 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
+      Dir.delete(path) # fails if path not empty dir
     rescue SystemCallError
       true # nothing, the dir is not empty
     end

data/lib/lolita-file-upload/configuration/tab/files.rb

@@ -48,7 +48,7 @@ module Lolita
         def association name=nil
           if name
             @association = self.dbi.associations[name]
-            @association_type = self.dbi.association_macro(@association)
+            @association_type = @association.macro
             @uploader = @association.klass.uploaders.keys.first
           end
           @association
@@ -70,17 +70,22 @@ module Lolita
         private
 
         def all_text_fields
-          self.association_dbi.fields.collect{|field| field[:name] if field[:type] == "string"}.compact
+          adapter = Lolita::DBI::Base.create(self.association.klass)
+          @text_fields ||=adapter.fields.collect{|field| 
+            if field.type == "string"
+              field.name
+            end
+          }.compact
         end
 
         def set_default_association
-          @association=self.dbi.associations.detect{|k,assoc| 
-            !assoc.klass.uploaders.empty? 
+          @association=self.dbi.associations.detect{|name,assoc| 
+            !assoc.polymorphic? && !assoc.klass.uploaders.empty?
           }
           if @association
-            @association=@association.last
-            @association_type = self.dbi.association_macro(@association)
-            @uploader = @association.klass.uploaders.keys.first
+            @association = @association.last
+            @association_type = @association.macro
+            @uploader = @association.klass.uploaders.keys.first #FIXME what to do when there is more than one uploader
           end
         end
 

data/lolita-file-upload.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{lolita-file-upload}
-  s.version = "0.3.0"
+  s.name = "lolita-file-upload"
+  s.version = "0.3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{ITHouse}, %q{Arturs Meisters}]
-  s.date = %q{2011-09-01}
-  s.description = %q{File upload gem for Lolita with with fulll integration - models, controller, views}
-  s.email = %q{support@ithouse.lv}
+  s.authors = ["ITHouse", "Arturs Meisters"]
+  s.date = "2011-12-07"
+  s.description = "File upload gem for Lolita with with fulll integration - models, controller, views"
+  s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -102,11 +102,11 @@ Gem::Specification.new do |s|
     "test_orm/uploaders/list_image_uploader.rb",
     "test_orm/uploaders/main_image_uploader.rb"
   ]
-  s.homepage = %q{http://github.com/ithouse/lolita-file-upload}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{File upload gem for Lolita CMS}
+  s.homepage = "http://github.com/ithouse/lolita-file-upload"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "File upload gem for Lolita CMS"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &72727590 !ruby/object:Gem::Requirement
+  requirement: &6741620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *72727590
+  version_requirements: *6741620
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &72727270 !ruby/object:Gem::Requirement
+  requirement: &6740140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *72727270
+  version_requirements: *6740140
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &72700960 !ruby/object:Gem::Requirement
+  requirement: &6738840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72700960
+  version_requirements: *6738840
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &72700530 !ruby/object:Gem::Requirement
+  requirement: &6737780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *72700530
+  version_requirements: *6737780
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &72700040 !ruby/object:Gem::Requirement
+  requirement: &6736880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *72700040
+  version_requirements: *6736880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &72697420 !ruby/object:Gem::Requirement
+  requirement: &6735520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *72697420
+  version_requirements: *6735520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72696190 !ruby/object:Gem::Requirement
+  requirement: &6734580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *72696190
+  version_requirements: *6734580
 description: File upload gem for Lolita with with fulll integration - models, controller,
   views
 email: support@ithouse.lv
@@ -195,9 +195,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -639909585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: File upload gem for Lolita CMS