mix-rails 0.15.0 → 0.16.0

data/Gemfile

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

data/MIX_RAILS_VERSION

@@ -1 +1 @@
-0.15.0
+0.16.0

data/README.md

@@ -5,23 +5,24 @@
 
 MixRails is a CMS based on Ruby on Rails and uses Mongoid as ORM(MongoDB).
 
-## Installation
+
+## Usage
+
+Create a new rails project.
+
+    $ rails new myproject -T --skip-active-record --skip-bundle --dummy-path=spec/dummy
 
 Add this line to your application's Gemfile:
 
     gem 'mix-rails'
 
 And then execute:
-
+    
+    $ cd myproject
     $ bundle
 
-## Usage
 
-Create a new rails project.
-
-    $ rails new myproject -T --skip-active-record --skip-bundle --dummy-path=spec/dummy
-
-In your config/application.rb add these after rails's requires.
+In your config/application.rb add require 'mix-rails/all'.
 
 ```ruby
 require "action_controller/railtie"
@@ -78,3 +79,9 @@ Admix::namespace_path = "myadminpath"
 TODO: Add some docs for admix
 
 [![Admix](http://img233.imageshack.us/img233/6731/screenshotfrom201301221.png)]
+
+# Plugins (Extensions)
+
+## Creatig a extensions
+
+    $ rails plugin new mix-rails-pluginame -T --skip-active-record --skip-bundle --dummy-path=spec/dummy --full

data/admix/app/assets/javascripts/admix/application.js.coffee

@@ -2,19 +2,28 @@
 #= require jquery_ujs
 #= require underscore
 #= require backbone
-#= require backbone_rails_sync
-#= require backbone_datalink
 #= require jquery/jquery.livequery
 #= require fancybox
 #= require jquery.ui.datepicker
-#= require ../../bootstrap/js/bootstrap.min
+#= require bootstrap
 #= require ./dates
 #= require ../../nicedit/nicEdit
 #= require ./nicedit_applier
 #= require ../../tipsy/src/javascripts/jquery.tipsy
-#= require ./tipsy_init
+# ./tipsy_init
+#= require jquery.qtip.js
+
+
+Backbone.emulateHTTP = true
 
 $ ->
+
+  $(".actions [title]").livequery ->
+    $(this).qtip
+      content: $(this).attr("title") # Use the tooltip attribute of the element for the content
+      #style: "dark" # Give it a crea mstyle to make it stand out
+      style:
+        classes: 'qtip-bootstrap'
   
   $('.fancybox').livequery ->
     $(@).fancybox();

data/admix/app/assets/javascripts/admix/tipsy_init.js.coffee

@@ -0,0 +1,3 @@
+$ ->
+  $("a[title]").livequery ->
+    $(this).tipsy gravity: "s"

data/admix/app/assets/stylesheets/admix/admix_bootstrap.scss

@@ -0,0 +1 @@
+@import "bootstrap";

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

@@ -12,7 +12,9 @@
  *= require jquery.ui.all
  *= require ../../tipsy/src/stylesheets/tipsy
  *= require fancybox
- *= require_tree .
+ *= require ./admix_bootstrap
+ *= require ./style
+ *= require jquery.qtip.css
  *= require_self
  */
 

data/admix/lib/admix/version.rb

@@ -1,7 +1,7 @@
 module Admix
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

data/mix-rails-albums/app/assets/javascripts/backbone/models/photo.js.coffee

@@ -11,7 +11,7 @@ class Application.Models.Photo extends Backbone.Model
 
   onAdd: ->
     xhr = new XMLHttpRequest()
-    xhr.open "POST", @url
+    xhr.open "POST", @url()
     datas = new FormData()
     datas.append "image", @get("image")
     xhr.upload.addEventListener "progress", (e) =>
@@ -25,6 +25,7 @@ class Application.Models.Photo extends Backbone.Model
         @trigger "uploadCompleted"
         if xhr.responseText
           responseObject = JSON.parse(xhr.responseText)
+          console.log responseObject
           @set responseObject
         else
           console.log "Não foi possível enviar o arquivo"
@@ -37,3 +38,34 @@ class Application.Collections.PhotosCollection extends Backbone.Collection
   model: Application.Models.Photo
   url: '/photos'
 
+  setFromFiles: (files) ->
+    @reset()
+    i = 0
+    while f = files[i]
+      reader = new FileReader()
+      reader.onload = ((theFile, theId) =>
+        (e) ->
+          photo = new Application.Models.Photo()
+          photo.set id: theId
+          photo.set filename: theFile.name
+          photo.set image: e.target.result
+          @add photo
+      )(f)
+      reader.readAsDataURL f, i
+      i++
+
+  addFromFiles: (files) ->
+    i = 0
+    while f = files[i]
+      reader = new FileReader()
+      reader.onload = ((theFile, theId) =>
+        (e) ->
+          photo = new Application.Models.Photo()
+          photo.set id: theId
+          photo.set filename: theFile.name
+          photo.set image: e.target.result
+          @add photo
+      )(f)
+      reader.readAsDataURL f, i
+      i++
+

data/mix-rails-albums/app/assets/javascripts/backbone/routers/photos_router.js.coffee

@@ -32,6 +32,6 @@ class Application.Routers.PhotosRouter extends Backbone.Router
 
   edit: (id) ->
     photo = @photos.get(id)
-
-    @view = new Application.Views.Photos.EditView(model: photo)
-    $("#upload-container").html(@view.render().el)
+    console.log 'Editando a foto!' + photo
+    #@view = new Application.Views.Photos.EditView(model: photo)
+    #$("#upload-container").html(@view.render().el)

data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb

@@ -5,12 +5,14 @@
     .loading-file
       - if @image.url
         %a.photo-link{href: "#"}
-          %img{src: ROOT_PATH + @image.thumb.url}
+          %img{src: ROOT_PATH + @image.medium.url}
       - else
         %img{src: "http://placehold.it/130x90&text=Carregando"}
     -if (@progress != null && @progress < 100)
       %div{class: (@progress < 100) ? 'progress progress-striped active' : 'progress'}
         .bar{style: "width:#{@progress}%;"}
   .caption
-    %a.file-action.destroy{href: "#"} 
-      <%= image_tag "albums/delete.png" %>
+    %a.file-action.btn.destroy{href: "#", tooltip: 'Excluir'} 
+      <%= image_tag "admix/icons/delete.png" %>
+    %a.file-action.btn.edit{href: "#", tooltip: 'Editar'} 
+      <%= image_tag "admix/icons/picture_edit.png" %>

data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee

@@ -5,26 +5,34 @@ class Application.Views.Photos.PhotoView extends Backbone.View
 
   events:
     "click .destroy" : "destroy"
-    "click .photo-link": "photo_link",
+    "click .edit": "edit",
 
   tagName: "li"
-  className: 'span2'
+  className: 'span4'
 
   initialize: ->
     @model.on "change", @render, this
     @model.on "uploadCompleted", @removeProgressBar, this
+    self = @
+    $(@el).find('a[tooltip]').livequery ->
+      $(this).qtip
+        content: $(this).attr("tooltip") # Use the tooltip attribute of the element for the content
+        #style: "dark" # Give it a crea mstyle to make it stand out
+        style:
+          classes: "qtip-bootstrap qtip-#{self.model.get('id')}"
 
   removeProgressBar: ->
     @$el.find(".progress").fadeOut()  unless @$el is undefined
 
-  destroy: () ->
-    @model.destroy()
-    this.remove()
-
-    return false
-
-  photo_link: () ->
-
+  destroy: ->
+    if confirm('Tem certeza que deseja deletar?')
+      @model.destroy()
+      this.remove()
+      $(".qtip-#{@model.get('id')}").remove()
+    false
+  edit: () ->
+    Backbone.history.navigate("#/#{@model.id}/edit")
+    false
   render: ->
     @$el.html(@template(@model.toJSON() ))
     return this

data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee

@@ -7,6 +7,7 @@ class Application.Views.Photos.UploadIndexView extends Backbone.View
 
   initialize: () ->
     @options.photos.bind('reset', @addAll)
+    @options.photos.bind('add', @addOne)
 
   addAll: () =>
     @options.photos.each(@addOne)

data/mix-rails-albums/app/assets/javascripts/photos/upload.js.coffee.erb

@@ -4,21 +4,24 @@
 <% url = Rails.application.routes.url_helpers %>
 $ ->
   $.getJSON RESOURCE_PATH,(json) ->
-    new Application.Routers.PhotosRouter(collectionUrl: RESOURCE_PATH, photos: json)
+    window.photos_router = new Application.Routers.PhotosRouter(collectionUrl: RESOURCE_PATH, photos: json)
     Backbone.history.start()
 
-  $("#uploader").change (el) ->
-    files = el.currentTarget.files
-    i = 0
-    while i < files.length
-      photo = new Application.Models.Photo(
-        image: files[i]
-        name: files[i].name
-      )
-      photo.url = fileList.url
-      fileList.add photo
-      setTimeout (->
-        fileList.add photo
-      ), 1000
-      i++
-    fileListView.render()
+  $("#uploader").livequery ->
+    $(@).change (el) ->
+      #photos_router.addFromFiles(el.currentTarget.files)
+      files = el.currentTarget.files
+      console.log "Files count: #{files.length}"
+      i = 0
+      while i < files.length
+        
+        photo = new Application.Models.Photo(
+          image: files[i]
+          name: files[i].name
+        )
+        ((photo) ->
+          setTimeout ->
+            photos_router.photos.add photo
+          , 1000
+        )(photo)
+        i++

data/mix-rails-albums/app/assets/javascripts/views/fileview.js

@@ -34,6 +34,5 @@ var FileView = Backbone.View.extend({
     },
     photo_link: function(e) {
         e.preventDefault();
-        Backbone.history.navigate(":photo_id/ajax_edit".replace(':photo_id', this.model.get('id')), {trigger: true});
     }
 });

data/mix-rails-albums/app/controllers/admix/photos_controller.rb

@@ -1,5 +1,10 @@
-class Admix::PhotosController < Admix::InheritedController
+class Admix::PhotosController < Admix::AdmixController
   
+  respond_to :json
+  respond_to :html, :only => [:upload, :index, :destroy]
+
+  inherit_resources
+
   before_filter :image_param
 
   polymorphic_belongs_to :album, param: :album_id
@@ -8,8 +13,6 @@ class Admix::PhotosController < Admix::InheritedController
   # load_and_authorize_resource :photo, :through => :album_id
   skip_load_and_authorize_resource
 
-  respond_to :json
-
   def upload
     render inline: params.to_s
   end

data/mix-rails-albums/app/models/album.rb

@@ -2,7 +2,6 @@ class Album
   
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Mongoid::Paranoia
   include Mongoid::Slug
 
   field :name,          type: String
@@ -22,8 +21,7 @@ class Album
 
   embeds_many :photos, cascade_callbacks: true
 
-
-  scope :published, where(published: true)
+  scope :published, where(published: true, :photos.ne => nil, :photos.exists => true)
 
 
 end

data/mix-rails-albums/app/uploaders/albums/image_uploader.rb

@@ -44,7 +44,7 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
   # version :thumb do
   #   process :resize_to_fit => [80, 80]
   # end
-  
+
   version :medium do
     process :resize_to_fill => [640,420]
   end

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

@@ -1,7 +1,7 @@
 module MixRailsAlbums
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

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

@@ -1,7 +1,7 @@
 module MixRailsAuth
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

data/mix-rails-core/app/controllers/mix_controller.rb

@@ -7,4 +7,6 @@ class MixController < ActionController::Base
 
   helper :all
 
+  before_filter -> { breadcrumbs.add 'Home', index_path } 
+
 end

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

@@ -1,7 +1,7 @@
 module MixRailsCore
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

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

@@ -38,5 +38,8 @@ require 'simple_form'
 
 require 'rails-backbone'
 
+require 'bootstrap-sass'
+require 'jquery-qtip2-rails'
+
 module MixRailsCore
 end

data/mix-rails-core/mix-rails-core.gemspec

@@ -1,58 +1,60 @@
 $:.push File.expand_path("../lib", __FILE__)
 # Maintain your gem's version:
-version = File.read(File.expand_path('../../MIX_RAILS_VERSION', __FILE__)).strip
+version = File.read(File.expand_path("../../MIX_RAILS_VERSION", __FILE__)).strip
 
 # Describe your gem and declare its dependencies:
-Gem::Specification.new do |s|
-  s.name        = "mix-rails-core"
-  s.version     = version
-  s.authors     = ["Sadjow Leão"]
-  s.email       = ["sadjow@gmail.com"]
-  s.homepage    = "https://github.com/mixinternet/mix-rails"
-  s.summary     = "This is the core of the mix-rails"
-  s.description = "This is the core of the mix-rails"
+Gem::Specification.new do |gem|
+  gem.name        = "mix-rails-core"
+  gem.version     = version
+  gem.authors     = ["Sadjow Leão"]
+  gem.email       = ["sadjow@gmail.com"]
+  gem.homepage    = "https://github.com/mixinternet/mix-rails"
+  gem.summary     = "This is the core of the mix-rails"
+  gem.description = "This is the core of the mix-rails"
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  gem.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
 
-  s.add_dependency "rails", "~> 3.2.9"
+  gem.add_dependency "rails", "~> 3.2.9"
 
-  s.add_dependency 'mail_form',    '~> 1.4.0'
-  s.add_dependency 'simple_form',  '~> 2.0.0'
+  gem.add_dependency "mail_form",    "~> 1.4.0"
+  gem.add_dependency "simple_form",  "~> 2.0.0"
   
-  s.add_dependency 'enumerize'
+  gem.add_dependency "enumerize"
 
-  s.add_dependency "activevalidators"
+  gem.add_dependency "activevalidators"
 
-  s.add_dependency "i18n_routing"
+  gem.add_dependency "i18n_routing"
 
-  s.add_dependency "rails-i18n"
+  gem.add_dependency "rails-i18n"
 
-  s.add_dependency 'mongoid'
+  gem.add_dependency "mongoid"
   # mongoid should be loaded before cancan
-  s.add_dependency "cancan"
+  gem.add_dependency "cancan"
   
-  s.add_dependency 'mongoid_slug'
-  s.add_dependency 'bson_ext'
-  s.add_dependency 'mongo'
-  s.add_dependency 'carrierwave-mongoid'
-  s.add_dependency 'mini_magick'
-  s.add_dependency 'haml_coffee_assets'
+  gem.add_dependency "mongoid_slug"
+  gem.add_dependency "bson_ext"
+  gem.add_dependency "mongo"
+  gem.add_dependency "carrierwave-mongoid"
+  gem.add_dependency "mini_magick"
+  gem.add_dependency "haml_coffee_assets"
   
-  s.add_dependency 'rspec-rails'
-  s.add_dependency 'database_cleaner'
-
-  s.add_dependency 'breadcrumbs'
-  s.add_dependency 'simple-navigation'
-  s.add_dependency 'simple-navigation-bootstrap'
-  s.add_dependency 'datagrid', '~> 0.7.0'
-  s.add_dependency 'will_paginate_mongoid'
-
-  s.add_dependency "jquery-rails"
-  s.add_dependency "jquery-ui-rails"
-
-  s.add_dependency "coffee-script"
-  s.add_dependency "coffee-filter"
-  s.add_dependency "rails-backbone"
-  #s.add_dependency "sass-rails"
+  gem.add_dependency "rspec-rails"
+  gem.add_dependency "database_cleaner"
+
+  gem.add_dependency "breadcrumbs"
+  gem.add_dependency "simple-navigation"
+  gem.add_dependency "simple-navigation-bootstrap"
+  gem.add_dependency "datagrid", "~> 0.7.0"
+  gem.add_dependency "will_paginate_mongoid"
+
+  gem.add_dependency "jquery-rails"
+  gem.add_dependency "jquery-ui-rails"
+
+  gem.add_dependency "coffee-script"
+  gem.add_dependency "coffee-filter"
+  gem.add_dependency "rails-backbone"
+  #gem.add_dependency "sass-rails"
+
+  gem.add_dependency "jquery-qtip2-rails", "~> 0.4.0"
 
 end

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

@@ -1,7 +1,7 @@
 module MixRailsMessageBoard
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

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

@@ -1,7 +1,7 @@
 module MixRailsSettings
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

data/mix-rails-songs/app/controllers/songs_controller.rb

@@ -1,5 +1,5 @@
 class SongsController < ApplicationController
-  
+
   def index
 
     @songs = Song.published.all
@@ -7,9 +7,22 @@ class SongsController < ApplicationController
     respond_to do |format|
       format.json { render json: @songs }
     end
+
+  end
+
+  def shuffled
+
+    @songs = Song.published.all.shuffle
+
+    respond_to do |format|
+      format.json { render json: @songs }
+    end
+    
   end
 
   def player
+    @shuffled = params[:shuffled] || false
+    @songs_api = @shuffled ? shuffled_songs_path(:json) : songs_path(:json)
     render layout: false
   end
 

data/mix-rails-songs/app/views/songs/player.haml

@@ -28,7 +28,7 @@
 
       $("#jquery_jplayer_1").bind $.jPlayer.event.pause, (event, par2) ->
 
-  $.getJSON "#{songs_path(:json)}", (songs) =>
+  $.getJSON "#{@songs_api}", (songs) =>
     new jPlayerPlaylist(
       jPlayer: "#jquery_jplayer_1"
       cssSelectorAncestor: "#jp_container_1"

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

@@ -1,9 +1,10 @@
 Rails.application.routes.draw do
 
   localized do
-    resources :songs do 
+    resources :songs do
       collection do
         get :player
+        get :shuffled
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module MixRailsSongs
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

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

@@ -1,7 +1,7 @@
 module MixRailsVideos
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

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

@@ -1,7 +1,7 @@
 module MixRailsVouchers
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     TINY  = 0
     PRE   = nil
 

data/mix-rails-wireframe/.gitignore

@@ -0,0 +1,7 @@
+.bundle/
+log/*.log
+pkg/
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+spec/dummy/.sass-cache

data/mix-rails-wireframe/Gemfile

@@ -0,0 +1,17 @@
+source "http://rubygems.org"
+
+# Declare your gem's dependencies in mix-rails-wireframe.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# jquery-rails is used by the dummy application
+gem "jquery-rails"
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'