constructor-cms 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3894197afd162e8ab298928453fcb0e86b4933f
-  data.tar.gz: b5d633caa865982a182375fd9a90a65e94acfdb1
+  metadata.gz: 716613644e3e6e549fc919b68851a791c016a817
+  data.tar.gz: 35838d41aa4fad5191d097a81075ec45b64d2b4c
 SHA512:
-  metadata.gz: 8433a4b604912711015ad5787e12fb55e7c76b653bb045df4cde700a8c18f0f9fa8357aa25dec96370bb752d55a1fb30977f3ba175da5024d5e65d95b6189408
-  data.tar.gz: 50b6fcd894e3176384f70a40c2eb4fc6d68d9ddfaaa269cdfd85e0fb0ce805649b21d885d36df22dfba8b5079fd9eb7686c7739eeff68893d7815863c6411a7a
+  metadata.gz: 1231e211970c6ca15260691debba39ee65d68a0ca48d9533d1679606145d54bd426fbe3bbbe94f06cdee5c8944679755b53bfd220a1c9dc2dd06ca7424de2a03
+  data.tar.gz: 1a19d0465eb5dd504bcee87a6b8bae2fb2db4ec7a6e7a0db6c0c7d21745cb4f7e1af10861cabd116a9f5e0ff8ad9f54f5bf5cf53fb0d89991b3e705426f8a1bd

data/Gemfile

@@ -2,6 +2,8 @@ source 'http://rubygems.org'
 
 gemspec
 
+gem 'awesome_nested_set', github: 'ivanzotov/awesome_nested_set'
+
 group :test do
   gem 'coveralls', require: false
   gem 'simplecov', :require => false
@@ -17,4 +19,4 @@ group :assets do
   gem 'uglifier', '>= 1.3.0'
 end
 
-gem 'jquery-rails'
+gem 'jquery-rails'

data/Guardfile

@@ -5,11 +5,9 @@ guard 'rspec', :spec_paths => extensions.map{|e| "#{e}/spec"}, :cli => (['~/.rsp
     watch(%r{^#{extension}/spec/.+_spec\.rb$})
     watch(%r{^#{extension}/app/(.+)\.rb$})                           { |m| "#{extension}/spec/#{m[1]}_spec.rb" }
     watch(%r{^#{extension}/lib/(.+)\.rb$})                           { |m| "#{extension}/spec/lib/#{m[1]}_spec.rb" }
-    watch(%r{^#{extension}/app/controllers/(.+)_(controller)\.rb$})  { |m| ["#{extension}/spec/routing/#{m[1]}_routing_spec.rb", "#{extension}/spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "#{extension}/spec/requests/#{m[1]}_spec.rb"] }
+    watch(%r{^#{extension}/app/controllers/(.+)_(controller)\.rb$})  { |m| ["#{extension}/spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "#{extension}/spec/features/#{m[1]}_spec.rb"] }
     watch(%r{^#{extension}/spec/support/(.+)\.rb$})                  { "#{extension}/spec" }
     watch("#{extension}/spec/spec_helper.rb")                        { "#{extension}/spec" }
-    watch("#{extension}/config/routes.rb")                           { "#{extension}/spec/routing" }
-    watch("#{extension}/app/controllers/application_controller.rb")  { "#{extension}/spec/controllers" }
     # Capybara request specs
     watch(%r{^#{extension}/app/views/(.+)/.*\.(erb|haml)$})          { |m| "#{extension}/spec/requests/#{m[1]}_spec.rb" }
   end

data/constructor-cms.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails', '~> 2.12'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'capybara'
+  s.add_development_dependency 'launchy'
 end

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

@@ -2,8 +2,6 @@
 
 module ConstructorCore
   class UsersController < ConstructorCore::ApplicationController
-    layout 'constructor_core/application'
-
     def profile
       @user = current_user
     end

data/core/app/views/constructor_core/sessions/new.html.haml

@@ -1,22 +1,22 @@
 - content_for :page_title do
   =t :login
 
-= form_for(resource, :as => resource_name, :url => '/login') do |f|
+= form_for(resource, as: resource_name, url: '/login') do |f|
   .form-horizontal
     .control-group
-      = f.label :email, :class => 'control-label'
+      = f.label :email, class: 'control-label'
       .controls
         = f.email_field :email
     .control-group 
-      = f.label :password, :class => 'control-label'
+      = f.label :password, class: 'control-label'
       .controls
         = f.password_field :password
 
     - if devise_mapping.rememberable?
       .control-group
         .controls
-          %label.checkbox.inline{:for => 'remember_me'}
+          %label.checkbox.inline{for: 'remember_me'}
             = f.check_box :remember_me
             =t :remember_me
       .controls
-        = f.submit t(:login), :class => "btn btn-primary"
+        = f.submit t(:login), class: 'btn btn-primary'

data/core/app/views/constructor_core/users/profile.haml

@@ -4,13 +4,13 @@
 = form_for @current_user, method: :post do |f|
   .form-horizontal
     .control-group
-      = f.label :password, :class => 'control-label'
+      = f.label :password, class: 'control-label'
       .controls
         = f.password_field :password, required: true
     .control-group
-      = f.label :password_confirmation, :class => 'control-label'
+      = f.label :password_confirmation, class: 'control-label'
       .controls
         = f.password_field :password_confirm, required: true
     .control-group
       .controls
-        = f.submit t(:save_password), :class => "btn btn-primary"
+        = f.submit t(:save_password), class: 'btn btn-primary'

data/core/app/views/layouts/constructor_core/application.haml

@@ -1,12 +1,12 @@
 !!!
-%html{:lang => 'ru'}
+%html{lang: 'ru'}
   %head
-    %meta{:charset => 'utf-8'}/
-    %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}/
+    %meta{charset: 'utf-8'}/
+    %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge,chrome=1'}/
     %title=t :dashboard
     
     / [if lt IE 9]
-      %script{:src => 'http://html5shim.googlecode.com/svn/trunk/html5.js'}
+      %script{src: 'http://html5shim.googlecode.com/svn/trunk/html5.js'}
     
     :javascript
       var CKEDITOR_BASEPATH = '/assets/ckeditor/'
@@ -16,15 +16,15 @@
     = csrf_meta_tag
     = favicon_link_tag
     
-    %link{:rel => 'apple-touch-icon', :href => 'images/apple-touch-icon.png'}
-    %link{:rel => 'apple-touch-icon', :sizes => '72x72', :href => 'images/apple-touch-icon-72x72.png'}
-    %link{:rel => 'apple-touch-icon', :sizes => '114x114', :href => 'images/apple-touch-icon-114x114.png'}
+    %link{rel: 'apple-touch-icon', href: 'images/apple-touch-icon.png'}
+    %link{rel: 'apple-touch-icon', sizes: '72x72', href: 'images/apple-touch-icon-72x72.png'}
+    %link{rel: 'apple-touch-icon', sizes: '114x114', href: 'images/apple-touch-icon-114x114.png'}
   
   %body
     .navbar.navbar-constructor
       .navbar-inner
         .container-fluid          
-          = link_to t(:homepage), '/', :class => 'brand'
+          = link_to t(:homepage), '/', class: 'brand'
           %a.btn.btn-navbar{'data-toggle' => 'collapse', 'data-target' => '.nav-collapse'}
             %span.icon-bar
             %span.icon-bar
@@ -63,7 +63,7 @@
                     %i.icon-question-sign
                     =t :help
                 %li
-                  = link_to core.destroy_user_session_path, method: :delete do
+                  = link_to core.logout_path, method: :delete do
                     %i.icon-signout
                     =t :logout
 
@@ -75,11 +75,11 @@
           .span4
             - unless notice.nil?
               .alert.fade.in
-                = link_to '×', '#', :class => 'close', 'data-dismiss' => 'alert'
+                = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
                 = notice
             - unless alert.nil?
               .alert.alert-error.fade.in
-                = link_to '×', '#', :class => 'close', 'data-dismiss' => 'alert'
+                = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
                 = alert                            
 
           = yield :actions
@@ -88,6 +88,6 @@
           = yield            
         
   / [if lt IE 7 ]
-    %script{:src => '//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js'}
+    %script{src: '//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js'}
     %script
       window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})

data/core/config/routes.rb

@@ -13,6 +13,6 @@ ConstructorCore::Engine.routes.draw do
     get '/admin' => 'sessions#new'
     get '/login' => 'sessions#new'
     post '/login' => 'sessions#create'
-    delete '/logout' => 'sessions#destroy'
+    delete '/logout' => 'sessions#destroy', as: :logout
   end
 end

data/core/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/constructor-cms/engine.rb

@@ -1,5 +1,5 @@
 module ConstructorCms
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
     engine_name "constructor-cms"
     isolate_namespace ConstructorCms
   end

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

@@ -6,6 +6,11 @@ module ConstructorPages
 
     before_filter {@roots = Page.roots}
 
+    def index
+      @template_exists = Template.count > 0
+      flash.notice = 'Create at least one template' unless @template_exists
+    end
+
     def new
       @page, @template_id, @multipart = Page.new, Template.first.id, false
 
@@ -15,7 +20,7 @@ module ConstructorPages
     end
 
     def show
-      @page = Page.find_by_request_or_first('/' + params[:all])
+      @page = Page.find_by_request_or_first("/#{params[:all]}")
 
       error_404 and return if @page.nil? or !@page.active?
 
@@ -102,12 +107,12 @@ module ConstructorPages
     def update
       @page = Page.find params[:id]
 
-      if @page.template.id != params[:page][:template_id].to_i
-        @page.remove_fields_values
-      end
+      _template_changed = @page.template.id != params[:page][:template_id].to_i
+
+      @page.remove_fields_values if _template_changed
 
       if @page.update page_params
-        @page.create_fields_values
+        @page.create_fields_values if _template_changed
         @page.update_fields_values params[:fields]
 
         redirect_to pages_url, notice: t(:page_success_updated, name: @page.name)
@@ -123,7 +128,7 @@ module ConstructorPages
       redirect_to pages_url, notice: t(:page_success_removed, name: _name)
     end
 
-    %w{up down}.each {|m| define_method "move_#{m}" do move_to :page, m.to_sym end}
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to :page, params[:id], m.to_sym end}
 
     private
 

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

@@ -3,6 +3,7 @@
 module ConstructorPages
   class TemplatesController < ConstructorCore::ApplicationController
     include MoveHelper
+    include TreeviewHelper
 
     before_filter {@roots = Template.roots}
 
@@ -41,7 +42,7 @@ module ConstructorPages
       redirect_to templates_url, notice: t(:template_success_removed, name: name)
     end
 
-    %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, m.to_sym end}
+    %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, params[:id], m.to_sym end}
 
     private
 

data/pages/app/helpers/constructor_pages/move_helper.rb

@@ -1,7 +1,7 @@
 module ConstructorPages
   module MoveHelper
-    def move_to(what, to)
-      from = ('constructor_pages/'+what.to_s).classify.constantize.find(params[:id])
+    def move_to(what, id, to)
+      from = ('constructor_pages/'+what.to_s).classify.constantize.find(id)
       to_sibling = to == :up ? from.left_sibling : from.right_sibling
 
       if not to_sibling.nil? and from.move_possible?(to_sibling)

data/pages/app/helpers/constructor_pages/pages_helper.rb

@@ -1,5 +1,7 @@
 module ConstructorPages
   module PagesHelper
+    include TreeviewHelper
+
     def for_select(roots)
       result = []
       roots.each do |r|

data/pages/app/helpers/constructor_pages/templates_helper.rb

@@ -1,5 +1,7 @@
 module ConstructorPages
   module TemplatesHelper
+    include TreeviewHelper
+
     def for_select(roots)
       result = []
       roots.each do |r|

data/pages/app/helpers/constructor_pages/treeview_helper.rb

@@ -0,0 +1,33 @@
+module ConstructorPages
+  module TreeviewHelper
+    def render_tree(roots, &block)
+      output = '<ul>'
+
+      roots.each do |root|
+        level, last = root.level, nil
+
+        root.self_and_descendants.each do |item|
+          if item.level > level
+            output += '<ul>'
+          elsif item.level < level
+            output += '</li>'
+            output += '</ul></li>' * (level-item.level)
+          elsif !item.root?
+            output += '</li>'
+          end
+
+          output += '<li>'
+
+          output += capture(item, &block)
+
+          level, last = item.level, item
+        end
+
+        output += '</li>'
+        output += '</ul></li>' * last.level
+      end
+
+      output.html_safe
+    end
+  end
+end

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

@@ -24,10 +24,10 @@ module ConstructorPages
 
     acts_as_nested_set
 
-    # Used for find page by request. It return first page if no request given
+    # Used for find page by request. It return first page if no request given or request is home page
     # @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
     def self.find_by_request_or_first(request = nil)
-      request.nil? ? Page.first : Page.where(full_url: request).first
+      request.nil? || request == '/' ? Page.first : Page.where(full_url: request).first
     end
 
     # Generate full_url from parent id and url
@@ -72,6 +72,8 @@ module ConstructorPages
     # @param params should looks like <tt>{price: 500, content: 'Hello'}</tt>
     # @param reset_booleans reset all boolean fields to false before assign params
     def update_fields_values(params, reset_booleans = true)
+      return if params.nil?
+
       fields.each do |field|
         value = params[field.code_name.to_sym]
 

data/pages/app/views/constructor_pages/fields/_form.haml

@@ -1,28 +1,28 @@
 = form_for @field do |f|
   - if @field.errors.any?
     .alert.alert-error.fade.in.span12
-      = link_to "×", "#", :class => "close", 'data-dismiss' => 'alert'
+      = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
       - @field.errors.full_messages.each do |m|
         = m
 
   .form-horizontal
     .control-group
-      = f.label :name, :class => 'control-label'
-      .controls= f.text_field :name, :class => "span4"
+      = f.label :name, class: 'control-label'
+      .controls= f.text_field :name, class: 'span4'
 
     .control-group
-      = f.label :code_name, :class => 'control-label'
-      .controls= f.text_field :code_name, :class => "span4"
-      = f.hidden_field :template_id, :value => @field.template.id, :class => "span4"
+      = f.label :code_name, class: 'control-label'
+      .controls= f.text_field :code_name, class: 'span4'
+      = f.hidden_field :template_id, value: @field.template.id, class: 'span4'
 
     - unless @field.type_value == 'image'
       .control-group
-        = f.label :type_value, :class => 'control-label'
+        = f.label :type_value, class: 'control-label'
         .controls
-          = f.select :type_value, options_for_select(types_value, :selected => @field.type_value), :class => "span4"
+          = f.select :type_value, options_for_select(types_value, selected: @field.type_value), class: 'span4'
 
     .row-fluid
       .span12
         .form-actions
-          = f.submit :class => "btn btn-primary"
-          = link_to t(:cancel), edit_template_url(@field.template), :class => "btn"
+          = f.submit class: 'btn btn-primary'
+          = link_to t(:cancel), edit_template_url(@field.template), class: 'btn'

data/pages/app/views/constructor_pages/fields/types/_html.haml

@@ -1 +1 @@
-= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :rows => 10, :class => 'span9 ckeditor'
+= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), rows: 10, class: 'span9 ckeditor'

data/pages/app/views/constructor_pages/fields/types/_image.haml

@@ -4,4 +4,4 @@
   = image_tag image.value.thumb('200x200').url
 
 %br/
-= file_field_tag "fields[#{field.code_name}]", :class => 'span6'
+= file_field_tag "fields[#{field.code_name}]", class: 'span6'

data/pages/app/views/constructor_pages/fields/types/_integer.haml

@@ -1 +1 @@
-= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :class => 'span2'
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span2'

data/pages/app/views/constructor_pages/fields/types/_string.haml

@@ -1 +1 @@
-= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :class => 'span6'
+= text_field_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), class: 'span6'

data/pages/app/views/constructor_pages/fields/types/_text.haml

@@ -1 +1 @@
-= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), :rows => 10, :class => 'span6'
+= text_area_tag "fields[#{field.code_name}]", page.get_field_value(field.code_name), rows: 10, class: 'span6'

data/pages/app/views/constructor_pages/pages/_breadcrumbs.haml

@@ -3,5 +3,5 @@
     - page.ancestors.each do |i|
       - if i.in_nav
         %li
-          = link_to i.name, i.full_url, :title => i.name, :class => 'b-page-json'
-          %span{:class => "divider"} /
+          = link_to i.name, i.full_url, title: i.name, class: 'b-page-json'
+          %span{class: 'divider'} /

data/pages/app/views/constructor_pages/pages/_form.haml

@@ -1,97 +1,97 @@
-= form_for @page, :html => {:multipart => @multipart} do |f|
+= form_for @page, html: {multipart: @multipart} do |f|
   - if @page.errors.any?
     .alert.alert-error.fade.in.span12
-      = link_to "×", "#", :class => "close", 'data-dismiss' => 'alert'
+      = link_to '×', '#', class: 'close', 'data-dismiss' => 'alert'
       - @page.errors.full_messages.each do |m|
         = m
           
   .form-horizontal
     .control-group
-      = f.label :active, :class => 'control-label'
-      .controls= f.check_box :active, :class => "span6"
+      = f.label :active, class: 'control-label'
+      .controls= f.check_box :active, class: 'span6'
 
     .control-group
-      = f.label :name, :class => 'control-label'
-      .controls= f.text_field :name, :class => "span4"
+      = f.label :name, class: 'control-label'
+      .controls= f.text_field :name, class: 'span4'
 
     .control-group.auto_url
-      = f.label :auto_url, :class => 'control-label'
+      = f.label :auto_url, class: 'control-label'
       .controls
-        = f.check_box :auto_url, :class => "span9"
+        = f.check_box :auto_url, class: 'span9'
 
     .control-group.url
-      = f.label :url, :class => 'control-label'
+      = f.label :url, class: 'control-label'
       .controls
         .full_url
           %span.path>= @page.parent.full_url unless @page.parent.nil?
           \/
           %span.address>= @page.url
-        = f.text_field :url, :class => "span3"
+        = f.text_field :url, class: 'span3'
         %i.address_icon.icon-pencil
 
     - unless @page.new_record?
       - @page.template.fields.each do |field|
         .control-group
-          = label_tag "", field.name, :class => 'control-label'
+          = label_tag "fields[#{field.code_name}]", field.name, class: 'control-label'
           .controls
-            = render :partial => "constructor_pages/fields/types/#{field.type_value}", :locals => {:field => field, :page => @page}
+            = render :partial => "constructor_pages/fields/types/#{field.type_value}", locals: {field: field, page: @page}
 
     .accordion
       .accordion-group
         .accordion-heading.text-center
-          = link_to t(:settings), '#collapse', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
+          = link_to t(:settings), '#collapse', class: 'accordion-toggle', 'data-toggle' => 'collapse'
         .accordion-body.in.collapse#collapse
           .accordion-inner
             .control-group
-              = f.label :parent, :class => 'control-label'
+              = f.label :parent_id, class: 'control-label'
               .controls
-                = f.select :parent_id, options_for_select(for_select(@roots), :selected => @page.parent_id, :disabled => @page.self_and_descendants.map{|p| p.id}), :include_blank => t(:no)
+                = f.select :parent_id, options_for_select(for_select(@roots), selected: @page.parent_id), disabled: @page.self_and_descendants.map(&:id), include_blank: t(:no)
 
             .control-group
-              = f.label :template, :class => 'control-label'
+              = f.label :template_id, :class => 'control-label'
               .controls
-                = f.select :template_id, options_for_select(templates, :selected => @template_id)
+                = f.select :template_id,  options_for_select(templates, selected: @template_id)
             .control-group
-              = f.label :link, :class => 'control-label'
+              = f.label :link, class: 'control-label'
               .controls
-                = f.text_field :link, :class => "span9"          
+                = f.text_field :link, class: 'span9'
             .control-group
               %label.control-label=t :display_in
               .controls
-                %label.checkbox.inline.span2{:for => 'in_menu'}
+                %label.checkbox.inline.span2{for: 'in_menu'}
                   = f.check_box :in_menu
                   =t :menu
 
-                %label.checkbox.inline.span2{:for => 'in_map'}
+                %label.checkbox.inline.span2{for: 'in_map'}
                   = f.check_box :in_map
                   =t :sitemap
 
-                %label.checkbox.inline.span2{:for => 'in_nav'}
+                %label.checkbox.inline.span2{for: 'in_nav'}
                   = f.check_box :in_nav
                   =t :breadcrumbs
 
     .accordion
       .accordion-group
         .accordion-heading.text-center
-          = link_to t(:seo), '#collapse-three', :class => 'accordion-toggle', 'data-toggle' => 'collapse'
+          = link_to t(:seo), '#collapse-three', class: 'accordion-toggle', 'data-toggle' => 'collapse'
         .accordion-body.in.collapse#collapse-three
           .accordion-inner
             .control-group
-              = f.label :title, :class => 'control-label'
+              = f.label :title, class: 'control-label'
               .controls
-                = f.text_field :title, :class => "span9"
+                = f.text_field :title, class: 'span9'
             .control-group
-              = f.label :keywords, :class => 'control-label'
+              = f.label :keywords, class: 'control-label'
               .controls
-                = f.text_field :keywords, :class => "span9"
+                = f.text_field :keywords, class: 'span9'
             .control-group
-              = f.label :description, :class => 'control-label'
+              = f.label :description, class: 'control-label'
               .controls
-                = f.text_area :description, :class => "span9", :rows => 8
+                = f.text_area :description, class: 'span9', rows: 8
 
     .row-fluid        
       .span12
         .form-actions
-          = f.submit :class => "btn btn-primary"
+          = f.submit class: 'btn btn-primary'
           = link_to t(:cancel), pages_url, class: 'btn'
           = link_to t(:delete_page), @page, method: :delete, data: {confirm: t(:are_you_sure?)}, class: 'btn btn-danger pull-right' unless @page.new_record?