enjoy_cms_catalog 0.2.0.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114464bfa249ce351c0a6e890748ac8d247a59b2
-  data.tar.gz: 1f18915d49ee5b3d2672f97f55855e978692e1b7
+  metadata.gz: 38d3f0bc0de2667ad75dfc5647106c3a83e6843c
+  data.tar.gz: 55f3ecc1ede6616068a73837e5289fbda08ab315
 SHA512:
-  metadata.gz: 759949488d235e315a7457807aaf99ce6c651753db138d9eff8a24263b1108ad8c10ed0a7f5a0b8a1aa24a0c67e025d22e8ad00fa4861f54906fca3c3e12b0f3
-  data.tar.gz: 15d6238782d5ca34b5c68d1616ac1010384160bfc053f27ef8926548c6ae55ceea029f1f27d5f21c469d7920f9d359c0d60b3d98af3182ce48e4525d62fd673b
+  metadata.gz: 889ecc3bcb16e643ebc714c0234a919bfd974c576d1b580fbc7c8495dd93c8ae39ff84dad51818531627f902036f4cfd656aa83a4b161fda140017f884e69b8d
+  data.tar.gz: 22592e5f748586af88081a69d6b511f645f6b4fb77105d77a2427cd13fa158f9504c99783682143c8ecffeaa62f68e88a3b1ceed9434b3d14146b2b894741687

data/app/controllers/concerns/enjoy/catalog/decorators/item_categories.rb

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

data/app/controllers/concerns/enjoy/catalog/decorators/items.rb

@@ -0,0 +1,5 @@
+module Enjoy::Catalog::Decorators
+  module Items
+    extend ActiveSupport::Concern
+  end
+end

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

@@ -1,5 +1,7 @@
 module Enjoy::Catalog
   class ItemCategoriesController < ApplicationController
     include Enjoy::Catalog::Controllers::ItemCategories
+
+    include Enjoy::Catalog::Decorators::ItemCategories
   end
 end

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

@@ -1,5 +1,7 @@
 module Enjoy::Catalog
   class ItemsController < ApplicationController
     include Enjoy::Catalog::Controllers::Items
+
+    include Enjoy::Catalog::Decorators::Items
   end
 end

data/enjoy_cms_catalog.gemspec

@@ -31,12 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'rails', '>= 4.1.0', '< 5.0'
-
   spec.add_dependency 'money-rails'
   spec.add_dependency 'mongoid_money_field'
 
-  spec.add_dependency 'enjoy_cms'
-  spec.add_dependency 'rails_admin_sort_embedded'
-  spec.add_dependency 'ack_rails_admin_jcrop'
+  spec.add_dependency 'enjoy_cms', "~> 0.3.0"
 end

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

@@ -34,8 +34,8 @@ module Enjoy::Catalog
               end
             end
             field :item_categories
-            field :excerpt, :ck_editor
-            field :content, :ck_editor
+            field :excerpt, :enjoy_html
+            field :content, :enjoy_html
 
             field :item_images
 

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

@@ -15,8 +15,10 @@ module Enjoy::Catalog
               read_only true
 
               pretty_value do
-                bindings[:object].items.to_a.map { |h|
-                  (bindings[:view] || bindings[:controller]).link_to(h.name, (bindings[:view] || bindings[:controller]).rails_admin.show_path(model_name: "item", id: h.id), title: h.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
@@ -42,8 +44,8 @@ module Enjoy::Catalog
                 :image_jcrop_options
               end
             end
-            field :excerpt, :ck_editor
-            field :content, :ck_editor
+            field :excerpt, :enjoy_html
+            field :content, :enjoy_html
 
             field :item_category_images
 
@@ -77,8 +79,10 @@ module Enjoy::Catalog
               help 'Список товаров'
 
               pretty_value do
-                bindings[:object].items.to_a.map { |h|
-                  (bindings[:view] || bindings[:controller]).link_to(h.name, (bindings[:view] || bindings[:controller]).rails_admin.edit_path(model_name: "item", id: h.id), title: h.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
@@ -108,8 +112,10 @@ module Enjoy::Catalog
               read_only true
 
               pretty_value do
-                bindings[:object].items.to_a.map { |h|
-                  (bindings[:view] || bindings[:controller]).link_to(h.name, (bindings[:view] || bindings[:controller]).rails_admin.show_path(model_name: "item", id: h.id), title: h.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

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

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

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

@@ -26,15 +26,6 @@ module Enjoy::Catalog
       def clean_content
         Rails::Html::FullSanitizer.new.sanitize(self.content.strip)
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

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

@@ -27,23 +27,6 @@ module Enjoy::Catalog
         Enjoy::Catalog::Item
       end
 
-      def items
-        item_class.in(item_category_ids: self.id)
-      end
-
-      def all_items
-        item_class.any_in(item_category_ids: self.self_and_descendants.map(&:id))
-      end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
-
     end
   end
 end

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

@@ -9,15 +9,6 @@ module Enjoy::Catalog
 
       included do
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

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

@@ -9,15 +9,6 @@ module Enjoy::Catalog
 
       included do
       end
-
-      module ClassMethods
-        def rails_admin_add_fields
-          {}
-        end
-
-        def rails_admin_add_config(config)
-        end
-      end
     end
   end
 end

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

@@ -5,9 +5,9 @@ module Enjoy::Catalog
         extend ActiveSupport::Concern
         include Enjoy::MongoidPaperclip
 
-        included do
-          # default_scope -> { unscoped.any_of( {_type: nil}, {type: ""}, {_type: "Enjoy::Catalog::Item"} ) }
+        include Enjoy::HtmlField
 
+        included do
           field :name, type: String, localize: Enjoy.configuration.localize, default: ""
 
           enjoy_cms_mongoid_attached_file(:image,
@@ -18,10 +18,11 @@ module Enjoy::Catalog
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
 
-          field :excerpt,   type: String, localize: Enjoy.configuration.localize, default: ""
-          field :content,   type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :content,   type: String, localize: Enjoy.configuration.localize, default: ""
 
           has_and_belongs_to_many :item_categories, class_name: "Enjoy::Catalog::ItemCategory", inverse_of: nil
+          alias :categories :item_categories
 
           embeds_many :item_images, cascade_callbacks: true, class_name: "Enjoy::Catalog::ItemImage"
           alias :images :item_images

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

@@ -5,6 +5,8 @@ module Enjoy::Catalog
         extend ActiveSupport::Concern
         include Enjoy::MongoidPaperclip
 
+        include Enjoy::HtmlField
+
         included do
           field :name, type: String, localize: Enjoy.configuration.localize, default: ""
 
@@ -16,14 +18,22 @@ module Enjoy::Catalog
           acts_as_nested_set
           scope :sorted, -> { order_by([:lft, :asc]) }
 
-          field :excerpt,   type: String, localize: Enjoy.configuration.localize, default: ""
-          field :content,   type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :excerpt,   type: String, localize: Enjoy.configuration.localize, default: ""
+          enjoy_cms_html_field :content,   type: String, localize: Enjoy.configuration.localize, default: ""
 
           embeds_many :item_category_images, cascade_callbacks: true, class_name: "Enjoy::Catalog::ItemCategoryImage"
           alias :images :item_category_images
           accepts_nested_attributes_for :item_category_images, allow_destroy: true
         end
 
+        def items
+          item_class.in(item_category_ids: self.id)
+        end
+
+        def all_items
+          item_class.any_in(item_category_ids: self.self_and_descendants.map(&:id))
+        end
+
         def image_styles
           Enjoy::Catalog.configuration.item_category_image_styles
         end

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.2.0.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.2.0.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,26 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
@@ -90,44 +70,16 @@ dependencies:
   name: enjoy_cms
   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: rails_admin_sort_embedded
-  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: ack_rails_admin_jcrop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: Items catalog with EnjoyCMS support.
 email:
 - dev@enjoycreate.ru
@@ -144,6 +96,8 @@ files:
 - Rakefile
 - app/assets/javascripts/enjoy_cms_catalog/enjoy_cms_catalog.coffee
 - app/assets/stylesheets/enjoy_cms_catalog/enjoy_cms_catalog.sass
+- app/controllers/concerns/enjoy/catalog/decorators/item_categories.rb
+- app/controllers/concerns/enjoy/catalog/decorators/items.rb
 - app/controllers/enjoy/catalog/item_categories_controller.rb
 - app/controllers/enjoy/catalog/items_controller.rb
 - app/models/concerns/enjoy/catalog/decorators/item.rb