mix-rails-albums 0.23.0 → 0.23.1

data/app/models/concerns/album.rb

@@ -10,14 +10,14 @@ module Concerns::Album
     enumerize :status, in: [:published, :unpublished], default: :published, predicates: true
     friendly_id :title, use: :slugged
 
-    has_many :photos, :as => :related
+    has_many :photos, :as => :related, dependent: :destroy
     belongs_to :related, :polymorphic => true
 
     validation_for_title
     validation_for_date
 
 
-    scope :published, where(status: :published).joins(:photos).having("count(photos.id) > 1")
+    scope :published, includes(:photos).where(status: :published).having('COUNT(photos.id) > 0')
 
   end
 

data/app/uploaders/albums/image_uploader.rb

@@ -50,11 +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")
+        MiniMagick::Image.open("#{Rails.root}/public#{albums_watermark.image.url}", "png")
       else
         # We can read a file from system too.
         #MiniMagick::Image.open("#{Rails.root}/app/assets/images/watermarks/watermark.png", "png")

data/config/locales/albums.pt-BR.yml

@@ -3,8 +3,8 @@ pt-BR:
     albums: 'albuns'
     photos: 'fotos'
   will_paginate:
-    previous_label: "<< admix"
-    next_label: "próximo >>"
+    previous_label: "anterior"
+    next_label: "próximo"
   albums:
     published_yes: 'Sim'
     published_no: 'Não'

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

@@ -2,7 +2,7 @@ module MixRailsAlbums
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 23
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-albums
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1145099264192215353
+      hash: -4085379778431430325
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1145099264192215353
+      hash: -4085379778431430325
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24