redde 0.1.4 → 0.1.5

data/README.md

@@ -47,6 +47,26 @@ Add `admin.scss` and `admin.js` to assets precompilation in config/production.rb
 ## Добавление фотографий
 
 	rails g redde:photo
+
+Добавьте в routes.rb единожды
+
+    concern :imageable do
+      resources :photos, only: [:show, :create, :destroy] do
+        post 'sort', :on => :collection
+      end
+    end
+
+и для каждой модели роуты `concerns :imageable` к которой необходимо добавить фотографии, например для Product
+
+    namespace :admin do
+      resources :products do
+        concerns :imageable
+      end
+    end
+
+Не забудьте добавить полиморфную связь
+
+    has_many :photos, dependent: :destroy, as: :imageable
 	
 создаст scaffold для модели Photo с полиморфной связью
 

data/lib/generators/redde/photo/templates/controller.rb

@@ -11,20 +11,19 @@ class Admin::PhotosController < ActionController::Base
 
   def create
     if params[:product_id].present?
-      @product = Product.find(params[:product_id])
-      @photo = @product.photos.build(src: params[:file])
+      parent = Product.find(params[:product_id])
     end       
-    if @photo.save
-      render layout: false
-    else
+    @photo = parent.photos.build(src: params[:file])
+    unless @photo.save
       render js: 'alert("Ошибка! Фото не загружено")'
     end
   end
 
   def destroy
     @photo = Photo.find(params[:id])
-    @photo.destroy
-    render 'admin/photos/destroy'
+    if @photo.destroy
+      render 'admin/photos/destroy'
+    end
   end
 
 end

data/lib/generators/redde/photo/templates/photos/_photo.haml

@@ -2,4 +2,4 @@
   = link_to photo.src.url do
     = image_tag photo.src.admin
     %em= photo.src.to_s.gsub(/.*\/(.*)\z/,'\1')
-  = link_to "удалить", url_for([:admin,parent,photo]), :method => :delete, :confirm => "Точно удалить?", :remote => true, :title => "Удалить", :class => "del"
+  = link_to "удалить", url_for([:admin, photo.imageable, photo]), :method => :delete, :confirm => "Точно удалить?", :remote => true, :title => "Удалить", :class => "del"

data/lib/generators/redde/photo/templates/photos/_photos.haml

@@ -1,12 +1,12 @@
 - unless parent.new_record?
-  =content_for(:page_sidebar) do
+  = content_for(:page_sidebar) do
     %h5 
       Фотографии
       - if editable ||= false
-        = link_to "ред.", [:admin,parent]
+        = link_to "ред.", [:admin, parent]
     .product-photos
       %ul.photos#photo-list
-        = render :partial => "admin/photos/photo", :collection => eval("parent.#{photos.to_s}"), :as => :photo, :locals => {:parent => parent}
+        = render parent.photos
 
       #preview
       #drag-n-drop{:style => "display: none; margin-top: 5px;"}
@@ -19,4 +19,4 @@
         .b-button.js-fileapi-wrapper
           .b-button__text Загрузить файлы
           %input.b-button__input.js-fileapi{:name => "files", :type => "file",  :multiple => true, data: {"upload-url" => url_for([:admin, parent, :photos])}}
-      = photo_sortable url_for([:sort,:admin,parent,photos])
+      = photo_sortable url_for([:sort, :admin, parent, :photos])

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/generators/layout_generator_spec.rb

@@ -28,7 +28,7 @@ describe Redde::Generators::LayoutGenerator do
 
       # check js and css
       assert_file "app/assets/javascripts/admin.js"
-      assert_file "app/assets/stylesheets/admin.scss"
+      assert_file "app/assets/stylesheets/admin/index.scss"
 
       #check images
       assert_directory "app/assets/images/admin"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 875708741128439050
+      hash: 1230283241805079294
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 875708741128439050
+      hash: 1230283241805079294
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24