lolita-file-upload 0.7.3 → 0.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bad60752c9c5a77fb9c8c76754eb40ceb9931f3a
+  data.tar.gz: b10230f5aa0f7d896bb436e02324dd6ecfe7ca37
+SHA512:
+  metadata.gz: b63032f1b0340729378973cd2c41b1939437c8a50a6823655bbce7daee3efb23658206cc8f8f4300ee513ac85ee75d93fb1356360cc394b6c751c7f083e80ee4
+  data.tar.gz: e813324dab6176db4b9e847095a016c4b1fb808ad5e35462e4f950b8a19995034a7007282f639df4c829e88e52c75b79fb99559402def279929d8df2e3fa0490

data/.gitignore

@@ -0,0 +1,49 @@
+uploads
+.project
+.settings
+.rvmrc
+coverage.data
+test_orm/log
+# rcov generated
+coverage
+/upload/
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+*.swp

data/Gemfile

@@ -1,23 +1,13 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "lolita", "~>3.2.0.rc.6"
-gem "carrierwave", "~> 0.6.0"
-gem "mini_magick"
-gem 'jquery-rails', '>= 1.0.12'
-group :test do
-  gem "rspec-rails", "~> 2.6"
-  gem "ffaker"
-  gem "factory_girl"
-  gem "sqlite3"
-  gem "rspec", "~> 2.6"
-  gem 'cover_me', '>= 1.0.0.rc6'
-  gem 'rails', "~> 3.2.0"
-end
-
-group :development do
-  gem "cucumber", "~> 1.0"
-  gem "cucumber-rails", "~> 1.0"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.6"
-end
+gemspec
 
+group :test do
+  gem 'rspec-rails', '~> 2.14'
+  gem 'ffaker', '~> 1.16.2'
+  gem 'factory_girl', '~> 3.6.2'
+  gem 'sqlite3', '~> 1.3.7'
+  gem 'rspec', '~> 2.14'
+  gem 'rails', '~> 3.2.12'
+  gem 'byebug'
+end

data/Gemfile.lock

@@ -0,0 +1,151 @@
+PATH
+  remote: .
+  specs:
+    lolita-file-upload (0.8.0)
+      carrierwave (~> 0.6.0)
+      lolita (~> 3.2)
+      mini_magick (~> 3.6.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    byebug (1.5.0)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    columnize (0.3.6)
+    debugger-linecache (1.2.0)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    factory_girl (3.6.2)
+      activesupport (>= 3.0.0)
+    ffaker (1.16.2)
+    haml (3.1.8)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.2.2)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    kaminari (0.14.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    lolita (3.3.0)
+      abstract (~> 1)
+      activesupport (~> 3.2.0)
+      haml (~> 3.0)
+      jquery-rails (~> 2.2.1)
+      kaminari (~> 0.13)
+      tinymce-rails (~> 3.5.8)
+      tinymce-rails-config-manager
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    mini_magick (3.6.0)
+      subexec (~> 0.2.1)
+    multi_json (1.7.7)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.14.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.1)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    rspec-rails (2.14.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    subexec (0.2.3)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tinymce-rails (3.5.8.3)
+      railties (>= 3.1.1)
+    tinymce-rails-config-manager (0.0.7)
+      railties (~> 3.2.8)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  factory_girl (~> 3.6.2)
+  ffaker (~> 1.16.2)
+  lolita-file-upload!
+  rails (~> 3.2.12)
+  rspec (~> 2.14)
+  rspec-rails (~> 2.14)
+  sqlite3 (~> 1.3.7)

data/README.md

@@ -0,0 +1,28 @@
+# Lolita file upload
+
+File upload gem for Lolita.
+
+## Instalation
+
+* gem install lolita-file-upload
+* include in gemfile like this: `gem "lolita-file-upload"`
+* cd your_project_path
+* rails g lolita_file_upload:install
+
+Install will copy migration to your project.
+If you update to newest version of gem, than run `rails g lolita_file_upload:assets`
+
+##Configuration
+
+Gem will not used until any of lolita configuration blocks define tab with type :files. Like this
+```ruby
+class Post
+  include Lolita::Configuration
+  has_many :files, :as=>:fileable, :class_name=>"Lolita::Upload::File"
+
+  lolita do
+    tab(:content)
+    tab(:files)
+  end
+end
+```

data/Rakefile

@@ -1,39 +1,7 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+require 'rspec/core/rake_task'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "lolita-file-upload"
-  gem.homepage = "http://github.com/ithouse/lolita-file-upload"
-  gem.license = "MIT"
-  gem.summary = %Q{File upload gem for Lolita CMS}
-  gem.description = %Q{File upload gem for Lolita with with fulll integration - models, controller, views}
-  gem.email = "support@ithouse.lv"
-  gem.authors = ["ITHouse","Arturs Meisters"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "lolita-file-upload #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/app/assets/javascripts/lolita/file-upload/gallery.js.coffee

@@ -53,9 +53,15 @@ class LolitaFileUploadGallery
       margin: 5
     })
 
+  _image_and_icon: ->
+    $(IMAGE_SELECTOR + ',' + FILE_ICON_SELECTOR)
+
   _makeImagesDraggable: ->
-    $(IMAGE_SELECTOR + ',' + FILE_ICON_SELECTOR).draggable("destroy")
-    $(IMAGE_SELECTOR + ',' + FILE_ICON_SELECTOR).draggable({
+    @_image_and_icon().each(->
+      if $(this).is('.ui-draggable')
+        $(this).draggable("destroy")
+    )
+    @_image_and_icon().draggable({
       appendTo: "body"
       zIndex: 20000
       helper: "clone"

data/app/assets/stylesheets/lolita/file-upload/uploader.css.erb

@@ -1,5 +1,15 @@
 #main #content .box .lolita-file-upload-form {padding: 20px 0 0 0;}
-
+#main .box form .field_file { margin-top: 17px;}
+#main .box form .field_file .field-value {}
+#main .box form .field_file .field-value img { float: left; padding-right: 10px; }
+#main .box form .field_file .field-value .actions { float: left; }
+#main .box form .field_file .field-value .actions input {
+border: 0;
+padding: 0 0 3px;
+width: auto;
+}
+#main .box form .field_file .field-value .actions .remove_checkbox { padding: 3px 0; }
+#main .box form .field_file .field-value .actions .remove_checkbox label{ color: rgb(73, 73, 73); }
 .filelist {padding: 6% 1% 6% 6%; overflow: hidden;}
 .filelist .filelist-container {overflow: hidden;}
 .filelist .file-item {

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

@@ -1,42 +1,19 @@
 module Lolita
   module Upload
     class File < ActiveRecord::Base
-      self.table_name =  'lolita_files'
+      self.table_name = 'lolita_files'
       attr_accessible :asset, :name, :fileable_type, :asset_extension
       mount_uploader :asset, FileUploader
-      belongs_to :fileable, :polymorphic=>true
-
-      #validate :size_limit FIXME to work with more than one tab
+      belongs_to :fileable, polymorphic: true
       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
-          if maxsize.to_i>0 && self.asset.file.size>maxsize
-            bytes=Lolita::Support::Bytes.new(maxsize)
-            self.errors.add(:asset,I18n.t("lolita.upload.errors.file too big",:value=>bytes.value,:unit=>bytes.unit))
-          end
-        end
-      end
-
       def set_metadata
         unless self.asset.blank?
-          self.name||=::File.basename(self.asset.store_path)
-          self.asset_size=self.asset.file.size
-          self.asset_extension=::File.extname(self.asset.store_path).gsub(".","")
+          self.name ||= ::File.basename(self.asset.store_path)
+          self.asset_size = self.asset.file.size
+          self.asset_extension = ::File.extname(self.asset.store_path).gsub(".", "")
         end
       end
 

data/app/views/components/lolita/configuration/field/file/_display.html.haml

@@ -1,3 +1,9 @@
-= image_tag(field.preview_image(current_form.object)) if field.has_image?(current_form.object) 
-= current_form.file_field field.name
-= current_form.hidden_field field.cache_name
+= image_tag(field.preview_image(current_form.object)) if field.has_image?(current_form.object)
+= content_tag(:span, { class: 'actions'}) do
+  = current_form.file_field field.name
+  = current_form.hidden_field field.cache_name
+  - if current_form.object.send(field.name).present?
+    = content_tag(:div, class: 'remove_checkbox') do
+      = current_form.check_box "remove_#{field.name}"
+      = current_form.label "remove_#{field.name}", I18n.t("components.lolita.configuration.field.file.remove_current_upload")
+= tag(:div, class: 'clear')

data/config/locales/en.yml

@@ -6,6 +6,9 @@ en:
           files:
           fixed_gallery:
             close: Close
+        field:
+          file:
+            remove_current_upload: "Remove current file?"
   lolita:
     uploads_controller:
       update:

data/config/locales/lv.yml

@@ -6,6 +6,9 @@ lv:
           files:
           fixed_gallery:
             close: Aizvērt
+        field:
+          file:
+            remove_current_upload: "Nodzēst failu?"
   lolita:
     uploads_controller:
       update:

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

@@ -12,13 +12,13 @@ module Lolita
         # 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)
+  	  	def initialize(dbi, *args, &block)
           @type=:files
           @dissociate = true
   	  		@filters=[]
           @dbi=dbi
           set_default_association
-  	  		super
+  	  		super(dbi, @type, *args, &block)
   	  	end
 
         # NOTE: Filters only limit frontend, backend limit is set in Uploader