mix-rails-albums 0.22.0 → 0.23.0

data/app/assets/javascripts/backbone/models/photo.js.coffee

@@ -1,6 +1,5 @@
 class Application.Models.Photo extends Backbone.Model
   paramRoot: 'photo'
-  idAttribute: '_id'
   defaults:
     image: null
     description: ''

data/app/assets/javascripts/backbone/templates/photos/photo_modal_edit.hamlc.erb

@@ -1,10 +1,10 @@
-.modal.hide.fade.admix-photo-modal{id: "photo-modal-#{@_id}"}
+.modal.hide.fade.admix-photo-modal{id: "photo-modal-#{@id}"}
   .modal-header
     %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
     %h3 Detalhes da foto
   .modal-body
     .edit-area.pull-right
-      %textarea.span5{id: "input_photo_description_#{@_id}",placeholder: 'Adicione uma descrição para esta foto.'}
+      %textarea.span5{id: "input_photo_description_#{@id}",placeholder: 'Adicione uma descrição para esta foto.'}
         #{@description}
     .photo
       %img{src: @image.medium.url}

data/app/assets/javascripts/models/fileitem.js

@@ -1,7 +1,6 @@
 var FileItem = Backbone.Model.extend({
     name: 'photo',
     url: 'photos',
-    idAttribute: '_id',
     defaults: {
         progress:0
     },

data/app/models/admix/albums_datagrid.rb

@@ -6,7 +6,7 @@ class Admix::AlbumsDatagrid
 
 
   scope do
-    Album.desc(:date)
+    Album.order("date DESC")
   end
 
   filter :title, :string

data/app/models/admix/photos_datagrid.rb

@@ -3,7 +3,7 @@ class Admix::PhotosDatagrid
   include Datagrid
 
   scope do
-    Photo.desc(:date)
+    Photo
   end
 
   filter :name, :string

data/app/models/album.rb

@@ -1,3 +1,3 @@
-class Album
-  include MixRailsAlbums::Concerns::Models::Album
-end
+class Album < ActiveRecord::Base
+  include Concerns::Album
+end

data/app/models/concerns/album.rb

@@ -0,0 +1,36 @@
+module Concerns::Album
+  extend ActiveSupport::Concern
+
+  included do
+    extend Enumerize
+    extend FriendlyId
+
+    attr_accessible :date, :description, :status, :title
+
+    enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
+    friendly_id :title, use: :slugged
+
+    has_many :photos, :as => :related
+    belongs_to :related, :polymorphic => true
+
+    validation_for_title
+    validation_for_date
+
+
+    scope :published, where(status: :published).joins(:photos).having("count(photos.id) > 1")
+
+  end
+
+  module ClassMethods
+    
+    def validation_for_title
+      validates_presence_of :title
+    end
+
+    def validation_for_date
+      validates_presence_of :date
+    end
+
+  end
+
+end

data/app/models/photo.rb

@@ -1,12 +1,11 @@
-class Photo
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
+class Photo < ActiveRecord::Base
+  extend FriendlyId
 
-  field :description
+  attr_accessible :description, :image, :image_cache
   
-  embedded_in :album
+  friendly_id :description, use: :slugged
 
+  belongs_to :related, :polymorphic => true
+  
   mount_uploader :image, Albums::ImageUploader
-
-end
+end

data/app/uploaders/albums/image_uploader.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'carrierwave/processing/mini_magick'
-require 'mix-rails-core/gridfs'
 
 class Albums::ImageUploader < CarrierWave::Uploader::Base
 
@@ -13,13 +12,13 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
   include Sprockets::Helpers::IsolatedHelper
 
   # Choose what kind of storage to use for this uploader:
-  storage :grid_fs
+  
   # storage :fog
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    "system/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
   def cache_dir
@@ -51,6 +50,8 @@ class Albums::ImageUploader < CarrierWave::Uploader::Base
       
       albums_watermark = Setting.albums_watermark
       
+      #raise albums_watermark.image
+
       watermark_image = if albums_watermark
         gridfs_file = MixRailsCore::Gridfs::read_file(albums_watermark.image.url)
         MiniMagick::Image.read(gridfs_file, "png")

data/db/migrate/20130208020540_create_albums.rb

@@ -0,0 +1,17 @@
+class CreateAlbums < ActiveRecord::Migration
+  def change
+    create_table :albums do |t|
+      t.string :title
+      t.text :description
+      t.date :date
+      t.string :status
+      t.string :slug
+
+      t.references :related, polymorphic: true
+      t.timestamps
+    end
+    
+    add_index :albums, :slug, unique: true
+
+  end
+end

data/db/migrate/20130208021030_create_photos.rb

@@ -0,0 +1,15 @@
+class CreatePhotos < ActiveRecord::Migration
+  def change
+    create_table :photos do |t|
+      t.text :description
+      t.string :image
+      t.string :slug
+
+      t.references :related, polymorphic: true
+      t.timestamps
+    end
+    
+    add_index :photos, :slug, unique: true
+
+  end
+end

data/lib/mix-rails-albums.rb

@@ -1,9 +1,5 @@
 require "mix-rails-albums/engine"
-
-require "mongoid/railtie"
-require "carrierwave/mongoid"
 require "mini_magick"
-
 require "haml_coffee_assets"
 
 module MixRailsAlbums
@@ -11,6 +7,4 @@ module MixRailsAlbums
     module Models
     end
   end
-end
-
-require 'concerns/models/album'
+end

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

@@ -1,6 +1,11 @@
 module MixRailsAlbums
   class Engine < ::Rails::Engine
     
+    config.generators do |g|                                                               
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
+
     def navigation
       if defined? Admix
         Admix::Navigation::NavBar.post_menu do

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-albums
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,54 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.9
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: carrierwave-mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +130,7 @@ files:
 - app/models/admix/albums_datagrid.rb
 - app/models/album.rb
 - app/models/photo.rb
+- app/models/concerns/album.rb
 - app/views/admix/albums/_show.html.haml
 - app/views/admix/albums/_table_actions.html.haml
 - app/views/admix/albums/_form_fields.html.haml
@@ -192,9 +145,10 @@ files:
 - config/initializers/albums.rb
 - config/routes.rb
 - config/application.rb
+- db/migrate/20130208020540_create_albums.rb
+- db/migrate/20130208021030_create_photos.rb
 - lib/tasks/albums_tasks.rake
 - lib/mix-rails-albums.rb
-- lib/concerns/models/album.rb
 - lib/mix-rails-albums/version.rb
 - lib/mix-rails-albums/engine.rb
 - MIT-LICENSE
@@ -214,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3474028709906897679
+      hash: -1145099264192215353
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3474028709906897679
+      hash: -1145099264192215353
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/concerns/models/album.rb

@@ -1,43 +0,0 @@
-module MixRailsAlbums::Concerns::Models::Album
-  extend ActiveSupport::Concern
-
-  included do
-
-    include Mongoid::Document
-    include Mongoid::Timestamps
-    include Mongoid::Slug
-
-    extend Enumerize
-
-    field :title,         type: String
-    field :description,   type: String
-    field :date,          type: Date
-    field :status,        type: String
-    enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
-
-    validation_for_title
-    validation_for_date
-
-    slug :title, history: true do |current_object|
-      current_object.title.parameterize
-    end
-
-    embeds_many :photos, cascade_callbacks: true
-    
-    scope :published, where(status: :published, :photos.ne => nil, :photos.exists => true)
-
-  end
-
-  module ClassMethods
-    
-    def validation_for_title
-      validates_presence_of :title
-    end
-
-    def validation_for_date
-      validates_presence_of :date
-    end
-
-  end
-
-end