lolita-file-upload 0.1.4 → 0.2.0

data/.document

@@ -1,5 +1,5 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -1,2 +1,2 @@
---color
---format d
+--color
+--format d

data/Gemfile

@@ -1,21 +1,21 @@
-source "http://rubygems.org"
-
-gem "lolita", "~>3.1.8"
-gem "carrierwave", "~> 0.5.2"
-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 'activerecord', "~> 3.0.7"
-end
-
-group :development do
-  gem "cucumber", "~> 0.10"
-  gem "cucumber-rails", "~> 0.5.2"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 1.5"
-end
-
+source "http://rubygems.org"
+
+gem "lolita", "~>3.1.9"
+gem "carrierwave", "~> 0.5.2"
+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.0.9"
+end
+
+group :development do
+  gem "cucumber", "~> 0.10"
+  gem "cucumber-rails", "~> 0.5.2"
+  gem "bundler", "~> 1.0"
+  gem "jeweler", "~> 1.5"
+end
+

data/LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright (c) 2011 Arturs Meisters
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2011 Arturs Meisters
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,27 +1,27 @@
-= Lolita file upload
-
-File upload gem for Lolita.
-
-==Instalation
-* gem install lolita-file-upload
-* include in gemfile like this:
-   gem "lolita-file-upload", ">=0.1.0"
-* cd your_project_path
-* rails g lolita_file_upload:install
-
-Install will copy all assets and migrations to your project.
-If you update to newest version of gem, than run <i>rails g lolita_file_upload:assets</i>
-
-==Configuration
-
-Gem will not used until any of lolita configuration blocks define tab with type :files. Like this
-   class Post
-      include Lolita::Configuration
-      has_many :files, :as=>:fileable, :class_name=>"Lolita::Upload::File"
-
-      lolita do
-        tab(:content)
-        tab(:files)
-      end
-   end
-
+= Lolita file upload
+
+File upload gem for Lolita.
+
+==Instalation
+* gem install lolita-file-upload
+* include in gemfile like this:
+   gem "lolita-file-upload", ">=0.1.0"
+* cd your_project_path
+* rails g lolita_file_upload:install
+
+Install will copy all assets and migrations to your project.
+If you update to newest version of gem, than run <i>rails g lolita_file_upload:assets</i>
+
+==Configuration
+
+Gem will not used until any of lolita configuration blocks define tab with type :files. Like this
+   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,39 @@
-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 '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
+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 '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

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/app/controllers/lolita/uploads_controller.rb

@@ -0,0 +1,58 @@
+class Lolita::UploadsController < ApplicationController
+  include Lolita::Controllers::UserHelpers
+  include Lolita::Controllers::InternalHelpers
+  before_filter :authenticate_lolita_user!
+  before_filter :set_tab, :only=>[:edit,:update,:destroy,:create]
+  before_filter :set_resource, :only=>[:create,:edit,:update,:destroy]
+  before_filter :set_file, :only=>[:edit,:update,:destroy,:create]
+
+  respond_to :js,:html
+
+  def create
+    @file.send(:"#{@tab.uploader}=",params[:file])
+    @file.save! 
+    render_component *@tab.build("",:row,:file=>@file)
+  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 set_resource
+    association_id = params["#{lolita_mapping.singular}_id"] || params[:upload]["#{lolita_mapping.singular}_id"] || params[:upload]["#{@tab.association.options[:as]}_id"]
+    self.resource = resource_class.find_by_id(association_id)
+  end
+
+  def build_file
+    @file = @tab.association.klass.new
+    params[:upload].each do |k,v|
+      @file[k] = v
+    end
+    @file
+  end
+
+  def set_file
+    dbi=Lolita::DBI::Base.new(@tab.association.klass)
+    @file = dbi.find_by_id(params[:id]) || build_file
+  end
+
+  def set_tab
+    @tab=tab_by_association(params[:association])
+  end
+
+  def tab_by_association name
+    resource_class.lolita.tabs.detect{|tab| tab.type == :files && (tab.try(:association) && tab.association.name == name.to_sym)}
+  end
+end

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

@@ -1,43 +1,43 @@
-module Lolita
-  module Upload
-    class File < ActiveRecord::Base
-      set_table_name :lolita_files
-
-      mount_uploader :asset, FileUploader
-      belongs_to :fileable, :polymorphic=>true
-
-      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
-          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
-        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
-  end
-end
-
+module Lolita
+  module Upload
+    class File < ActiveRecord::Base
+      set_table_name :lolita_files
+
+      mount_uploader :asset, FileUploader
+      belongs_to :fileable, :polymorphic=>true
+
+      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
+          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
+        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
+  end
+end
+

data/app/uploaders/file_uploader.rb

@@ -1,21 +1,21 @@
-class FileUploader < CarrierWave::Uploader::Base
-    storage :file
-    def timestamp
-      time=if model
-        model.created_at || Time.now
-      else
-        Time.now
-      end
-      time.strftime("%Y%m")
-    end
-
-    # 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}"
-      else
-        "upload/misc"
-      end
-    end
-
+class FileUploader < CarrierWave::Uploader::Base
+    storage :file
+    def timestamp
+      time=if model
+        model.created_at || Time.now
+      else
+        Time.now
+      end
+      time.strftime("%Y%m")
+    end
+
+    # 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}"
+      else
+        "upload/misc"
+      end
+    end
+
 end

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

@@ -1,5 +1,11 @@
-<td><%=file.name || "-"%></td>
-<td>
-  <%=link_to "E",send(:"edit_lolita_upload_#{tab.type.to_s.singularize}_path",:id=>file.id),:remote=>true %>
-  <%= link_to "D",send(:"lolita_upload_#{tab.type.to_s.singularize}_path",:id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
+<td style="margin-top: 3px; border-bottom: 2px solid #E1E1E1; width: 600px;font-weight: bold; color: #737373; font-size: 14px; padding: 7px 20px; vertical-align: middle;">
+  <% if file.send(tab.uploader).to_s =~ /(jpg|jpeg|png|gif)$/i %>
+    <%= link_to image_tag(file.send(tab.uploader).url, :style=>"width:300px; height 160px;"), file.send(tab.uploader).url %>
+  <% else %>
+    <%= link_to file.send(tab.uploader).url, file.send(tab.uploader).url %>
+  <% end %>
+</td>
+<td style="margin-top: 3px; border-bottom: 2px solid #E1E1E1; width: 55px;text-align: center; font-size: 14px; padding: 7px 20px; vertical-align: middle;">
+  <%= link_to  image_tag("edit.png"),send(:"edit_lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => resource.nil? ? 0 : resource.id, :association => tab.association.name, :id=>file),:remote=>true %>
+  <%= link_to image_tag("delete_picture.png"),send(:"lolita_#{tab.dbi.klass.model_name.singular}_upload_path", "#{tab.dbi.klass.model_name.singular}_id" => resource.nil? ? 0 : resource.id, :association => tab.association.name, :id=>file.id),:method=>:delete,:remote=>true,:confirm=>"Are you sure?" %>
 </td>

data/app/views/components/lolita/configuration/tab/files/_destroy.js.erb

@@ -1,2 +1,2 @@
-$("#upload_<%=tab.type%>_row_<%=file.id%>").remove()
-$("input.<%=tab.type%>-ids[value=<%=file.id%>]").remove()
+$("#upload_<%=tab.association.name%>_row_<%=file.id%>").remove()
+$("input.<%=tab.association.name%>-ids[value=<%=file.id%>]").remove()