padrino-admin 0.7.0 → 0.7.1

data/lib/padrino-admin/generators/templates/uploader/lib/uploader.rb

@@ -1,54 +1,66 @@
 class Uploader < CarrierWave::Uploader::Base
 
-  # Include RMagick or ImageScience support
-  #   include CarrierWave::RMagick
-  #   include CarrierWave::ImageScience
-  include CarrierWave::MiniMagick
+  ##
+  # Image manipulator library:
+  #
+  # include CarrierWave::RMagick
+  # include CarrierWave::ImageScience
+  # include CarrierWave::MiniMagick
 
-  # Choose what kind of storage to use for this uploader
+  ##
+  # Storage type
+  # 
   storage :file
-  #     storage :s3
-
-  # Override the directory where uploaded files will be stored
-  # This is a sensible default for uploaders that are meant to be mounted:
-
-  def root
-    "app/public"
-  end
+  # storage :s3
 
+  ##
+  # Directory where uploaded files will be stored (default is /public/uploads)
+  # 
   def store_dir
     "uploads"
   end
 
+  ##
+  # Directory where uploaded temp files will be stored (default is [root]/tmp)
+  # 
   def cache_dir
-    "tmp"
+    Padrino.root("tmp")
   end
 
-  # Provide a default URL as a default if there hasn't been a file uploaded
-  #     def default_url
-  #       "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  #     end
+  ##
+  # Default URL as a default if there hasn't been a file uploaded
+  # 
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  ##
   # Process files as they are uploaded.
-  process :resize_to_fit => [640, 480]
+  # 
+  # process :resize_to_fit => [640, 480]
   #
-  #     def scale(width, height)
-  #       # do something
-  #     end
+  # def scale(width, height)
+  #   # do something
+  # end
 
+  ##
   # Create different versions of your uploaded files
-  version :thumb do
-    process :resize_to_fit => [128, 128]
-  end
+  # 
+  # version :thumb do
+  #   process :resize_to_fit => [128, 128]
+  # end
 
-  # Add a white list of extensions which are allowed to be uploaded,
-  # for images you might use something like this:
+  ##
+  # White list of extensions which are allowed to be uploaded:
+  # 
   # def extension_white_list
   #   %w(jpg jpeg gif png)
   # end
 
+  ##
   # Override the filename of the uploaded files
-  #     def filename
-  #       "something.jpg" if original_filename
-  #     end
-
+  # 
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
 end

data/lib/padrino-admin/helpers/view.rb

@@ -144,6 +144,7 @@ module Padrino
       # 
       # :with:: name of the association. Ex: :images.
       # :url:: the url of the gird, by default we autogenerate them using +:with+ ex: url(:images_index, :format => :js)
+      # :controller:: the name of the controller that contains the gird, by default is +:with+
       # :show:: value to display, if it's a symbol we tranform them using +with+ ex: :name, will be: data["images.name"]
       # :get:: value to store in our db, Default: +:id+
       # :grid:: the name of the var of Admin.grid. Default :grid
@@ -188,7 +189,8 @@ module Padrino
       def open_window_grid(object_name, method, options={})
 
         # We need plural version of our association
-        controller = options[:multiple] ? options[:with] : "#{options[:with].to_s.pluralize}".to_sym
+        options[:controller] ||= options[:with]
+        controller = options[:multiple] ? options[:controller] : "#{options[:controller].to_s.pluralize}".to_sym
 
         # Now we need our association
         association = instance_variable_get("@#{object_name}").send(options[:with])
@@ -205,6 +207,10 @@ module Padrino
         input_name  = "#{object_name}[#{method}]"
         input_name += "[]" if options[:multiple]
 
+        # We need always some defaults values
+        defaults = hidden_field_tag(input_name)
+
+        # Now a reusable (also from extjs) template
         template = (<<-HTML).gsub(/ {10}/, "")
           <li>
             <span class="display">{0}</span>
@@ -224,7 +230,7 @@ module Padrino
         collection << li_link
 
         # Now we have the final container
-        container = content_tag(:ul, collection.join.gsub("\\",""), :id => "#{object_name}_#{method}", :class => "open-window-grid")
+        container = content_tag(:ul, defaults + collection.join.gsub("\\",""), :id => "#{object_name}_#{method}", :class => "open-window-grid")
 
         # We need to refactor some values
         show   = "data['#{controller}.#{options[:show]}']" if options[:show].is_a?(Symbol)

data/lib/padrino-admin/orm/abstract.rb

@@ -1,6 +1,7 @@
 module Padrino
   module Admin
-    class OrmError < StandardError; end
+    class OrmError < StandardError #:nodoc:
+    end
 
     module Orm
       module Abstract