lolita-file-upload 0.2.9 → 0.3.0

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem "lolita", "~>3.1.9"
 gem "carrierwave", "~> 0.5.2"
+gem "mini_magick"
 group :test do
   gem "rspec-rails", "~> 2.6"
   gem "ffaker"

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.3.0

data/app/uploaders/file_uploader.rb

@@ -19,9 +19,9 @@ class FileUploader < CarrierWave::Uploader::Base
     # With slash in first place it will be absolute url, otherwise relative to Rails.root+"/public"
     def store_dir
       if model
-        "upload/#{model.class.to_s.underscore}/#{timestamp}/#{model.id}"
+        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{timestamp}/#{model.id}"
       else
-        "upload/misc"
+        "uploads/misc"
       end
     end
 

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

@@ -74,7 +74,9 @@ module Lolita
         end
 
         def set_default_association
-          @association=self.dbi.associations.detect{|k,assoc| !assoc.klass.uploaders.empty? }
+          @association=self.dbi.associations.detect{|k,assoc| 
+            !assoc.klass.uploaders.empty? 
+          }
           if @association
             @association=@association.last
             @association_type = self.dbi.association_macro(@association)

data/lolita-file-upload.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-file-upload}
-  s.version = "0.2.9"
+  s.version = "0.3.0"
 
   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-08-13}
+  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.extra_rdoc_files = [
@@ -114,6 +114,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<lolita>, ["~> 3.1.9"])
       s.add_runtime_dependency(%q<carrierwave>, ["~> 0.5.2"])
+      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_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -121,6 +122,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<lolita>, ["~> 3.1.9"])
       s.add_dependency(%q<carrierwave>, ["~> 0.5.2"])
+      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<bundler>, ["~> 1.0"])
@@ -129,6 +131,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<lolita>, ["~> 3.1.9"])
     s.add_dependency(%q<carrierwave>, ["~> 0.5.2"])
+    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<bundler>, ["~> 1.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-file-upload
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &84644510 !ruby/object:Gem::Requirement
+  requirement: &72727590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *84644510
+  version_requirements: *72727590
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &84644120 !ruby/object:Gem::Requirement
+  requirement: &72727270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,21 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *84644120
+  version_requirements: *72727270
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: &72700960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *72700960
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &84643760 !ruby/object:Gem::Requirement
+  requirement: &72700530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *84643760
+  version_requirements: *72700530
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &84643380 !ruby/object:Gem::Requirement
+  requirement: &72700040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *84643380
+  version_requirements: *72700040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84642860 !ruby/object:Gem::Requirement
+  requirement: &72697420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *84642860
+  version_requirements: *72697420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84642420 !ruby/object:Gem::Requirement
+  requirement: &72696190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +88,7 @@ dependencies:
         version: '1.5'
   type: :development
   prerelease: false
-  version_requirements: *84642420
+  version_requirements: *72696190
 description: File upload gem for Lolita with with fulll integration - models, controller,
   views
 email: support@ithouse.lv
@@ -186,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -402144947
+      hash: -639909585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: