cmor_galleries 0.0.44.pre → 0.0.45.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa77ffc1c05f231d7a0aee00d04046080229fce084a947429a557bc30bba6a5
-  data.tar.gz: 79dc0c88f171c77bf69332219fffe95c2eee0584c78c613f5e22dbba5531f45a
+  metadata.gz: ecf4d3f2e0e19baa01e90bc4fde032320358b300ae782bbbc3d88837c459b9ad
+  data.tar.gz: fcd010ac6bc7ef206c7623458eef27d9109df22fd6a05d3f1ef9d7a519c14b86
 SHA512:
-  metadata.gz: b499055bc67cd3809fc55fb0d677a5cd4f661dab9cfcb179e02ab475797696697ca7ccb6463e3dd003ecd3dc06dde082d6e709b9e47f038144c3695647396c48
-  data.tar.gz: e70f11ec25bc55bc4395c705fe3abbb9795750281465b2b0560d32097257ee923b34aac2b7e9ce71e90971724a905d76d9e1dcc12324ca27a83a03f808378352
+  metadata.gz: a9fb8f4cea0490e06b6fca0be9a383ce53b06295c2eb8c32f190761de8605e5c487a1510c5a7f2d223fcf88f7146da2864f5bd38f084f7f9332f227b3ca3cd9b
+  data.tar.gz: ccb77c0f5ad8f2b4b991cc280c29198c3b91a119c1106faa56a18e3b2e5e7824343f52d4897aa532cd6fcca2536d794be22816cf8a746877451f01f3a14ef40e

data/app/controllers/cmor/galleries/picture_galleries_controller.rb

@@ -1,17 +1,21 @@
-module Cmor::Galleries
-  class PictureGalleriesController < ApplicationResourcesController
-    def self.resource_class
-      Cmor::Galleries::PictureGallery
-    end
+module Cmor
+  module Galleries
+    class PictureGalleriesController < ApplicationResourcesController
+      include Rao::ResourcesController::FriendlyIdConcern
 
-    private
+      def self.resource_class
+        Cmor::Galleries::PictureGallery
+      end
 
-    def load_collection_scope
-      super.published
-    end
+      private
+
+      def load_collection_scope
+        super.published
+      end
 
-    def load_resource_scope
-      super.published
+      def load_resource_scope
+        super.published
+      end
     end
   end
 end

data/app/models/cmor/galleries/picture_gallery.rb

@@ -1,14 +1,10 @@
 module Cmor
   module Galleries
     class PictureGallery < ApplicationRecord
-      include ActsAsPublished::ActiveRecord
+      include Cmor::Core::Model::CollectionConcern
 
       has_many_attached :assets
 
-      acts_as_published
-
-      validates :name, presence: true, uniqueness: true
-
       module PictureDetails
         extend ActiveSupport::Concern
 

data/config/locales/de.yml

@@ -18,12 +18,16 @@ de:
         append_assets: Bilder hinzufügen
         description: Beschreibung
         display_code_for_erb: Anzeigecode (erb)
+        identifier: Bezeichner
+        locale: Sprache
         name: Name
         overwrite_assets: Bilder ersetzen
         picture_details_count: Bilder
+        position: Position
         preview: Vorschau
-        published_at: Veröffentlicht am
         published: Veröffentlicht
+        published_at: Veröffentlicht am
+        slug: Freundliche ID
         created_at: Erstellt am
         updated_at: Aktualisiert am
       cmor/galleries/picture_detail:

data/config/locales/en.yml

@@ -15,13 +15,19 @@ en:
     attributes:
       cmor/galleries/picture_gallery:
         id: ID
-        name: Name
+        append_assets: Append pictures
         description: Description
         display_code_for_erb: Display code (erb)
+        identifier: Identifier
+        locale: Locale
+        name: Name
+        overwrite_assets: Overwrite pictures
         picture_details_count: Pictures
+        position: Position
         preview: Preview
         published: Published
         published_at: Published at
+        slug: Friendly ID
         created_at: Created at 
         updated_at: Updated at
       cmor/galleries/picture_detail:

data/db/migrate/20200217230501_add_locale_to_cmor_galleries_picture_galleries.rb

@@ -0,0 +1,5 @@
+class AddLocaleToCmorGalleriesPictureGalleries < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_galleries_picture_galleries, :locale, :string
+  end
+end

data/db/migrate/20200217230546_add_identifier_to_cmor_galleries_picture_galleries.rb

@@ -0,0 +1,5 @@
+class AddIdentifierToCmorGalleriesPictureGalleries < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_galleries_picture_galleries, :identifier, :string
+  end
+end

data/db/migrate/20200217230622_add_position_to_cmor_galleries_picture_galleries.rb

@@ -0,0 +1,5 @@
+class AddPositionToCmorGalleriesPictureGalleries < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_galleries_picture_galleries, :position, :integer
+  end
+end

data/db/migrate/20200217230709_add_slug_to_cmor_galleries_picture_galleries.rb

@@ -0,0 +1,5 @@
+class AddSlugToCmorGalleriesPictureGalleries < ActiveRecord::Migration[5.2]
+  def change
+    add_column :cmor_galleries_picture_galleries, :slug, :string
+  end
+end

data/lib/cmor_galleries.rb

@@ -1,8 +1,12 @@
 require 'acts_as_list'
 require 'acts_as_published'
+require 'friendly_id'
 require 'cmor_core_frontend'
 require 'rao-resources_controller'
 require 'rao-view_helper'
 require 'haml-rails'
 
+require 'cmor/core/model/collection_concern'
+require 'cmor/core/model/localization_concern'
+require 'cmor/core/model/identifier_concern'
 require 'cmor/galleries'

data/spec/models/cmor/galleries/picture_gallery_spec.rb

@@ -3,6 +3,6 @@ require 'rails_helper'
 module Cmor::Galleries
   RSpec.describe PictureGallery, type: :model do
     it { expect(subject).to validate_presence_of(:name) }
-    it { expect(subject).to validate_uniqueness_of(:name) }
+    it { expect(subject).to validate_uniqueness_of(:name).scoped_to([:locale]) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_galleries
 version: !ruby/object:Gem::Version
-  version: 0.0.44.pre
+  version: 0.0.45.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: cmor_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.44.pre
+        version: 0.0.45.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  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: rao-resources_controller
   requirement: !ruby/object:Gem::Requirement
@@ -395,6 +409,10 @@ files:
 - db/migrate/20180301153325_create_cmor_galleries_picture_galleries.rb
 - db/migrate/20180302082402_create_cmor_galleries_picture_details.rb
 - db/migrate/20200119181150_add_identifier_to_cmor_galleries_picture_details.rb
+- db/migrate/20200217230501_add_locale_to_cmor_galleries_picture_galleries.rb
+- db/migrate/20200217230546_add_identifier_to_cmor_galleries_picture_galleries.rb
+- db/migrate/20200217230622_add_position_to_cmor_galleries_picture_galleries.rb
+- db/migrate/20200217230709_add_slug_to_cmor_galleries_picture_galleries.rb
 - lib/cmor/galleries.rb
 - lib/cmor/galleries/configuration.rb
 - lib/cmor/galleries/engine.rb