sunrise-file-upload 0.1.1 → 0.1.2

data/lib/sunrise/file_upload/active_record.rb

@@ -74,6 +74,7 @@ module Sunrise
           if fileuploads_columns.include?(method.to_sym)
             asset = new_record? ? self.class.fileupload_find(method, fileupload_guid) : send(method)
             asset ||= send("build_#{method}") if respond_to?("build_#{method}")
+            asset
           end
         end
         

data/lib/sunrise/file_upload/manager.rb

@@ -23,11 +23,9 @@ module Sunrise
           request = Request.new(env)
           params = request.params.symbolize_keys
           
-          klass = find_klass(params)
-          asset = find_asset(klass, params) || klass.new(params[:asset])
-      
+          asset = find_or_build_asset(params)
         	asset.assetable_type = params[:assetable_type]
-		      asset.assetable_id = params[:assetable_id].blank? ? 0 : params[:assetable_id].to_i
+		      asset.assetable_id = (params[:assetable_id] || 0).to_i
 		      asset.guid = params[:guid]
         	asset.data = Http.normalize_param(params[:qqfile], request)
           
@@ -45,21 +43,34 @@ module Sunrise
           
           [status, {'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s}, body]
         end
-      
-        def find_klass(params)
-          params[:klass].blank? ? Asset : params[:klass].classify.constantize
+        
+        def find_or_build_asset(params)
+          assetable = load_klass(params[:assetable_type])
+          attribute_name = params[:method].to_s.downcase.to_sym
+          reflection = assetable.reflect_on_association(attribute_name)
+          klass = load_klass(reflection.class_name)
+          
+          asset = nil
+          asset = find_asset(klass, params) unless reflection.collection?
+          asset || klass.new(params[:asset])
+        end
+        
+        def load_klass(class_name)
+          return nil if class_name.blank?
+          class_name.to_s.classify.constantize
         end
         
         def find_asset(klass, params)
-          query = klass.scoped
+          query = klass.scoped.where(:assetable_type => params[:assetable_type])
           
-          unless params[:assetable_id].blank? || params[:assetable_type].blank?
+          if !params[:assetable_id].blank?
             query = query.where(:assetable_id => params[:assetable_id].to_i)
-            query = query.where(:assetable_type => params[:assetable_type])
-          else
+          elsif !params[:guid]
             query = query.where(:guid => params[:guid])
+          else
+            query = query.where(:id => params[:id])
           end
-                    
+          
           query.first
         end
         

data/lib/sunrise/file_upload/version.rb

@@ -1,5 +1,5 @@
 module Sunrise
   module FileUpload
-    VERSION = "0.1.1".freeze
+    VERSION = "0.1.2".freeze
   end
 end

data/lib/sunrise/file_upload/view_helper.rb

@@ -16,7 +16,7 @@ module Sunrise
         script_options = (options.delete(:script) || {}).stringify_keys
         
         params = {
-          :klass => value.class.name, 
+          :method => method, 
           :assetable_id => object.new_record? ? nil : object.id, 
           :assetable_type => object.class.name,
           :guid => element_guid
@@ -26,13 +26,11 @@ module Sunrise
         script_options['allowedExtensions'] ||=  ['jpg', 'jpeg', 'png', 'gif']
         script_options['multiple'] ||= object.fileupload_multiple?(method)
         
-        content_tag(:div, :class => 'fileupload') do
-          content_tag(:div, :id => element_id) do
-            content_tag(:noscript) do
-              fields_for object do |form|
-                form.fields_for method, value do |f|
-                  f.file_field :data
-                end
+        content_tag(:div, :class => 'fileupload', :id => element_id) do
+          content_tag(:noscript) do
+            fields_for object do |form|
+              form.fields_for method, value do |f|
+                f.file_field :data
               end
             end
           end + javascript_tag( fileupload_script(element_id, value, script_options) )

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sunrise-file-upload
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 Z
+date: 2011-05-23 00:00:00 +03:00
+default_executable: 
 dependencies: []
 
 description: Sunrise is a Aimbulance CMS
@@ -44,6 +45,7 @@ files:
 - lib/sunrise/file_upload/request.rb
 - lib/sunrise/file_upload/version.rb
 - lib/sunrise/file_upload/view_helper.rb
+has_rdoc: true
 homepage: https://github.com/galetahub/sunrise-file-upload
 licenses: []
 
@@ -73,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails FileUpload