enjoy_cms_faq 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74523e085f8b1d0f5dc74c225e0c8551fef7549
-  data.tar.gz: 7b0afe4a8218f10880c14a3b7a32a56ab9726042
+  metadata.gz: c5c4f104fce776355a25b9073e42aa96a4643d8d
+  data.tar.gz: 2e4422d8ec654c5b0c9e6f41dbc9b8b70db52b9d
 SHA512:
-  metadata.gz: d4290543bccf56d27246cc51f0f77b5d5ff7acb5ef21bbe4a1147d14b72a001fb5ef15a994380739886168dbd9c38bbef0b6fc7a9b93d458cbe1cf145c517524
-  data.tar.gz: 3b6f23463593ebf576887bd511d9501c2f98c479e65934e7c31c4b9450a6f050ae5dc8986f3ad2d09d6261370658de50f8a7759a07e72073410b6f97f80a33fc
+  metadata.gz: 3ee95207fb2d6a8f3b174214b4920976d0ae31df2034bfb123c302caa64f40e2cfccedd758a586cdbf68ed15f5ca0126badfad7001971be9433a78af1fe7abd7
+  data.tar.gz: 4c97c0f2c58c34e8fffc037809b476114478e51a696b70c3ac5fe5a87c1422e4db84c99a2a32f63bd92ebbf14c35f02fd54f11a10c1ebe484987bd81d080a9f2

data/app/views/enjoy/faq/questions/_new_question_form.html.slim

@@ -1,6 +1,6 @@
 - @question ||= Enjoy::Faq::Question.new
 - if @question.new_record?
-  = simple_form_for @question, url: enjoy_cms_faq.questions_path do |f|
+  = simple_form_for @question, url: enjoy_questions_path do |f|
     - unless @message.blank?
       h3= @message
     .inputtextblock_q

data/enjoy_cms_faq.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency 'enjoy_cms', "~> 0.3.2"
+  spec.add_dependency 'enjoy_cms', "~> 0.3.5"
 end

data/lib/enjoy/faq/configuration.rb

@@ -19,8 +19,6 @@ module Enjoy
       attr_accessor :save_with_captcha
       attr_accessor :captcha_error_message
 
-      attr_accessor :routes_config
-
       def initialize
         @author_name_required = true
 
@@ -28,12 +26,6 @@ module Enjoy
 
         @save_with_captcha = true
         @captcha_error_message = "Код с картинки введен неверно"
-
-        @routes_config = {
-          use_questions_path: true,
-          use_question_categories_path: true,
-          use_faq_path: true
-        }
       end
     end
   end

data/lib/enjoy/faq/engine.rb

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

data/lib/enjoy/faq/routes.rb

@@ -0,0 +1,34 @@
+module ActionDispatch::Routing
+  class Mapper
+
+    def enjoy_cms_faq_routes(config = {})
+      routes_config = {
+        use_questions_path: true,
+        use_question_categories_path: true,
+        use_faq_path: true
+      }
+      routes_config.merge!(config)
+
+      scope module: 'enjoy' do
+        scope module: 'faq' do
+          if routes_config[:use_questions_path]
+            resources :questions, only: [:show, :new, :create], as: :enjoy_faq_questions do
+              get '(/page/:page)', action: :index, on: :collection, as: ""
+            end
+          end
+
+          if routes_config[:use_question_categories_path]
+            resources :question_categories, only: [:index, :show], as: :enjoy_faq_question_categories do
+              get 'questions(/page/:page)', action: :questions, on: :member, as: :questions
+            end
+          end
+          if routes_config[:use_faq_path]
+            get 'faq' => 'question_categories#index', as: :enjoy_faq
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/enjoy/faq/version.rb

@@ -1,5 +1,5 @@
 module Enjoy
   module Faq
-    VERSION = "0.3.2"
+    VERSION = "0.3.5"
   end
 end

data/lib/enjoy_cms_faq.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms_faq
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
 description: FAQ system with EnjoyCMS support.
 email:
 - dev@enjoycreate.ru
@@ -86,7 +86,6 @@ files:
 - bin/console
 - bin/setup
 - config/initializers/rails_admin.rb
-- config/routes.rb
 - enjoy_cms_faq.gemspec
 - lib/enjoy/faq/admin.rb
 - lib/enjoy/faq/admin/question.rb
@@ -99,6 +98,7 @@ files:
 - lib/enjoy/faq/models/mongoid/question_category.rb
 - lib/enjoy/faq/models/question.rb
 - lib/enjoy/faq/models/question_category.rb
+- lib/enjoy/faq/routes.rb
 - lib/enjoy/faq/version.rb
 - lib/enjoy_cms_faq.rb
 - release.sh

data/config/routes.rb

@@ -1,18 +0,0 @@
-Enjoy::Faq::Engine.routes.draw do
-  routes_config = Enjoy::Faq.configuration.routes_config
-
-  if !routes_config or routes_config[:use_questions_path]
-    resources :questions, only: [:show, :new, :create] do
-      get '(/page/:page)', action: :index, on: :collection, as: ""
-    end
-  end
-
-  if !routes_config or routes_config[:use_question_categories_path]
-    resources :question_categories, only: [:index, :show] do
-      get 'items(/page/:page)', action: :questions, on: :member, as: :items
-    end
-  end
-  if !routes_config or routes_config[:use_faq_path]
-    get 'faq' => 'question_categories#index', as: :faq
-  end
-end