enjoy_cms_catalog 0.3.7 → 0.4.0.beta3

data/lib/enjoy/catalog/controllers/{item_categories.rb → categories.rb}

@@ -1,40 +1,51 @@
 module Enjoy::Catalog
   module Controllers
-    module ItemCategories
+    module Categories
       extend ActiveSupport::Concern
 
+      included do
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+          add_breadcrumb I18n.t('enjoy.breadcrumbs.catalog'), :enjoy_catalog_path
+        end
+      end
+
       def index
-        @item_categories = item_category_class.enabled.sorted.to_a
-        @root_catalog = item_category_class.enabled.roots.sorted.all.to_a
+        @categories = category_class.enabled.sorted.to_a
+        @root_catalog = category_class.enabled.roots.sorted.all.to_a
         # index_crumbs
       end
 
       def show
-        @item_category = item_category_class.enabled.find(params[:id])
-        if !@item_category.text_slug.blank? and @item_category.text_slug != params[:id]
-          redirect_to @item_category, status_code: 301
+        @category = category_class.enabled.find(params[:id])
+        if !@category.text_slug.blank? and @category.text_slug != params[:id]
+          redirect_to @category, status_code: 301
           return
         end
-        @seo_parent_page = find_seo_page(item_categories_path)
+        @seo_parent_page = find_seo_page(url_for(action: :index))
+
+        @children = @category.children.enabled.sorted.all.to_a
+        @items = @category.items.enabled.sorted.all.to_a
+
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+          add_breadcrumb @category.name, url_for(@category)
+        end
 
-        @children = @item_category.children.enabled.sorted.all.to_a
-        @items = @item_category.items.enabled.sorted.all.to_a
 
         # index_crumbs
         # category_crumbs
       end
 
       def page_title
-        if @item_category
-          @item_category.page_title
+        if @category
+          @category.page_title
         else
           super
         end
       end
 
       private
-      def item_category_class
-        Enjoy::Catalog::ItemCategory
+      def category_class
+        Enjoy::Catalog::Category
       end
       def item_class
         Enjoy::Catalog::Item
@@ -51,24 +62,24 @@ module Enjoy::Catalog
       #   else
       #     catalog_title   = Settings.ns('breadcrumbs').catalog_title(default: "Каталог", label: "'Каталог' в breadcrumbs")
       #     _crumb = catalog_title
-      #     add_crumb _crumb, item_categories_path
+      #     add_crumb _crumb, news_categories_path
       #   end
       # end
       #
       # def category_crumbs
-      #   if @item_category
-      #     _parent = @item_category.parent
+      #   if @news_category
+      #     _parent = @news_category.parent
       #     if _parent
       #       _crumb = _parent.name if _crumb.blank?
       #       _crumb = _parent.title if _crumb.blank?
       #       _crumb = _parent.h1 if _crumb.blank?
-      #       add_crumb _crumb, item_category_path(_parent)
+      #       add_crumb _crumb, news_category_path(_parent)
       #       _crumb = nil
       #     end
-      #     _crumb = @item_category.name if _crumb.blank?
-      #     _crumb = @item_category.title if _crumb.blank?
-      #     _crumb = @item_category.h1 if _crumb.blank?
-      #     add_crumb _crumb, item_category_path(@item_category)
+      #     _crumb = @news_category.name if _crumb.blank?
+      #     _crumb = @news_category.title if _crumb.blank?
+      #     _crumb = @news_category.h1 if _crumb.blank?
+      #     add_crumb _crumb, news_category_path(@news_category)
       #   end
       # end
     end

data/lib/enjoy/catalog/controllers/items.rb

@@ -3,59 +3,48 @@ module Enjoy::Catalog
     module Items
       extend ActiveSupport::Concern
 
+      included do
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+          add_breadcrumb I18n.t('enjoy.breadcrumbs.items'), :enjoy_items_path
+        end
+      end
+
       def index
-        @items = item_class.enabled.sorted.to_a
-        # index_crumbs
+        @item = item_class.enabled.sorted
+
+        unless Enjoy::Catalog.config.items_per_page.nil?
+          @item = @item.page(params[:page])
+        end
       end
 
       def show
         @item = item_class.enabled.find(params[:id])
-        if !@item.text_slug.blank? and @item.text_slug != params[:id]
+
+        if @item and @item.text_slug != params[:id]
           redirect_to @item, status_code: 301
-          return
+          return true
         end
-        @parent_seo_page = find_seo_page(item_categories_path) if @seo_page.blank?
-        # item_crumbs
-      end
 
-      def page_title
-        if @item
-          @item.page_title
-        else
-          super
+        if Enjoy::Catalog.config.breadcrumbs_on_rails_support
+          add_breadcrumb @item.name, url_for(@item)
         end
       end
 
       private
-      def item_category_class
-        Enjoy::Catalog::ItemCategory
+      def category_class
+        Enjoy::Catalog::Category
       end
       def item_class
         Enjoy::Catalog::Item
       end
+      def page_title
+        if @item.class.name == model.name
+          @item.page_title
+        else
+          super
+        end
+      end
 
-      # def item_crumbs
-      #   if @item
-      #     if @item.item_categories.enabled.count == 1
-      #       if @parent_seo_page
-      #         _crumb = @parent_seo_page.name
-      #         _crumb = @parent_seo_page.title if _crumb.blank?
-      #         _crumb = @parent_seo_page.h1 if _crumb.blank?
-      #         add_crumb _crumb, @parent_seo_page.fullpath
-      #       end
-      #
-      #       @item_category = @item.item_categories.enabled.first
-      #       _crumb = @item_category.name
-      #       _crumb = @item_category.title if _crumb.blank?
-      #       _crumb = @item_category.h1 if _crumb.blank?
-      #       add_crumb _crumb, item_category_path(@item_category)
-      #     end
-      #     _crumb = @item.name
-      #     _crumb = @item.title if _crumb.blank?
-      #     _crumb = @item.h1 if _crumb.blank?
-      #     add_crumb _crumb, item_path(@item)
-      #   end
-      # end
     end
   end
 end

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

@@ -0,0 +1,50 @@
+module Enjoy::Catalog
+  module Models
+    module Category
+      extend ActiveSupport::Concern
+      include Enjoy::Model
+      include Enjoy::Enableable
+      if Enjoy::Catalog.config.seo_support
+        include Enjoy::Seo::Seoable
+        include Enjoy::Seo::SitemapDataField
+      end
+      if Enjoy::Catalog.config.pages_support
+        include Enjoy::Pages::Connectable
+      end
+      if Enjoy::Catalog.config.gallery_support
+        include Enjoy::Gallery::Paperclipable
+      end
+
+      include Enjoy::Catalog.orm_specific('Category')
+
+      include ManualSlug
+
+      included do
+        manual_slug :name
+
+        if Enjoy::Catalog.config.pages_support and Enjoy::Catalog.configuration.can_connect_category_with_pages
+          enjoy_connectable_field :connected_pages
+        end
+
+        if Enjoy::Catalog.config.gallery_support and Enjoy::Catalog.configuration.category_image_styles
+          enjoy_cms_attached_file(:image,
+                    styles: lambda { |attachment| attachment.instance.image_styles }
+          )
+        end
+      end
+
+      def item_class
+        Enjoy::Catalog::Item
+      end
+
+      def image_styles
+        Enjoy::Catalog.configuration.category_image_styles
+      end
+
+      def image_jcrop_options
+        {}
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Enjoy::Catalog
+  module Models
+    module CategoryImage
+      extend ActiveSupport::Concern
+      # include Enjoy::Model
+      # include Enjoy::Enableable
+
+      include Enjoy::Catalog.orm_specific('CategoryImage')
+
+      included do
+      end
+
+      def image_styles
+        Enjoy::Catalog.configuration.category_images_image_styles
+      end
+
+      def image_jcrop_options
+        {}
+      end
+    end
+  end
+end

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

@@ -4,9 +4,16 @@ module Enjoy::Catalog
       extend ActiveSupport::Concern
       include Enjoy::Model
       include Enjoy::Enableable
-      include Enjoy::Seoable
-      include Enjoy::SitemapDataField
-      include Enjoy::Connectable
+      if Enjoy::Catalog.config.seo_support
+        include Enjoy::Seo::Seoable
+        include Enjoy::Seo::SitemapDataField
+      end
+      if Enjoy::Catalog.config.pages_support
+        include Enjoy::Pages::Connectable
+      end
+      if Enjoy::Catalog.config.gallery_support
+        include Enjoy::Gallery::Paperclipable
+      end
 
       include Enjoy::Catalog.orm_specific('Item')
 
@@ -15,7 +22,23 @@ module Enjoy::Catalog
       included do
         manual_slug :name
 
-        enjoy_connectable_field :connected_pages
+        if Enjoy::Catalog.config.pages_support and Enjoy::Catalog.configuration.can_connect_items_with_pages
+          enjoy_connectable_field :connected_pages
+        end
+
+        if Enjoy::Catalog.config.gallery_support and Enjoy::Catalog.configuration.item_image_styles
+          enjoy_cms_attached_file(:image,
+                    styles: lambda { |attachment| attachment.instance.image_styles }
+          )
+        end
+      end
+
+      def image_styles
+        Enjoy::Catalog.configuration.item_image_styles
+      end
+
+      def image_jcrop_options
+        {}
       end
     end
   end

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

@@ -9,6 +9,14 @@ module Enjoy::Catalog
 
       included do
       end
+
+      def image_styles
+        Enjoy::Catalog.configuration.item_images_image_styles
+      end
+
+      def image_jcrop_options
+        {}
+      end
     end
   end
 end

data/lib/enjoy/catalog/models/mongoid/category.rb

@@ -0,0 +1,32 @@
+module Enjoy::Catalog
+  module Models
+    module Mongoid
+      module Category
+        extend ActiveSupport::Concern
+        include Enjoy::HtmlField
+
+        included do
+          field :name, type: String, localize: Enjoy::Catalog.configuration.localize, default: ""
+
+          acts_as_nested_set
+          scope :sorted, -> { order_by([:lft, :asc]) }
+
+          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy::Catalog.configuration.localize, default: ""
+          enjoy_cms_html_field :content,   type: String, localize: Enjoy::Catalog.configuration.localize, default: ""
+
+          embeds_many :category_images, cascade_callbacks: true, class_name: "Enjoy::Catalog::CategoryImage"
+          alias :images :category_images
+          accepts_nested_attributes_for :category_images, allow_destroy: true
+        end
+
+        def items
+          item_class.in(category_ids: self.id)
+        end
+
+        def all_items
+          item_class.any_in(category_ids: self.self_and_descendants.map(&:id))
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/catalog/models/mongoid/category_image.rb

@@ -0,0 +1,20 @@
+module Enjoy::Catalog
+  module Models
+    module Mongoid
+      module CategoryImage
+        extend ActiveSupport::Concern
+
+        included do
+          embedded_in :item, class_name: "Enjoy::Catalog::Category"
+        end
+
+        include ::Mongoid::EmbeddedFindable
+        module ClassMethods
+          def find(id)
+            find_through(Enjoy::Catalog::Category, 'category_images', id)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/enjoy/catalog/models/mongoid/item.rb

@@ -3,30 +3,19 @@ module Enjoy::Catalog
     module Mongoid
       module Item
         extend ActiveSupport::Concern
-        include Enjoy::MongoidPaperclip
 
         include Enjoy::HtmlField
 
         included do
-          if defined?(RailsAdminComments)
-            include RailsAdminComments::Commentable
-          end
-
-          field :name, type: String, localize: Enjoy.configuration.localize, default: ""
-
-          enjoy_cms_mongoid_attached_file(:image,
-                    styles: lambda { |attachment| attachment.instance.image_styles },
-                    content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
-          )
+          field :name, type: String, localize: Enjoy::Catalog.configuration.localize, default: ""
 
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
 
-          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy.configuration.localize, default: ""
-          enjoy_cms_html_field :content,   type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy::Catalog.configuration.localize, default: ""
+          enjoy_cms_html_field :content,   type: String, localize: Enjoy::Catalog.configuration.localize, default: ""
 
-          has_and_belongs_to_many :item_categories, class_name: "Enjoy::Catalog::ItemCategory", inverse_of: nil
-          alias :categories :item_categories
+          has_and_belongs_to_many :categories, class_name: "Enjoy::Catalog::Category", inverse_of: nil
 
           embeds_many :item_images, cascade_callbacks: true, class_name: "Enjoy::Catalog::ItemImage"
           alias :images :item_images
@@ -34,15 +23,7 @@ module Enjoy::Catalog
 
           has_and_belongs_to_many :related_items, :class_name => "Enjoy::Catalog::Item", :inverse_of => :related_items
 
-          field :price,     type: Money,    default: nil, localize: Enjoy.configuration.localize
-        end
-
-        def image_styles
-          Enjoy::Catalog.configuration.item_image_styles
-        end
-
-        def image_jcrop_options
-          {}
+          field :price,     type: Money,    default: nil, localize: Enjoy::Catalog.configuration.localize
         end
       end
     end

data/lib/enjoy/catalog/models/mongoid/item_image.rb

@@ -3,27 +3,17 @@ module Enjoy::Catalog
     module Mongoid
       module ItemImage
         extend ActiveSupport::Concern
-        # include Enjoy::MongoidPaperclip
 
         included do
           embedded_in :item, class_name: "Enjoy::Catalog::Item"
         end
 
-
         include ::Mongoid::EmbeddedFindable
         module ClassMethods
           def find(id)
             find_through(Enjoy::Catalog::Item, 'item_images', id)
           end
         end
-
-        def image_styles
-          Enjoy::Catalog.configuration.item_images_image_styles
-        end
-
-        def image_jcrop_options
-          {}
-        end
       end
     end
   end

data/lib/enjoy/catalog/routes.rb

@@ -1,33 +1,77 @@
 module ActionDispatch::Routing
   class Mapper
-
     def enjoy_cms_catalog_routes(config = {})
       routes_config = {
         use_items_path: true,
-        use_item_categories_path: true,
-        use_catalog_path: true
+        use_categories_path: true,
+        use_catalog_path: true,
+        catalog_path: 'catalog',
+        classes: {
+          items: :items,
+          categories: :categories,
+          catalog_controller: :categories
+        },
+        paths: {
+          items: :items,
+          categories: :categories
+        },
+        pagination: {
+          items: true,
+          categories: true,
+          category_items: true
+        },
+        actions: {
+          items: [:show],
+          categories: [:show],
+        }
       }
-      routes_config.merge!(config)
+      routes_config.deep_merge!(config)
+
+      generate_enjoy_catalog_user_routes(routes_config)
+      generate_enjoy_catalog_cms_routes(routes_config)
+    end
+
+
+    private
+    def generate_enjoy_catalog_user_routes(routes_config)
+      if !routes_config[:use_items_path] and !routes_config[:classes][:items].nil?
+        resources routes_config[:classes][:items].to_sym, only: routes_config[:actions][:items], path: routes_config[:paths][:items] do
+          get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:items]
+        end
+      end
 
+      if !routes_config[:use_categories_path] and !routes_config[:classes][:categories].nil?
+        resources routes_config[:classes][:categories].to_sym, only: routes_config[:actions][:categories], path: routes_config[:paths][:categories] do
+          get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:categories]
+          get 'items(/page/:page)', action: :items, on: :member, as: :items if routes_config[:pagination][:category_items]
+        end
+      end
+
+      if !routes_config[:use_catalog_path] and !routes_config[:classes][:catalog_controller].nil?
+        get "#{routes_config[:catalog_path]}" => "#{routes_config[:classes][:catalog_controller]}#index"
+      end
+    end
+
+    def generate_enjoy_catalog_cms_routes(routes_config)
       scope module: 'enjoy' do
         scope module: 'catalog' do
-          if routes_config[:use_items_path]
-            resources :items, only: [:show], as: :enjoy_catalog_items do
-              get '(/page/:page)', action: :index, on: :collection, as: ""
+          if routes_config[:use_items_path] and !routes_config[:classes][:items].nil?
+            resources routes_config[:classes][:items].to_sym, only: routes_config[:actions][:items], path: routes_config[:paths][:items], as: :enjoy_catalog_items do
+              get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:items]
             end
           end
 
-          if routes_config[:use_item_categories_path]
-            resources :item_categories, only: [:index, :show], as: :enjoy_catalog_item_categories do
-              get 'items(/page/:page)', action: :items, on: :member, as: :items
+          if routes_config[:use_categories_path] and !routes_config[:classes][:categories].nil?
+            resources routes_config[:classes][:categories].to_sym, only: routes_config[:actions][:categories], path: routes_config[:paths][:categories], as: :enjoy_catalog_categories do
+              get '(/page/:page)', action: :index, on: :collection, as: "" if routes_config[:pagination][:categories]
+              get 'items(/page/:page)', action: :items, on: :member, as: :items if routes_config[:pagination][:category_items]
             end
           end
-          if routes_config[:use_catalog_path]
-            get 'catalog' => 'item_categories#index', as: :enjoy_catalog
+          if routes_config[:use_catalog_path] and !routes_config[:classes][:catalog_controller].nil?
+            get "#{routes_config[:catalog_path]}" => "#{routes_config[:classes][:catalog_controller]}#index", as: :enjoy_catalog
           end
         end
       end
-
     end
 
   end

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.3.7"
+    VERSION = "0.4.0.beta3"
   end
 end

data/lib/enjoy_cms_catalog.rb

@@ -1,62 +1,69 @@
+unless defined?(Enjoy) && Enjoy.respond_to?(:orm) && [:active_record, :mongoid].include?(Enjoy.orm)
+  puts "please use enjoy_cms_mongoid or enjoy_cms_activerecord"
+  puts "also: please use enjoy_cms_mongoid or enjoy_cms_activerecord and not enjoy_cms directly"
+  exit 1
+end
+
 require "enjoy/catalog/version"
+require 'enjoy/catalog/engine'
+require 'enjoy/catalog/configuration'
 
 require 'enjoy/catalog/routes'
 
 require 'money-rails'
+# require 'mongoid_money_field'
 
-require 'enjoy_cms'
-
-require 'rails_admin_sort_embedded'
-require 'rails_admin_jcrop'
+module Enjoy::Catalog
+  class << self
+    def orm
+      Enjoy.orm
+    end
+    def mongoid?
+      Enjoy::Catalog.orm == :mongoid
+    end
+    def active_record?
+      Enjoy::Catalog.orm == :active_record
+    end
+    def model_namespace
+      "Enjoy::Catalog::Models::#{Enjoy::Catalog.orm.to_s.camelize}"
+    end
+    def orm_specific(name)
+      "#{model_namespace}::#{name}".constantize
+    end
+  end
 
-require 'enjoy/catalog/configuration'
-require 'enjoy/catalog/engine'
+  autoload :Admin,  'enjoy/catalog/admin'
+  module Admin
+    autoload :Item,           'enjoy/catalog/admin/item'
+    autoload :Category,       'enjoy/catalog/admin/category'
+    autoload :ItemImage,      'enjoy/catalog/admin/item_image'
+    autoload :CategoryImage,  'enjoy/catalog/admin/category_image'
+  end
 
-module Enjoy
-  module Catalog
-    class << self
-      def orm
-        :mongoid
-      end
-      def mongoid?
-        Enjoy::Catalog.orm == :mongoid
-      end
-      def active_record?
-        Enjoy::Catalog.orm == :active_record
-      end
-      def model_namespace
-        "Enjoy::Catalog::Models::#{Enjoy::Catalog.orm.to_s.camelize}"
-      end
-      def orm_specific(name)
-        "#{model_namespace}::#{name}".constantize
-      end
-    end
+  module Models
+    autoload :Item,           'enjoy/catalog/models/item'
+    autoload :Category,       'enjoy/catalog/models/category'
+    autoload :ItemImage,      'enjoy/catalog/models/item_image'
+    autoload :CategoryImage,  'enjoy/catalog/models/category_image'
 
-    autoload :Admin,  'enjoy/catalog/admin'
-    module Admin
-      autoload :Item,               'enjoy/catalog/admin/item'
-      autoload :ItemCategory,       'enjoy/catalog/admin/item_category'
-      autoload :ItemImage,          'enjoy/catalog/admin/item_image'
-      autoload :ItemCategoryImage,  'enjoy/catalog/admin/item_category_image'
+    module Mongoid
+      autoload :Item,           'enjoy/catalog/models/mongoid/item'
+      autoload :Category,       'enjoy/catalog/models/mongoid/category'
+      autoload :ItemImage,      'enjoy/catalog/models/mongoid/item_image'
+      autoload :CategoryImage,  'enjoy/catalog/models/mongoid/category_image'
     end
 
-    module Models
-      autoload :Item,               'enjoy/catalog/models/item'
-      autoload :ItemCategory,       'enjoy/catalog/models/item_category'
-      autoload :ItemImage,          'enjoy/catalog/models/item_image'
-      autoload :ItemCategoryImage,  'enjoy/catalog/models/item_category_image'
-
-      module Mongoid
-        autoload :Item,               'enjoy/catalog/models/mongoid/item'
-        autoload :ItemCategory,       'enjoy/catalog/models/mongoid/item_category'
-        autoload :ItemImage,          'enjoy/catalog/models/mongoid/item_image'
-        autoload :ItemCategoryImage,  'enjoy/catalog/models/mongoid/item_category_image'
-      end
-    end
+    # module ActiveRecord
+    #   autoload :Item,           'enjoy/catalog/models/active_record/item'
+    #   autoload :Category,       'enjoy/catalog/models/active_record/category'
+    #   autoload :ItemImage,      'enjoy/catalog/models/active_record/item_image'
+    #   autoload :CategoryImage,  'enjoy/catalog/models/active_record/category_image'
+    # end
+  end
 
-    module Controllers
-      autoload :Items,                'enjoy/catalog/controllers/items'
-      autoload :ItemCategories,       'enjoy/catalog/controllers/item_categories'
-    end
+  module Controllers
+    autoload :Items,            'enjoy/catalog/controllers/items'
+    autoload :Categories,       'enjoy/catalog/controllers/categories'
   end
+
 end