sunrise-core 0.1.5 → 0.2.0

data/Gemfile

@@ -0,0 +1,38 @@
+source "http://rubygems.org"
+gemspec
+
+gem "rails", "~> 3.0.10"
+
+platforms :ruby do
+  gem 'nokogiri', '~> 1.5.0'
+  gem 'inherited_resources', '~> 1.2.2'
+  gem "has_scope", "~> 0.5.1"
+  gem 'carrierwave', '~> 0.5.7'
+  gem 'mini_magick'
+  gem 'mime-types', '~> 1.16'
+  gem 'kaminari', '~> 0.12.4'
+  gem 'cancan', '~> 1.6.5'
+  gem 'cancan_namespace', '~> 0.1.3'
+  gem 'devise', '~> 1.4.2'
+  gem 'simple_form', '~> 1.4.2'
+  gem 'awesome_nested_set', '~> 2.0.1'
+  gem "fastercsv", "~> 1.5.4"
+  gem 'ckeditor'
+  
+  gem 'galetahub-enum_field', '~> 0.1.4', :require => 'enum_field'
+  gem 'galetahub-salty_slugs', '~> 1.0.0', :require => 'salty_slugs'
+  
+  gem "sunrise-file-upload", "~> 0.1.2"
+  
+  group :development, :test do
+    gem "rspec-rails", "2.6.1"
+    gem "jeweler", "1.6.2"
+    gem "rdoc", "~> 3.6.1"
+    gem "mysql2", "~> 0.2.10"
+    gem "capybara", "~> 1.0.0"
+    gem "database_cleaner"
+    gem "factory_girl"
+    gem "fuubar"
+    gem "generator_spec"
+  end
+end

data/README.rdoc

@@ -4,11 +4,13 @@
 
 === Include gems:
   
-  gem "rails", "~> 3.0.9"
-  gem "mysql2", "~> 0.2.11"
+  gem "rails", "~> 3.0.10"
+  gem "mysql2", "~> 0.2.13"
   
   gem 'inherited_resources'
-  gem 'paperclip'
+  gem 'has_scope'
+  gem 'carrierwave'
+  gem 'mini_magick'
   gem 'mime-types'
   gem 'kaminari'
   gem 'cancan'
@@ -24,6 +26,13 @@
 
   gem "sunrise-cms"
   gem "sunrise-file-upload"
+  
+  group :test, :development do
+    gem "rspec-rails", "~> 2.6.1"
+    gem "database_cleaner", "~> 0.6.7"
+    gem "factory_girl_rails", "~> 1.1.0"
+    gem "fuubar"
+  end
 
 === Generate all your need:
 
@@ -33,6 +42,7 @@ It's run all dependent generators:
 
 * simple_form:install
 * sunrise:file_upload:install
+* ckeditor:install
 * devise:install
 
 === Configuration

data/Rakefile

@@ -8,11 +8,14 @@ end
 
 require 'rake'
 require 'rdoc/task'
-require File.join(File.dirname(__FILE__), 'lib', 'sunrise', 'version')
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
+# Clear tmp folder
+require "fileutils"
+FileUtils.rm_r "#{File.dirname(__FILE__)}/spec/tmp", :force => true 
+
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = ['--options', "spec/spec.opts"]
 end
@@ -27,22 +30,3 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "sunrise-core"
-    s.version = Sunrise::VERSION.dup
-    s.summary = "Rails CMS"
-    s.description = "Sunrise is a Aimbulance CMS"
-    s.email = "galeta.igor@gmail.com"
-    s.homepage = "https://github.com/galetahub/sunrise-core"
-    s.authors = ["Igor Galeta", "Pavlo Galeta"]
-    s.files =  FileList["[A-Z]*", "{app,config,lib}/**/*"] - %w(Gemfile Gemfile.lock)
-    #s.extra_rdoc_files = FileList["[A-Z]*"]
-  end
-  
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end

data/app/controllers/manage/base_controller.rb

@@ -1,9 +1,5 @@
 class Manage::BaseController < ApplicationController
-  before_filter :authenticate_user!
-  check_authorization
-  
-  layout "manage"
-  respond_to :html
+  include Sunrise::Controllers::Manage
   
   protected
   
@@ -17,8 +13,4 @@ class Manage::BaseController < ApplicationController
         format.js   { head :unauthorized }
       end
     end
-    
-    def current_ability
-      @current_ability ||= ::Ability.new(current_user, :manage)
-    end
 end

data/app/controllers/manage/users_controller.rb

@@ -4,10 +4,17 @@ class Manage::UsersController < Manage::BaseController
   
   load_and_authorize_resource  
   
-  before_filter :make_filter, :only=>[:index]
   before_filter :check_params, :only => [:create, :update]
   
-  respond_to :json, :csv, :only => [:index]
+  with_options :only => [:index] do |i|
+    i.respond_to :json, :csv
+    
+    i.has_scope :with_name, :as => :name
+    i.has_scope :with_email, :as => :email
+    i.has_scope :with_role, :as => :role
+  end
+  
+  order_by :name, :created_at
 
   def index
     index! do |format|
@@ -59,12 +66,7 @@ class Manage::UsersController < Manage::BaseController
   protected
     
     def collection
-      @users = (@users || end_of_association_chain).merge(@search.scoped).includes(:avatar).page(params[:page])
-    end
-    
-    def make_filter
-      @search = Sunrise::ModelFilter.new(User, :attributes=>[:name, :email])
-      @search.update_attributes(params[:search])
+      @users = (@users || end_of_association_chain).order(search_filter.order).includes(:avatar).page(params[:page])
     end
     
     def check_params

data/app/views/manage/shared/_head.html.erb

@@ -20,7 +20,7 @@
     <div class="user-info">
       <div class="info">
         <%= link_to current_user.name, edit_manage_user_path(current_user), :class=>"name" %>
-        <%= link_to t('manage.exit'), destroy_user_session_path, :class=>"exit" %>
+        <%= link_to t('manage.exit'), destroy_user_session_path, :class=>"exit", :method => :delete %>
       </div>
     </div>
     

data/app/views/manage/shared/_notice.html.erb

@@ -1,6 +1,6 @@
 <% flash.each do |k, v| %>
 	<%= content_tag(:div, :id=>"message_#{k}", :class=>"message #{k}") do %>
-		<%= link_to_function(image_tag("manage/ico_del.gif", :title=>t('manage.close')), "$(this).parent('div.message').hide()", :class=>"close") %>
+		<%= link_to_function(manage_icon('delete'), "$(this).parent('div.message').hide()", :class=>"close") %>
     <%= v %>
   <% end %>
   <script type='text/javascript'>window.setTimeout("Manage.fade_flash()", 15000);</script>

data/app/views/manage/shared/_panel.html.erb

@@ -22,7 +22,7 @@
         <div class="p-user-info">
           <div class="p-info">
             <%= link_to current_user.name, edit_manage_user_path(current_user), :class=>"p-name" %>
-            <%= link_to t('manage.exit'), destroy_user_session_path, :class=>"p-exit" %>
+            <%= link_to t('manage.exit'), destroy_user_session_path, :class=>"p-exit", :method => :delete %>
           </div>
         </div>
         <div class="p-user-foto">

data/app/views/manage/structures/_form.html.erb

@@ -3,6 +3,7 @@
     <div class="inputs-bl">
       <%= f.input :title, :input_html => { :class => 'name text' } %>
       <%= f.input :redirect_url %>
+      <%= f.input :slug %>
     </div>
   </div>
   

data/app/views/manage/structures/_structure.html.erb

@@ -4,22 +4,22 @@
       <%= link_to structure.title, edit_structure_record_path(structure), :class=>(structure.descendants_count.zero? ? "dark-text" : "dark-arr"), :id=>"a#{structure.id}" %>
       <div class="act-bl" style="display:none;">
         <% if can? :update, structure, :context => :manage %>
-          <%= link_to image_tag("manage/ico_down.gif", :alt=>t('manage.position.down'), :title=>t('manage.position.down')), 
+          <%= link_to manage_icon("down"), 
               move_manage_structure_path(:id => structure.id, :direction => 'down', :format => :json),
               :remote => true,
               :class=>"icons move_down" %>
               
-          <%= link_to image_tag("manage/ico_up.gif", :alt=>t('manage.position.up'), :title=>t('manage.position.up')), 
+          <%= link_to manage_icon("up"), 
               move_manage_structure_path(:id => structure.id, :direction => 'up', :format => :json),
               :remote => true,
               :class=>"icons move_up" %>
           
-          <%= link_to image_tag("manage/ico_edit.gif", :alt=>t('manage.edit'), :title=>t('manage.edit')), edit_structure_record_path(structure), :class=>"icons" %>
-          <%= link_to image_tag("manage/ico_settings.gif", :alt=>t('manage.label_settings'), :title=>t('manage.label_settings')), edit_manage_structure_path(:id=>structure.id), :class=>"icons" %>
+          <%= link_to manage_icon("edit"), edit_structure_record_path(structure), :class=>"icons" %>
+          <%= link_to manage_icon("settings"), edit_manage_structure_path(:id=>structure.id), :class=>"icons" %>
         <% end %>
         
         <% if can? :delete, structure, :context => :manage %>
-          <%= link_to image_tag("manage/ico_del.gif", :alt=>t('manage.delete'), :title=>t('manage.delete')), manage_structure_path(:id=>structure.id), 
+          <%= link_to manage_icon("delete"), manage_structure_path(:id=>structure.id), 
               :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
         <% end %>
       </div>

data/app/views/manage/users/_model_filter.html.erb

@@ -5,12 +5,16 @@
     <%= t('manage.model_filter.total_count') %>: <%= @users.total_count %>
     
     <%= cookie_content_tag(:div, :id=>"block_filter", :class=>"filt") do %>
-      <%= form_for @search, :as => :search, :url=>manage_users_path, :html=>{:method=>:get} do |f| %>
-        <%= f.label :email, t('activerecord.attributes.user.email') %>
-        <%= f.text_field :email, :class=>"text" %>
+      <%= form_for search_filter, :url => manage_users_path, :html =>{ :method => :get } do |f| %>
         
-        <%= f.label :name, t('activerecord.attributes.user.name') %>
-        <%= f.text_field :name, :class=>"text" %>
+        <% controller.scopes_configuration.each do |key, value| %>
+          <% next if [:with_role].include?(key) %>
+          <%= f.label value[:as], t(value[:as], :scope => "activerecord.attributes.user") %>
+          <%= f.text_field value[:as], :class => "text", :name => value[:as] %>
+        <% end %>
+        
+        <%= f.label :role, t(:role, :scope => "activerecord.attributes.user") %>
+        <%= f.collection_select :role, RoleType.all, :id, :title, {:include_blank => true}, {:name => "role"} %>
         
         <div class="buts">
           <%= content_tag(:button, :value => "search", :type => "submit", :name => "commit", :class => "gr cupid-green") do %>
@@ -25,13 +29,12 @@
   
   <div class="sort">
   	<label><%= t('manage.sort') %></label>
-    <div class="select-input"><%= link_to_function t("manage.users.sort.#{@search.order_column}_#{@search.order_type}"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
+    <div class="select-input"><%= link_to_function t(search_filter.current_order, :scope => "manage.users.sort"), "SelectList.toggle(event)", :class=>"corn", :id=>'sort_select' %></div>
     <div id='sort_select_list' class="select-list" style='display:none;'>
-      <%= link_to_sort(t('manage.users.sort.created_at_desc'),:name=>"created_at", :order_type=>'desc') %>
-      <%= link_to_sort(t('manage.users.sort.created_at_asc'), :name=>"created_at", :order_type=>'asc') %>
-      
-      <%= link_to_sort(t('manage.users.sort.name_desc'), :name=>"name", :order_type=>'desc') %>
-      <%= link_to_sort(t('manage.users.sort.name_asc'), :name=>"name", :order_type=>'asc') %>
+      <% controller.orders_configuration.each do |key, value| %>
+        <%= link_to_sort(t("#{key}_desc", :scope => "manage.users.sort"), :name => key, :order_type=>'desc') %>
+        <%= link_to_sort(t("#{key}_asc", :scope => "manage.users.sort"), :name => key, :order_type=>'asc') %>
+      <% end %>
     </div>
   </div>
   <div class="sort">

data/app/views/manage/users/_user.html.erb

@@ -1,11 +1,11 @@
 <%= content_tag(:div, :id=>dom_id(user), :class=>"dinamic-bl #{user.state}") do %>
   <div class="act-bl" style="display:none;">
     <% if can? :update, user, :context => :manage %>
-      <%= link_to image_tag("manage/ico_edit.gif", :title=>t('manage.edit')), edit_manage_user_path(:id=>user.id), :class=>"icons" %>
+      <%= link_to manage_icon("edit"), edit_manage_user_path(:id=>user.id), :class=>"icons" %>
     <% end %>
     
     <% if can? :delete, user, :context => :manage %>
-      <%= link_to image_tag("manage/ico_del.gif", :title=>t('manage.delete')), manage_user_path(:id=>user.id), 
+      <%= link_to manage_icon("delete"), manage_user_path(:id=>user.id), 
             :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"icons" %>
     <% end %>
   </div>

data/config/locales/manage/en.yml

@@ -12,6 +12,7 @@ en:
         about: "About"
         remember_me: "Remember me"
         role_type_id: "Role type"
+        role: "Role type"
       
       structure:
         title: "Name"
@@ -22,6 +23,7 @@ en:
         kind: "Page Type"
         redirect_url: "Redirect (URL)"
         position: "Position"
+        slug: "Slug"
       
       header:
         title: "Title page"
@@ -224,6 +226,21 @@ en:
     fileupload:
       button: "Select file"
       max_size: "Max size"
+    
+    icons:
+      down: "Down"
+      up: "Up"
+      edit: "Edit"
+      settings: "Settings"
+      delete: "Delete"
+  
+  views:
+    pagination:
+      previous: "Previous"
+      next: "Next"
+      truncate: "..."
+      last: "Last"
+      first: "First"
       
   flash:
     manage:      
@@ -257,3 +274,11 @@ en:
         update:
           success: "Site successfully saved"
           failure: "Errors during data retention"
+          
+  errors:
+    messages:
+      wrong_size: "is the wrong size (should be %{file_size})"
+      size_too_small: "is too small (should be at least %{file_size})"
+      size_too_big: "is too big (should be at most %{file_size})"
+      carrierwave_processing_error: 'Cannot resize image.'
+      carrierwave_integrity_error: 'Not an image.'

data/config/locales/manage/ru.yml

@@ -12,6 +12,7 @@ ru:
         about: "О себе"
         remember_me: "Запомнить меня"
         role_type_id: "Тип пользователя"
+        role: "Тип пользователя"
       
       structure:
         title: "Название"
@@ -22,6 +23,7 @@ ru:
         kind: "Тип страницы"
         redirect_url: "Перенаправление (URL)"
         position: "Позиция"
+        slug: "URL"
       
       header:
         title: "Заглавие страницы"
@@ -225,6 +227,21 @@ ru:
       button: "Выберите файл"
       max_size: "Макс. р."
       
+    icons:
+      down: "Опустить вниз"
+      up: "Поднять вверх"
+      edit: "Редактировать"
+      settings: "Настройки"
+      delete: "Удалить"
+  
+  views:
+    pagination:
+      previous: "Предыдущая"
+      next: "Следующая"
+      truncate: "..."
+      last: "Последняя"
+      first: "Первая"
+      
   flash:
     manage:      
       actions:
@@ -257,3 +274,11 @@ ru:
         update:
           success: "Страничка успешно сохранена"
           failure: "Возникли ошибки при сохранении данных"
+          
+  errors:
+    messages:
+      wrong_size: "неправильный размер (должно быть %{file_size})"
+      size_too_small: "слишком маленький размер (должно быть не менее %{file_size})"
+      size_too_big: "слишком большой размер (должно быть не более %{file_size})"
+      carrierwave_processing_error: 'Невозможно переконвертировать'
+      carrierwave_integrity_error: 'Не является рисунком'

data/config/locales/manage/uk.yml

@@ -12,6 +12,7 @@ uk:
         about: "Про себе"
         remember_me: "Запам'ятати мене"
         role_type_id: "Тип користувача"
+        role: "Тип користувача"
       
       structure:
         title: "Назва"
@@ -22,6 +23,7 @@ uk:
         kind: "Тип сторінки"
         redirect_url: "Перенаправлення (URL)"
         position: "Позиція"
+        slug: "URL"
       
       header:
         title: "Заголовок сторінки"
@@ -224,7 +226,22 @@ uk:
     fileupload:
       button: "Оберіть файл"
       max_size: "Макс. р."
-      
+  
+    icons:
+      down: "Опустити вниз"
+      up: "Підняти вгору"
+      edit: "Редагувати"
+      settings: "Установки"
+      delete: "Видалити"
+  
+  views:
+    pagination:
+      previous: "Попередня"
+      next: "Наступна"
+      truncate: "..."
+      last: "Остання"
+      first: "Перша"
+  
   flash:
     manage:      
       actions:
@@ -257,3 +274,11 @@ uk:
         update:
           success: "Сторінка успішно збережено"
           failure: "Виникли помилки при збереженні даних"
+          
+  errors:
+    messages:
+      wrong_size: "неправильний розмір (повинно бути %{file_size})"
+      size_too_small: "занадто маленький розмір (повинно бути не менше %{file_size})"
+      size_too_big: "занадто великий розмір (повинно бути не більше %{file_size})"
+      carrierwave_processing_error: 'Неможливо переконвертувати'
+      carrierwave_integrity_error: 'Не є картинкою'