lolita-file-upload 0.1.4 → 0.2.0

data/features/support/env.rb

@@ -1,15 +1,15 @@
-require File.expand_path('test_orm/coverage')
-require File.expand_path("lib/lolita-file-upload")
-require "carrierwave"
-
-require "ruby-debug"
-current_orm=:active_record
-require 'carrierwave/orm/'+current_orm.to_s.gsub("_","")
-
-require File.expand_path("test_orm/#{current_orm}")
-
-require File.expand_path("test_orm/support")
-
-
-
- 
+require File.expand_path('test_orm/coverage')
+require File.expand_path("lib/lolita-file-upload")
+require "carrierwave"
+
+require "ruby-debug"
+current_orm=:active_record
+require 'carrierwave/orm/'+current_orm.to_s.gsub("_","")
+
+require File.expand_path("test_orm/#{current_orm}")
+
+require File.expand_path("test_orm/support")
+
+
+
+ 

data/features/support_byte_converter.feature

@@ -1,31 +1,31 @@
-Feature: convert bytes to biggest possible unit
-
-In order to show file upload errors in human understendable way
-There should be converter that converts bytes to kilobytes, megabytes, gigabytes.
-Lolita::Suport::Bytes do that think, it is create by passing bytes, and return unit and values with
-converted values
-
-Scenario Outline: convert bytes
-  Given byte converter
-  When I humanize "<size>"
-  Then I should get "<unit>" and "<limit>"
-
-  Scenarios: to bytes
-    | size | unit  | limit   |
-    | 0    | bytes | 0.0     |
-    | 1023 | bytes | 1023.0  |
-    
-  Scenarios: to kilobytes
-    | size      | unit      | limit   |
-    | 1024      | kilobyte  | 1.0     |
-    | 1024**2-1 | megabyte  | 1.0     |
-
-  Scenarios: to megabytes
-    | size      | unit      | limit   |
-    | 1024**2   | megabyte  | 1.0     |
-    | 1024**3-1 | gigabyte  | 1.0     |
-
-  Scenarios: to gigabytes
-    | size      | unit      | limit   |
-    | 1024**3   | gigabyte  | 1.0     |
-    | 1024**4-1 | gigabytes | 1024.0  |
+Feature: convert bytes to biggest possible unit
+
+In order to show file upload errors in human understendable way
+There should be converter that converts bytes to kilobytes, megabytes, gigabytes.
+Lolita::Suport::Bytes do that think, it is create by passing bytes, and return unit and values with
+converted values
+
+Scenario Outline: convert bytes
+  Given byte converter
+  When I humanize "<size>"
+  Then I should get "<unit>" and "<limit>"
+
+  Scenarios: to bytes
+    | size | unit  | limit   |
+    | 0    | bytes | 0.0     |
+    | 1023 | bytes | 1023.0  |
+    
+  Scenarios: to kilobytes
+    | size      | unit      | limit   |
+    | 1024      | kilobyte  | 1.0     |
+    | 1024**2-1 | megabyte  | 1.0     |
+
+  Scenarios: to megabytes
+    | size      | unit      | limit   |
+    | 1024**2   | megabyte  | 1.0     |
+    | 1024**3-1 | gigabyte  | 1.0     |
+
+  Scenarios: to gigabytes
+    | size      | unit      | limit   |
+    | 1024**3   | gigabyte  | 1.0     |
+    | 1024**4-1 | gigabytes | 1024.0  |

data/features/upload_file.feature

@@ -1,16 +1,16 @@
-Feature: upload file from lolita and manage file attributes
-
-Files in lolita have name attribute. Any attributes can be changed after file is uploaded.
-File always is related with some ORM class object.
-
-Scenario: upload file
-  Given a lolita
-  And a rails
-  And rails application
-  And lolita-file-upload
-  And I visit new post 
-  When I upload file normal_file.txt
-  Then I see normal_file
-  And I change file attribute name to my_file
-  And save file
+Feature: upload file from lolita and manage file attributes
+
+Files in lolita have name attribute. Any attributes can be changed after file is uploaded.
+File always is related with some ORM class object.
+
+Scenario: upload file
+  Given a lolita
+  And a rails
+  And rails application
+  And lolita-file-upload
+  And I visit new post 
+  When I upload file normal_file.txt
+  Then I see normal_file
+  And I change file attribute name to my_file
+  And save file
   Then I see my_file

data/lib/generators/lolita_file_upload/assets_generator.rb

@@ -1,13 +1,13 @@
-require 'generators/helpers/file_helper'
-module LolitaFileUpload
-  module Generators
-    class AssetsGenerator < Rails::Generators::Base
-      include Lolita::Generators::FileHelper
-      desc "Copy all from public directory to project public directory."
-      def copy_all
-        root=File.expand_path("../../../../",__FILE__)
-        copy_dir("public",:root=>root)
-      end      
-    end
-  end
+require 'generators/helpers/file_helper'
+module LolitaFileUpload
+  module Generators
+    class AssetsGenerator < Rails::Generators::Base
+      include Lolita::Generators::FileHelper
+      desc "Copy all from public directory to project public directory."
+      def copy_all
+        root=File.expand_path("../../../../",__FILE__)
+        copy_dir("public",:root=>root)
+      end      
+    end
+  end
 end

data/lib/generators/lolita_file_upload/install_generator.rb

@@ -1,19 +1,19 @@
-module LolitaFileUpload
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      include Lolita::Generators::FileHelper
-      source_root File.expand_path("../templates", __FILE__)
-      desc "Copy assets and create migrations. "
-
-
-      def copy_assets
-        generate("lolita_file_upload:assets")
-      end
-
-      def copy_migration
-        copy_file "migration.rb", "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_create_lolita_upload_files.rb"
-      end
-     
-    end
-  end
-end
+module LolitaFileUpload
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Lolita::Generators::FileHelper
+      source_root File.expand_path("../templates", __FILE__)
+      desc "Copy assets and create migrations. "
+
+
+      def copy_assets
+        generate("lolita_file_upload:assets")
+      end
+
+      def copy_migration
+        copy_file "migration.rb", "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_create_lolita_upload_files.rb"
+      end
+     
+    end
+  end
+end

data/lib/generators/lolita_file_upload/templates/migration.rb

@@ -1,25 +1,25 @@
-class CreateLolitaUploadFiles < ActiveRecord::Migration
-  class << self
-    
-    def up
-      create_table :lolita_files, :force=>true do |t|
-        t.string  :asset
-        t.string  :name
-        t.string  :fileable_type
-        t.integer :fileable_id
-        t.string  :asset_extension, :limit=>12
-        t.integer :asset_size
-        t.timestamps
-      end
-
-      add_index :lolita_files, [:fileable_type,:fileable_id]
-      add_index :lolita_files, :fileable_type
-      add_index :lolita_files,:asset_size
-      add_index :lolita_files, :created_at
-    end
-
-    def down
-      drop_table :lolita_files
-    end
-  end
+class CreateLolitaUploadFiles < ActiveRecord::Migration
+  class << self
+    
+    def up
+      create_table :lolita_files, :force=>true do |t|
+        t.string  :asset
+        t.string  :name
+        t.string  :fileable_type
+        t.integer :fileable_id
+        t.string  :asset_extension, :limit=>12
+        t.integer :asset_size
+        t.timestamps
+      end
+
+      add_index :lolita_files, [:fileable_type,:fileable_id]
+      add_index :lolita_files, :fileable_type
+      add_index :lolita_files,:asset_size
+      add_index :lolita_files, :created_at
+    end
+
+    def down
+      drop_table :lolita_files
+    end
+  end
 end

data/lib/lolita-file-upload.rb

@@ -1,37 +1,36 @@
-#TODO add exception if lolita not found, show exception and msg that user should install this gem
-# if files tab is defined, but there no tab for that, maybe check that through gem.
-if !defined?(Lolita)
-  require "lolita" 
-end
-$:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
-
-I18n.load_path += Dir[File.expand_path("config/locales")+"/**/*.yml"] if defined?(I18n)
-
-module Lolita
-  module FileUpload
-  end
-  module Support
-    autoload :Bytes, "support/bytes"
-  end
-  
-  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
-
-require 'lolita-file-upload/module'
-
-if defined?(Rails)
- require "lolita-file-upload/rails"
-end
-
-# How to connect multimedia engine with lolita resources
-# Detecting from tabs will not be very good idea because it will load many thing 
-# There should be the way to connect it on demand when realy multimedia tab is used for resource like
+#TODO add exception if lolita not found, show exception and msg that user should install this gem
+# if files tab is defined, but there no tab for that, maybe check that through gem.
+if !defined?(Lolita)
+  require "lolita" 
+end
+$:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
+
+I18n.load_path += Dir[File.expand_path("config/locales")+"/**/*.yml"] if defined?(I18n)
+
+module Lolita
+  module FileUpload
+  end
+  module Support
+    autoload :Bytes, "support/bytes"
+  end
+  
+  module Configuration
+    module Tab
+    	autoload :Files, "lolita-file-upload/configuration/tab/files"
+    end
+    # module Field
+    #   autoload :Upload, "lolita-file-upload/configuration/field/upload"
+    # end
+  end
+end
+
+require 'lolita-file-upload/module'
+
+if defined?(Rails)
+ require "lolita-file-upload/rails"
+end
+
+# How to connect multimedia engine with lolita resources
+# Detecting from tabs will not be very good idea because it will load many thing 
+# There should be the way to connect it on demand when realy multimedia tab is used for resource like
 # lolita/posts/files/new[create,destroy,update, index]

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

@@ -1,58 +1,109 @@
-module Lolita
-  module Configuration
-    module Tab
-      # FileTab extend Lolita default tab with new lolita accessors.
-      # * <tt>extensions</tt> - Array of extension white list
-      # * <tt>maxfilesize</tt> - uploaded file maximums size
-    	class Files < Lolita::Configuration::Tab::Base
-    	
-  	  	lolita_accessor :extensions,:maxfilesize
-        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.
-        # And block.
-  	  	def initialize(dbi,*args,&block)
-          @type=:files
-  	  		@extensions=[]
-          @dbi=dbi
-          set_association
-  	  		super
-  	  	end
-
-        # Add another extension to #extensions white list.
-        # ====Example
-        #     # using in lolita configuration definition
-        #     lolita do
-        #       tab(:file) do
-        #         extension "Images", "png,jpg"
-        #       end
-        #     end
-        #     
-        #     # using for object
-        #     Lolita::Configuration.FileTab.new(dbi).extension("pdf")
-  	  	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"}
-          if @association
-            @association=@association.last
-            @association_type = self.dbi.association_macro(@association)
-          end
-        end
-
-        def validate
-          super
-          unless self.association
-            raise Lolita::AssociationError, "#{self.dbi.klass} has no association with Lolita::Upload::File. Put has_many :files, :class_name=>'Lolita::Upload::File' to have one."
-          end
-        end
-
-      end
-  	end
-  end
+module Lolita
+  module Configuration
+    module Tab
+      # FileTab extend Lolita default tab with new lolita accessors.
+      # * <tt>extensions</tt> - Array of extension white list
+      # * <tt>maxfilesize</tt> - uploaded file maximums size
+    	class Files < Lolita::Configuration::Tab::Base
+    	
+  	  	lolita_accessor :extensions, :maxfilesize, :filters
+        attr_reader :association, :uploader, :association_type, :editable_fields
+
+        # As any other Lolita::Configuration::Tab this should receive _dbi_ object.
+        # Additional _args_ that may represent methods, for details see Lolita::Configuration::Tab.
+        # And block.
+  	  	def initialize(dbi,*args,&block)
+          @type=:files
+  	  		@filters=[]
+          @dbi=dbi
+          @editable_fields=[]
+          set_default_uploader
+  	  		super
+  	  	end
+
+        # NOTE: Filters only limit frontend, backend limit is set in Uploader
+        #
+        # Add another filter or just title for uploader's extension_white_list
+        # ====Example
+        #     # using in lolita configuration definition
+        #     lolita do
+        #       tab(:file) do
+        #         title "Pictures"
+        #         filters "Images", "png,jpg"
+        #         # OR
+        #         filters "Pictures"
+        #       end
+        #     end
+        #     
+  	  	def filters(title=nil, extensions=nil)
+  	  		@filters << {:title => title, :extensions => extensions || self.extension_white_list} if title
+          (@filters.empty? && self.extension_white_list) ? [{:title => self.title, :extensions => self.extension_white_list}] : @filters
+  	  	end
+
+        def uploader name=nil
+          if name
+            @uploader = name.to_sym
+            @association = self.dbi.klass
+            @association_type = :self
+          end
+          @uploader
+        end
+
+        def association name=nil
+          if name
+            @association = self.dbi.associations[name]
+            @association_type = self.dbi.association_macro(@association)
+            @uploader = @association.klass.uploaders.keys.first
+          end
+          @association
+        end
+
+        def association_dbi
+          Lolita::DBI::Base.new self.association.klass
+        end
+
+        def editable_fields *names
+          @editable_fields = names unless names.empty?
+          @editable_fields.empty? ? all_text_fields : @editable_fields
+        end
+
+        def extension_white_list
+          self.association.klass.uploaders[self.uploader].new.extension_white_list
+        end
+
+        private
+
+        def all_text_fields
+          self.association_dbi.fields.collect{|field| field[:name] if field[:type] == "string"}.compact
+        end
+
+        def set_default_uploader
+          unless self.dbi.klass.uploaders.empty?
+            @uploader = self.dbi.klass.uploaders.keys.first
+            @association = self.dbi.klass
+            @association_type = :self
+          else
+            set_default_association
+          end
+        end
+
+        def set_default_association
+          @association=self.dbi.associations.detect{|k,assoc| !assoc.klass.uploaders.empty? }
+          if @association
+            @association=@association.last
+            @association_type = self.dbi.association_macro(@association)
+            @uploader = @association.klass.uploaders.keys.first
+          end
+        end
+
+        def validate
+          super
+          unless self.uploader
+            raise "#{self.dbi.klass} has no uploader. Add your custom uploader or use Lolita's built in `has_many :files, :class_name=>'Lolita::Upload::File'`."
+          end
+        end
+
+      end
+  	end
+  end
 end