mix-rails 0.23.1 → 0.24.0

data/{admix → mix-rails-addresses}/spec/dummy/README.rdoc

@@ -157,9 +157,9 @@ The default directory structure of a generated Ruby on Rails application:
 
   |-- app
   |   |-- assets
-  |       |-- images
-  |       |-- javascripts
-  |       `-- stylesheets
+  |   |   |-- images
+  |   |   |-- javascripts
+  |   |   `-- stylesheets
   |   |-- controllers
   |   |-- helpers
   |   |-- mailers
@@ -173,6 +173,7 @@ The default directory structure of a generated Ruby on Rails application:
   |-- db
   |-- doc
   |-- lib
+  |   |-- assets
   |   `-- tasks
   |-- log
   |-- public
@@ -184,13 +185,12 @@ The default directory structure of a generated Ruby on Rails application:
   |   |-- performance
   |   `-- unit
   |-- tmp
-  |   |-- cache
-  |   |-- pids
-  |   |-- sessions
-  |   `-- sockets
+  |   `-- cache
+  |       `-- assets
   `-- vendor
       |-- assets
-          `-- stylesheets
+      |   |-- javascripts
+      |   `-- stylesheets
       `-- plugins
 
 app

data/{admix → mix-rails-addresses}/spec/dummy/config/application.rb

@@ -1,15 +1,15 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-# require "active_record/railtie"
+require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
-Bundler.require
-require "admix"
+Bundler.require(*Rails.groups)
+require "mix-rails-addresses"
 
 module Dummy
   class Application < Rails::Application
@@ -53,7 +53,7 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
+    config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/mix-rails-addresses/spec/dummy/config/database.yml

@@ -0,0 +1,42 @@
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+# 
+# Install the MYSQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: dummy_development
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: dummy_test
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock
+
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: dummy_production
+  pool: 5
+  username: root
+  password:
+  socket: /tmp/mysql.sock

data/{admix → mix-rails-addresses}/spec/dummy/config/environments/development.rb

@@ -22,6 +22,12 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false

data/{mix-rails-albums → mix-rails-addresses}/spec/dummy/config/environments/production.rb

@@ -61,4 +61,7 @@ Dummy::Application.configure do
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/{mix-rails-auth → mix-rails-addresses}/spec/dummy/config/environments/test.rb

@@ -29,6 +29,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/{admix → mix-rails-addresses}/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '9e045dee040a45a735e549980752b1ce04cae649b2e937c8fd143db8fb364b26ee46a478b58c1d2e211989d26869b0ad49524a81f879a26da07c71699871ebf1'
+Dummy::Application.config.secret_token = 'b62dc4806005a0acb3a4c1400335556aaf6ecbcd5038ab6278b93ef5e8c43b407d34f9a6438fda5825039c18a98942c786e0940ad68cb17c980f58033a54a630'

data/{mix-rails-albums → mix-rails-addresses}/spec/dummy/config/initializers/wrap_parameters.rb

@@ -8,3 +8,7 @@ ActiveSupport.on_load(:action_controller) do
   wrap_parameters format: [:json]
 end
 
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/mix-rails-addresses/spec/models/address_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Address do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/mix-rails-addresses/spec/models/city_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe City do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/mix-rails-addresses/spec/models/state_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe State do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/app/views/admix/albums/_grid_actions.haml

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

data/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/app/views/templates/albums/index.haml

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

data/mix-rails-albums/app/views/templates/albums/show.haml

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

data/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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/mix-rails-albums/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('.')

data/mix-rails-auth/app/views/admix/roles/_form_config.haml

@@ -0,0 +1,4 @@
+- admix_tab t('roles.role') do |t|
+  -t.tab_content do
+    = f.input :name, as: 'string'
+    = f.association :users, as: :check_boxes, collection: User.all, label_method: :email, value_method: :id

data/mix-rails-auth/app/views/admix/users/_form_config.haml

@@ -0,0 +1,7 @@
+- admix_tab t('users.user') do |t|
+  -t.tab_content do
+    = f.input :email, as: 'string'
+    = f.input :password, as: 'password'
+    = f.input :roles, :as => :select, :collection => Role.all
+  
+