optimacms 0.1.56 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f101211f56b650bfa8d000f61939d493f11063a
-  data.tar.gz: 0810dcf625799ae274889d90e72d668dcbf29b71
+  metadata.gz: a3d4e52c4c4f6ee80e2e2cc715fe5942ee76800f
+  data.tar.gz: ab6c741215c43f9a2ab6da485b835a7c4bfdd765
 SHA512:
-  metadata.gz: 6e56b2404fc66b518e6f14202f48db55e78814b943b3f797e778691387a1fb3d86db6a6bc8debbc5c17e86afa8d62f8c759ba996216bdcad12ca10d77105f32f
-  data.tar.gz: 202bb78a078a84bb6f3bbbfa307925547a2ba3a07e9e5c7d2ab7d64509ddaeeb341c32edc75992b927bbd3ae117147ba51e523940579d3aed674b256cbadb8b0
+  metadata.gz: 14df3169bf11dab1293192bae129fb27a2fb7e581f22b355038f3f68c9a03ab134ea80a22da4dcca5f50b99aa9ddcf2882c4fc7920e6ecc0edf85aff2d2d938c
+  data.tar.gz: 512efcbef77513ee9d20b0281842a0d71280171dfed7265470f12925435c059ef48ec5b5a72c8954d5b59ee75e7e0f1347ecb8d1b58fbe609e48407eb2ed59a8

data/app/controllers/optimacms/dev_controller.rb

@@ -24,13 +24,38 @@ module Optimacms
     end
 
     def addadminuser
-      return
+      #return
 
-      row = Optimacms::CmsAdminUser.new
+      row = Optimacms::CmsAdminUser.where(email: 'admin@example.com').first || Optimacms::CmsAdminUser.new
       row.email = 'admin@example.com'
       row.password = 'password'
+      row.password_confirmation = row.password
 
-      row.save
+      row.save!
+    end
+
+    def url1
+      v = '[a-z\d\_]+'
+
+      p = '(:pg)'
+      p.gsub! /(\(\:#{v}\))([-\.]|$)/, '([^/]+|)\2'
+
+      x = 0
+
+    end
+
+    def url2
+      u = "news/3"
+      r = /^news\/([^\/]+|)$/
+
+      if u =~ /^news(\/.*|)$/
+
+        x = $1
+        y = $2
+
+        z=0
+
+      end
     end
   end
 

data/lib/optimacms/page_services/page_route_service.rb

@@ -63,7 +63,11 @@ module Optimacms
 
         url_parts = url.split '/'
         a = []
+        i_part = 0
         url_parts.each do |part|
+          i_part+=1
+
+
           # check for brackets inside brackets
           return nil if part =~ /\{[^{}]*[{}][^{}]*\}/
 
@@ -72,9 +76,20 @@ module Optimacms
 
           p = part
 
+
+          # variables inside (.) - optional
+
+          if i_part>1
+            # add / to the beginning - / is optional too
+            p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '(\/[^/]+)*\2'
+          else
+            # the first param
+            p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
+          end
+
           # variables
           #p.gsub! /\{\$[^}]+\}/, '([^/]+)'
-          p.gsub! /(\:#{REGEX_VARIABLE})([-\.]|$)/, '([^/]+)\2'
+          p.gsub! /(\:#{REGEX_VARIABLE})([-\.]|$)/, '\/([^/]+)\2'
 
 
           # escape system symbols
@@ -85,7 +100,7 @@ module Optimacms
           a << p
         end
 
-        return '^'+url_parts.join('\/')+'$'
+        return '^'+url_parts.join('')+'$'
       end
 
       def self.count_url_parts(url)
@@ -173,4 +188,4 @@ module Optimacms
     end
 
   end
-end
+end

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.56"
+  VERSION = "0.1.57"
 end

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

@@ -4,6 +4,8 @@ class NewsController < ApplicationController
 
   def index
 
+    x = params[:pg]
+
     @items = News.all
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimacms
 version: !ruby/object:Gem::Version
-  version: 0.1.56
+  version: 0.1.57
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails