mix-rails-albums 0.23.1 → 0.24.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 13fcbba330215aac7557e9898a7e6b0abd424b74
+  data.tar.gz: e8237ccc41d9d6074019347b39cabd29791bf2e7
+SHA512:
+  metadata.gz: 9e9210bc3a51149b747feb3bfc1a5762ef1559f05c05b4607d67243085b657db4af9e56bb5b2dbb1d0b8b70d92a597b223b118c52ab7d32687925e80fa5a0ab8
+  data.tar.gz: e2ba0214e317185e7b8882359fe62a7e3bfff47671e7e1d8ca230bb5c726dd95d067191a1e4d8274139ea682fc2d2c6331a1eaeb29d3661ce2111eeac9156526

data/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb

@@ -2,7 +2,7 @@
   %a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
     .loading-file
       - if @get('image').url
-        %a.edit{href: "#"}
+        %a.zoom-image.edit{href: ROOT_PATH + @get('image').url, rel: 'admix-albums-image'}
           %img{src: ROOT_PATH + @get('image').medium.url}
       - else
         %img{src: "http://placehold.it/130x90&text=Carregando"}

data/app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb

@@ -1,9 +1,8 @@
-#upload-buttons{:style => "padding: 20px;"}
+#upload-buttons
   %div{:style => "display:none;"}
-    %input#uploader{:multiple => "multiple", :name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}/
-    %input#uploaderZip{:name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}/
-  %p <%= "I18n.t('photos.upload.explanation')" %>
-  %div
+    %input#uploader{:multiple => "multiple", :name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}
+    %input#uploaderZip{:name => "files", :style => "display:none;", :type => "file", :value => "Selecionar File(s)"}
+  %div.well
     %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploader').click();"} <%= I18n.t('photos.btn.upload_pictures') %>
   -#
     <%= I18n.t('photos.or') %>

data/app/controllers/albums_controller.rb

@@ -1,11 +1,12 @@
 class AlbumsController < ApplicationController
   
   def index
-    @albums = Album.published.paginate(:page => params[:page], :per_page => 12)
+    @albums = Album.published.desc.paginate(:page => params[:page], :per_page => 12)
   end
 
   def show
     @album = Album.find(params[:id])
+    @photos = @album.photos.paginate(:page => params[:page], :per_page => 12)
   end
   
 end

data/app/helpers/admix/albums_helper.rb

@@ -1,11 +1,7 @@
 module Admix::AlbumsHelper
-  def form2_attributes
-    %w(name description date published)
-  end
 
-  def album_form_attributes(form)
-    form.input :name
-    form.input :date
+  def action_photos(obj)
+    link_to image_tag('albums/photos.png'), resource_url([obj, :photos]), class: 'btn', title:'Adicionar fotos'
   end
 
 end

data/app/models/concerns/album.rb

@@ -10,14 +10,16 @@ module Concerns::Album
     enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
     friendly_id :title, use: :slugged
 
-    has_many :photos, :as => :related, dependent: :destroy
+    has_many :photos, dependent: :destroy
     belongs_to :related, :polymorphic => true
 
     validation_for_title
     validation_for_date
 
 
-    scope :published, includes(:photos).where(status: :published).having('COUNT(photos.id) > 0')
+    scope :published, includes(:photos).where(status: :published)
+
+    scope :desc, order('albums.date DESC')
 
   end
 

data/app/models/photo.rb

@@ -5,7 +5,7 @@ class Photo < ActiveRecord::Base
   
   friendly_id :description, use: :slugged
 
-  belongs_to :related, :polymorphic => true
+  belongs_to :album
   
   mount_uploader :image, Albums::ImageUploader
 end

data/app/views/admix/albums/_form_config.haml

@@ -0,0 +1,9 @@
+- admix_tab t('albums.album') do |t|
+  -t.tab_content do
+    = f.input :title,         as: 'string', input_html: {class: 'span12'}
+    = f.input :description,   as: 'text', input_html: {class: 'span12'}
+    = f.input :date,          as: 'datepicker', input_html: {class: 'span12'}
+
+- content_for :form_options do
+  = f.input :status, input_html: {class: 'span12'}  
+  

data/app/views/admix/albums/_grid_actions.haml

@@ -0,0 +1 @@
+= grid_actions_for(obj, [:photos, :show, :edit, :destroy])

data/app/views/admix/albums/_grid_columns.haml

@@ -0,0 +1,9 @@
+- grid.column name: input_label(:defaults, :title), attribute: 'title' do |obj|
+  - obj.title
+- grid.column name: input_label(:defaults, :date), attribute: 'date' do |obj|
+  - obj.date
+
+- grid.column name: input_label(:defaults, :status), attribute: 'status', 
+  custom_filter: {t('enumerize.status.published') => 'published', t('enumerize.status.unpublished') => 'unpublished'} do |obj|
+  - obj.status.text
+- column_actions(grid)

data/app/views/admix/albums/_show.html.haml

@@ -2,6 +2,6 @@
   %dt= input_label(:albums, :title)
   %dd= resource.title
   %dt= input_label(:albums, :date)
-  %dd= resource.date
+  %dd= l(resource.date)
 
 = render('admix/photos/upload')

data/app/views/templates/albums/index.haml

@@ -0,0 +1,2 @@
+- content_for :content do
+  = content_for(:albums_content)

data/app/views/templates/albums/show.haml

@@ -0,0 +1,2 @@
+- content_for :content do
+  = content_for(:album_content)

data/config/locales/albums.pt-BR.yml

@@ -1,3 +1,4 @@
+# conding: utf-8
 pt-BR:
   resources:
     albums: 'albuns'
@@ -23,7 +24,7 @@ pt-BR:
     legend: 'Legenda'
     or: 'ou'
     upload:
-      explanation: 'Clique no botão abaixo para adicionar as fotos.'
+      explanation: 'Adicione as fotos.'
     btn:
       upload_pictures: 'Enviar arquivos de imagem'
       upload_zip: 'Enviar arquivo ZIP'

data/db/migrate/20130219111930_remove_polymorphic_association_from_photos.rb

@@ -0,0 +1,6 @@
+class RemovePolymorphicAssociationFromPhotos < ActiveRecord::Migration
+  def change
+    rename_column :photos, :related_id, :album_id
+    remove_column :photos, :related_type
+  end
+end

data/lib/mix-rails-albums/engine.rb

@@ -6,15 +6,12 @@ module MixRailsAlbums
       g.integration_tool :rspec
     end
 
-    def navigation
-      if defined? Admix
-        Admix::Navigation::NavBar.post_menu do
-          Admix::Navigation::NavBar.find(:content) do |menu|
-            menu.submenu do |submenu|
-              submenu.key   = :albums
-              submenu.title = I18n.t('albums.albums')
-              submenu.url   = 'admix_albums_url'
-            end
+    initializer "mix-rails-albums.setup_menu", after: "admix.setup_menu" do
+      ActiveMenu::get('admix-nav') do |nav|
+        nav.get(:content) do |content|
+          content.child :albums do |albums|
+            albums.text Proc.new {t('albums.albums')}
+            albums.href Proc.new {admix_albums_url}
           end
         end
       end

data/lib/mix-rails-albums/version.rb

@@ -1,8 +1,8 @@
 module MixRailsAlbums
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 23
-    TINY  = 1
+    MINOR = 24
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-albums
 version: !ruby/object:Gem::Version
-  version: 0.23.1
-  prerelease: 
+  version: 0.24.0
 platform: ruby
 authors:
 - Sadjow Leão
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,33 +27,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is a module for albums funcionality of mix-rails.
@@ -126,18 +119,19 @@ files:
 - app/assets/javascripts/views/filezipview.js
 - app/assets/javascripts/views/fileview.js
 - app/helpers/admix/albums_helper.rb
-- app/models/admix/photos_datagrid.rb
-- app/models/admix/albums_datagrid.rb
 - app/models/album.rb
 - app/models/photo.rb
 - app/models/concerns/album.rb
 - app/views/admix/albums/_show.html.haml
-- app/views/admix/albums/_table_actions.html.haml
-- app/views/admix/albums/_form_fields.html.haml
+- app/views/admix/albums/_grid_actions.haml
+- app/views/admix/albums/_grid_columns.haml
+- app/views/admix/albums/_form_config.haml
 - app/views/admix/photos/index.html.haml
 - app/views/admix/photos/_upload.html.haml
 - app/views/albums/index.html.haml
 - app/views/albums/show.html.haml
+- app/views/templates/albums/index.haml
+- app/views/templates/albums/show.haml
 - app/views/photos/index.html.haml
 - app/views/photos/show.html.haml
 - config/locales/albums.pt-BR.yml
@@ -145,6 +139,7 @@ files:
 - config/initializers/albums.rb
 - config/routes.rb
 - config/application.rb
+- db/migrate/20130219111930_remove_polymorphic_association_from_photos.rb
 - db/migrate/20130208020540_create_albums.rb
 - db/migrate/20130208021030_create_photos.rb
 - lib/tasks/albums_tasks.rake
@@ -156,32 +151,25 @@ files:
 - README.rdoc
 homepage: https://github.com/mixinternet/mix-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4085379778431430325
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4085379778431430325
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This is a module for albums funcionality of mix-rails.
 test_files: []

data/app/models/admix/albums_datagrid.rb

@@ -1,32 +0,0 @@
-class Admix::AlbumsDatagrid
-
-  include Datagrid
-
-  extend AdmixHelper
-
-
-  scope do
-    Album.order("date DESC")
-  end
-
-  filter :title, :string
-  filter :date do |value|
-    value.to_s(:created_at)
-  end
-
-  column :title, header: input_label(:albums, :title)
-  column :date, header: input_label(:albums, :date) do |album|
-    album.date.strftime("%d/%m/%Y") #album.date.to_s(:created_at)
-  end
-  column :photos_quantity, header: input_label(:albums, :photos_quantity) do |album|
-    album.photos.count
-  end
-
-  column :published, header: input_label(:albums, :status) do |album|
-    album.status.text
-  end
-  
-
-  include Admix::TableActions
-
-end

data/app/models/admix/photos_datagrid.rb

@@ -1,15 +0,0 @@
-class Admix::PhotosDatagrid
-
-  include Datagrid
-
-  scope do
-    Photo
-  end
-
-  filter :name, :string
-  filter :date, :date
-
-  column :name 
-  column :date
-  
-end

data/app/views/admix/albums/_form_fields.html.haml

@@ -1,4 +0,0 @@
-= f.input :title,         as: 'string'
-= f.input :description,   as: 'text'
-= f.input :date,          as: 'datepicker'
-= f.input :status

data/app/views/admix/albums/_table_actions.html.haml

@@ -1,4 +0,0 @@
-= link_to image_tag('albums/photos.png'), resource_url([resource, :photos]), class: 'btn', title:'Adicionar fotos'
-= link_to image_tag('admix/zoom.png'), resource_url(resource), class: 'btn', title:'Visualizar registro'
-= link_to image_tag('admix/page_edit.png'), edit_resource_url(resource), class: 'btn', title:'Editar registro'
-= link_to image_tag('admix/cancel.png'), resource_url(resource), method: :delete, data: { confirm: t('admix.crud.destroy_confirm') }, class: 'btn', title:'Deletar registro'