enjoy_cms_catalog 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1e8327ef229c0b25ddea63ef933783c1d10648c
-  data.tar.gz: 47d6cb35664902671b67c71efe2350a85de68766
+  metadata.gz: 76ed535e18dd2cc2e1c8df32149a0f5a1c9d651f
+  data.tar.gz: 2e677aeed56f706021b71b11e2279e2a9c028fe4
 SHA512:
-  metadata.gz: b9d8811cb17691cf9fdf50c1833e17eab32439ee4cb4812aa8999cc71df9053ab6685a449b70d301f9f3d3677d882453ac595c537cf1a8dd18649db9e646342d
-  data.tar.gz: b07fec3e354c84e7e29671c14cf0d875a390ca82cf25aa0a6c8a7fdb6771605d6bdfc577dc60709e402305f24a61d2e830e04120cc06891e1f05ccd15e67fbba
+  metadata.gz: deb8f237ccc72b51a138bf8b6eef8b1ef9d6b2c93b91d5a39fa8850c5b28d1869b7e3eed3d6ba2b2492c03db7fcbca14b5b722fb438d7ea50f6c5670bd3ba93a
+  data.tar.gz: dfc7da876f99f2a6f3d6c8d32fc762d137783141693e7888505ec867cacdb8da35adf60114f5dd5231f548432b7363d1014fcc59c9417112c44da5a85ce32db6

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

@@ -8,7 +8,7 @@
 
       .ic_block
 
-        = link_to enjoy_cms_catalog.item_category_path(ic), title: ic.name do
+        = link_to ic, title: ic.name do
 
           .ic_img_block
 

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

@@ -22,7 +22,7 @@
 
         .ic_block
 
-          = link_to enjoy_cms_catalog.item_category_path(icc), title: icc.name do
+          = link_to icc, title: icc.name do
 
             .ic_img_block
 
@@ -52,7 +52,7 @@
 
 
         .item_block
-          = link_to enjoy_cms_catalog.item_path(i), title: i.name do
+          = link_to i, title: i.name do
             .i_block
 
 

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

@@ -5,7 +5,7 @@
   - unless @items.blank?
     - @items.each do |i|
       .item_block
-        = link_to enjoy_cms_catalog.item_path(i), title: i.name do
+        = link_to i, title: i.name do
           .i_block
 
 

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

@@ -9,7 +9,7 @@
 
     
 .item_block
-  = link_to enjoy_cms_catalog.item_path(@item), title: @item.name do
+  = link_to @item, title: @item.name do
     .i_block
 
 

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.4"
+  spec.add_dependency 'enjoy_cms', "~> 0.3.5"
 end

data/lib/enjoy/catalog/configuration.rb

@@ -22,8 +22,6 @@ module Enjoy
 
       attr_accessor :item_category_images_image_styles
 
-      attr_accessor :routes_config
-
       def initialize
         @item_image_styles  = {}
         @item_per_page      = 10
@@ -34,12 +32,6 @@ module Enjoy
         @item_category_per_page     = 10
 
         @item_category_images_image_styles = {}
-
-        @routes_config = {
-          use_items_path: true,
-          use_item_categories_path: true,
-          use_catalog_path: true
-        }
       end
     end
   end

data/lib/enjoy/catalog/engine.rb

@@ -1,7 +1,7 @@
 module Enjoy
   module Catalog
     class Engine < ::Rails::Engine
-      isolate_namespace Enjoy::Catalog
+      # isolate_namespace Enjoy::Catalog
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Enjoy::Catalog
       included do
         manual_slug :name
 
-        enjoy_connectable_field :connected_pages, routes_namespace: :enjoy_cms_catalog
+        enjoy_connectable_field :connected_pages
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Enjoy::Catalog
       included do
         manual_slug :name
 
-        enjoy_connectable_field :connected_pages, routes_namespace: :enjoy_cms_catalog
+        enjoy_connectable_field :connected_pages
       end
 
       def item_class

data/lib/enjoy/catalog/routes.rb

@@ -0,0 +1,34 @@
+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
+      }
+      routes_config.merge!(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: ""
+            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
+            end
+          end
+          if routes_config[:use_catalog_path]
+            get 'catalog' => 'item_categories#index', as: :enjoy_catalog
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/enjoy/catalog/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Catalog
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

data/lib/enjoy_cms_catalog.rb

@@ -1,8 +1,11 @@
 require "enjoy/catalog/version"
 
+require 'enjoy/catalog/routes'
+
 require 'money-rails'
 
-require 'enjoy_cms_mongoid'
+require 'enjoy_cms'
+
 require 'rails_admin_sort_embedded'
 require 'rails_admin_jcrop'
 

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

@@ -9,10 +9,4 @@ Enjoy::Catalog.configure do |config|
   # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_catalog
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-03-07 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.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 description: Items catalog with EnjoyCMS support.
 email:
 - dev@enjoycreate.ru
@@ -115,7 +115,6 @@ files:
 - bin/console
 - bin/setup
 - config/initializers/rails_admin.rb
-- config/routes.rb
 - enjoy_cms_catalog.gemspec
 - lib/enjoy/catalog/admin.rb
 - lib/enjoy/catalog/admin/item.rb
@@ -134,6 +133,7 @@ files:
 - lib/enjoy/catalog/models/mongoid/item_category.rb
 - lib/enjoy/catalog/models/mongoid/item_category_image.rb
 - lib/enjoy/catalog/models/mongoid/item_image.rb
+- lib/enjoy/catalog/routes.rb
 - lib/enjoy/catalog/version.rb
 - lib/enjoy_cms_catalog.rb
 - lib/generators/enjoy/catalog/all_generator.rb

data/config/routes.rb

@@ -1,18 +0,0 @@
-Enjoy::Catalog::Engine.routes.draw do
-  routes_config = Enjoy::Catalog.configuration.routes_config
-
-  if !routes_config or routes_config[:use_items_path]
-    resources :items, only: [:show] do
-      get '(/page/:page)', action: :index, on: :collection, as: ""
-    end
-  end
-
-  if !routes_config or routes_config[:use_item_categories_path]
-    resources :item_categories, only: [:index, :show] do
-      get 'items(/page/:page)', action: :items, on: :member, as: :items
-    end
-  end
-  if !routes_config or routes_config[:use_catalog_path]
-    get 'catalog' => 'item_categories#index', as: :catalog
-  end
-end