optimacms 0.1.58 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b97da65940e9e195a6724bef2dbacd66e3b748f1
-  data.tar.gz: 750087e73c213267611d745337edb7c337e473cf
+  metadata.gz: 8bf26a5c5469d53c0c18948a05ede70518510deb
+  data.tar.gz: 473d018c47aa5cc53b5d968a6d8d6b381de367c1
 SHA512:
-  metadata.gz: ee8de12d7ad50837f34f3617719d1f360b481f721bb72e784571ce71edd6d1a513c3c16ce54e326936116bda964645a70244cc36400e17623141840a74e64ddd
-  data.tar.gz: c8600d0d2effef8000d7eada7f6123aac76a111ddb2dfbcf2bf4df68935e0c1175639c751f92faf6e57548e9eedb945034ba251a20cd6e2cfe5a4715cd578709
+  metadata.gz: 84226e4dae3c1aa13c33d2452546d0013692e48dd2df5fb283f0a2182d5dda99beee9e3cc8ac4dd2cb3e344f24ede105617e75ec29abe8ccf9eb3ebbb768b138
+  data.tar.gz: 888a16554ab331aa1ef79349bcfa6b33c85b3a4e2f1f9d14d403cd155087c479858618f8032b7d5c948a9d1d5f9202d841e20a60f13ec8175a461f9a9dc472e4

data/lib/optimacms/page_services/page_route_service.rb

@@ -190,6 +190,9 @@ module Optimacms
           (params_extra[name[1..-1].to_sym] || '')
         end
 
+        # remove ()
+        res.gsub! /[\(\)]/, ''
+
         # add extra params
         p_not_used =  p - p_used - [:controller, :action, :only_path, :url]
 

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.58"
+  VERSION = "0.1.59"
 end

data/spec/dummy/app/controllers/news_controller.rb

@@ -8,6 +8,8 @@ class NewsController < ApplicationController
 
     @items = News.all
 
+    y = site_page_path('news_item', {id: 1, name: 'mama'})
+    z=0
 
   end
 

data/spec/dummy/log/development.log

@@ -23068,3 +23068,162 @@ Started GET "/assets/bootstrap-5219915267bc07092cc5984f417a5ad5.js?body=1" for 1
 
 
 Started GET "/assets/application-144f3468d85785a421c7f26f17032903.js?body=1" for 127.0.0.1 at 2016-02-29 00:34:56 +0200
+
+
+Started GET "/cmsadmin/pages/105/edit" for 127.0.0.1 at 2016-02-29 00:44:19 +0200
+Processing by Optimacms::Admin::PagesController#edit as HTML
+  Parameters: {"id"=>"105"}
+  Optimacms::CmsAdminUser Load (1.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`id` = 105 LIMIT 1
+  Optimacms::Language Load (0.0ms)  SELECT `cms_languages`.* FROM `cms_languages`  ORDER BY pos asc
+  CACHE (0.0ms)  SELECT `cms_languages`.* FROM `cms_languages`  ORDER BY pos asc
+  Optimacms::PageTranslation Load (0.0ms)  SELECT `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 105
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_form_errors.html.haml (1.0ms)
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`id` = 104 LIMIT 1
+  Optimacms::Template Load (1.0ms)  SELECT `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`is_folder` = 0 AND `cms_templates`.`type_id` = 1
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 147 LIMIT 1
+  CACHE (0.0ms)  SELECT `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 105  [["item_id", 105]]
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/_meta.html.haml (396.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/common/_modal_div.html.haml (3.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/templates/_js_form_modal.html.haml (14.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/common/_js_tinymce.html.haml (4.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/_form.html.haml (644.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/edit.html.haml within optimacms/admin/layouts/main (655.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_top.html.haml (9.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_leftmenu.html.haml (49.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_breadcrumbs.html.haml (2.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_flash.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_version.html.haml (0.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_footer.html.haml (9.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (900.1ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (1041.1ms)
+Completed 200 OK in 1784ms (Views: 1725.1ms | ActiveRecord: 5.0ms)
+
+
+Started GET "/assets/bootstrap-5219915267bc07092cc5984f417a5ad5.js?body=1" for 127.0.0.1 at 2016-02-29 00:44:21 +0200
+
+
+Started GET "/assets/jquery_ujs-f9f4ae336c0d19804775e0e2c8749423.js?body=1" for 127.0.0.1 at 2016-02-29 00:44:22 +0200
+
+
+Started PATCH "/cmsadmin/pages/105" for 127.0.0.1 at 2016-02-29 00:44:24 +0200
+Processing by Optimacms::Admin::PagesController#update as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"LwA894ABeDkHdwoCb5l3TjiuNKB6meFZUB1c0in2N/ZPDG3NujqDwX9b1+SlGzFx3a6HvWol48baTMPERPS6Og==", "page"=>{"parent_id"=>"104", "title"=>"News in category", "url"=>"news-:category", "name"=>"news_category", "controller_action"=>"news#index", "layout_id"=>"4", "template_id"=>"147", "template"=>"news (news/index)", "is_translated"=>"1", "translations_attributes"=>{"0"=>{"lang"=>"en", "meta_title"=>"", "meta_keywords"=>"", "meta_description"=>"", "id"=>"267"}, "1"=>{"lang"=>"ru", "meta_title"=>"", "meta_keywords"=>"", "meta_description"=>"", "id"=>"302"}, "2"=>{"lang"=>"", "meta_title"=>"", "meta_keywords"=>"", "meta_description"=>"", "id"=>"355"}}}, "commit"=>"Save", "id"=>"105"}
+  Optimacms::CmsAdminUser Load (1.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`id` = 105 LIMIT 1
+   (0.0ms)  BEGIN
+  Optimacms::PageTranslation Load (1.0ms)  SELECT `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 105 AND `cms_pages_translation`.`id` IN (267, 302, 355)
+  SQL (4.0ms)  UPDATE `cms_pages` SET `url` = 'news-:category', `url_parts_count` = 1, `parsed_url` = '^news-([^/]+)$', `updated_at` = '2016-02-28 22:44:41' WHERE `cms_pages`.`id` = 105
+   (5.0ms)  COMMIT
+Redirected to http://localhost:3001/cmsadmin/pages
+Completed 302 Found in 16296ms (ActiveRecord: 12.0ms)
+
+
+Started GET "/cmsadmin/pages" for 127.0.0.1 at 2016-02-29 00:44:41 +0200
+Processing by Optimacms::Admin::PagesController#index as HTML
+  Optimacms::CmsAdminUser Load (1.0ms)  SELECT  `cms_users`.* FROM `cms_users` WHERE `cms_users`.`id` = 4  ORDER BY `cms_users`.`id` ASC LIMIT 1
+  Optimacms::Page Load (0.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`id` = 104 LIMIT 1
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/fields_simple_form/_text.html.haml (19.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_field_simple_form.html.haml (25.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/fields_simple_form/_hidden.html.haml (16.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_field_simple_form.html.haml (21.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_fields.html.haml (56.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_buttons_apply_clear.html.haml (0.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_buttons_apply_clear_inline.html.haml (5.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_form_inline.html.haml (78.0ms)
+  Rendered D:/Ruby217x64/lib/ruby/gems/2.1.0/gems/simple_search_filter-0.0.31/app/views/simple_search_filter/_form.html.haml (83.0ms)
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE (1=1  AND parent_id= 104  )  ORDER BY created_at desc LIMIT 10 OFFSET 0
+  Optimacms::Template Load (0.0ms)  SELECT `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` IN (146, 63, 147, 4)
+   (0.0ms)  SELECT COUNT(*) FROM `cms_pages` WHERE (1=1  AND parent_id= 104  )
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/pages/index.html.haml within optimacms/admin/layouts/main (215.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_top.html.haml (18.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_leftmenu.html.haml (68.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_breadcrumbs.html.haml (2.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_flash.html.haml (2.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_version.html.haml (1.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/shared/_footer.html.haml (14.0ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/application.html.haml (1023.1ms)
+  Rendered W:/myrails/cms/site/app/views/optimacms/admin/layouts/basic.html.haml (1203.1ms)
+Completed 200 OK in 1474ms (Views: 1446.1ms | ActiveRecord: 2.0ms)
+
+
+Started GET "/assets/bootstrap-5219915267bc07092cc5984f417a5ad5.js?body=1" for 127.0.0.1 at 2016-02-29 00:44:42 +0200
+
+
+Started GET "/assets/jquery_ujs-f9f4ae336c0d19804775e0e2c8749423.js?body=1" for 127.0.0.1 at 2016-02-29 00:44:42 +0200
+
+
+Started GET "/news-hello" for 127.0.0.1 at 2016-02-29 00:57:42 +0200
+Processing by Optimacms::PagesController#show as HTML
+  Parameters: {"url"=>"news-hello"}
+  Optimacms::Language Load (1.0ms)  SELECT `cms_languages`.* FROM `cms_languages`
+   (1.0ms)  SELECT COUNT(*) FROM `cms_pages` WHERE (is_folder = 0 AND enabled = 1 AND 'news-hello' REGEXP parsed_url)
+  Optimacms::Page Load (2.0ms)  SELECT `cms_pages`.* FROM `cms_pages` WHERE (is_folder = 0 AND enabled = 1 AND 'news-hello' REGEXP parsed_url)  ORDER BY url_parts_count DESC, url_vars_count ASC
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 147 LIMIT 1
+  Optimacms::Template Load (2.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 4 LIMIT 1
+  Optimacms::PageTranslation Load (1.0ms)  SELECT  `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 105 AND `cms_pages_translation`.`lang` = 'en'  ORDER BY `cms_pages_translation`.`id` ASC LIMIT 1
+Processing by NewsController#index as HTML
+  Parameters: {"url"=>"news-hello"}
+  News Load (0.0ms)  SELECT `news`.* FROM `news`
+  Optimacms::Page Load (3.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`name` = 'news_item' LIMIT 1
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`name` = 'news' LIMIT 1
+  Rendered news/index.html.haml within layouts/main (41934.4ms)
+Completed 200 OK in 203669ms (Views: 42834.5ms | ActiveRecord: 21.0ms)
+  Rendered text template (0.0ms)
+Completed 200 OK in 204474ms (Views: 9.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/tpl-9372bde26d6601c2b8935bc58c33f499.css?body=1" for 127.0.0.1 at 2016-02-29 01:01:10 +0200
+
+
+Started GET "/assets/application-4d551ce5508bd37ab7519607c8026e23.css?body=1" for 127.0.0.1 at 2016-02-29 01:01:12 +0200
+
+
+Started GET "/assets/jquery-4075e3b7b3964707c653f61b66f46dec.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:12 +0200
+
+
+Started GET "/assets/jquery_ujs-f9f4ae336c0d19804775e0e2c8749423.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:13 +0200
+
+
+Started GET "/assets/bootstrap-5219915267bc07092cc5984f417a5ad5.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:13 +0200
+
+
+Started GET "/assets/application-144f3468d85785a421c7f26f17032903.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:13 +0200
+
+
+Started GET "/news-hello" for 127.0.0.1 at 2016-02-29 01:01:14 +0200
+Processing by Optimacms::PagesController#show as HTML
+  Parameters: {"url"=>"news-hello"}
+  Optimacms::Language Load (1.0ms)  SELECT `cms_languages`.* FROM `cms_languages`
+   (2.0ms)  SELECT COUNT(*) FROM `cms_pages` WHERE (is_folder = 0 AND enabled = 1 AND 'news-hello' REGEXP parsed_url)
+  Optimacms::Page Load (2.0ms)  SELECT `cms_pages`.* FROM `cms_pages` WHERE (is_folder = 0 AND enabled = 1 AND 'news-hello' REGEXP parsed_url)  ORDER BY url_parts_count DESC, url_vars_count ASC
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 147 LIMIT 1
+  Optimacms::Template Load (1.0ms)  SELECT  `cms_templates`.* FROM `cms_templates` WHERE `cms_templates`.`id` = 4 LIMIT 1
+  Optimacms::PageTranslation Load (1.0ms)  SELECT  `cms_pages_translation`.* FROM `cms_pages_translation` WHERE `cms_pages_translation`.`item_id` = 105 AND `cms_pages_translation`.`lang` = 'en'  ORDER BY `cms_pages_translation`.`id` ASC LIMIT 1
+Processing by NewsController#index as HTML
+  Parameters: {"url"=>"news-hello"}
+  News Load (1.0ms)  SELECT `news`.* FROM `news`
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`name` = 'news_item' LIMIT 1
+  Optimacms::Page Load (1.0ms)  SELECT  `cms_pages`.* FROM `cms_pages` WHERE `cms_pages`.`name` = 'news' LIMIT 1
+  Rendered news/index.html.haml within layouts/main (8.0ms)
+Completed 200 OK in 9607ms (Views: 860.0ms | ActiveRecord: 17.0ms)
+  Rendered text template (0.0ms)
+Completed 200 OK in 10285ms (Views: 11.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/tpl-9372bde26d6601c2b8935bc58c33f499.css?body=1" for 127.0.0.1 at 2016-02-29 01:01:25 +0200
+
+
+Started GET "/assets/bootstrap-5219915267bc07092cc5984f417a5ad5.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:25 +0200
+
+
+Started GET "/assets/application-4d551ce5508bd37ab7519607c8026e23.css?body=1" for 127.0.0.1 at 2016-02-29 01:01:25 +0200
+
+
+Started GET "/assets/jquery-4075e3b7b3964707c653f61b66f46dec.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:25 +0200
+
+
+Started GET "/assets/jquery_ujs-f9f4ae336c0d19804775e0e2c8749423.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:25 +0200
+
+
+Started GET "/assets/application-144f3468d85785a421c7f26f17032903.js?body=1" for 127.0.0.1 at 2016-02-29 01:01:26 +0200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optimacms
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.59
 platform: ruby
 authors:
 - Max Ivak