lalala 4.0.0.dev.94 → 4.0.0.dev.107

data/app/assets/stylesheets/lalala/modules/_grid.css.scss

@@ -6,11 +6,20 @@
 */
 
 .mod-grid {
+  border: 1px solid #ddd;
+  padding: 18px;
+
+  @include border-radius(5px);
+
   .images,
-  .input-fields {
+  .actions {
     overflow: hidden;
   }
 
+  .images {
+    padding-top: 10px - 3px;
+  }
+
   // [row]
   li {
     float: left;
@@ -53,6 +62,14 @@
     z-index: 1;
   }
 
+  // [row].edit-block
+  li.edit-block {
+    clear: both;
+    height: auto;
+    min-height: 100px;
+    width: 100%;
+  }
+
   // label
   li label {
     @include border-radius(2px);
@@ -72,4 +89,82 @@
     z-index: 2;
   }
 
+  // attributes
+  li .attributes { display: none; position: relative }
+  li.edit-block .attributes { display: block }
+
+  li .attributes input,
+  li .attributes textarea {
+    margin-bottom: 6px;
+    margin-left: 115px;
+    resize: none;
+    width: 300px;
+  }
+
+  li .attributes textarea {
+    height: 100px !important;
+  }
+
+  li .attributes .close-button {
+    color: #c5c5c5;
+    cursor: pointer;
+    display: inline-block;
+    font-size: 18px;
+    padding: 4px 6px;
+    position: absolute;
+    right: 0;
+    top: -4px;
+
+    &:hover { color: $black }
+  }
+
+  //
+  //  Actions
+  //
+  .actions {
+    & > div {
+      float: left;
+    }
+
+    input[type="file"] {
+      display: none;
+    }
+
+    .button {
+      background: $button_green;
+      color: white;
+      cursor: pointer;
+      float: left;
+      font-size: 10px;
+      font-weight: 600;
+      margin-bottom: 3px;
+      margin-right: 7px;
+      padding: 7px 9px 6px;
+      text-transform: uppercase;
+
+      @include border-radius(3px);
+    }
+
+    .button.unavailable {
+      background-color: #ddd !important;
+      cursor: default;
+    }
+
+    .button[rel="edit"] { background-color: $button_yellow; }
+    .button[rel="destroy"] { background-color: $button_red; }
+
+    .files-description {
+      color: #999;
+      display: none;
+      font-size: 9px;
+      height: 23px;
+      letter-spacing: 1px;
+      line-height: 25px;
+      margin-right: 12px;
+      overflow: hidden;
+      text-transform: uppercase;
+    }
+  }
+
+
 }

data/app/models/lalala/abstract_asset.rb

@@ -0,0 +1,20 @@
+class Lalala::AbstractAsset < ActiveRecord::Base
+  self.abstract_class = true
+  self.table_name = "assets"
+
+  attr_accessible :asset, :title, :caption
+  translates :title, :caption
+  Lalala::AbstractAsset::Translation.table_name = 'asset_translations'
+
+  belongs_to :asset_owner, polymorphic: true
+
+  def self.extension_white_list
+    list = if self.uploaders and self.uploaders[:asset]
+      self.uploaders[:asset].new.extension_white_list
+    end
+
+    list = list || []
+    list.map { |e| ".#{e}" }.join(",")
+  end
+
+end

data/app/models/lalala/file_asset.rb

@@ -0,0 +1,3 @@
+class Lalala::FileAsset < Lalala::AbstractAsset
+  mount_uploader :asset, ::FileUploader
+end

data/app/models/lalala/image_asset.rb

@@ -0,0 +1,3 @@
+class Lalala::ImageAsset < Lalala::AbstractAsset
+  mount_uploader :asset, ::ImageUploader
+end

data/lalala-assets.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
   gem.add_runtime_dependency 'compass',              '= 0.13.alpha.0'
   gem.add_runtime_dependency 'compass-rails',        '= 1.0.3'
-  gem.add_runtime_dependency 'sass',                 '= 3.2.7'
+  gem.add_runtime_dependency 'sass',                 '= 3.2.8'
   gem.add_runtime_dependency 'sass-rails',           '= 3.2.6'
   gem.add_runtime_dependency 'sprockets-commonjs',   '= 0.0.5'
   gem.add_runtime_dependency 'uglifier',             '= 1.3.0'

data/lib/formtastic/inputs/grid_input.rb

@@ -5,21 +5,46 @@ class Formtastic::Inputs::GridInput
     object = builder.object
     assets = object.send(method)
 
+    image_model_class = object.class.reflect_on_association(method).class_name.constantize
+    image_attributes = image_model_class.accessible_attributes.to_a
+    image_attributes.select! { |x| x.size > 0 and x != "asset" }
+
     ul = template.content_tag :ul do
       html = template.raw("")
 
-      assets.each do |asset|
+      assets.each_with_index do |asset, idx|
         html += template.content_tag :li do
           builder.fields_for(method, asset) do |f|
-            thumbnail_html = template.image_tag f.object.asset.thumb.url
-            template.link_to thumbnail_html, f.object.asset.url
+            thumbnail_html = template.image_tag f.object.asset.lalala_thumb.url
+            asset_html = template.raw("")
+            asset_html << template.link_to(thumbnail_html, f.object.asset.url)
+            asset_html << template.content_tag(:div, { class: "attributes" }) do
+              inputs = image_attributes.map do |ia|
+                if image_model_class.columns_hash[ia]
+                  column_type = image_model_class.columns_hash[ia].type
+                elsif image_model_class.translation_class.columns_hash[ia]
+                  column_type = image_model_class.translation_class.columns_hash[ia].type
+                end
+
+                case column_type
+                when :string then f.text_field(ia.to_sym, placeholder: ia)
+                when :text then f.text_area(ia.to_sym, placeholder: ia)
+                when :boolean then f.check_box(ia.to_sym)
+                end
+              end
+
+              template.raw(inputs.join) + template.content_tag(
+                :a, template.raw("&#10005;"), class: "close-button"
+              )
+            end
+            asset_html
           end
         end
       end
 
       html += template.content_tag :li do
         builder.fields_for(method, assets.build) do |f|
-          f.file_field :asset
+          f.file_field :asset, multiple: true, accept: image_model_class.extension_white_list
         end
       end
 

data/lib/formtastic/inputs/single_file_input.rb

@@ -0,0 +1,34 @@
+class Formtastic::Inputs::SingleFileInput
+  include Formtastic::Inputs::Base
+
+  def to_html
+    object = builder.object
+    model_instance = object.send(method)
+    model_class = object.class.reflect_on_association(method).klass
+
+    html = template.raw("")
+    html << template.content_tag(:label, method.to_s.humanize, class: "label")
+    html << builder.fields_for(method, model_class.new) do |f|
+      f.file_field :asset, accept: model_class.extension_white_list
+    end
+
+    if model_instance
+      html << template.content_tag(:div, class: "file-description") do
+        filename = model_instance.asset.file.try(:filename)
+        f_html = template.raw("")
+
+        if model_class.to_s.include?("Image")
+          f_html << template.content_tag(:img, "", src: model_instance.asset.lalala_thumb.url)
+        end
+
+        if filename
+          f_html << template.content_tag(:span, filename)
+        end
+
+        f_html
+      end
+    end
+
+    input_wrapping { html }
+  end
+end

data/lib/generators/lalala/install/install_generator.rb

@@ -30,6 +30,12 @@ module Lalala
         template 'errors_controller.rb', 'app/controllers/errors_controller.rb'
       end
 
+      def setup_models
+        empty_directory "app/models"
+        copy_file "models/file_asset.rb", "app/models/file_asset.rb"
+        copy_file "models/image_asset.rb", "app/models/image_asset.rb"
+      end
+
       def setup_pages
         empty_directory "app/pages"
         template 'application_page.rb', 'app/pages/application_page.rb'
@@ -48,6 +54,12 @@ module Lalala
         end
       end
 
+      def setup_uploaders
+        empty_directory "app/uploaders"
+        copy_file "uploaders/file.rb", "app/uploaders/file.rb"
+        copy_file "uploaders/image.rb", "app/uploaders/image.rb"
+      end
+
       def create_assets
         generate "lalala:assets"
       end

data/lib/generators/lalala/install/templates/migrations/4_create_assets.rb

@@ -0,0 +1,23 @@
+class CreateAssets < ActiveRecord::Migration
+  def up
+    create_table :assets do |t|
+      t.string :asset # carrierwave file mount
+      t.string :type
+
+      t.references :asset_owner, polymorphic: true
+      t.string :asset_owner_section
+
+      t.timestamps
+    end
+
+    add_index :assets, [:asset_owner_id, :asset_owner_type, :asset_owner_section], name: 'asset_owner_idx'
+
+    ImageAsset.create_translation_table! title: :string, caption: :text
+  end
+
+  def down
+    drop_table :assets
+
+    ImageAsset.drop_translation_table!
+  end
+end

data/lib/generators/lalala/install/templates/models/file_asset.rb

@@ -0,0 +1,2 @@
+class FileAsset < Lalala::FileAsset
+end

data/lib/generators/lalala/install/templates/models/image_asset.rb

@@ -0,0 +1,2 @@
+class ImageAsset < Lalala::ImageAsset
+end

data/lib/generators/lalala/install/templates/uploaders/file_uploader.rb

@@ -0,0 +1,2 @@
+class FileUploader < Lalala::Uploaders::File
+end

data/lib/generators/lalala/install/templates/uploaders/image_uploader.rb

@@ -0,0 +1,11 @@
+class ImageUploader < Lalala::Uploaders::Image
+
+  #
+  #  Versions
+  #  -- https://github.com/jnicklas/carrierwave#adding-versions
+  #
+  # version :example do
+  #   process :resize_to_fill => [420, 700]
+  # end
+
+end

data/lib/lalala/engine.rb

@@ -45,6 +45,10 @@ module Lalala
         'ActionDispatch::Flash',
         Lalala::ExtRack::PageLoader)
 
+      stack.insert_before(
+        'ActionDispatch::Head',
+        Lalala::ExtRack::MultipleFileUploadSupport)
+
     end
 
   end
@@ -70,6 +74,9 @@ module Lalala
     ActiveRecord::Base.send(
       :include, Lalala::ExtActiveRecord::I18nTranslationsWriter)
 
+    ActiveRecord::Base.send(
+      :include, Lalala::ExtActiveRecord::Assets)
+
   end
 
   ActiveSupport.on_load :action_controller do

data/lib/lalala/ext_active_record/assets.rb

@@ -0,0 +1,25 @@
+module Lalala::ExtActiveRecord::Assets
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+
+    def has_many_assets(name, options={})
+      class_name = options.delete(:class_name)
+      class_name ||= if name.to_s.include?("image") then "::ImageAsset" else "::FileAsset" end
+
+      attr_accessible :"#{name}_attributes"
+      has_many name, class_name: class_name, as: :asset_owner, dependent: :destroy, conditions: { asset_owner_section: name.to_s }
+      accepts_nested_attributes_for name, allow_destroy: true
+    end
+
+    def has_one_asset(name, options={})
+      class_name = options.delete(:class_name)
+      class_name ||= if name.to_s.include?("image") then "::ImageAsset" else "::FileAsset" end
+
+      attr_accessible :"#{name}_attributes"
+      has_one name, class_name: class_name, as: :asset_owner, dependent: :destroy, conditions: { asset_owner_section: name.to_s }
+      accepts_nested_attributes_for name, allow_destroy: true
+    end
+
+  end
+end

data/lib/lalala/ext_active_record.rb

@@ -3,4 +3,5 @@ module Lalala::ExtActiveRecord
 
   autoload :Schema
   autoload :I18nTranslationsWriter
+  autoload :Assets
 end

data/lib/lalala/ext_rack/multiple_file_upload_support.rb

@@ -0,0 +1,46 @@
+class Lalala::ExtRack::MultipleFileUploadSupport
+
+  METHODS = /^POST|PUT|PATCH$/
+
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    if METHODS === env["REQUEST_METHOD"]
+      params = env["rack.request.form_hash"]
+      correct_assets_hash_nesting(params)
+    end
+
+    @app.call(env)
+  end
+
+  def correct_assets_hash_nesting(params, key=nil)
+    if key and key.to_s.ends_with?("_attributes")
+      return if params.size == 0
+
+      last_id = params.keys.sort_by(&:to_i).last
+      last_id = "#{last_id}"
+
+      return if params[last_id]["asset"].nil?
+
+      last = params.delete(last_id)
+      assets = last["asset"]
+
+      return unless Array === assets
+
+      assets.each do |file|
+        params[last_id] = { "asset" => file }.with_indifferent_access
+        last_id.succ!
+      end
+
+    else
+      case params
+      when Hash then params.each { |k, v| correct_assets_hash_nesting(v, k) }
+      when Array then params.each { |v| correct_assets_hash_nesting(v) }
+      end
+
+    end
+  end
+
+end

data/lib/lalala/ext_rack.rb

@@ -4,5 +4,6 @@ module Lalala::ExtRack
   autoload :CanonicalURL
   autoload :PageLoader
   autoload :I18nNegotiator
+  autoload :MultipleFileUploadSupport
 
 end

data/lib/lalala/uploaders/file.rb

@@ -0,0 +1,19 @@
+class Lalala::Uploaders::File < CarrierWave::Uploader::Base
+
+  def store_dir
+    if Rails.env.production? or Rails.env.staging?
+      "#{model.class.to_s.underscore}/#{model.id}"
+    else
+      "uploads/#{model.class.to_s.underscore}/#{model.id}"
+    end
+  end
+
+  def url(*)
+    if Rails.env.production? or Rails.env.staging?
+      File.join("/storage/assets", super)
+    else
+      super
+    end
+  end
+
+end

data/lib/lalala/uploaders/image.rb

@@ -1,27 +1,15 @@
-class Lalala::Uploaders::Image < CarrierWave::Uploader::Base
+class Lalala::Uploaders::Image < Lalala::Uploaders::File
 
   include CarrierWave::MiniMagick
   include Sprockets::Helpers::RailsHelper
   include Sprockets::Helpers::IsolatedHelper
 
-  def store_dir
-    if Rails.env.production? or Rails.env.staging?
-      "#{model.class.to_s.underscore}/#{model.id}"
-    else
-      "uploads/#{model.class.to_s.underscore}/#{model.id}"
-    end
-  end
-
-  def url(*)
-    if Rails.env.production? or Rails.env.staging?
-      File.join("/storage/assets", super)
-    else
-      super
-    end
-  end
-
   def extension_white_list
     %w(jpg jpeg gif png)
   end
 
+  version :lalala_thumb do
+    process :resize_to_fill => [100, 100]
+  end
+
 end

data/lib/lalala/uploaders.rb

@@ -1,5 +1,6 @@
 module Lalala::Uploaders
   extend ActiveSupport::Autoload
 
+  autoload :File
   autoload :Image
 end

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "94"
+  BUILD   = "107"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/lib/lalala.rb

@@ -41,6 +41,7 @@ module Lalala
   end
 
   require 'formtastic/inputs/grid_input'
+  require 'formtastic/inputs/single_file_input'
 
   autoload :ExtActiveRecord
   autoload :ExtRack

data/lib/tasks/lalala_tasks.rake

@@ -1,4 +1,12 @@
-# desc "Explaining what the task does"
-# task :lalala do
-#   # Task goes here
-# end
+namespace :lalala do
+
+  namespace :assets do
+    desc "Reprocess assets"
+    task :reprocess => :environment do
+      ImageAsset.all.each do |image|
+        image.asset.recreate_versions! if image.asset
+      end
+    end
+  end
+
+end

data/test/dummy/app/uploaders/file_uploader.rb

@@ -0,0 +1,2 @@
+class FileUploader < Lalala::Uploaders::File
+end

data/test/dummy/app/uploaders/image_uploader.rb

@@ -0,0 +1,2 @@
+class ImageUploader < Lalala::Uploaders::Image
+end