lolita-file-upload 0.1.3 → 0.1.4

data/Gemfile

@@ -1,25 +1,21 @@
 source "http://rubygems.org"
 
-gem "lolita", ">=3.0.6"
+gem "lolita", "~>3.1.8"
 gem "carrierwave", "~> 0.5.2"
 group :test do
-  gem "rspec-rails", "~> 2.5"
+  gem "rspec-rails", "~> 2.6"
   gem "ffaker"
   gem "factory_girl"
   gem "sqlite3"
+  gem "rspec", "~> 2.6"
+  gem 'cover_me', '>= 1.0.0.rc6'
+  gem 'activerecord', "~> 3.0.7"
 end
 
 group :development do
   gem "cucumber", "~> 0.10"
-  gem "cucumber-rails", "~> 0.4.0"
+  gem "cucumber-rails", "~> 0.5.2"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.5"
 end
 
-group :test do
-  gem "rspec", "~> 2.5"
-  gem 'cover_me', '>= 1.0.0.rc6'
-  gem 'activerecord', "~> 3.0", :require=>false
-end
-
-

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/app/controllers/lolita/upload/images_controller.rb

@@ -0,0 +1,52 @@
+module Lolita
+  module Upload
+    class ImagesController < ApplicationController
+
+      include Lolita::Controllers::UserHelpers
+      include Lolita::Controllers::InternalHelpers
+      before_filter :authenticate_lolita_user!
+      before_filter :get_or_build_resource, :only=>[:create,:edit,:update,:destroy]
+      before_filter :set_tab, :only=>[:edit,:update,:destroy,:create]
+
+       respond_to :js,:html
+
+      def create
+        @resource.send("#{params[:field]}=".to_sym, params[:file])
+        @resource.save!(:validate => false)
+        render_component @tab, :row, :file => @resource
+      end
+
+      def edit
+        render_component *@tab.build("",:edit,:file=>@file)
+      end
+
+      def update
+        @file.update_attributes!(params[:file])
+        render_component *@tab.build("",:update,:file=>@file)
+      end
+
+
+      def destroy
+        @file.destroy
+        render_component *@tab.build("",:destroy,:file=>@file)
+      end
+
+      private
+
+      def get_or_build_resource
+        @klass = params[:resource_class].camelize.constantize
+        @resource = if params[:many] 
+         # @klass.new(params[:upload])
+        else
+          @klass.find_by_id(params[:resource_id])
+        end
+      end
+
+      def set_tab
+        @tab = @klass.lolita.tabs.select{|tab|
+          tab.type == :images && tab.tab_field == params[:field].to_sym
+        }
+      end
+    end
+  end
+end

data/app/models/lolita/upload/file.rb

@@ -8,10 +8,19 @@ module Lolita
 
       validate :size_limit
       before_save :set_metadata
+      before_create :singularize_files
       
 
       private
 
+      def singularize_files
+        if self.fileable && lolita = self.fileable.class.lolita
+          if lolita.tabs.by_type(:files).association_type == :one
+            self.class.destroy_all(["fileable_type = :type AND fileable_id = :id AND fileable_id > 0",:type => fileable_type,:id => fileable_id])
+          end
+        end
+      end
+
       def size_limit
         if self.fileable && lolita=self.fileable.class.lolita
           maxsize=lolita.tabs.by_type(:files).maxfilesize

data/app/uploaders/file_uploader.rb

@@ -1,5 +1,5 @@
 class FileUploader < CarrierWave::Uploader::Base
-  storage :file
+    storage :file
     def timestamp
       time=if model
         model.created_at || Time.now

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

@@ -4,8 +4,8 @@
   </div>
 <% end %>
  <div id="filelist">
-    <%= render_component *tab.build("",:list)%>
+    <%= render_component tab,:list %>
   </div>
-<%= render_component *tab.build("",:upload_script,:container=>"file_upload_container")%>
+<%= render_component tab, :upload_script, :container => "file_upload_container"%>
 <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
 

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

@@ -6,7 +6,8 @@
     </tr>
   </thead>
   <tbody>
-    <% resource.send(tab.association.name).each do |file| %>
+    <% files = tab.association_type == :one ? [resource.send(tab.association.name)].compact :  resource.send(tab.association.name)%>
+    <% files.each do |file| %>
       <%= render_component *tab.build("",:row,:file=>file,:value=>nil) %>
     <% end %>
   </tbody>

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

@@ -8,7 +8,6 @@
 <% unless Lolita.locale.to_s.downcase=="en" %>
   <script type="text/javascript" src="/javascripts/lolita/upload/I18n/<%=Lolita.locale%>.js"></script>
 <% end %>
-
 <script type="text/javascript">  
  $(function(){  
   $("#<%=container%>").plupload({
@@ -19,11 +18,18 @@
     chunk_size : '1mb',
     unique_names : true,
     rename: true,
+    <% if tab.extensions.any? %>
+      filters:[
+        <% tab.extensions.each do |ext_data| %>
+          {title: "<%=ext_data[:title]%>", extensions: "<%= ext_data[:extensions].is_a?(Array) ? ext_data[:extensions].join(",") : ext_data[:extensions] %>"},
+        <% end %>
+      ],
+    <% end %>
     multipart: true,
     multipart_params: {  
       "authenticity_token" : '<%= form_authenticity_token %>',
-      "<%="upload[#{tab.association.name.to_s.singularize}able_type]"%>": "<%=resource.class%>",
-      "<%="upload[#{tab.association.name.to_s.singularize}able_id]"%>": "<%=resource.new_record? ? 0 : resource.id%>"
+      "<%="upload[#{tab.association.options[:as]}_type]"%>": "<%=resource.class%>",
+      "<%="upload[#{tab.association.options[:as]}_id]"%>": "<%=resource.new_record? ? 0 : resource.id%>"
     },
     headers:{
         "X-CSRF-Token": $("meta[name='csrf-token']").attr("content")
@@ -33,9 +39,20 @@
     flash_swf_url : '/javascripts/lolita/upload/plupload.flash.swf',
     init:{
       FileUploaded:function(uploader, file, info){
-        $("#file_list_for_<%=tab.type%>>tbody").append(info.response)
+        <% if tab.association_type == :one %>
+          uploader.splice(0,10);
+          $("#file_list_for_<%=tab.type%>>tbody").html("")
+          $("#file_list_for_<%=tab.type%>>tbody").append(info.response)
+        <% else %>
+          $("#file_list_for_<%=tab.type%>>tbody").append(info.response)
+        <% end %>
+
+        <% if tab.association_type == :many %>
+          var ids="<%="#{resource_name}[#{tab.association.name}_ids][]"%>"
+        <% else %>
+          var ids = "<%="#{resource_name}[#{tab.association.name}_new]"%>"
+        <% end %>
 
-        var ids="<%="#{resource_name}[#{tab.type.to_s.singularize}_ids][]"%>"
         var existing_ids=[]
         $("input.<%=tab.type%>-ids").each(function(){
           existing_ids.push($(this).val())

data/lib/lolita-file-upload.rb

@@ -17,7 +17,11 @@ module Lolita
   module Configuration
     module Tab
     	autoload :Files, "lolita-file-upload/configuration/tab/files"
+      autoload :Images, "lolita-file-upload/configuration/tab/images"
     end
+    # module Field
+    #   autoload :Upload, "lolita-file-upload/configuration/field/upload"
+    # end
   end
 end
 

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

@@ -7,7 +7,7 @@ module Lolita
     	class Files < Lolita::Configuration::Tab::Base
     	
   	  	lolita_accessor :extensions,:maxfilesize
-        attr_reader :association
+        attr_reader :association, :association_type
 
         # As any other Lolita::Configuration::Tab this should receive _dbi_ object.
         # Additional _args_ that may represent methods, for details see Lolita::Configuration::Tab.
@@ -25,21 +25,24 @@ module Lolita
         #     # using in lolita configuration definition
         #     lolita do
         #       tab(:file) do
-        #         extension :pdf
+        #         extension "Images", "png,jpg"
         #       end
         #     end
         #     
         #     # using for object
         #     Lolita::Configuration.FileTab.new(dbi).extension("pdf")
-  	  	def extension(value)
-  	  		@extensions << value
+  	  	def extension(title, extensions)
+  	  		@extensions << {:title => title, :extensions => extensions}
   	  	end
   	  	
         private
 
         def set_association
           @association=self.dbi.associations.detect{|k,assoc| assoc.class_name=="Lolita::Upload::File"}
-          @association=@association.last if @association
+          if @association
+            @association=@association.last
+            @association_type = self.dbi.association_macro(@association)
+          end
         end
 
         def validate

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

@@ -0,0 +1,20 @@
+module Lolita
+  module Configuration
+    module Tab
+      class Images < Lolita::Configuration::Tab::Base
+
+        def initialize dbi,type,tab_field,*args
+          @type=:images
+          @tab_field = tab_field
+          super
+        end
+
+        def tab_field
+          @tab_field
+        end
+
+      end
+    end
+  end
+end
+

data/lolita-file-upload.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita-file-upload}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = %q{2011-05-03}
+  s.date = %q{2011-06-15}
   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 = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/lolita/upload/files_controller.rb",
+    "app/controllers/lolita/upload/images_controller.rb",
     "app/models/lolita/upload/file.rb",
     "app/uploaders/file_uploader.rb",
     "app/views/components/lolita/configuration/tab/files/_cells.html.erb",
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
     "lib/generators/lolita_file_upload/templates/migration.rb",
     "lib/lolita-file-upload.rb",
     "lib/lolita-file-upload/configuration/tab/files.rb",
+    "lib/lolita-file-upload/configuration/tab/images.rb",
     "lib/lolita-file-upload/module.rb",
     "lib/lolita-file-upload/rails.rb",
     "lib/lolita-file-upload/rails/file_upload_routes.rb",
@@ -66,6 +68,7 @@ Gem::Specification.new do |s|
     "public/images/lolita/upload/plupload/plupload.png",
     "public/images/lolita/upload/plupload/throbber.gif",
     "public/images/lolita/upload/plupload/transp50.png",
+    "public/javascripts/lolita/upload/I18n/lv.js",
     "public/javascripts/lolita/upload/I18n/ru.js",
     "public/javascripts/lolita/upload/jquery.ui.plupload.js",
     "public/javascripts/lolita/upload/plupload.flash.swf",
@@ -73,62 +76,64 @@ Gem::Specification.new do |s|
     "public/stylesheets/lolita/upload/jquery.ui.plupload.css",
     "public/stylesheets/lolita/upload/plupload.queue.css",
     "spec/configuration/tab/files_spec.rb",
+    "spec/configuration/tab/images_spec.rb",
     "spec/lolita/support/bytes_spec.rb",
     "spec/models/file_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/post.rb",
     "spec/uploaders/file_uploader_spec.rb",
     "test_orm/active_record.rb",
+    "test_orm/active_record/news.rb",
     "test_orm/active_record/post.rb",
+    "test_orm/active_record/tag.rb",
     "test_orm/config/active_record.yml",
     "test_orm/coverage.rb",
     "test_orm/db/migrate/01_create_posts.rb",
     "test_orm/db/migrate/02_create_files.rb",
+    "test_orm/db/migrate/03_create_news.rb",
+    "test_orm/db/migrate/04_create_tags.rb",
     "test_orm/files/large_file.txt",
     "test_orm/files/normal_file.txt",
     "test_orm/rails/config/application.rb",
     "test_orm/rails/config/enviroment.rb",
     "test_orm/rails/config/routes.rb",
     "test_orm/rails/log/development.log",
-    "test_orm/support.rb"
+    "test_orm/support.rb",
+    "test_orm/uploaders/list_image_uploader.rb",
+    "test_orm/uploaders/main_image_uploader.rb",
+    "upload/lolita/upload/file/201105/1/large_file.txt",
+    "upload/lolita/upload/file/201106/1/large_file.txt",
+    "upload/misc/large_file.txt"
   ]
   s.homepage = %q{http://github.com/ithouse/lolita-file-upload}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{File upload gem for Lolita CMS}
-  s.test_files = [
-    "spec/configuration/tab/files_spec.rb",
-    "spec/lolita/support/bytes_spec.rb",
-    "spec/models/file_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/post.rb",
-    "spec/uploaders/file_uploader_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<lolita>, [">= 3.0.6"])
+      s.add_runtime_dependency(%q<lolita>, ["~> 3.1.8"])
       s.add_runtime_dependency(%q<carrierwave>, ["~> 0.5.2"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.10"])
-      s.add_development_dependency(%q<cucumber-rails>, ["~> 0.4.0"])
+      s.add_development_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5"])
     else
-      s.add_dependency(%q<lolita>, [">= 3.0.6"])
+      s.add_dependency(%q<lolita>, ["~> 3.1.8"])
       s.add_dependency(%q<carrierwave>, ["~> 0.5.2"])
       s.add_dependency(%q<cucumber>, ["~> 0.10"])
-      s.add_dependency(%q<cucumber-rails>, ["~> 0.4.0"])
+      s.add_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<lolita>, [">= 3.0.6"])
+    s.add_dependency(%q<lolita>, ["~> 3.1.8"])
     s.add_dependency(%q<carrierwave>, ["~> 0.5.2"])
     s.add_dependency(%q<cucumber>, ["~> 0.10"])
-    s.add_dependency(%q<cucumber-rails>, ["~> 0.4.0"])
+    s.add_dependency(%q<cucumber-rails>, ["~> 0.5.2"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5"])
   end

data/public/javascripts/lolita/upload/I18n/lv.js

@@ -0,0 +1,22 @@
+// Latvian
+plupload.addI18n({
+    'Select files' : 'Izvēlieties failu',
+    'Add files to the upload queue and click the start button.' : 'Pievienojiet failu augšupielādes rindai un nospiediet pogu "Sākt augšupielādi".',
+    'Filename' : 'Faila nosaukums',
+    'Status' : 'Statuss',
+    'Size' : 'Izmērs',
+    'Add Files' : 'Pievienot failus',
+    'Start Upload': "Sākt augšupielādi",
+    'Stop current upload' : 'Apturēt augšupielādi',
+    'Start uploading queue' : 'Sākt augšupielādēt rindu',
+    'Uploaded %d/%d files': 'Augšupielādēti %d no %d failiem',
+    'N/A' : 'N/A',
+    'Drag files here.' : 'Pārvilkt failus šeit.',
+    'File extension error.': 'Faila paplašinājuma kļūda.',
+    'File size error.': 'Faila izmēra kļūda.',
+    'Init error.': 'Inicializācijas kļūda.',
+    'HTTP Error.': 'HTTP kļūda.',
+    'Security error.': 'Drošības kļūda.',
+    'Generic error.': 'Vispārīga kļūda.',
+    'IO error.': 'Ievades-izvades kļūda.'
+});

data/spec/configuration/tab/files_spec.rb

@@ -1,12 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
-describe Lolita::Configuration::FilesTab do
+describe Lolita::Configuration::Tab::Files do
 
   let(:dbi){Lolita::DBI::Base.new(Post)}
-  let(:tab){Lolita::Configuration::FilesTab.new(dbi)}
+  let(:tab){Lolita::Configuration::Tab::Files.new(dbi)}
 
   it "should create new file tab" do
-    Lolita::Configuration::FilesTab.new(dbi).type.should == :files
+    Lolita::Configuration::Tab::Files.new(dbi).type.should == :files
   end
 
   describe "extensions" do
@@ -21,8 +21,8 @@ describe Lolita::Configuration::FilesTab do
     end
 
     it "should allow to add new one" do
-      tab.extension("pdf")
-      tab.extensions.should == ["pdf"]
+      tab.extension("Image","pdf")
+      tab.extensions.should == [{:title=>"Image",:extensions=>"pdf"}]
     end
   end
 

data/spec/configuration/tab/images_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Lolita::Configuration::Tab::Images do
+
+  let(:dbi){Lolita::DBI::Base.new(News)}
+  let(:klass){Lolita::Configuration::Tab::Images}
+
+  it "should create new tab " do
+    klass.new(dbi,:images,:main_image)
+  end
+
+  it "should have tab_field for image tab" do
+    News.lolita.tabs.first.tab_field.should == :main_image
+  end
+
+end