ecm_pictures2 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2eb95b79a43b2c784d1296c5013cc9c4775a7e
-  data.tar.gz: a81d19f9a09e294d0015d74b343d4626176aafed
+  metadata.gz: 29f38d24ca296c73767ef8e1fb1f3a3ad59460bc
+  data.tar.gz: c0a86295ed72ed2b2e2b1f4b1321654ea2c67e6f
 SHA512:
-  metadata.gz: 12f30ed06ed70686e7ac9ee6da41f11b7ad2a278f83604f32945a26bfefad9b4905894efa2dfd39a052a6f4811235ae11c3b150a4abfc13a1e356e838f1906ff
-  data.tar.gz: f8205fa0b4fd60bfc370f516882409e2ad0b51cd6968f725b6ea463104b1789138cdcf2790595637fe9858f9459a8127be8aae2425ac41dbf8c18b3e1e67baa5
+  metadata.gz: b6348e2824683d32724e4ef3151dc69f0d7136662088ea759a1543407a4852490da9a13dd7346ceb0346a8a617883665e71c812f03db99e5721da8cb62cc6a2f
+  data.tar.gz: 56392d7231dc84fab7e9390decfd8a7b5384884063c94f9a78f518d7a8e2bebdf71b4a0c43dfb95bc152b2547c4a63f178e9d2618e9ef363fbe28b636c1468f9

data/app/controllers/ecm/pictures/galleries_controller.rb

@@ -15,11 +15,11 @@ module Ecm
       end
 
       def load_collection
-        @collection = resource_class.all
+        @collection = resource_class.published.all
       end
 
       def load_resource
-        @resource = resource_class.find(params[:id])
+        @resource = resource_class.published.find(params[:id])
       end
     end
   end

data/app/controllers/ecm/pictures/pictures_controller.rb

@@ -15,11 +15,11 @@ module Ecm
       end
 
       def load_collection
-        @collection = resource_class.all
+        @collection = resource_class.published.all
       end
 
       def load_resource
-        @resource = resource_class.find(params[:id])
+        @resource = resource_class.published.find(params[:id])
       end
     end
   end

data/app/helpers/ecm/pictures_helper.rb

@@ -10,7 +10,7 @@ module Ecm::PicturesHelper
   def render_picture_gallery(name, options = {})
     options = { preview_style: :thumb }.merge(options)
 
-    gallery = Ecm::Pictures::Gallery.where(name: name.to_s).first
+    gallery = Ecm::Pictures::Gallery.published.where(name: name.to_s).first
 
     if gallery.nil?
       content_tag(:div, class: 'warning missing gallery') do
@@ -53,7 +53,7 @@ module Ecm::PicturesHelper
     img_css_class = options.delete(:img_css_class)
     plain         = options.delete(:plain)
 
-    picture = Ecm::Pictures::Picture.where(name: name.to_s).first
+    picture = Ecm::Pictures::Picture.published.where(name: name.to_s).first
 
     if picture.nil?
       return content_tag(:div, class: 'warning missing picture') do

data/app/models/ecm/pictures/attached_picture.rb

@@ -2,11 +2,11 @@ module Ecm
   module Pictures
     class AttachedPicture < ActiveRecord::Base
       # associations
-      belongs_to :picture, foreign_key: 'ecm_pictures_picture_id'
+      belongs_to :picture
       belongs_to :pictureable, polymorphic: true
 
       # validations
-      validates :picture, :pictureable, presence: true
+      validates :picture, :pictureable, presence: true if Rails.version < '5.0.0'
     end
   end
 end

data/app/models/ecm/pictures/gallery.rb

@@ -3,7 +3,11 @@ module Ecm
     class Gallery < ActiveRecord::Base
       # associations
       has_many :pictures, -> { order :position },
-               dependent: :destroy
+               dependent: :destroy do
+        def published
+          where(proxy_association.reflection.klass.arel_table[:published_at].not_eq(nil))
+        end
+      end
 
       # attributes
       accepts_nested_attributes_for :pictures, allow_destroy: true
@@ -12,6 +16,9 @@ module Ecm
       acts_as_list
       default_scope { order(:position) }
 
+      include ActsAsPublished::ActiveRecord
+      acts_as_published
+
       # acts as markup
       acts_as_markup language: :variable, columns: [:description]
 
@@ -51,7 +58,7 @@ module Ecm
       end
 
       def preview_picture
-        pictures.first
+        pictures.published.first
       end
 
       private

data/app/models/ecm/pictures/picture.rb

@@ -11,6 +11,9 @@ module Ecm
       # acts as markup
       acts_as_markup language: :variable, columns: [:description, :description]
 
+      include ActsAsPublished::ActiveRecord
+      acts_as_published
+
       # callbacks
       after_initialize :set_defaults
       before_validation :set_name_from_image_file_name, if: proc { |p| (p.name.nil? || p.name.empty?) }

data/app/views/ecm/pictures/galleries/index.haml

@@ -16,7 +16,7 @@
             = t('.more')
 - when :media_object
   - @collection.each do |resource|
-    = bootstrap_media_object(image_options: { src: resource.preview_picture&.image&.url(Ecm::Pictures.thumbnail_paperclip_style) }) do
+    = bootstrap_media_object(container_id: dom_id(resource), image_options: { src: resource.preview_picture&.image&.url(Ecm::Pictures.thumbnail_paperclip_style) }) do
       %h4= resource.name
       - if Ecm::Pictures::Configuration.prevent_textile_rendering_in_html
         %notextile

data/app/views/ecm/pictures/galleries/show.haml

@@ -1,8 +1,8 @@
 %h1= @resource.name
 
 .row
-  - @resource.pictures.each do |picture|
-    = bootstrap_thumbnail(container_classes: Ecm::Pictures.thumbnail_container_css_classes, image_options: { src: picture.image.url(Ecm::Pictures.thumbnail_paperclip_style) }, link_options: { href: "#{picture.image.url}#{File.extname(picture.image_file_name).downcase}", :'data-gallery' => "gallery" }) do
+  - @resource.pictures.published.each do |picture|
+    = bootstrap_thumbnail(container_id: dom_id(picture), container_classes: Ecm::Pictures.thumbnail_container_css_classes, image_options: { src: picture.image.url(Ecm::Pictures.thumbnail_paperclip_style) }, link_options: { href: "#{picture.image.url}#{File.extname(picture.image_file_name).downcase}", :'data-gallery' => "gallery" }) do
       %h3= picture.name
       - if Ecm::Pictures::Configuration.prevent_textile_rendering_in_html
         %notextile

data/config/locales/ecm.pictures.attached_picture.de.yml

@@ -6,8 +6,12 @@ de:
         other: Verknüpfte Bilder
     attributes:
       ecm/pictures/attached_picture:
+        id: ID
         picture: Bild
+        picture_id: Bild
         pictureable: Verknüpft mit
+        pictureable_id: Verknüpft mit
+        pictureable_type: Verknüofungstyp
         created_at: Erstellt am
         updated_at: Aktualisiert am
   routes:

data/config/locales/ecm.pictures.attached_picture.en.yml

@@ -6,8 +6,12 @@ en:
         other: attached pictures
     attributes:
       ecm/pictures/attached_picture:
+        id: ID
         picture: picture
+        picture_id: picture
         pictureable: attached to
+        pictureable_id: attached to
+        pictureable_type: attached to type
         created_at: created at
         updated_at: updated at
   routes:

data/config/locales/ecm.pictures.gallery.de.yml

@@ -6,7 +6,7 @@ de:
         other: Bildgalerien
     attributes:
       ecm/pictures/gallery:
-        created_at: Erstellt am
+        id: ID
         description: Beschreibung
         display_code_for_erb: Anzeigecode (erb)
         link_images: Bilder verlinken
@@ -15,4 +15,7 @@ de:
         pictures: Bilder
         pictures_count: Bilder
         position: Position
+        published_at: Veröffentlicht am
+        slug: Freundliche ID
+        created_at: Erstellt am
         updated_at: Aktualisiert am

data/config/locales/ecm.pictures.gallery.en.yml

@@ -6,7 +6,7 @@ en:
         other: picture galleries
     attributes:
       ecm/pictures/gallery:
-        created_at: created at
+        id: ID
         description: description
         display_code_for_erb: display code (erb)
         link_images: link images
@@ -15,4 +15,7 @@ en:
         pictures: pictures
         pictures_count: pictures
         position: position
+        published_at: published at
+        slug: slug
+        created_at: created at
         updated_at: updated at

data/config/locales/ecm.pictures.picture.de.yml

@@ -6,20 +6,26 @@ de:
         other: Bilder
     attributes:
       ecm/pictures/picture:
-        created_at: Erstellt am
+        id: ID
         description: Beschreibung
         display_code: Anzeigecode
         display_code_for_erb: Anzeigecode (erb)
         display_code_for_textile: Anzeigecode (textile)
         image: Datei
+        image_content_type: Dateityp
         image_file: Datei
         image_file_name: Dateiname
         image_file_size: Größe
         image_fingerprint: Fingerabdruck
+        image_updated_at: Datei aktualisiert am
         markup_language: Markup Sprache
         name: Name
         gallery: Galerie
+        gallery_id: Galerie
         position: Position
         preview_picture: Vorschau
+        published_at: Veröffentlicht am
+        slug: Freundliche ID
         thumbnail: Vorschau
+        created_at: Erstellt am
         updated_at: Aktualisiert am

data/config/locales/ecm.pictures.picture.en.yml

@@ -6,19 +6,26 @@ en:
         other: pictures
     attributes:
       ecm/pictures/picture:
-        created_at: created at
+        id: ID
         description: description
         display_code: display code
         display_code_for_erb: display code (erb)
         display_code_for_textile: display code (textile)
+        image: image
+        image_content_type: image type
         image_file: image
         image_file_name: image filename
         image_file_size: image size
         image_fingerprint: image fingerprint
+        image_updated_at: image updated at
         markup_language: markup language
         name: name
         gallery: picture gallery
+        gallery_id: picture gallery
         position: position
         preview_picture: preview
+        published_at: published at
+        slug: slug
         thumbnail: thumbnail
+        created_at: created at
         updated_at: updated at

data/db/migrate/20171002221137_add_published_at_to_ecm_pictures_galleries.rb

@@ -0,0 +1,5 @@
+class AddPublishedAtToEcmPicturesGalleries < ActiveRecord::Migration[4.2]
+  def change
+    add_column :ecm_pictures_galleries, :published_at, :timestamp
+  end
+end

data/db/migrate/20171002232958_add_published_at_to_ecm_pictures_pictures.rb

@@ -0,0 +1,5 @@
+class AddPublishedAtToEcmPicturesPictures < ActiveRecord::Migration[4.2]
+  def change
+    add_column :ecm_pictures_pictures, :published_at, :timestamp
+  end
+end

data/db/migrate/20180325205124_rename_ecm_pictures_picture_id_on_ecm_pictures_attached_pictures.rb

@@ -0,0 +1,5 @@
+class RenameEcmPicturesPictureIdOnEcmPicturesAttachedPictures < ActiveRecord::Migration[4.2]
+  def change
+    rename_column :ecm_pictures_attached_pictures, :ecm_pictures_picture_id, :picture_id
+  end
+end

data/lib/ecm/pictures/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Pictures
-    VERSION = '5.1.0'
+    VERSION = '6.0.0'.freeze
   end
 end

data/lib/ecm_pictures2.rb

@@ -1,5 +1,6 @@
 require 'acts_as_list'
 require 'acts_as_markup'
+require 'acts_as_published'
 require 'friendly_id'
 require 'haml-rails'
 require 'paperclip'

data/lib/generators/ecm/pictures/install/templates/initializer.rb

@@ -44,4 +44,10 @@ Ecm::Pictures.configure do |config|
   # Default: config.render_gallery_index_as = :media_object
   #
   config.render_gallery_index_as = :media_object
+
+  # Name of the factory to use to attach attached pictures to.
+  #
+  # default: config.pictureable_factory_name = :post
+  #
+  config.pictureable_factory_name = :post
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_published
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -386,6 +400,9 @@ files:
 - db/migrate/003_create_ecm_pictures_attached_pictures.rb
 - db/migrate/20160626141629_rename_ecm_pictures_picture_galleries_to_ecm_pictures_galleries.rb
 - db/migrate/20160626143414_rename_ecm_pictures_pictures_picture_gallery_id_to_gallery_id.rb
+- db/migrate/20171002221137_add_published_at_to_ecm_pictures_galleries.rb
+- db/migrate/20171002232958_add_published_at_to_ecm_pictures_pictures.rb
+- db/migrate/20180325205124_rename_ecm_pictures_picture_id_on_ecm_pictures_attached_pictures.rb
 - lib/ecm/pictures/configuration.rb
 - lib/ecm/pictures/engine.rb
 - lib/ecm/pictures/version.rb