enjoy_cms_catalog 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50336fa30ed1da7b57b4a4ba843fe9da321a7295
-  data.tar.gz: 24595a6b9322d1cf2412afd7d4abb9df435db1d7
+  metadata.gz: 5dcc9e6dfe4bfb5b628d62e0a3d674ae894ecc02
+  data.tar.gz: 4df60483663fa45698f4565ac340e5784421f67d
 SHA512:
-  metadata.gz: 9225f7b387bdcff7468b28c694e6ea69e29cdaeedcd8c572cc29d8b80e2484e763b46548adc27cf79295be426a914b2f525374700838c5c2843c9fbcb68b4677
-  data.tar.gz: fb4fa09a88703a146b3d32ac0a8c70d19394022c928437a53906c8fc1b304a21c90a3efa275361c5105d3b091e96f8705c88a3fa0fcf7b9e165d20e64a49616b
+  metadata.gz: 7f854240f5feb44f8fa235874c06bfec9d7d7820792aa3f7be35a7ffb716998520503d14625144b41c31854ed6a14ac18828fe243752ed4390cb565e18854b63
+  data.tar.gz: 73199aff546f1a80c32a75e9248e0a0c181e0a4f144c6170d6b27cc05f94e7617a2fe9c52c6661fee822e8b415bb21999490cdf0fd45d8ef2b009ac2a65a88ab

data/enjoy_cms_catalog.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'money-rails'
   spec.add_dependency 'mongoid_money_field'
 
-  spec.add_dependency 'enjoy_cms', "~> 0.3.2"
+  spec.add_dependency 'enjoy_cms', "~> 0.3.3"
 end

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

@@ -51,17 +51,7 @@ module Enjoy::Catalog
 
             field :item_images
 
-            fields.each_pair do |name, type|
-              if type.nil?
-                field name
-              else
-                if type.is_a?(Array)
-                  field name, type[0], &type[1]
-                else
-                  field name, type
-                end
-              end
-            end
+            Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
             group :seo do
               active false

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

@@ -28,6 +28,7 @@ module Enjoy::Catalog
             field :enabled, :toggle
             field :name
             group :URL do
+              active false
               field :slugs, :enum do
                 enum_method do
                   :slugs
@@ -55,17 +56,7 @@ module Enjoy::Catalog
 
             field :item_category_images
 
-            fields.each_pair do |name, type|
-              if type.nil?
-                field name
-              else
-                if type.is_a?(Array)
-                  field name, type[0], &type[1]
-                else
-                  field name, type
-                end
-              end
-            end
+            Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
 
             group :seo do
               active false
@@ -99,7 +90,6 @@ module Enjoy::Catalog
 
           show do
             field :name
-            field :sidebar_title
             field :slugs, :enum do
               enum_method do
                 :slugs
@@ -117,6 +107,8 @@ module Enjoy::Catalog
             field :excerpt
             field :content
 
+            Enjoy::RailsAdminGroupPatch::enjoy_cms_group(self, fields)
+
             field :items do
               read_only true
 

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

@@ -4,7 +4,7 @@ module Enjoy::Catalog
       extend ActiveSupport::Concern
 
       def index
-        @z = item_class.enabled.sorted.to_a
+        @items = item_class.enabled.sorted.to_a
         # index_crumbs
       end
 

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

@@ -13,18 +13,6 @@ module Enjoy::Catalog
 
       included do
         manual_slug :name
-
-        rails_admin(&Enjoy::Catalog::Admin::Item.config(rails_admin_add_fields) { |config|
-          rails_admin_add_config(config)
-        })
-      end
-
-      def clean_excerpt
-        Rails::Html::FullSanitizer.new.sanitize(self.excerpt.strip)
-      end
-
-      def clean_content
-        Rails::Html::FullSanitizer.new.sanitize(self.content.strip)
       end
     end
   end

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

@@ -15,14 +15,6 @@ module Enjoy::Catalog
         manual_slug :name
       end
 
-      def clean_excerpt
-        Rails::Html::FullSanitizer.new.sanitize(self.excerpt.strip)
-      end
-
-      def clean_content
-        Rails::Html::FullSanitizer.new.sanitize(self.content.strip)
-      end
-
       def item_class
         Enjoy::Catalog::Item
       end

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

@@ -11,7 +11,7 @@ module Enjoy::Catalog
           if defined?(RailsAdminComments)
             include RailsAdminComments::Commentable
           end
-          
+
           field :name, type: String, localize: Enjoy.configuration.localize, default: ""
 
           enjoy_cms_mongoid_attached_file(:image,
@@ -40,6 +40,10 @@ module Enjoy::Catalog
         def image_styles
           Enjoy::Catalog.configuration.item_image_styles
         end
+
+        def image_jcrop_options
+          {}
+        end
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Enjoy::Catalog
           if defined?(RailsAdminComments)
             include RailsAdminComments::Commentable
           end
-          
+
           field :name, type: String, localize: Enjoy.configuration.localize, default: ""
 
           enjoy_cms_mongoid_attached_file(:image,
@@ -41,6 +41,10 @@ module Enjoy::Catalog
         def image_styles
           Enjoy::Catalog.configuration.item_category_image_styles
         end
+
+        def image_jcrop_options
+          {}
+        end
       end
     end
   end

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

@@ -19,6 +19,10 @@ module Enjoy::Catalog
         def image_styles
           Enjoy::Catalog.configuration.item_category_images_image_styles
         end
+
+        def image_jcrop_options
+          {}
+        end
       end
     end
   end

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

@@ -20,6 +20,10 @@ module Enjoy::Catalog
         def image_styles
           Enjoy::Catalog.configuration.item_images_image_styles
         end
+
+        def image_jcrop_options
+          {}
+        end
       end
     end
   end

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/generators/enjoy/catalog/all_generator.rb

@@ -0,0 +1,17 @@
+require 'rails/generators'
+
+module Enjoy::Catalog
+  class AllGenerator < Rails::Generators::Base
+    argument :class_name, type: :string
+
+    desc 'Enjoy::Catalog Controllers generator'
+    def all
+      generate "enjoy:catalog:config:install"
+
+      generate "enjoy:catalog:models:all #{class_name}"
+      
+      generate "enjoy:catalog:controllers:all #{class_name}"
+    end
+
+  end
+end

data/lib/generators/enjoy/catalog/config/install_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Config
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'Enjoy::Catalog Config generator'
+    def install
+      template 'enjoy_catalog.erb', "config/initializers/enjoy_catalog.rb"
+    end
+
+  end
+end

data/lib/generators/enjoy/catalog/config/templates/enjoy_catalog.erb

@@ -0,0 +1,18 @@
+Enjoy::Catalog.configure do |config|
+  ##### defaults #####
+  # config.item_image_styles  = {}
+  # config.item_per_page      = 10
+  #
+  # config.item_images_image_styles = {}
+  #
+  # config.item_category_image_styles = {}
+  # config.item_category_per_page     = 10
+  #
+  # config.item_category_images_image_styles = {}
+  #
+  # config.routes_config = {
+  #   use_items_path: true,
+  #   use_item_categories_path: true,
+  #   use_catalog_path: true
+  # }
+end

data/lib/generators/enjoy/catalog/controllers/all_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Controllers
+  class AllGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :category_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog Controllers generator'
+    def all
+      generate "enjoy:catalog:controllers:item #{camelcased_class_name}"
+      generate "enjoy:catalog:controllers:item_category #{category_class_name}"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def category_class_name
+      category_class_name_arg.blank? ? "#{camelcased_class_name}Category" : category_class_name_arg
+    end
+
+  end
+end

data/lib/generators/enjoy/catalog/controllers/item_category_generator.rb

@@ -0,0 +1,43 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Controllers
+  class ItemCategoryGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :item_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog ItemCategory Controller generator'
+    def item_category
+      template 'item_categories_controller.erb', "app/controllers/#{file_name}_controller.rb"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def camelcased_pluralized_class_name
+      camelcased_class_name.pluralize
+    end
+
+    def file_name
+      underscored_pluralized_class_name
+    end
+
+    def underscored_class_name
+      camelcased_class_name.underscore
+    end
+
+    def underscored_pluralized_class_name
+      underscored_class_name.pluralize
+    end
+
+    def item_class_name
+      item_class_name_arg.blank? ? camelcased_class_name.sub(/Category$/, "") : item_class_name_arg
+    end
+  end
+end

data/lib/generators/enjoy/catalog/controllers/item_generator.rb

@@ -0,0 +1,43 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Controllers
+  class ItemGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :item_category_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog Item Controller generator'
+    def item
+      template 'items_controller.erb', "app/controllers/#{file_name}_controller.rb"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def camelcased_pluralized_class_name
+      camelcased_class_name.pluralize
+    end
+
+    def file_name
+      underscored_pluralized_class_name
+    end
+
+    def underscored_class_name
+      camelcased_class_name.underscore
+    end
+
+    def underscored_pluralized_class_name
+      underscored_class_name.pluralize
+    end
+
+    def item_category_class_name
+      item_category_class_name_arg.blank? ? "#{camelcased_class_name}Category" : item_category_class_name_arg
+    end
+  end
+end

data/lib/generators/enjoy/catalog/controllers/templates/item_categories_controller.erb

@@ -0,0 +1,10 @@
+class <%= camelcased_pluralized_class_name %>Controller < Enjoy::Catalog::ItemCategoriesController
+
+  private
+  def item_category_class
+    <%= camelcased_class_name %>
+  end
+  def item_class
+    <%= item_class_name %>
+  end
+end

data/lib/generators/enjoy/catalog/controllers/templates/items_controller.erb

@@ -0,0 +1,10 @@
+class <%= camelcased_pluralized_class_name %>Controller < Enjoy::Catalog::ItemsController
+
+  private
+  def item_category_class
+    <%= item_category_class_name %>
+  end
+  def item_class
+    <%= camelcased_class_name %>
+  end
+end

data/lib/generators/enjoy/catalog/models/all_generator.rb

@@ -0,0 +1,38 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Models
+  class AllGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :category_class_name_arg, type: :string, default: ""
+    argument :image_class_name_arg, type: :string, default: ""
+    argument :category_image_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog Models generator'
+    def all
+      generate "enjoy:catalog:models:item #{camelcased_class_name}"
+      generate "enjoy:catalog:models:item_category #{category_class_name}"
+      generate "enjoy:catalog:models:item_image #{image_class_name}"
+      generate "enjoy:catalog:models:item_category_image #{category_image_class_name}"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def category_class_name
+      category_class_name_arg.blank? ? "#{camelcased_class_name}Category" : category_class_name_arg
+    end
+    def image_class_name
+      image_class_name_arg.blank? ? "#{camelcased_class_name}Image" : image_class_name_arg
+    end
+    def category_image_class_name
+      category_image_class_name_arg.blank? ? "#{camelcased_class_name}CategoryImage" : category_image_class_name_arg
+    end
+
+  end
+end

data/lib/generators/enjoy/catalog/models/item_category_generator.rb

@@ -0,0 +1,39 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Models
+  class ItemCategoryGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :item_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog ItemCategory Model generator'
+    def item_category
+      template 'item_category.erb', "app/models/#{file_name}.rb"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def file_name
+      underscored_class_name
+    end
+
+    def underscored_class_name
+      camelcased_class_name.underscore
+    end
+
+    def underscored_pluralized_class_name
+      underscored_class_name.pluralize
+    end
+
+    def item_class_name
+      item_class_name_arg.blank? ? camelcased_class_name.sub(/Category$/, "") : item_class_name_arg
+    end
+  end
+end

data/lib/generators/enjoy/catalog/models/item_category_image_generator.rb

@@ -0,0 +1,39 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Models
+  class ItemCategoryImageGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :item_category_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog ItemCategoryImage Model generator'
+    def item_category_image
+      template 'item_category_image.erb', "app/models/#{file_name}.rb"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def file_name
+      underscored_class_name
+    end
+
+    def underscored_class_name
+      camelcased_class_name.underscore
+    end
+
+    def underscored_pluralized_class_name
+      underscored_class_name.pluralize
+    end
+
+    def item_category_class_name
+      item_category_class_name_arg.blank? ? camelcased_class_name.sub(/Image$/, "") : item_category_class_name_arg
+    end
+  end
+end

data/lib/generators/enjoy/catalog/models/item_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Models
+  class ItemGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+
+    desc 'Enjoy::Catalog Item Model generator'
+    def item
+      template 'item.erb', "app/models/#{file_name}.rb"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def file_name
+      underscored_class_name
+    end
+
+    def underscored_class_name
+      camelcased_class_name.underscore
+    end
+
+    def underscored_pluralized_class_name
+      underscored_class_name.pluralize
+    end
+  end
+end

data/lib/generators/enjoy/catalog/models/item_image_generator.rb

@@ -0,0 +1,39 @@
+require 'rails/generators'
+
+module Enjoy::Catalog::Models
+  class ItemImageGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :class_name, type: :string
+    argument :item_class_name_arg, type: :string, default: ""
+
+    desc 'Enjoy::Catalog ItemImage Model generator'
+    def item_image
+      template 'item_image.erb', "app/models/#{file_name}.rb"
+    end
+
+    private
+    def capitalized_class_name
+      class_name.capitalize
+    end
+
+    def camelcased_class_name
+      class_name.camelcase
+    end
+
+    def file_name
+      underscored_class_name
+    end
+
+    def underscored_class_name
+      camelcased_class_name.underscore
+    end
+
+    def underscored_pluralized_class_name
+      underscored_class_name.pluralize
+    end
+
+    def item_class_name
+      item_class_name_arg.blank? ? camelcased_class_name.sub(/Image$/, "") : item_class_name_arg
+    end
+  end
+end

data/lib/generators/enjoy/catalog/models/templates/item.erb

@@ -0,0 +1,32 @@
+class <%= camelcased_class_name %> < Enjoy::Catalog::Item
+
+  has_and_belongs_to_many :item_categories, class_name: "<%= camelcased_class_name %>Category", inverse_of: nil
+  alias :<%= underscored_class_name %>_categories :item_categories
+
+  embeds_many :item_images, cascade_callbacks: true, class_name: "<%= camelcased_class_name %>Image"
+  alias :<%= underscored_class_name %>_images :item_images
+
+  has_and_belongs_to_many :related_items, :class_name => "<%= camelcased_class_name %>", :inverse_of => :related_items
+  alias :related_<%= underscored_pluralized_class_name %> :related_items
+
+  def image_styles
+    {}
+  end
+
+  def image_jcrop_options
+    {}
+  end
+
+
+  ############# rails_admin ##############
+  def self.rails_admin_add_fields
+    {}
+  end
+
+  def self.rails_admin_add_config(config)
+  end
+
+  rails_admin(&Enjoy::Catalog::Admin::Item.config(rails_admin_add_fields) { |config|
+    rails_admin_add_config(config)
+  })
+end

data/lib/generators/enjoy/catalog/models/templates/item_category.erb

@@ -0,0 +1,30 @@
+class <%= camelcased_class_name %> < Enjoy::Catalog::ItemCategory
+
+  embeds_many :item_category_images, cascade_callbacks: true, class_name: "<%= camelcased_class_name %>Image"
+  alias :<%= underscored_class_name %>_images :item_category_images
+
+  def image_styles
+    {}
+  end
+
+  def image_jcrop_options
+    {}
+  end
+
+  def item_class
+    <%= item_class_name %>
+  end
+
+
+  ############# rails_admin ##############
+  def self.rails_admin_add_fields
+    {}
+  end
+
+  def self.rails_admin_add_config(config)
+  end
+
+  rails_admin(&Enjoy::Catalog::Admin::ItemCategory.config(rails_admin_add_fields) { |config|
+    rails_admin_add_config(config)
+  })
+end

data/lib/generators/enjoy/catalog/models/templates/item_category_image.erb

@@ -0,0 +1,30 @@
+class <%= camelcased_class_name %> < Enjoy::Catalog::ItemCategoryImage
+  embedded_in :item_category, class_name: "<%= item_category_class_name %>"
+  alias :<%= underscored_class_name %>_category :item_category
+
+  def self.find(id)
+    find_through(<%= item_category_class_name %>, 'item_category_images', id)
+  end
+
+  def image_styles
+    {}
+  end
+
+  def image_jcrop_options
+    {}
+  end
+
+
+  ############# rails_admin ##############
+  def self.rails_admin_add_fields
+    {}
+  end
+
+  def self.rails_admin_add_config(config)
+  end
+
+  rails_admin(&Enjoy::Catalog::Admin::ItemCategoryImage.config(rails_admin_add_fields) { |config|
+    rails_admin_add_config(config)
+  })
+
+end

data/lib/generators/enjoy/catalog/models/templates/item_image.erb

@@ -0,0 +1,30 @@
+class <%= camelcased_class_name %> < Enjoy::Catalog::ItemImage
+  embedded_in :item, class_name: "<%= item_class_name %>"
+  alias :<%= underscored_class_name %> :item
+
+  def self.find(id)
+    find_through(<%= item_class_name %>, 'item_images', id)
+  end
+
+  def image_styles
+    {}
+  end
+
+  def image_jcrop_options
+    {}
+  end
+
+
+  ############# rails_admin ##############
+  def self.rails_admin_add_fields
+    {}
+  end
+
+  def self.rails_admin_add_config(config)
+  end
+
+  rails_admin(&Enjoy::Catalog::Admin::ItemImage.config(rails_admin_add_fields) { |config|
+    rails_admin_add_config(config)
+  })
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 description: Items catalog with EnjoyCMS support.
 email:
 - dev@enjoycreate.ru
@@ -136,6 +136,23 @@ files:
 - lib/enjoy/catalog/models/mongoid/item_image.rb
 - lib/enjoy/catalog/version.rb
 - lib/enjoy_cms_catalog.rb
+- lib/generators/enjoy/catalog/all_generator.rb
+- lib/generators/enjoy/catalog/config/install_generator.rb
+- lib/generators/enjoy/catalog/config/templates/enjoy_catalog.erb
+- lib/generators/enjoy/catalog/controllers/all_generator.rb
+- lib/generators/enjoy/catalog/controllers/item_category_generator.rb
+- lib/generators/enjoy/catalog/controllers/item_generator.rb
+- lib/generators/enjoy/catalog/controllers/templates/item_categories_controller.erb
+- lib/generators/enjoy/catalog/controllers/templates/items_controller.erb
+- lib/generators/enjoy/catalog/models/all_generator.rb
+- lib/generators/enjoy/catalog/models/item_category_generator.rb
+- lib/generators/enjoy/catalog/models/item_category_image_generator.rb
+- lib/generators/enjoy/catalog/models/item_generator.rb
+- lib/generators/enjoy/catalog/models/item_image_generator.rb
+- lib/generators/enjoy/catalog/models/templates/item.erb
+- lib/generators/enjoy/catalog/models/templates/item_category.erb
+- lib/generators/enjoy/catalog/models/templates/item_category_image.erb
+- lib/generators/enjoy/catalog/models/templates/item_image.erb
 - release.sh
 homepage: https://github.com/enjoycreative/enjoy_cms_catalog
 licenses: