lolita-file-upload 0.1.1 → 0.1.2

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-#gem "lolita"
+gem "lolita", ">=3.0.6"
 gem "carrierwave", "~> 0.5.2"
 group :test do
   gem "rspec-rails", "~> 2.5"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

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

@@ -13,22 +13,22 @@ module Lolita
       def create
         @file.asset = params[:file]  
         @file.save! 
-        render_component :"lolita/tab/files",:row,:file=>@file, :tab=>@tab
+        render_component *@tab.build("",:row,:file=>@file)
       end
 
       def edit
-        render_component :"lolita/tab/files", :edit, :file=>@file,:tab=>@tab
+        render_component *@tab.build("",:edit,:file=>@file)
       end
 
       def update
         @file.update_attributes!(params[:file])
-        render_component :"lolita/tab/files", :update, :file=>@file,:tab=>@tab
+        render_component *@tab.build("",:update,:file=>@file)
       end
 
 
       def destroy
         @file.destroy
-        render_component :"lolita/tab/files",:destroy,:file=>@file,:tab=>@tab
+        render_component *@tab.build("",:destroy,:file=>@file)
       end
 
       private

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

@@ -23,9 +23,9 @@ module Lolita
       end
 
       def set_metadata
-        self.name||=::File.basename(self.asset.to_s)
+        self.name||=::File.basename(self.asset.store_path)
         self.asset_size=self.asset.file.size
-        self.asset_extension=::File.extname(self.asset.to_s).gsub(".","")
+        self.asset_extension=::File.extname(self.asset.store_path).gsub(".","")
       end
 
     end

data/app/uploaders/file_uploader.rb

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

data/app/views/components/lolita/{tab/_files.html.erb → configuration/tab/files/_display.html.erb}

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

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

@@ -0,0 +1 @@
+$("#upload_<%=tab.type%>_row_<%=file.id%>").html("<%=escape_javascript(render_component(*tab.build("",:list_form,:file=>file,:format=>"html")))%>")

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

@@ -7,7 +7,7 @@
   </thead>
   <tbody>
     <% resource.send(tab.association.name).each do |file| %>
-      <%= render_component :"lolita/tab/files", :row, :file=>file,:tab=>tab,:value=>nil %>
+      <%= render_component *tab.build("",:row,:file=>file,:value=>nil) %>
     <% end %>
   </tbody>
 </table>

data/app/views/components/lolita/{tab → configuration/tab}/files/_list_form.html.erb

@@ -1,5 +1,5 @@
 <td>
-  <%=render_component :"lolita/tab/files", :form, :tab=>tab,:file=>file%>
+  <%=render_component *tab.build("",:form,:file=>file)%>
 </td>
 <td>
   <%= link_to "S", "#", :onclick=>"$('##{"edit_#{tab.type}_#{file.id}"}').submit();return false;" %>

data/app/views/components/lolita/{tab → configuration/tab}/files/_row.html.erb

@@ -1,3 +1,3 @@
 <tr id="upload_<%=tab.type%>_row_<%=file.id%>" data-<%=tab.type%>-id="<%=file.id%>" >
-  <%= render_component :"lolita/tab/files", :cells, :tab=>tab, :file=>file %>
+  <%= render_component *tab.build("",:cells,:file=>file) %>
 </tr>

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

@@ -0,0 +1 @@
+$("#upload_<%=tab.type%>_row_<%=file.id%>").html("<%=escape_javascript(render_component(*tab.build("",:cells,:file=>file,:format=>"html")))%>")

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

@@ -5,8 +5,8 @@
   <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/jquery-ui.min.js" type="text/javascript"></script>
   <script type="text/javascript" src="/javascripts/lolita/upload/plupload.full.min.js"></script>
   <script type="text/javascript" src="/javascripts/lolita/upload/jquery.ui.plupload.min.js"></script>
-<% unless I18n.locale.to_s.downcase=="en" %>
-  <script type="text/javascript" src="/javascripts/lolita/upload/I18n/<%=I18n.locale%>.js"></script>
+<% 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">  

data/lib/generators/lolita_file_upload/assets_generator.rb

@@ -5,7 +5,8 @@ module LolitaFileUpload
       include Lolita::Generators::FileHelper
       desc "Copy all from public directory to project public directory."
       def copy_all
-        copy_dir("public")
+        root=File.expand_path("../../../../",__FILE__)
+        copy_dir("public",:root=>root)
       end      
     end
   end

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

@@ -2,13 +2,13 @@ class CreateLolitaUploadFiles < ActiveRecord::Migration
   class << self
     
     def up
-      create_table :lolita_files, :force=>true do |f|
-        f.string  :asset
-        f.string  :name
-        f.string  :fileable_type
-        f.integer :fileable_id
-        f.string  :asset_extension, :limit=>12
-        f.integer :asset_size
+      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
 

data/lib/lolita-file-upload.rb

@@ -1,8 +1,11 @@
 #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"]
+I18n.load_path += Dir[File.expand_path("config/locales")+"/**/*.yml"] if defined?(I18n)
 
 module Lolita
   module FileUpload
@@ -12,7 +15,9 @@ module Lolita
   end
   
   module Configuration
-  	autoload :FilesTab, "lolita-file-upload/configuration/tab/files"
+    module Tab
+    	autoload :Files, "lolita-file-upload/configuration/tab/files"
+    end
   end
 end
 

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

@@ -1,53 +1,55 @@
 module Lolita
   module Configuration
-    # 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 FilesTab < Lolita::Configuration::Tab
-  	
-	  	lolita_accessor :extensions,:maxfilesize
-      attr_reader :association
+    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
 
-      # 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
+        # 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 :pdf
-      #       end
-      #     end
-      #     
-      #     # using for object
-      #     Lolita::Configuration.FileTab.new(dbi).extension("pdf")
-	  	def extension(value)
-	  		@extensions << value
-	  	end
-	  	
-      private
+        # Add another extension to #extensions white list.
+        # ====Example
+        #     # using in lolita configuration definition
+        #     lolita do
+        #       tab(:file) do
+        #         extension :pdf
+        #       end
+        #     end
+        #     
+        #     # using for object
+        #     Lolita::Configuration.FileTab.new(dbi).extension("pdf")
+  	  	def extension(value)
+  	  		@extensions << value
+  	  	end
+  	  	
+        private
 
-      def set_association
-        @association=self.dbi.associations.detect{|k,assoc| assoc.class_name=="Lolita::Upload::File"}
-        @association=@association.last if @association
-      end
+        def set_association
+          @association=self.dbi.associations.detect{|k,assoc| assoc.class_name=="Lolita::Upload::File"}
+          @association=@association.last if @association
+        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."
+        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
   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.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Arturs Meisters"]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-04-12}
   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 = [
@@ -27,16 +27,16 @@ Gem::Specification.new do |s|
     "app/controllers/lolita/upload/files_controller.rb",
     "app/models/lolita/upload/file.rb",
     "app/uploaders/file_uploader.rb",
-    "app/views/components/lolita/tab/_files.html.erb",
-    "app/views/components/lolita/tab/files/_cells.html.erb",
-    "app/views/components/lolita/tab/files/_destroy.js.erb",
-    "app/views/components/lolita/tab/files/_edit.js.erb",
-    "app/views/components/lolita/tab/files/_form.html.erb",
-    "app/views/components/lolita/tab/files/_list.html.erb",
-    "app/views/components/lolita/tab/files/_list_form.html.erb",
-    "app/views/components/lolita/tab/files/_row.html.erb",
-    "app/views/components/lolita/tab/files/_update.js.erb",
-    "app/views/components/lolita/tab/files/_upload_script.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_cells.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_destroy.js.erb",
+    "app/views/components/lolita/configuration/tab/files/_display.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_edit.js.erb",
+    "app/views/components/lolita/configuration/tab/files/_form.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_list.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_list_form.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_row.html.erb",
+    "app/views/components/lolita/configuration/tab/files/_update.js.erb",
+    "app/views/components/lolita/configuration/tab/files/_upload_script.html.erb",
     "config/locales/en.yml",
     "features/configuration_for_tab.feature",
     "features/connect_with_lolita.feature",
@@ -112,12 +112,14 @@ Gem::Specification.new do |s|
     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<carrierwave>, ["~> 0.5.2"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.10"])
       s.add_development_dependency(%q<cucumber-rails>, ["~> 0.3.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<carrierwave>, ["~> 0.5.2"])
       s.add_dependency(%q<cucumber>, ["~> 0.10"])
       s.add_dependency(%q<cucumber-rails>, ["~> 0.3.2"])
@@ -125,6 +127,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5"])
     end
   else
+    s.add_dependency(%q<lolita>, [">= 3.0.6"])
     s.add_dependency(%q<carrierwave>, ["~> 0.5.2"])
     s.add_dependency(%q<cucumber>, ["~> 0.10"])
     s.add_dependency(%q<cucumber-rails>, ["~> 0.3.2"])

data/test_orm/db/migrate/02_create_files.rb

@@ -7,6 +7,9 @@ class CreateFiles < ActiveRecord::Migration
         f.string :name
         f.string  :fileable_type
         f.string  :fileable_id
+        f.integer :asset_size
+        f.string  :asset_extension
+        f.timestamps
       end
     end
 

metadata

@@ -2,7 +2,7 @@
 name: lolita-file-upload
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - ITHouse
@@ -11,12 +11,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +03:00
+date: 2011-04-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: carrierwave
+  name: lolita
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: carrierwave
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -24,10 +35,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -35,10 +46,10 @@ dependencies:
         version: "0.10"
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,10 +57,10 @@ dependencies:
         version: 0.3.2
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -57,10 +68,10 @@ dependencies:
         version: "1.0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -68,7 +79,7 @@ dependencies:
         version: "1.5"
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 description: File upload gem for Lolita with with fulll integration - models, controller, views
 email: support@ithouse.lv
 executables: []
@@ -89,16 +100,16 @@ files:
 - app/controllers/lolita/upload/files_controller.rb
 - app/models/lolita/upload/file.rb
 - app/uploaders/file_uploader.rb
-- app/views/components/lolita/tab/_files.html.erb
-- app/views/components/lolita/tab/files/_cells.html.erb
-- app/views/components/lolita/tab/files/_destroy.js.erb
-- app/views/components/lolita/tab/files/_edit.js.erb
-- app/views/components/lolita/tab/files/_form.html.erb
-- app/views/components/lolita/tab/files/_list.html.erb
-- app/views/components/lolita/tab/files/_list_form.html.erb
-- app/views/components/lolita/tab/files/_row.html.erb
-- app/views/components/lolita/tab/files/_update.js.erb
-- app/views/components/lolita/tab/files/_upload_script.html.erb
+- app/views/components/lolita/configuration/tab/files/_cells.html.erb
+- app/views/components/lolita/configuration/tab/files/_destroy.js.erb
+- app/views/components/lolita/configuration/tab/files/_display.html.erb
+- app/views/components/lolita/configuration/tab/files/_edit.js.erb
+- app/views/components/lolita/configuration/tab/files/_form.html.erb
+- app/views/components/lolita/configuration/tab/files/_list.html.erb
+- app/views/components/lolita/configuration/tab/files/_list_form.html.erb
+- app/views/components/lolita/configuration/tab/files/_row.html.erb
+- app/views/components/lolita/configuration/tab/files/_update.js.erb
+- app/views/components/lolita/configuration/tab/files/_upload_script.html.erb
 - config/locales/en.yml
 - features/configuration_for_tab.feature
 - features/connect_with_lolita.feature
@@ -169,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 307725709
+      hash: -452058159
       segments: 
       - 0
       version: "0"

data/app/views/components/lolita/tab/files/_edit.js.erb

@@ -1 +0,0 @@
-$("#upload_<%=tab.type%>_row_<%=file.id%>").html("<%=escape_javascript(render_component(:"lolita/tab/files",:list_form,:tab=>tab,:file=>file,:format=>"html"))%>")

data/app/views/components/lolita/tab/files/_update.js.erb

@@ -1 +0,0 @@
-$("#upload_<%=tab.type%>_row_<%=file.id%>").html("<%=escape_javascript(render_component(:"lolita/tab/files",:cells,:tab=>tab,:file=>file,:format=>"html"))%>")