constructor-cms 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3205e81cbc3d6a541a972c3d842fbe0cd53510f9
-  data.tar.gz: 8f2e17e9b94e8f702703d9dd78be435d906b8bab
+  metadata.gz: 1f20c51a1d988a4130e232048b3bd6cbd386834f
+  data.tar.gz: ac6c3b2c45985db4bf5604028ee94a5076251571
 SHA512:
-  metadata.gz: 09ebeaee4e96799713703101d43bc02c5405a662eb661dd2abd073308d369ad3f5c2548197f7dd93b40f55b4552cc5400d6b2e1aea0b98be4bd16b890cdeafdf
-  data.tar.gz: f52c26da5a3825fa13a450bdaffe5befaed493ed6f11bedbaad63560db63a2b65098790a348614c5b5a86faa4cbc2fa323171a6e3e1bcf6aa51707bed265d50b
+  metadata.gz: 88d01166d105e8ad84a1032f150228d3c287e5a9b366c7e30b95dbcb5dc3676a373e4de286f2f1e458207b5a3ae320f0ecd1cd51f84bc3ce374580c1e1bd258e
+  data.tar.gz: d529723a118b866cb573506af6dd3fbdffada473ded047cf2982c8a48022bd8a989c5e697819c53c31a391cbb09e77f6159bfab9843c525bd1b09eb88d561327

data/Gemfile

@@ -9,12 +9,12 @@ group :test do
 end
 
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails',   '~> 4.0.0.rc2'
+  gem 'coffee-rails', '~> 4.0.0'
   gem 'less-rails'
   gem 'therubyracer', :platforms => :ruby
 
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier', '>= 1.3.0'
 end
 
 gem 'jquery-rails'

data/README.md

@@ -1,6 +1,6 @@
 # Constructor CMS
 
-Content management system on Ruby on Rails
+Constructor – Ruby on Rails 4 content management system (cms)
 
 [![Gem Version](https://badge.fury.io/rb/constructor-cms.png)](https://rubygems.org/gems/constructor-cms)
 [![Build Status](https://travis-ci.org/ivanzotov/constructor.png?branch=master)](https://travis-ci.org/ivanzotov/constructor)

data/{script → bin}/rails

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/constructor-cms/engine', __FILE__)

data/constructor-cms.gemspec

@@ -15,14 +15,12 @@ Gem::Specification.new do |s|
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
-  s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_dependency 'constructor-core', ConstructorCore::VERSION
   s.add_dependency 'constructor-pages', ConstructorCore::VERSION
-  s.add_dependency 'russian'
 
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '2.14.0.rc1'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'capybara'
 end

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

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module ConstructorCore
-  class ApplicationController < ApplicationController
+  class ApplicationController < ::ApplicationController
     before_filter :authenticate_user!, :except => [:show]
 
     helper_method :current_user

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

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
 module ConstructorCore
-  class UsersController < ApplicationController
-    layout 'constructor_core/application_admin'
+  class UsersController < ConstructorCore::ApplicationController
+    layout 'constructor_core/application'
 
     def profile
       @user = current_user

data/core/app/models/constructor_core/user.rb

@@ -3,6 +3,5 @@
 module ConstructorCore
   class User < ActiveRecord::Base
     devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :timeoutable, :registerable  #:confirmable,  :omniauthable, :lockable, :encryptable
-    attr_accessible :email, :password, :password_confirmation, :remember_me
   end
 end

data/core/config/initializers/devise.rb

@@ -1,15 +1,15 @@
 Devise.setup do |config|
   config.mailer_sender = 'ivanzotov@gmail.com'
 
-  config.parent_controller = 'ActionController::Base'
+  #config.parent_controller = 'ActionController::Base'
 
   require 'devise/orm/active_record'
 
-  config.case_insensitive_keys = [ :email ]
-  config.strip_whitespace_keys = [ :email ]
-  config.skip_session_storage = [:http_auth]
-  config.stretches = Rails.env.test? ? 1 : 10
-  config.reconfirmable = true
-  config.reset_password_within = 6.hours
-  config.sign_out_via = :delete
+  #config.case_insensitive_keys = [ :email ]
+  #config.strip_whitespace_keys = [ :email ]
+  #config.skip_session_storage = [:http_auth]
+  #config.stretches = Rails.env.test? ? 1 : 10
+  #config.reconfirmable = true
+  #config.reset_password_within = 6.hours
+  #config.sign_out_via = :delete
 end

data/core/constructor-core.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
   s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
-  s.add_dependency 'rails', '~> 3.2.13'
-  s.add_dependency 'devise'
+  s.add_dependency 'rails', '~> 4.0.0.rc2'
+  s.add_dependency 'devise', '~> 3.0.0.rc'
   s.add_dependency 'bootstrap-sass'
   s.add_dependency 'font-awesome-sass-rails'
 end

data/core/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.5.8'
+  VERSION = '0.6.0'
 end

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

@@ -13,7 +13,7 @@ module ConstructorPages
     end
 
     def create
-      @field = Field.new params[:field]
+      @field = Field.new field_params
 
       if @field.save
         redirect_to edit_template_path(@field.template_id), notice: t(:field_success_added, name: @field.name)
@@ -42,7 +42,7 @@ module ConstructorPages
             field.destroy
           end
         end
-      if @field.update_attributes params[:field]
+      if @field.update field_params
         redirect_to edit_template_url(@field.template.id), notice: t(:field_success_updated, name: @field.name)
       else
         render :action => "edit"
@@ -61,6 +61,15 @@ module ConstructorPages
 
     private
 
+    def field_params
+      params.require(:field).permit(
+          :name,
+          :code_name,
+          :template_id,
+          :type_value
+      )
+    end
+
     def move_to(to)
       @field = Field.find(params[:id])
       to == :up ? @field.move_higher : @field.move_lower

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

@@ -3,10 +3,8 @@
 module ConstructorPages
   class PagesController < ConstructorCore::ApplicationController
     include MoveHelper
-    caches_page :show
 
     before_filter {@roots = Page.roots}
-    before_filter :cache, only: [:create, :update, :destroy, :move_up, :move_down]
 
     def new
       @page, @template_id, @multipart = Page.new, Template.first.id, false
@@ -92,7 +90,7 @@ module ConstructorPages
     end
 
     def create
-      @page = Page.new params[:page]
+      @page = Page.new page_params
 
       if @page.save
         redirect_to pages.pages_url, notice: t(:page_success_added, name: @page.name)
@@ -108,7 +106,7 @@ module ConstructorPages
         @page.remove_fields_values
       end
 
-      if @page.update_attributes params[:page]
+      if @page.update page_params
         @page.create_fields_values
         @page.update_fields_values params[:fields]
 
@@ -129,16 +127,26 @@ module ConstructorPages
 
     private
 
-    def error_404
-      render file: "#{Rails.root}/public/404", layout: false, status: 404
+    def page_params
+      params.require(:page).permit(
+          :active,
+          :name,
+          :url,
+          :title,
+          :keywords,
+          :description,
+          :auto_url,
+          :parent_id,
+          :template_id,
+          :in_nav,
+          :in_map,
+          :in_menu,
+          :link
+      )
     end
 
-    def cache
-      expire_page :action => :show
-      cache_dir = ActionController::Base.page_cache_directory
-      unless cache_dir == Rails.root.to_s+"/public"
-        FileUtils.rm_r(Dir.glob(cache_dir+"/*")) rescue Errno::ENOENT
-      end
+    def error_404
+      render file: "#{Rails.root}/public/404", layout: false, status: 404
     end
   end
 end

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

@@ -8,11 +8,6 @@ module ConstructorPages
 
     def new
       @template = Template.new
-
-      if params[:template]
-        @parent = Template.find(params[:template])
-        @template.parent_id = @parent.id
-      end
     end
 
     def edit
@@ -20,7 +15,7 @@ module ConstructorPages
     end
 
     def create
-      @template = Template.new params[:template]
+      @template = Template.new template_params
 
       if @template.save
         redirect_to templates_url, notice: t(:template_success_added, name: @template.name)
@@ -32,7 +27,7 @@ module ConstructorPages
     def update
       @template = Template.find params[:id]
 
-      if @template.update_attributes params[:template]
+      if @template.update template_params
         redirect_to templates_url, notice: t(:template_success_updated, name: @template.name)
       else
         render action: :edit
@@ -47,5 +42,16 @@ module ConstructorPages
     end
 
     %w{up down}.each {|m| define_method "move_#{m}" do move_to :template, m.to_sym end}
+
+    private
+
+    def template_params
+      params.require(:template).permit(
+          :name,
+          :code_name,
+          :parent_id,
+          :child_id
+      )
+    end
   end
 end

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

@@ -5,8 +5,6 @@ module ConstructorPages
   #
   # Each field has type of value such as float, integer, string...
   class Field < ActiveRecord::Base
-    attr_accessible :name, :code_name, :type_value, :template_id, :template
-
     # Adding code_name_uniqueness method
     include CodeNameUniq
 
@@ -38,7 +36,7 @@ module ConstructorPages
     def type_class; "constructor_pages/types/#{type_value}_type".classify.constantize end
 
     # Return object of type_value by page
-    def find_type_object(page); type_class.find_by_field_id_and_page_id(id, page.id) end
+    def find_type_object(page); type_class.where(field_id: id, page_id: page.id).first end
 
     # Create object of type_value by page
     def create_type_object(page); type_class.create(field_id: id, page_id: page.id) end

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

@@ -3,11 +3,6 @@
 module ConstructorPages
   # Page model. Pages are core for company websites, blogs etc.
   class Page < ActiveRecord::Base
-    attr_accessible :name, :title, :keywords, :description,
-                    :url, :full_url, :active, :auto_url,
-                    :parent, :parent_id, :link, :in_menu, :in_map,
-                    :in_nav, :template_id, :template
-
     # Adding has_many for all field types
     Field::TYPES.each do |t|
       class_eval %{
@@ -19,7 +14,7 @@ module ConstructorPages
 
     belongs_to :template
 
-    default_scope order :lft
+    default_scope -> { order(:lft)}
 
     validate :template_check
 
@@ -32,7 +27,7 @@ module ConstructorPages
     # Used for find page by request. It return first page if no request given
     # @param request for example <tt>'/conditioners/split-systems/zanussi'</tt>
     def self.find_by_request_or_first(request = nil)
-      request.nil? ? Page.first : Page.find_by_full_url(request)
+      request.nil? ? Page.first : Page.where(full_url: request).first
     end
 
     # Generate full_url from parent id and url
@@ -47,6 +42,7 @@ module ConstructorPages
     # field and template code_name should be uniqueness for page methods
     def self.check_code_name(code_name)
       [code_name, code_name.pluralize, code_name.singularize].each do |name|
+        # TODO: replace Page.first
         if Page.first.respond_to?(name)
           return false
         end
@@ -57,7 +53,7 @@ module ConstructorPages
 
     # Get field by code_name
     def field(code_name)
-      Field.find_by_code_name_and_template_id code_name, template_id
+      Field.find_by code_name: code_name, template_id: template_id
     end
 
     # Get value of field by code_name
@@ -80,13 +76,16 @@ module ConstructorPages
         value = params[field.code_name.to_sym]
 
         _type_object = field.find_type_object(self)
-        _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
 
-        if value
-          _type_object.value = field.type_value == 'date' ? parse_date(value).to_s : value
-        end
+        if _type_object
+          _type_object.value = 0 if field.type_value == 'boolean' and reset_booleans
+
+          if value
+            _type_object.value = value
+          end
 
-        _type_object.save
+          _type_object.save
+        end
       end
     end
 
@@ -107,12 +106,12 @@ module ConstructorPages
     # It determines if code_name is singular or nor
     # @param code_name template code name
     def find_page_in_branch(code_name)
-      _template = Template.find_by_code_name code_name.singularize
+      _template = Template.where(code_name: code_name.singularize).first
 
       if _template
         result = []
         result = descendants.where(template_id: _template.id) if code_name == code_name.pluralize
-        result = ancestors.find_by_template_id(_template.id) if result.empty?
+        result = ancestors.where(template_id: _template.id).first if result.empty?
         result
       end
     end
@@ -158,13 +157,8 @@ module ConstructorPages
       self.url = ((auto_url || url.empty?) ? translit(name) : url).parameterize
     end
 
-    # TODO: move out
-    def parse_date(value)
-      Date.new(value['date(1i)'].to_i, value['date(2i)'].to_i, value['date(3i)'].to_i)
-    end
-
     # TODO: add more languages
-    # Translit to english
+    # translit to english
     def translit(str)
       Russian.translit(str)
     end

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

@@ -7,12 +7,9 @@ module ConstructorPages
   # For example:
   #   template "Product" should has fields like "price", "description", "size" etc.
   class Template < ActiveRecord::Base
-
     # Adding code_name_uniqueness method
     include CodeNameUniq
 
-    attr_accessible :name, :code_name, :child_id, :parent_id, :parent
-
     validates_presence_of :name, :code_name
     validates_uniqueness_of :code_name
     validate :code_name_uniqueness

data/pages/app/models/constructor_pages/types/boolean_type.rb

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # Boolean type. Render as checkbox.
     class BooleanType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end

data/pages/app/models/constructor_pages/types/date_type.rb

@@ -2,15 +2,10 @@
 
 module ConstructorPages
   module Types
+    # Date time. Render as three select lists (day, month, year).
     class DateType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
-
-      def russian
-        Russian::strftime(self.value, "%d %B %Y").gsub(/0(\d\D)/, '\1')
-      end
     end
   end
 end

data/pages/app/models/constructor_pages/types/float_type.rb

@@ -2,9 +2,8 @@
 
 module ConstructorPages
   module Types
+    # Float type. Render small text field.
     class FloatType < ActiveRecord::Base
-      attr_accessible :value, :field_id, :field, :page_id, :page
-
       belongs_to :field
       belongs_to :page
     end