enjoy_cms_catalog 0.3.7 → 0.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0117875d71ca0a24bdd0fcdec9fdcfe6260d3b0a
-  data.tar.gz: a53ecb5661763f15fca3c876919ff8bff15d585e
+  metadata.gz: b1c6044878fd5465b1096e04747894c1d1554fea
+  data.tar.gz: 99d7d3cfd1af087061147fcdd9d71ad4ec51bfd3
 SHA512:
-  metadata.gz: 7653b0246035cc8f77f78a8a1f4c09199df29151b5ccb3c6d0b61baf4ab85be54e111e2780db2698624659fa2e0937fb202750d82b07dd49650210139ff6d83e
-  data.tar.gz: 31daed42107fbdabf5fa43ab19a6a750963aa16ef497eb6dcd168788e060de5750ffa876be866e66704bd7d0218dd8dcad582b46cb97bcbcf0999a57ece5873a
+  metadata.gz: 1e1c13c7266507321c90287b13cf37b2e6aab6dc42fd88e0adb6aaec5f0f4670fb515531d3f890e652f2f93bdecd0a79cc6dd78d3dbebaca6470f90ea5a5db3b
+  data.tar.gz: 1f8b599684ab89b2b14607ac7128bc52905dd59bd9eed87860718dbbdf26351012043cadf63af06f990dabd8b4b058d00beb8c6dcd7deed1def127076d8286d1

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/app/{models/concerns/enjoy/catalog/decorators/item_category.rb → controllers/concerns/enjoy/catalog/decorators/categories.rb}

@@ -1,5 +1,5 @@
 module Enjoy::Catalog::Decorators
-  module ItemCategory
+  module Categories
     extend ActiveSupport::Concern
   end
 end

data/app/controllers/enjoy/catalog/categories_controller.rb

@@ -0,0 +1,7 @@
+module Enjoy::Catalog
+  class CategoriesController < ApplicationController
+    include Enjoy::Catalog::Controllers::Categories
+
+    include Enjoy::Catalog::Decorators::Categories
+  end
+end

data/app/{controllers/concerns/enjoy/catalog/decorators/item_categories.rb → models/concerns/enjoy/catalog/decorators/category.rb}

@@ -1,5 +1,5 @@
 module Enjoy::Catalog::Decorators
-  module ItemCategories
+  module Category
     extend ActiveSupport::Concern
   end
 end

data/app/models/concerns/enjoy/catalog/decorators/{item_category_image.rb → category_image.rb}

@@ -1,5 +1,5 @@
 module Enjoy::Catalog::Decorators
-  module ItemCategoryImage
+  module CategoryImage
     extend ActiveSupport::Concern
   end
 end

data/app/models/enjoy/catalog/category.rb

@@ -0,0 +1,12 @@
+module Enjoy::Catalog
+  class Category
+    include Enjoy::Catalog::Models::Category
+
+    include Enjoy::Catalog::Decorators::Category
+
+    rails_admin(&Enjoy::Catalog::Admin::Category.config(rails_admin_add_fields) { |config|
+      # puts config.bindings.keys
+      rails_admin_add_config(config)
+    })
+  end
+end

data/app/models/enjoy/catalog/category_image.rb

@@ -0,0 +1,16 @@
+if Enjoy::Catalog.config.gallery_support
+  module Enjoy::Catalog
+    _parent_class = Enjoy::Gallery::Image if Enjoy::Catalog.active_record?
+    _parent_class = Enjoy::Gallery::EmbeddedImage if Enjoy::Catalog.mongoid?
+
+    class CategoryImage < _parent_class
+      include Enjoy::Catalog::Models::CategoryImage
+
+      include Enjoy::Catalog::Decorators::CategoryImage
+
+      rails_admin(&Enjoy::Catalog::Admin::CategoryImage.config(nil, rails_admin_add_fields) { |config|
+        rails_admin_add_config(config)
+      })
+    end
+  end
+end

data/app/models/enjoy/catalog/item_image.rb

@@ -1,11 +1,16 @@
-module Enjoy::Catalog
-  class ItemImage < Enjoy::EmbeddedGalleryImage
-    include Enjoy::Catalog::Models::ItemImage
+if Enjoy::Catalog.config.gallery_support
+  module Enjoy::Catalog
+    _parent_class = Enjoy::Gallery::Image if Enjoy::Catalog.active_record?
+    _parent_class = Enjoy::Gallery::EmbeddedImage if Enjoy::Catalog.mongoid?
 
-    include Enjoy::Catalog::Decorators::ItemImage
+    class ItemImage < _parent_class
+      include Enjoy::Catalog::Models::ItemImage
 
-    rails_admin(&Enjoy::Catalog::Admin::ItemImage.config(rails_admin_add_fields) { |config|
-      rails_admin_add_config(config)
-    })
+      include Enjoy::Catalog::Decorators::ItemImage
+
+      rails_admin(&Enjoy::Catalog::Admin::ItemImage.config(nil, rails_admin_add_fields) { |config|
+        rails_admin_add_config(config)
+      })
+    end
   end
 end

data/app/views/enjoy/catalog/{item_categories → categories}/index.html.slim

@@ -1,7 +1,10 @@
+/ - if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+/   = render partial: "blocks/breadcrumbs"
+  
 = render partial: "blocks/seo_block"
 
 .ic_content
-  //- @item_categories.each do |ic|
+  //- @categories.each do |ic|
   - unless @root_catalog.blank?
 
     - @root_catalog.each do |ic|

data/app/views/enjoy/catalog/{item_categories → categories}/show.html.slim

@@ -1,16 +1,19 @@
-= render partial: "blocks/seo_block_with_obj", locals: {obj: @item_category}
+/ - if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+/   = render partial: "blocks/breadcrumbs"
+  
+= render partial: "blocks/seo_block_with_obj", locals: {obj: @category}
 
 
 .ic_content
-  //- @item_categories.each do |ic|
-  //- root_catalog = ItemCategory.enabled.roots.sorted.all.to_a
+  //- @categories.each do |ic|
+  //- root_catalog = Enjoy::Catalog::Category.enabled.roots.sorted.all.to_a
   //- unless root_catalog.blank?
   
     //- root_catalog.each do |ic|
-  - label = @item_category.name
+  - label = @category.name
   h3.icpage_title = label
 
-  - unless @item_category.content.blank?
+  - unless @category.content.blank?
     .ic_description_block
       == @item_category.content
       - if @children.blank? or @items.blank?
@@ -81,4 +84,4 @@
 
   / - if @children.blank? and items.blank? and @item_category.content.blank?
     .items_block
-      h3= Settings.ns('item_categories').empty_category(default: "Приносим свои извинения. Страница находится на стадии разработки.", label: "Сообщение об отсутсвии товаров в категории", kind: :text)
+      h3= Settings.ns('enjoy_catalog.categories').empty_category(default: "Приносим свои извинения. Страница находится на стадии разработки.", label: "Сообщение об отсутсвии товаров в категории", kind: :text)

data/app/views/enjoy/catalog/items/index.html.slim

@@ -1,5 +1,7 @@
-= render partial: "blocks/seo_block_with_obj", locals: {obj: @item}
-
+/ - if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+/   = render partial: "blocks/breadcrumbs"
+  
+= render partial: "blocks/seo_block"
 
 .i_content
   - unless @items.blank?

data/app/views/enjoy/catalog/items/show.html.slim

@@ -1,3 +1,6 @@
+/ - if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+/   = render partial: "blocks/breadcrumbs"
+  
 = render partial: "/blocks/seo_block_with_obj", locals: {obj: @item}
 
 / .item_fulltitle=@item.full_name

data/config/initializers/enjoy_catalog.rb

@@ -0,0 +1,88 @@
+Enjoy.rails_admin_configure do |config|
+  config.action_visible_for :nested_set, 'Enjoy::Catalog::Item'
+  config.action_visible_for :nested_set, 'Enjoy::Catalog::Category'
+
+  if Enjoy::Catalog.active_record?
+    config.action_visible_for :nested_set, 'Enjoy::Catalog::ItemImage'
+    config.action_visible_for :nested_set, 'Enjoy::Catalog::CategoryImage'
+  elsif Enjoy::Catalog.mongoid?
+    config.action_visible_for :sort_embedded, 'Enjoy::Catalog::Item'
+    config.action_visible_for :sort_embedded, 'Enjoy::Catalog::Category'
+  end
+
+  if defined?(RailsAdminComments)
+    config.action_visible_for :comments, 'Enjoy::Catalog::Item'
+    config.action_visible_for :comments, 'Enjoy::Catalog::Category'
+    config.action_visible_for :model_comments, 'Enjoy::Catalog::Item'
+    config.action_visible_for :model_comments, 'Enjoy::Catalog::Category'
+    if Enjoy::Catalog.active_record?
+      config.action_visible_for :comments, 'Enjoy::Catalog::ItemImage'
+      config.action_visible_for :comments, 'Enjoy::Catalog::CategoryImage'
+      config.action_visible_for :model_comments, 'Enjoy::Catalog::ItemImage'
+      config.action_visible_for :model_comments, 'Enjoy::Catalog::CategoryImage'
+    end
+  end
+
+  if defined?(RailsAdminMultipleFileUpload)
+    if Enjoy::Catalog.mongoid?
+      config.action_visible_for :multiple_file_upload, 'Enjoy::Catalog::Item'
+      config.action_visible_for :multiple_file_upload, 'Enjoy::Catalog::Category'
+    end
+  end
+end
+
+Enjoy.configure do |config|
+  _actions = [:new, :create, :edit, :update, :nested_set, :multiple_file_upload, :sort_embedded]
+  if Enjoy::Catalog.active_record?
+    _actions.delete(:multiple_file_upload)
+    _actions.delete(:sort_embedded)
+  end
+
+  config.ability_manager_config ||= []
+  config.ability_manager_config << {
+    method: :can,
+    model: Enjoy::Catalog::Item,
+    actions: _actions
+  }
+  config.ability_manager_config << {
+    method: :can,
+    model: Enjoy::Catalog::Category,
+    actions: _actions
+  }
+  if Enjoy::Catalog.active_record?
+    config.ability_manager_config << {
+      method: :can,
+      model: Enjoy::Catalog::ItemImage,
+      actions: _actions
+    }
+    config.ability_manager_config << {
+      method: :can,
+      model: Enjoy::Catalog::CategoryImage,
+      actions: _actions
+    }
+  end
+
+  config.ability_admin_config ||= []
+  config.ability_admin_config << {
+    method: :can,
+    model: Enjoy::Catalog::Item,
+    actions: :manage
+  }
+  config.ability_admin_config << {
+    method: :can,
+    model: Enjoy::Catalog::Category,
+    actions: :manage
+  }
+  if Enjoy::Catalog.active_record?
+    config.ability_admin_config << {
+      method: :can,
+      model: Enjoy::Catalog::ItemImage,
+      actions: :manage
+    }
+    config.ability_admin_config << {
+      method: :can,
+      model: Enjoy::Catalog::CategoryImage,
+      actions: :manage
+    }
+  end
+end

data/config/locales/enjoy.catalog.ru.yml

@@ -1,16 +1,23 @@
 ru:
+  enjoy:
+    catalog: Каталог
+    breadcrumbs:
+      catalog: Каталог
+      categories: Категории
+      items: Товары
+
   mongoid:
     models:
       enjoy/catalog/item: Товары
-      enjoy/catalog/item_category: Разделы
+      enjoy/catalog/category: Разделы
     attributes:
       enjoy/catalog/item:
         price: Цена
         connected_pages: Страницы в меню
-        item_categories: Разделы
+        categories: Разделы
         item_images: Галерея
         related_items: Похожие товары
-      enjoy/catalog/item_category:
+      enjoy/catalog/category:
         connected_pages: Страницы в меню
         items: Товары
-        item_category_images: Галерея
+        category_images: Галерея

data/config/locales/ru.kaminari.yml

@@ -0,0 +1,17 @@
+ru:
+  views:
+    pagination:
+      first: "« Начало"
+      last: "Конец »"
+      previous: "‹ Предыдущая"
+      next: "Следующая ›"
+      truncate: "…"
+  helpers:
+    page_entries_info:
+      one_page:
+        display_entries:
+          zero: "%{entry_name} не найдены"
+          one: "Показано <b>1</b> %{entry_name}"
+          other: "Показаны <b>все %{count}</b> %{entry_name}"
+      more_pages:
+        display_entries: "Показаны %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> из <b>%{total}</b>"

data/enjoy_cms_catalog.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
+  spec.add_dependency 'enjoy_cms_gallery', "~> 0.4.0.beta3"
+  
   spec.add_dependency 'money-rails'
-  spec.add_dependency 'mongoid_money_field'
-
-  spec.add_dependency 'enjoy_cms', "~> 0.3.7"
+  spec.add_dependency 'mongoid_money_field', '~> 5.0.0'
 end

data/lib/enjoy/catalog/admin/{item_category.rb → category.rb}

@@ -1,8 +1,9 @@
 module Enjoy::Catalog
   module Admin
-    module ItemCategory
+    module Category
       def self.config(fields = {})
         Proc.new {
+          navigation_label I18n.t("enjoy.catalog")
 
           list do
             scopes [:sorted, :enabled, nil]
@@ -13,13 +14,24 @@ module Enjoy::Catalog
             field :name do
               searchable true
             end
-            field :connected_pages, :enjoy_connectable
+            if Enjoy::Catalog.config.pages_support and Enjoy::Catalog.configuration.can_connect_category_with_pages
+              field :connected_pages, :enjoy_connectable
+            end
           end
 
           edit do
             field :enabled, :toggle
             field :name
-            field :connected_pages, :enjoy_connectable
+            if Enjoy::Catalog.config.pages_support and Enjoy::Catalog.configuration.can_connect_category_with_pages
+              group :connected_pages do
+                active false
+                field :connected_pages, :enjoy_connectable do
+                  read_only do
+                    !bindings[:view].current_user.admin?
+                  end
+                end
+              end
+            end
             group :URL do
               active false
               field :slugs, :enum do
@@ -44,7 +56,7 @@ module Enjoy::Catalog
                   :image_jcrop_options
                 end
               end
-              field :item_category_images
+              field :category_images
             end
 
             group :content do
@@ -110,10 +122,10 @@ module Enjoy::Catalog
               read_only true
 
               pretty_value do
-                  bindings[:object].items.to_a.map { |i|
-                    route = (bindings[:view] || bindings[:controller])
-                    model_name = i.rails_admin_model
-                    route.link_to(i.name, route.rails_admin.show_path(model_name: model_name, id: i.id), title: i.name)
+                bindings[:object].items.to_a.map { |i|
+                  route = (bindings[:view] || bindings[:controller])
+                  model_name = i.rails_admin_model
+                  route.link_to(i.name, route.rails_admin.show_path(model_name: model_name, id: i.id), title: i.name)
                 }.join("<br>").html_safe
               end
             end
@@ -123,14 +135,14 @@ module Enjoy::Catalog
 
           sort_embedded(
               {
-                  fields: [:item_category_images]
+                  fields: [:category_images]
               }
           )
 
           if defined?(RailsAdminMultipleFileUpload)
             multiple_file_upload(
                 {
-                    fields: [:item_category_images]
+                    fields: [:category_images]
                 }
             )
           end

data/lib/enjoy/catalog/admin/category_image.rb

@@ -0,0 +1,31 @@
+module Enjoy::Catalog
+  module Admin
+    module CategoryImage
+      def self.config(nav_label = nil, fields = {})
+        if Enjoy::Catalog.config.gallery_support
+          if Enjoy::Catalog.mongoid?
+            if block_given?
+              Enjoy::Gallery::Admin::EmbeddedImage.config(fields) do |config|
+                yield config
+              end
+            else
+              Enjoy::Gallery::Admin::EmbeddedImage.config(fields)
+            end
+
+          else
+            nav_label ||= I18n.t('enjoy.catalog')
+            if block_given?
+              Enjoy::Gallery::Admin::Image.config(nav_label, fields) do |config|
+                yield config
+              end
+            else
+              Enjoy::Gallery::Admin::Image.config(nav_label,fields)
+            end
+          end #if Enjoy::Catalog.mongoid?
+        end #if Enjoy::Catalog.config.gallery_support
+
+      end #def self.config(fields = {})
+
+    end #module CategoryImage
+  end #module Admin
+end #module Enjoy::Catalog

data/lib/enjoy/catalog/admin/item.rb

@@ -3,6 +3,8 @@ module Enjoy::Catalog
     module Item
       def self.config(fields = {})
         Proc.new {
+          navigation_label I18n.t("enjoy.catalog")
+
           list do
             scopes [:sorted, :enabled, nil]
 
@@ -12,24 +14,31 @@ module Enjoy::Catalog
             field :name do
               searchable true
             end
-            field :item_categories do
+            field :categories do
               searchable :name
             end
-            field :connected_pages, :enjoy_connectable
+            if Enjoy::Catalog.config.pages_support and Enjoy::Catalog.configuration.can_connect_items_with_pages
+              field :connected_pages, :enjoy_connectable
+            end
           end
 
           edit do
             field :enabled, :toggle
             field :name
-            field :connected_pages, :enjoy_connectable do
-              read_only do
-                !bindings[:view].current_user.admin?
+            if Enjoy::Catalog.config.pages_support and Enjoy::Catalog.configuration.can_connect_items_with_pages
+              group :connected_pages do
+                active false
+                field :connected_pages, :enjoy_connectable do
+                  read_only do
+                    !bindings[:view].current_user.admin?
+                  end
+                end
               end
             end
-            field :item_categories do
+            field :categories do
               searchable :name
             end
-            field :price
+            field :price, :string
 
             group :URL do
               active false

data/lib/enjoy/catalog/admin/item_image.rb

@@ -1,15 +1,31 @@
 module Enjoy::Catalog
   module Admin
     module ItemImage
-      def self.config(fields = {})
-        if block_given?
-          Enjoy::Admin::EmbeddedGalleryImage.config(fields) do |config|
-            yield config
-          end
-        else
-          Enjoy::Admin::EmbeddedGalleryImage.config(fields)
-        end
-      end
-    end
-  end
-end
+      def self.config(nav_label = nil, fields = {})
+        if Enjoy::Catalog.config.gallery_support
+          if Enjoy::Catalog.mongoid?
+            if block_given?
+              Enjoy::Gallery::Admin::EmbeddedImage.config(fields) do |config|
+                yield config
+              end
+            else
+              Enjoy::Gallery::Admin::EmbeddedImage.config(fields)
+            end
+
+          else
+            nav_label ||= I18n.t('enjoy.catalog')
+            if block_given?
+              Enjoy::Gallery::Admin::Image.config(nav_label, fields) do |config|
+                yield config
+              end
+            else
+              Enjoy::Gallery::Admin::Image.config(nav_label, fields)
+            end
+          end #if Enjoy::Catalog.mongoid?
+        end #if Enjoy::Catalog.config.gallery_support
+
+      end #def self.config(fields = {})
+
+    end #module ItemImage
+  end #module Admin
+end #module Enjoy::Catalog

data/lib/enjoy/catalog/admin.rb

@@ -1,6 +1,4 @@
 module Enjoy::Catalog
   module Admin
-    class << self
-    end
   end
 end

data/lib/enjoy/catalog/configuration.rb

@@ -1,38 +1,58 @@
-module Enjoy
-  module Catalog
-    def self.configuration
-      @configuration ||= Configuration.new
-    end
-    def self.config
-      @configuration ||= Configuration.new
-    end
+module Enjoy::Catalog
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+  def self.config
+    @configuration ||= Configuration.new
+  end
 
-    def self.configure
-      yield configuration
-    end
+  def self.configure
+    yield configuration
+  end
+
+  class Configuration
+    attr_accessor :item_image_styles
+    attr_accessor :item_per_page
+
+    attr_accessor :item_images_image_styles
+
+    attr_accessor :category_image_styles
+    attr_accessor :category_per_page
+
+    attr_accessor :category_images_image_styles
+
+    attr_accessor :gallery_support
+    attr_accessor :seo_support
+    attr_accessor :pages_support
+
+    attr_accessor :breadcrumbs_on_rails_support
+
+    attr_accessor :can_connect_items_with_pages
+    attr_accessor :can_connect_category_with_pages
+
+    attr_accessor :localize
 
-    class Configuration
-      attr_accessor :item_image_styles
-      attr_accessor :item_per_page
+    def initialize
+      @item_image_styles  = {}
+      @item_per_page      = 10
 
-      attr_accessor :item_images_image_styles
+      @item_images_image_styles = {}
 
-      attr_accessor :item_category_image_styles
-      attr_accessor :item_category_per_page
+      @category_image_styles = {}
+      @category_per_page     = 10
 
-      attr_accessor :item_category_images_image_styles
+      @category_images_image_styles = {}
 
-      def initialize
-        @item_image_styles  = {}
-        @item_per_page      = 10
+      @gallery_support = defined?(Enjoy::Gallery)
+      @seo_support = defined?(Enjoy::Seo)
+      @pages_support = defined?(Enjoy::Pages)
 
-        @item_images_image_styles = {}
+      @breadcrumbs_on_rails_support = defined?(BreadcrumbsOnRails)
 
-        @item_category_image_styles = {}
-        @item_category_per_page     = 10
+      @can_connect_items_with_pages = true
+      @can_connect_category_with_pages = true
 
-        @item_category_images_image_styles = {}
-      end
+      @localize = Enjoy.config.localize
     end
   end
 end