mix-rails 0.12.1 → 0.12.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (67) hide show
  1. data/MIX_RAILS_VERSION +1 -1
  2. data/admix/app/assets/javascripts/admix/application.js.coffee +17 -13
  3. data/admix/app/assets/stylesheets/admix/application.css +7 -1
  4. data/admix/app/controllers/admix/inherited_controller.rb +1 -1
  5. data/admix/lib/admix/version.rb +1 -1
  6. data/mix-rails-albums/app/assets/javascripts/admix/photos.js.erb +4 -17
  7. data/mix-rails-albums/app/assets/javascripts/{albums.js → application.js} +0 -0
  8. data/mix-rails-albums/app/assets/javascripts/backbone/application.js.coffee +12 -0
  9. data/mix-rails-albums/app/assets/javascripts/backbone/models/.gitkeep +0 -0
  10. data/mix-rails-albums/app/assets/javascripts/backbone/models/photo.js.coffee +39 -0
  11. data/mix-rails-albums/app/assets/javascripts/backbone/routers/.gitkeep +0 -0
  12. data/mix-rails-albums/app/assets/javascripts/backbone/routers/photos_router.js.coffee +36 -0
  13. data/mix-rails-albums/app/assets/javascripts/backbone/templates/.gitkeep +0 -0
  14. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/edit.jst.ejs +20 -0
  15. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/index.jst.ejs +15 -0
  16. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/modal.hamlc.erb +14 -0
  17. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/new.jst.ejs +20 -0
  18. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/photo.jst.ejs +6 -0
  19. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/show.jst.ejs +12 -0
  20. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb +16 -0
  21. data/mix-rails-albums/app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb +1 -0
  22. data/mix-rails-albums/app/assets/javascripts/backbone/views/.gitkeep +0 -0
  23. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/edit_view.js.coffee +24 -0
  24. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/index_view.js.coffee +20 -0
  25. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/new_view.js.coffee +37 -0
  26. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/photo_view.js.coffee +19 -0
  27. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/show_view.js.coffee +8 -0
  28. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee +30 -0
  29. data/mix-rails-albums/app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee +22 -0
  30. data/mix-rails-albums/app/assets/javascripts/collections/filelist.js +1 -0
  31. data/mix-rails-albums/app/assets/javascripts/models/fileitem.js +3 -0
  32. data/mix-rails-albums/app/assets/javascripts/photos/upload.js.coffee.erb +9 -0
  33. data/mix-rails-albums/app/assets/javascripts/routers/photo_router.js.coffee.erb +7 -0
  34. data/mix-rails-albums/app/assets/javascripts/templates/photo_modal_edit.hamlc.erb +14 -0
  35. data/mix-rails-albums/app/assets/javascripts/templates/photo_view.hamlc.erb +1 -1
  36. data/mix-rails-albums/app/assets/javascripts/views/filelistview.js +2 -0
  37. data/mix-rails-albums/app/assets/javascripts/views/fileview.js +6 -1
  38. data/mix-rails-albums/app/assets/javascripts/views/photo_modal_view.js.coffee +25 -0
  39. data/mix-rails-albums/app/models/photo.rb +2 -2
  40. data/mix-rails-albums/app/views/admix/photos/_upload.html.haml +2 -2
  41. data/mix-rails-albums/config/routes.rb +5 -1
  42. data/mix-rails-albums/lib/mix-rails-albums.rb +1 -1
  43. data/mix-rails-albums/lib/mix-rails-albums/version.rb +1 -1
  44. data/mix-rails-albums/script/rails +1 -1
  45. data/mix-rails-auth/app/models/ability.rb +1 -1
  46. data/mix-rails-auth/lib/mix-rails-auth/version.rb +1 -1
  47. data/mix-rails-core/Gemfile +2 -0
  48. data/mix-rails-core/config/initializers/mongoid.rb +3 -0
  49. data/mix-rails-core/lib/mix-rails-core.rb +4 -2
  50. data/mix-rails-core/lib/{mix-rails-core → mix-rails}/concerns/engine.rb +0 -0
  51. data/mix-rails-core/lib/{mix-rails-core → mix-rails}/engine.rb +0 -0
  52. data/mix-rails-core/lib/{mix-rails-core → mix-rails}/railtie.rb +0 -0
  53. data/mix-rails-core/lib/{mix-rails-core → mix-rails}/version.rb +1 -1
  54. data/mix-rails-core/mix-rails-core.gemspec +1 -0
  55. data/mix-rails-message-board/lib/mix-rails-message-board/version.rb +1 -1
  56. data/mix-rails-settings/lib/mix-rails-settings/version.rb +1 -1
  57. data/mix-rails-songs/lib/mix-rails-songs/version.rb +1 -1
  58. data/mix-rails-videos/lib/mix-rails-videos/version.rb +1 -1
  59. data/mix-rails-vouchers/lib/mix-rails-vouchers/version.rb +1 -1
  60. data/mix-rails-writer/lib/mix-rails-writer/version.rb +1 -1
  61. data/version.rb +1 -1
  62. metadata +56 -34
  63. data/admix/app/assets/javascripts/admix/backbone-min.js +0 -42
  64. data/admix/app/assets/javascripts/admix/underscore-min.js +0 -1
  65. data/mix-rails-albums/app/assets/javascripts/colorbox/jquery.colorbox-min.js +0 -4
  66. data/mix-rails-albums/app/assets/javascripts/photo_uploader.coffee +0 -2
  67. data/mix-rails-core/app/assets/javascripts/underscore.js +0 -1221
@@ -0,0 +1,8 @@
1
+ Application.Views.Photos ||= {}
2
+
3
+ class Application.Views.Photos.ShowView extends Backbone.View
4
+ template: JST["backbone/templates/photos/show"]
5
+
6
+ render: ->
7
+ @$el.html(@template(@model.toJSON() ))
8
+ return this
@@ -0,0 +1,30 @@
1
+ Application.Views.Photos ||= {}
2
+
3
+ class Application.Views.Photos.PhotoView extends Backbone.View
4
+ template: JST["backbone/templates/photos/thumbnail"]
5
+
6
+ events:
7
+ "click .destroy" : "destroy"
8
+ "click .photo-link": "photo_link",
9
+
10
+ tagName: "li"
11
+ className: 'span2'
12
+
13
+ initialize: ->
14
+ @model.on "change", @render, this
15
+ @model.on "uploadCompleted", @removeProgressBar, this
16
+
17
+ removeProgressBar: ->
18
+ @$el.find(".progress").fadeOut() unless @$el is undefined
19
+
20
+ destroy: () ->
21
+ @model.destroy()
22
+ this.remove()
23
+
24
+ return false
25
+
26
+ photo_link: () ->
27
+
28
+ render: ->
29
+ @$el.html(@template(@model.toJSON() ))
30
+ return this
@@ -0,0 +1,22 @@
1
+ Application.Views.Photos ||= {}
2
+
3
+ class Application.Views.Photos.UploadIndexView extends Backbone.View
4
+ template: JST["backbone/templates/photos/upload_index"]
5
+ tagName: 'ul'
6
+ className: 'thumbnails'
7
+
8
+ initialize: () ->
9
+ @options.photos.bind('reset', @addAll)
10
+
11
+ addAll: () =>
12
+ @options.photos.each(@addOne)
13
+
14
+ addOne: (photo) =>
15
+ view = new Application.Views.Photos.PhotoView({model : photo})
16
+ @$(".photos-container").append(view.render().el)
17
+
18
+ render: =>
19
+ @$el.html(@template(photos: @options.photos.toJSON() ))
20
+ @addAll()
21
+
22
+ return this
@@ -1,4 +1,5 @@
1
1
  var FileList = Backbone.Collection.extend({
2
+ name: 'photos',
2
3
  initialize: function(){
3
4
 
4
5
  }
@@ -1,4 +1,7 @@
1
1
  var FileItem = Backbone.Model.extend({
2
+ name: 'photo',
3
+ url: 'photos',
4
+ idAttribute: '_id',
2
5
  defaults: {
3
6
  progress:0
4
7
  },
@@ -0,0 +1,9 @@
1
+ #= require ../backbone/application
2
+ #= require_self
3
+
4
+ <% url = Rails.application.routes.url_helpers %>
5
+
6
+ $ ->
7
+ $.getJSON $("#photos").data('url'),(json) ->
8
+ new Application.Routers.PhotosRouter(photos: json)
9
+ Backbone.history.start()
@@ -0,0 +1,7 @@
1
+ class window.PhotoRouter extends Backbone.Router
2
+ routes:
3
+ ":photo_id/ajax_edit": "ajax_edit"
4
+
5
+ ajax_edit: (photo_id) ->
6
+ console.log "Editando foto #{photo_id}"
7
+ $("#photo-modal-#{photo_id}").modal()
@@ -0,0 +1,14 @@
1
+ .modal.hide.fade.admix-photo-modal{id: "photo-modal-#{@id}"}
2
+ .modal-header
3
+ %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
4
+ %h3 Detalhes da foto
5
+ .modal-body
6
+ .edit-area.pull-right
7
+ %textarea.span5{id: "input_photo_description_#{@id}",placeholder: 'Adicione uma descrição para esta foto.'}
8
+ #{@description}
9
+ .photo
10
+ %img{src: @image.medium.url}
11
+ %p One fine body…
12
+ .modal-footer
13
+ %a.btn{href:"#", "data-dismiss": "modal"} Cancelar
14
+ %a.btn.btn-primary.save{:href => "#"} Salvar mudanças
@@ -4,7 +4,7 @@
4
4
  %a.link-popover{"data-content" => "<i class=icon-edit></i> Edit"}
5
5
  .loading-file
6
6
  - if @image.url
7
- %a.fancybox{href: ROOT_PATH + @image.medium.url, rel: 'photo-album'}
7
+ %a.photo-link{href: "#"}
8
8
  %img{src: ROOT_PATH + @image.thumb.url}
9
9
  - else
10
10
  %img{src: "http://placehold.it/130x90&text=Carregando"}
@@ -9,7 +9,9 @@ var FileListView = Backbone.View.extend({
9
9
  },
10
10
  addOne: function(fileItem){
11
11
  var fileView = new FileView({model: fileItem});
12
+ var photoModalView = new PhotoModalView({model: fileItem});
12
13
  this.$el.append(fileView.render().el);
14
+ this.$el.append(photoModalView.render().el);
13
15
  }
14
16
 
15
17
  });
@@ -2,7 +2,8 @@ var FileView = Backbone.View.extend({
2
2
  tagName: 'li',
3
3
  className: 'span2',
4
4
  events: {
5
- "click .delete": "delete"
5
+ "click .delete": "delete",
6
+ "click .photo-link": "photo_link",
6
7
  },
7
8
  initialize: function(){
8
9
  this.template = JST['photo_view']
@@ -30,5 +31,9 @@ var FileView = Backbone.View.extend({
30
31
  }
31
32
  });
32
33
  this.$el.fadeOut();
34
+ },
35
+ photo_link: function(e) {
36
+ e.preventDefault();
37
+ Backbone.history.navigate(":photo_id/ajax_edit".replace(':photo_id', this.model.get('id')), {trigger: true});
33
38
  }
34
39
  });
@@ -0,0 +1,25 @@
1
+ class window.PhotoModalView extends Backbone.View
2
+ tagName: "div"
3
+ #className: "span2"
4
+ events:
5
+ "click .save": "save_changes"
6
+
7
+ initialize: ->
8
+ @template = JST["photo_modal_edit"]
9
+ @model.on "change", @render, this
10
+
11
+ render: ->
12
+ data = _.defaults(@model.attributes,
13
+ progress: null
14
+ id: null
15
+ title: null
16
+ )
17
+ html = @template(@model.attributes)
18
+ $(@el).html html
19
+ this
20
+
21
+ save_changes: (e) ->
22
+ e.preventDefault()
23
+ description = $("#input_photo_description_#{@model.get('id')}").val()
24
+ @model.set(description: description)
25
+ @model.save()
@@ -3,9 +3,9 @@ class Photo
3
3
  include Mongoid::Document
4
4
  include Mongoid::Timestamps
5
5
 
6
- attr_accessible :image, :image_cache
6
+ attr_accessible :description, :image, :image_cache
7
7
 
8
- field :legend
8
+ field :description
9
9
 
10
10
  embedded_in :album
11
11
 
@@ -1,5 +1,5 @@
1
1
  - content_for :javascripts do
2
- = javascript_include_tag 'admix/photos'
2
+ = javascript_include_tag 'photos/upload'
3
3
 
4
4
  %h3 Upload de fotos
5
5
  #upload-buttons{:style => "padding: 20px;"}
@@ -14,4 +14,4 @@
14
14
  %a.btn.btn-primary.btn-upload{:onclick => "jQuery('#uploaderZip').click();"}= t('photos.btn.upload_zip')
15
15
 
16
16
  #fileZip
17
- %ul#files.thumbnails{'data-url' => admix_album_photos_path(defined?(parent) ? parent : resource, format: :json)}
17
+ %ul#photos.thumbnails{'data-url' => admix_album_photos_path(defined?(parent) ? parent : resource)}
@@ -6,7 +6,11 @@ Rails.application.routes.draw do
6
6
 
7
7
  scope Admix::namespace_path, as: :admix, module: :admix do
8
8
  resources :albums do
9
- resources :photos
9
+ resources :photos do
10
+ member do
11
+ get :edit_ajax
12
+ end
13
+ end
10
14
  end
11
15
  end
12
16
 
@@ -6,5 +6,5 @@ require "mini_magick"
6
6
 
7
7
  require "haml_coffee_assets"
8
8
 
9
- module Albums
9
+ module MixRailsAlbums
10
10
  end
@@ -2,7 +2,7 @@ module MixRailsAlbums
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -2,7 +2,7 @@
2
2
  # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
3
3
 
4
4
  ENGINE_ROOT = File.expand_path('../..', __FILE__)
5
- ENGINE_PATH = File.expand_path('../../lib/albums/engine', __FILE__)
5
+ ENGINE_PATH = File.expand_path('../../lib/mix-rails-albums/engine', __FILE__)
6
6
 
7
7
  require 'rails/all'
8
8
  require 'rails/engine/commands'
@@ -5,7 +5,7 @@ class Ability
5
5
  # Define abilities for the passed in user here. For example:
6
6
  #
7
7
  user ||= User.new # guest user (not logged in)
8
- if user.is?(:admin)
8
+ if true #user.is?(:admin)
9
9
  can :manage, :all
10
10
  else
11
11
  can :read, :all
@@ -2,7 +2,7 @@ module MixRailsAuth
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -35,6 +35,8 @@ gem 'will_paginate_mongoid'
35
35
  gem 'coffee-script'
36
36
  #gem 'sass-rails'
37
37
 
38
+ gem 'rails-backbone'
39
+
38
40
  group :test do
39
41
  gem 'cucumber-rails'
40
42
  gem 'capybara'
@@ -0,0 +1,3 @@
1
+ puts "==================================================="
2
+ #Mongoid.include_root_in_json = false
3
+ puts "==================================================="
@@ -1,7 +1,7 @@
1
- require 'mix-rails-core/railtie' if defined?(Rails)
1
+ require 'mix-rails/railtie' if defined?(Rails)
2
2
 
3
3
 
4
- require 'mix-rails-core/engine'
4
+ require 'mix-rails/engine'
5
5
 
6
6
  require 'enumerize'
7
7
 
@@ -36,5 +36,7 @@ require 'haml_coffee_assets'
36
36
  require 'mail_form'
37
37
  require 'simple_form'
38
38
 
39
+ require 'rails-backbone'
40
+
39
41
  module MixRailsCore
40
42
  end
@@ -2,7 +2,7 @@ module MixRailsCore
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
52
52
 
53
53
  s.add_dependency "coffee-script"
54
54
  s.add_dependency "coffee-filter"
55
+ s.add_dependency "rails-backbone"
55
56
  #s.add_dependency "sass-rails"
56
57
 
57
58
  end
@@ -2,7 +2,7 @@ module MixRailsMessageBoard
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -2,7 +2,7 @@ module MixRailsSettings
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -2,7 +2,7 @@ module MixRailsSongs
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -2,7 +2,7 @@ module MixRailsVideos
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -2,7 +2,7 @@ module MixRailsVouchers
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
@@ -2,7 +2,7 @@ module MixRailsWriter
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
data/version.rb CHANGED
@@ -2,7 +2,7 @@ module MixRailsCore
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 12
5
- TINY = 1
5
+ TINY = 2
6
6
  PRE = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mix-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.1
4
+ version: 0.12.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-23 00:00:00.000000000 Z
12
+ date: 2013-01-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mix-rails-core
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.12.1
21
+ version: 0.12.2
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 0.12.1
29
+ version: 0.12.2
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: mix-rails-auth
32
32
  requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - '='
36
36
  - !ruby/object:Gem::Version
37
- version: 0.12.1
37
+ version: 0.12.2
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - '='
44
44
  - !ruby/object:Gem::Version
45
- version: 0.12.1
45
+ version: 0.12.2
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: admix
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: 0.12.1
53
+ version: 0.12.2
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.12.1
61
+ version: 0.12.2
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: mix-rails-settings
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - '='
68
68
  - !ruby/object:Gem::Version
69
- version: 0.12.1
69
+ version: 0.12.2
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.12.1
77
+ version: 0.12.2
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: mix-rails-writer
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - '='
84
84
  - !ruby/object:Gem::Version
85
- version: 0.12.1
85
+ version: 0.12.2
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - '='
92
92
  - !ruby/object:Gem::Version
93
- version: 0.12.1
93
+ version: 0.12.2
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: mix-rails-albums
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - '='
100
100
  - !ruby/object:Gem::Version
101
- version: 0.12.1
101
+ version: 0.12.2
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - '='
108
108
  - !ruby/object:Gem::Version
109
- version: 0.12.1
109
+ version: 0.12.2
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: mix-rails-videos
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - '='
116
116
  - !ruby/object:Gem::Version
117
- version: 0.12.1
117
+ version: 0.12.2
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - '='
124
124
  - !ruby/object:Gem::Version
125
- version: 0.12.1
125
+ version: 0.12.2
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: mix-rails-message-board
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - '='
132
132
  - !ruby/object:Gem::Version
133
- version: 0.12.1
133
+ version: 0.12.2
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - '='
140
140
  - !ruby/object:Gem::Version
141
- version: 0.12.1
141
+ version: 0.12.2
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: mix-rails-vouchers
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
146
146
  requirements:
147
147
  - - '='
148
148
  - !ruby/object:Gem::Version
149
- version: 0.12.1
149
+ version: 0.12.2
150
150
  type: :runtime
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
154
154
  requirements:
155
155
  - - '='
156
156
  - !ruby/object:Gem::Version
157
- version: 0.12.1
157
+ version: 0.12.2
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: mix-rails-songs
160
160
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - '='
164
164
  - !ruby/object:Gem::Version
165
- version: 0.12.1
165
+ version: 0.12.2
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
170
170
  requirements:
171
171
  - - '='
172
172
  - !ruby/object:Gem::Version
173
- version: 0.12.1
173
+ version: 0.12.2
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: fancybox-rails
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -1224,12 +1224,10 @@ files:
1224
1224
  - admix/app/assets/images/admix/page_edit.png
1225
1225
  - admix/app/assets/images/admix/zoom.png
1226
1226
  - admix/app/assets/javascripts/admix/application.js.coffee
1227
- - admix/app/assets/javascripts/admix/backbone-min.js
1228
1227
  - admix/app/assets/javascripts/admix/bootstrap.js
1229
1228
  - admix/app/assets/javascripts/admix/dates.js.coffee
1230
1229
  - admix/app/assets/javascripts/admix/nicedit_applier.js.coffee
1231
1230
  - admix/app/assets/javascripts/admix/tipsy_init.js
1232
- - admix/app/assets/javascripts/admix/underscore-min.js
1233
1231
  - admix/app/assets/nicedit/nicEdit.js
1234
1232
  - admix/app/assets/nicedit/nicEditorIcons.gif
1235
1233
  - admix/app/assets/stylesheets/admix/application.css
@@ -1349,24 +1347,48 @@ files:
1349
1347
  - mix-rails-albums/app/assets/images/colorbox/loading_background.png
1350
1348
  - mix-rails-albums/app/assets/images/colorbox/overlay.png
1351
1349
  - mix-rails-albums/app/assets/javascripts/admix/photos.js.erb
1352
- - mix-rails-albums/app/assets/javascripts/albums.js
1353
1350
  - mix-rails-albums/app/assets/javascripts/albums/.gitkeep
1354
1351
  - mix-rails-albums/app/assets/javascripts/albums/jquery.jcarousel.min.js
1355
1352
  - mix-rails-albums/app/assets/javascripts/albums/show.js.coffee
1353
+ - mix-rails-albums/app/assets/javascripts/application.js
1354
+ - mix-rails-albums/app/assets/javascripts/backbone/application.js.coffee
1355
+ - mix-rails-albums/app/assets/javascripts/backbone/models/.gitkeep
1356
+ - mix-rails-albums/app/assets/javascripts/backbone/models/photo.js.coffee
1357
+ - mix-rails-albums/app/assets/javascripts/backbone/routers/.gitkeep
1358
+ - mix-rails-albums/app/assets/javascripts/backbone/routers/photos_router.js.coffee
1359
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/.gitkeep
1360
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/edit.jst.ejs
1361
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/index.jst.ejs
1362
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/modal.hamlc.erb
1363
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/new.jst.ejs
1364
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/photo.jst.ejs
1365
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/show.jst.ejs
1366
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/thumbnail.hamlc.erb
1367
+ - mix-rails-albums/app/assets/javascripts/backbone/templates/photos/upload_index.hamlc.erb
1368
+ - mix-rails-albums/app/assets/javascripts/backbone/views/.gitkeep
1369
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/edit_view.js.coffee
1370
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/index_view.js.coffee
1371
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/new_view.js.coffee
1372
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/photo_view.js.coffee
1373
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/show_view.js.coffee
1374
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/thumbnail_view.js.coffee
1375
+ - mix-rails-albums/app/assets/javascripts/backbone/views/photos/upload_index_view.js.coffee
1356
1376
  - mix-rails-albums/app/assets/javascripts/collections/.gitkeep
1357
1377
  - mix-rails-albums/app/assets/javascripts/collections/filelist.js
1358
- - mix-rails-albums/app/assets/javascripts/colorbox/jquery.colorbox-min.js
1359
1378
  - mix-rails-albums/app/assets/javascripts/models/.gitkeep
1360
1379
  - mix-rails-albums/app/assets/javascripts/models/fileitem.js
1361
1380
  - mix-rails-albums/app/assets/javascripts/models/filezip.js
1362
- - mix-rails-albums/app/assets/javascripts/photo_uploader.coffee
1381
+ - mix-rails-albums/app/assets/javascripts/photos/upload.js.coffee.erb
1363
1382
  - mix-rails-albums/app/assets/javascripts/routers/.gitkeep
1383
+ - mix-rails-albums/app/assets/javascripts/routers/photo_router.js.coffee.erb
1364
1384
  - mix-rails-albums/app/assets/javascripts/templates/.gitkeep
1385
+ - mix-rails-albums/app/assets/javascripts/templates/photo_modal_edit.hamlc.erb
1365
1386
  - mix-rails-albums/app/assets/javascripts/templates/photo_view.hamlc.erb
1366
1387
  - mix-rails-albums/app/assets/javascripts/views/.gitkeep
1367
1388
  - mix-rails-albums/app/assets/javascripts/views/filelistview.js
1368
1389
  - mix-rails-albums/app/assets/javascripts/views/fileview.js
1369
1390
  - mix-rails-albums/app/assets/javascripts/views/filezipview.js
1391
+ - mix-rails-albums/app/assets/javascripts/views/photo_modal_view.js.coffee
1370
1392
  - mix-rails-albums/app/assets/stylesheets/albums/.gitkeep
1371
1393
  - mix-rails-albums/app/assets/stylesheets/colorbox/colorbox.css.scss
1372
1394
  - mix-rails-albums/app/assets/stylesheets/skins/ie7/credits.txt
@@ -1551,7 +1573,6 @@ files:
1551
1573
  - mix-rails-core/app/assets/javascripts/jquery.jplayer/popcorn/popcorn.jplayer.js
1552
1574
  - mix-rails-core/app/assets/javascripts/jquery/jquery.livequery.js
1553
1575
  - mix-rails-core/app/assets/javascripts/jquery/jquery.maskedinput-1.3.min.js
1554
- - mix-rails-core/app/assets/javascripts/underscore.js
1555
1576
  - mix-rails-core/app/assets/stylesheets/colorbox.css
1556
1577
  - mix-rails-core/app/assets/stylesheets/colorbox/colorbox.css.erb
1557
1578
  - mix-rails-core/app/assets/stylesheets/core/.gitkeep
@@ -1566,13 +1587,14 @@ files:
1566
1587
  - mix-rails-core/app/models/youtube_validator.rb
1567
1588
  - mix-rails-core/app/views/.gitkeep
1568
1589
  - mix-rails-core/app/views/application/_title.html.haml
1590
+ - mix-rails-core/config/initializers/mongoid.rb
1569
1591
  - mix-rails-core/config/locales/core.pt-BR.yml
1570
1592
  - mix-rails-core/config/routes.rb
1571
1593
  - mix-rails-core/lib/mix-rails-core.rb
1572
- - mix-rails-core/lib/mix-rails-core/concerns/engine.rb
1573
- - mix-rails-core/lib/mix-rails-core/engine.rb
1574
- - mix-rails-core/lib/mix-rails-core/railtie.rb
1575
- - mix-rails-core/lib/mix-rails-core/version.rb
1594
+ - mix-rails-core/lib/mix-rails/concerns/engine.rb
1595
+ - mix-rails-core/lib/mix-rails/engine.rb
1596
+ - mix-rails-core/lib/mix-rails/railtie.rb
1597
+ - mix-rails-core/lib/mix-rails/version.rb
1576
1598
  - mix-rails-core/lib/tasks/mix-rails_tasks.rake
1577
1599
  - mix-rails-core/mix-rails-core.gemspec
1578
1600
  - mix-rails-core/script/rails
@@ -2022,7 +2044,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
2022
2044
  version: '0'
2023
2045
  segments:
2024
2046
  - 0
2025
- hash: -589095447981552963
2047
+ hash: 1312724239574122502
2026
2048
  required_rubygems_version: !ruby/object:Gem::Requirement
2027
2049
  none: false
2028
2050
  requirements:
@@ -2031,7 +2053,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
2031
2053
  version: '0'
2032
2054
  segments:
2033
2055
  - 0
2034
- hash: -589095447981552963
2056
+ hash: 1312724239574122502
2035
2057
  requirements: []
2036
2058
  rubyforge_project:
2037
2059
  rubygems_version: 1.8.24