constructor-core 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eae1551bac830196d4492d037655cd90d309008
-  data.tar.gz: da22a7f841a4dd633c4c5a8c8eb578187f231e5c
+  metadata.gz: 9102123bee93e7f71e4d809e57c3bf93feeff872
+  data.tar.gz: 123265b3943235c4082e1faa1d1c5dd3b4b1fbb3
 SHA512:
-  metadata.gz: 76c77d3065c08a97912dd06387cead8f1a78582d105fdfc1dafde14ef51581b1154ed4aa1f5cbf11581fc2d286f6b7202a1f95e22fdf3fbb5e4f5887e718126b
-  data.tar.gz: 9d046b9ec0353caf2230b6513cdd28e4d01a0a196a5e3cf9d725a84b4f638da9bb60b50c9d2e9d2ac5ac5b1af757a3c710f6ff035362131ab3c21e5fcdfbbdab
+  metadata.gz: 0b332b5052cc57374fc63452d3ea10c671fa8323ba4d922f5e43e78c243ee05d66badc47c8001a9b41cf4eaf25061e342d093cc0ccd6bafd8cacf3f369fed776
+  data.tar.gz: 6c1330cfcd55d39811a86646046ed879b6cfaab4508c2c0cd4e20303a5e8382700dfbf10a7864f192ffe5156368e0dc9405a94b00fd80146a1566076bde89c7a

data/core/app/controllers/constructor_core/application_controller.rb

@@ -2,6 +2,7 @@
 
 module ConstructorCore
   class ApplicationController < ::ApplicationController
+    layout 'constructor_core/application_core'
     before_filter :authenticate_user!, :except => [:show]
 
     helper_method :current_user

data/core/app/views/layouts/constructor_core/{application.haml → application_core.haml}

@@ -31,10 +31,11 @@
             %span.icon-bar
           .nav-collapse
             %ul.nav
-              %li
-                = link_to '/admin/dashboard' do
-                  %i.icon-dashboard
-                  =t :dashboard
+              /
+                %li
+                  = link_to '/admin/dashboard' do
+                    %i.icon-dashboard
+                    =t :dashboard
               %li
                 = link_to '/admin/pages' do
                   %i.icon-sitemap
@@ -43,14 +44,15 @@
                 = link_to '/admin/templates' do
                   %i.icon-film
                   =t :templates
-              %li
-                = link_to '/admin/users' do
-                  %i.icon-group
-                  =t :users
-              %li
-                = link_to '/admin/settings' do
-                  %i.icon-cogs
-                  =t :settings
+              /
+                %li
+                  = link_to '/admin/users' do
+                    %i.icon-group
+                    =t :users
+                %li
+                  = link_to '/admin/settings' do
+                    %i.icon-cogs
+                    =t :settings
 
             - if current_user
               %ul.nav.pull-right
@@ -59,7 +61,7 @@
                     = image_tag gravatar_icon(current_user.email, 48), width: 24, height: 24, class: 'avatar'
                     %span= current_user.email
                 %li
-                  = link_to '/admin/help' do
+                  = link_to 'http://ivanzotov.github.io/constructor/' do
                     %i.icon-question-sign
                     =t :help
                 %li

data/core/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/pages/app/controllers/constructor_pages/pages_controller.rb

@@ -2,6 +2,8 @@
 
 module ConstructorPages
   class PagesController < ApplicationController
+    layout 'constructor_core/application_core', except: [:show, :search]
+
     movable :page
 
     before_filter {@roots, @template_exists = Page.roots, Template.count > 0}
@@ -13,84 +15,43 @@ module ConstructorPages
     def new
       redirect_to pages_path and return unless @template_exists
       @page, @template_id, @multipart = Page.new, Template.first.id, false
-
-      if params[:page] and (@page.parent = Page.find(params[:page]))
-        @template_id = @page.parent.template.child.id
-      end
+      @template_id = @page.parent.template.child.id if params[:page] and (@page.parent = Page.find(params[:page]))
     end
 
     def show
       @page = Page.find_by_request_or_first("/#{params[:all]}")
-
       error_404 and return if @page.nil? or !@page.active?
-
       redirect_to @page.link if @page.redirect?
-
       _code_name = @page.template.code_name.to_s
-
       instance_variable_set('@'+_code_name, @page)
-
       respond_to do |format|
         format.html { render template: "html_templates/#{_code_name}" }
         format.json {
           _template = render_to_string partial: "json_templates/#{_code_name}.json.erb", layout: false, locals: {_code_name.to_sym => @page, page: @page}
           _js = render_to_string partial: "js_partials/#{_code_name}.js"
-
           render json: @page, self_and_ancestors: @page.self_and_ancestors.map(&:id), template: _template.gsub(/\n/, '\\\\n'), js: _js
         }
       end
     end
 
-=begin
     def search
-      if params[:all].nil?
-        @page = Page.first
-      else
-        @request = '/' + params[:all]
-        @page = Page.where(:full_url => @request).first
-      end
-
-      instance_variable_set('@'+@page.template.code_name.to_s, @page)
-
-      what_search = params[:what_search]
-      params_selection = request.query_parameters
-
-      template = Template.find_by_code_name(what_search.singularize)
-
-      if template.nil?
-        render :action => "error_404", :layout => false
-        return
-      end
+      @page = Page.find_by_request_or_first("/#{params[:all]}")
 
-      @pages = @page.descendants.where(:template_id => template.id)
-
-      params_selection.each_pair do |code_name, value|
-        if value.numeric?
-          value = value.to_f
-        elsif value.boolean?
-          value = value.to_bool
-        end
-
-        @pages = @pages.select do |page|
-          if code_name == 'name'
-            page.name == value
-          else
-            page.field(code_name) == value
-          end
-        end
-      end
+      _params = request.query_parameters
+      _params.each_pair {|k,v| v || (_params.delete(k); next)
+        _params[k] = v.numeric? ? v.to_f : (v.to_bool if v.boolean?)}
 
-      instance_variable_set('@'+template.code_name.pluralize, @pages)
+      @pages = Page.in(@page).by(_params).search(params[:what_search])
 
-      render :template => "templates/#{template.code_name}_search"
+      instance_variable_set('@'+@page.template.code_name.pluralize, @pages)
+      instance_variable_set('@'+@page.template.code_name.singularize, @page)
+      render :template => "html_templates/#{@page.template.code_name}_search"
     end
-=end
 
     def edit
       @page = Page.find(params[:id])
       @page.template ||= Template.first
       @template_id = @page.template.id
-
       @multipart = @page.fields.map{|f| f.type_value == 'image'}.include?(true) ? true : false
     end
 

data/pages/app/models/constructor_pages/page.rb

@@ -39,10 +39,8 @@ module ConstructorPages
       # When missing method Page find field or page in branch with plural and singular code_name so
       # field and template code_name should be uniqueness for page methods
       def check_code_name(code_name)
-        [code_name, code_name.pluralize, code_name.singularize].each do |name|
-          return false if Page.instance_methods.include?(name.to_sym)
-        end
-
+        [code_name, code_name.pluralize, code_name.singularize].each {|name|
+          return false if Page.instance_methods.include?(name.to_sym)}
         true
       end
 

data/spec/dummy/app/views/layouts/application.haml

@@ -0,0 +1,10 @@
+!!!
+%html
+  %head
+    %title Dummy
+    = stylesheet_link_tag 'application', media: 'all'
+    = javascript_include_tag 'application'
+    = csrf_meta_tags
+
+  %body
+    = yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-core
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Ivan Zotov
@@ -129,7 +129,7 @@ files:
 - core/app/views/constructor_core/devise/unlocks/new.html.haml
 - core/app/views/constructor_core/sessions/new.html.haml
 - core/app/views/constructor_core/users/profile.haml
-- core/app/views/layouts/constructor_core/application.haml
+- core/app/views/layouts/constructor_core/application_core.haml
 - core/config/environments/production.rb
 - core/config/initializers/devise.rb
 - core/config/locales/devise.en.yml
@@ -391,7 +391,7 @@ files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/views/html_templates/page.haml
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/application.haml
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
@@ -457,7 +457,7 @@ test_files:
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/views/html_templates/page.haml
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/application.haml
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>