mix-rails 0.10.4 → 0.12.1

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mix-rails.gemspec
-gemspec
+gemspec
+
+
+gem 'fancybox-rails'

data/MIX_RAILS_VERSION

@@ -1 +1 @@
-0.10.4
+0.12.1

data/README.md

@@ -1,6 +1,6 @@
 # MixRails
 
-[![Build Status](https://travis-ci.org/mixinternet/mix-rails.png)](https://travis-ci.org/mixinternet/mix-rails) (Without tests yet, but working)
+[![Build Status](https://travis-ci.org/mixinternet/mix-rails.png)](https://travis-ci.org/mixinternet/mix-rails)
 [![Dependency Status](https://gemnasium.com/mixinternet/mix-rails.png)](https://gemnasium.com/mixinternet/mix-rails)
 
 MixRails is a CMS based on Ruby on Rails and uses Mongoid as ORM(MongoDB).

data/admix/app/assets/javascripts/admix/{application.js → application.js.coffee}

@@ -1,5 +1,7 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery/jquery.livequery
+//= require fancybox
 //= require jquery.ui.datepicker
 //= require ../../bootstrap/js/bootstrap.min
 //= require ./dates
@@ -8,4 +10,8 @@
 //= require ../../nicedit/nicEdit
 //= require ./nicedit_applier
 //= require ../../tipsy/src/javascripts/jquery.tipsy
-//= require ./tipsy_init
+//= require ./tipsy_init
+
+$ ->
+  $('.fancybox').livequery ->
+    $(@).fancybox();

data/admix/app/assets/stylesheets/admix/application.css

@@ -11,5 +11,6 @@
  *= require_self
  *= require jquery.ui.all
  *= require ../../tipsy/src/stylesheets/tipsy
+ *= require fancybox
  *= require_tree .
  */

data/admix/app/controllers/admix/admix_controller.rb

@@ -1,10 +1,13 @@
 module Admix
   class AdmixController < MixController
 
-    before_filter :authenticate_user!, :add_initial_breadcrumbs, :globals
+    before_filter :authenticate_admix_user!, :add_initial_breadcrumbs, :globals
 
-    protected
+    def current_user
+      current_admix_user
+    end
 
+    protected
     def add_initial_breadcrumbs
       breadcrumbs.add t('admix.dashboard'), admix_root_path, :id => 'dashboard', :title => 'Go to the home page'
     end

data/admix/app/controllers/admix/sessions_controller.rb

@@ -1,3 +1,9 @@
 class Admix::SessionsController < Devise::SessionsController
+    
     layout 'admix/login'
+
+    def after_sign_in_path_for(resource)
+      request.env['omniauth.origin'] || session[:admix_user_return_to] || admix_root_path
+    end
+
 end

data/admix/app/views/layouts/admix/admix.html.haml

@@ -24,9 +24,10 @@
               %input.span3{:type => "text"}
                 %button.btn{:type => "submit"}
                   %i.icon-search
-          %ul.nav
+          %ul.nav.pull-right
+            %li= link_to current_user.email, admix_user_path(current_user)
             %li
-              = link_to destroy_user_session_url, method: :delete do
+              = link_to destroy_admix_user_session_url do
                 %i{class: 'icon-off'}
                 = t('admix.logout')
 

data/admix/config/routes.rb

@@ -1,6 +1,10 @@
 Rails.application.routes.draw do
-  namespace :admix do
-    match 'upload' => 'nicedit#upload'
-    root to: 'dashboard#index'
-  end
-end
+
+    scope Admix::namespace_path, as: :admix, module: :admix do
+      match 'upload' => 'nicedit#upload'
+      root to: 'dashboard#index'
+    end
+
+
+
+end

data/admix/lib/admix.rb

@@ -19,9 +19,13 @@ require 'mix-rails-auth'
 
 
 module Admix
-  mattr_accessor :menus_container
+
+  mattr_accessor :menus_container, :namespace_path
+
   self.menus_container = []
 
+  self.namespace_path = 'admix'
+
 
   module Navigation
   end

data/admix/lib/admix/version.rb

@@ -1,8 +1,8 @@
 module Admix
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-albums/app/assets/javascripts/templates/photo_view.hamlc.erb

@@ -4,7 +4,7 @@
   %a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
     .loading-file
       - if @image.url
-        %a.colorbox{href: ROOT_PATH + @image.medium.url}
+        %a.fancybox{href: ROOT_PATH + @image.medium.url, rel: 'photo-album'}
           %img{src: ROOT_PATH + @image.thumb.url}
       - else
         %img{src: "http://placehold.it/130x90&text=Carregando"}

data/mix-rails-albums/app/views/admix/photos/_upload.html.haml

@@ -1,15 +1,6 @@
-- content_for :stylesheets do
-  = stylesheet_link_tag 'colorbox/colorbox'
 - content_for :javascripts do
   = javascript_include_tag 'admix/photos'
-  = javascript_include_tag 'jquery.livequery'
-  = javascript_include_tag 'colorbox/jquery.colorbox-min'
-  :coffeescript
-    $ ->
-      $('.colorbox').livequery ->
-        $(@).colorbox();
-
-
+  
 %h3 Upload de fotos
 #upload-buttons{:style => "padding: 20px;"}
   %div{:style => "display:none;"}

data/mix-rails-albums/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
     resources :albums
   end
     
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :albums do
       resources :photos
     end

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

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

data/mix-rails-auth/app/models/user.rb

@@ -9,7 +9,7 @@ class User
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :recoverable, :rememberable,
-         :trackable, :validatable#, :registerable
+         :trackable, :validatable, :registerable
 
   ## Database authenticatable
   field :email,              :type => String, :default => ""

data/mix-rails-auth/config/routes.rb

@@ -1,10 +1,9 @@
 Rails.application.routes.draw do
 
-  devise_for :users, controllers: { sessions: 'admix/sessions', passwords: 'admix/passwords' },
-             path_names: { :sign_in => 'login', :sign_out => 'logout' }
+  devise_for :users, sign_out_via: 'get'
 
-
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
+    devise_for :users, sign_out_via: 'get', controllers: {sessions: 'admix/sessions', passwords: 'admix/passwords'}, :path_names => { :sign_in => 'login', :sign_out => 'logout' }
     resources :users
   end
 

data/mix-rails-auth/config/sessions.rb

@@ -0,0 +1,3 @@
+class SessionsController < Devise::SessionsController
+  
+end

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

@@ -1,8 +1,8 @@
 module MixRailsAuth
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-core/lib/mix-rails-core.rb

@@ -5,6 +5,8 @@ require 'mix-rails-core/engine'
 
 require 'enumerize'
 
+require 'fancybox-rails'
+
 require 'rails-i18n'
 
 require 'activevalidators'

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

@@ -1,8 +1,8 @@
 module MixRailsCore
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-message-board/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
     resources :board_messages
   end
     
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :board_messages do
       
       resources :board_replies

data/mix-rails-message-board/lib/mix-rails-message-board/version.rb

@@ -1,8 +1,8 @@
 module MixRailsMessageBoard
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-settings/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :settings
   end
 end

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

@@ -1,8 +1,8 @@
 module MixRailsSettings
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-songs/config/routes.rb

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
     end
   end
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :songs
   end
 

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

@@ -1,8 +1,8 @@
 module MixRailsSongs
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-videos/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   resources :videos, only: [:index, :show]
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :videos
   end
 end

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

@@ -1,8 +1,8 @@
 module MixRailsVideos
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-vouchers/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
   match 'vouchers/:id/confirm/:user_id' => 'vouchers#confirmation', as: :vouchers_confirmation
   match 'vouchers/:id/imprimir/:user_id' => 'vouchers#print', as: :vouchers_print
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     get 'vouchers/:id/users/print' => 'vouchers#print', as: :voucher_print
     get 'vouchers/:id/users' => 'vouchers#users', as: :voucher_users
     delete 'vouchers/:id/users/:user_id/delete' => 'vouchers#delete_user', as: :voucher_user_delete

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

@@ -1,8 +1,8 @@
 module MixRailsVouchers
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails-writer/config/routes.rb

@@ -9,7 +9,7 @@ Rails.application.routes.draw do
     resources :posts
   end
 
-  namespace :admix do
+  scope Admix::namespace_path, as: :admix, module: :admix do
     resources :news
     resources :blogs do
       resources :posts

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

@@ -1,8 +1,8 @@
 module MixRailsWriter
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/mix-rails.gemspec

@@ -46,4 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mix-rails-vouchers',          version
   gem.add_dependency 'mix-rails-songs',             version
 
+
+  gem.add_dependency 'fancybox-rails', "~> 0.1.4"
+
 end

data/version.rb

@@ -1,8 +1,8 @@
 module MixRailsCore
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 10
-    TINY  = 4
+    MINOR = 12
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mix-rails-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-auth
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: admix
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-settings
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-writer
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-albums
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-videos
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-message-board
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-vouchers
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: mix-rails-songs
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: fancybox-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 description: MixRails is a CMS and system based on Ruby on Rails and use Mongoid as
   ORM(MongoDB)
 email:
@@ -1207,7 +1223,7 @@ files:
 - admix/app/assets/images/admix/mix-framework-small.png
 - admix/app/assets/images/admix/page_edit.png
 - admix/app/assets/images/admix/zoom.png
-- admix/app/assets/javascripts/admix/application.js
+- admix/app/assets/javascripts/admix/application.js.coffee
 - admix/app/assets/javascripts/admix/backbone-min.js
 - admix/app/assets/javascripts/admix/bootstrap.js
 - admix/app/assets/javascripts/admix/dates.js.coffee
@@ -1461,6 +1477,7 @@ files:
 - mix-rails-auth/config/locales/devise.en.yml
 - mix-rails-auth/config/locales/devise.pt-BR.yml
 - mix-rails-auth/config/routes.rb
+- mix-rails-auth/config/sessions.rb
 - mix-rails-auth/lib/mix-rails-auth.rb
 - mix-rails-auth/lib/mix-rails-auth/engine.rb
 - mix-rails-auth/lib/mix-rails-auth/version.rb
@@ -2005,7 +2022,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -825491615181391548
+      hash: -589095447981552963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -2014,7 +2031,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -825491615181391548
+      hash: -589095447981552963
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24