mix-rails-songs 0.15.0 → 0.16.0

data/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/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/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/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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-songs
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,21 +34,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/uploaders/songs/song_uploader.rb
+- app/views/admix/songs/_form_fields.html.haml
+- app/views/admix/songs/_table_actions.html.haml
+- app/views/admix/songs/_show.html.haml
+- app/views/songs/player.haml
 - app/controllers/admix/songs_controller.rb
 - app/controllers/songs_controller.rb
-- app/models/admix/songs_datagrid.rb
 - app/models/song.rb
-- app/views/admix/songs/_show.html.haml
-- app/views/admix/songs/_table_actions.html.haml
-- app/views/admix/songs/_form_fields.html.haml
-- app/views/songs/player.haml
-- config/locales/songs.pt-BR.yml
+- app/models/admix/songs_datagrid.rb
+- app/uploaders/songs/song_uploader.rb
 - config/routes.rb
+- config/locales/songs.pt-BR.yml
+- lib/mix-rails-songs.rb
 - lib/tasks/songs_tasks.rake
 - lib/mix-rails-songs/version.rb
 - lib/mix-rails-songs/engine.rb
-- lib/mix-rails-songs.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -66,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1008765679201104356
+      hash: 1995139474515889120
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1008765679201104356
+      hash: 1995139474515889120
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24