sunrise-cms 0.6.0 → 0.6.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.6.1
+  * New callbacks after_sort, before_sort, after_mass_destroy, before_mass_destroy in Abstract model.
+  * Translate sort buttons
+  * New nginx config (using try_files)
+
 == 0.6.0
   * Raname attributes kind and position to structure_type_id and position_type_id
   * Integrate "public_activity" gem

data/README.md

@@ -39,6 +39,8 @@ class SunriseProduct < Sunrise::AbstractModel
   self.resource_name = "Product"
 
   association :structure
+
+  after_sort :clear_cache
   
   list :thumbs do
     scope { Product.includes(:picture) }
@@ -79,6 +81,12 @@ class SunriseProduct < Sunrise::AbstractModel
       field :picture, :as => :uploader
     end
   end
+
+  protected
+
+    def clear_cache
+      Rails.cache.clear
+    end
 end
 ```
 

data/app/controllers/sunrise/dashboard_controller.rb

@@ -9,7 +9,7 @@ module Sunrise
       cur_page = (params[:page] || 1).to_i
       offset = (cur_page - 1) * per_page
       
-      @events = PublicActivity::Activity.includes(:owner, :trackable, :recipient)
+      @events = Sunrise.activities
       @events = @events.limit(per_page).offset(offset)
 
       respond_with(@events) do |format|

data/app/controllers/sunrise/manager_controller.rb

@@ -80,7 +80,7 @@ module Sunrise
     end
     
     def mass_destroy
-      abstract_model.model.destroy_all(:id => params[:ids]) unless params[:ids].blank?
+      abstract_model.destroy_all(params)
       
       respond_to do |format|
         format.html { redirect_to redirect_after_update }

data/app/views/sunrise/manager/buttons/_sort.html.erb

@@ -1,6 +1,6 @@
 <div class="but-holder">
   <div class="act-but">
-    <%= link_to image_tag('sunrise/empty.gif'), export_path(:format => :json), :class => 'but-container sort', :title => 'Sort', :id => 'sort-button', :"data-save_title" => 'Save', :"data-cancel_title" => 'Cancel', :"data-url" => sort_path(:format => :json) %>
+    <%= link_to image_tag('sunrise/empty.gif'), export_path(:format => :json), :class => 'but-container sort', :title => t('manage.buttons.sort'), :id => 'sort-button', :"data-save_title" => t('manage.buttons.save'), :"data-cancel_title" => t('manage.buttons.cancel'), :"data-url" => sort_path(:format => :json) %>
     
     <script type="text/javascript">
       $(document).ready(function(){

data/config/locales/sunrise/en.yml

@@ -164,6 +164,9 @@ en:
       exit: "Exit"
       add_nested_field: "+Add"
       next_50: "Show more 50"
+      sort: "Sort"
+      save: "Save"
+      cancel: "Cancel"
 
     user:
       actions: "action"

data/config/locales/sunrise/ru.yml

@@ -164,6 +164,9 @@ ru:
       exit: "Выход"
       add_nested_field: "+Еще"
       next_50: "Показать еще 50"
+      sort: "Сортировать"
+      save: "Сохранить"
+      cancel: "Отмена"
     
     user:
       actions: "действия"

data/config/locales/sunrise/uk.yml

@@ -164,6 +164,9 @@ uk:
       exit: "Вихід"
       add_nested_field: "+Ще"
       next_50: "Показати ще 50"
+      sort: "Сортувати"
+      save: "Зберегти"
+      cancel: "Скасувати"
     
     user:
       actions: "дії"

data/lib/generators/sunrise/install_generator.rb

@@ -22,7 +22,7 @@ module Sunrise
       
       def copy_configurations
         copy_file('config/seeds.rb', 'db/seeds.rb')
-        copy_file('config/sunrise.rb', 'config/initializers/sunrise.rb')
+        copy_file("config/#{orm}/sunrise.rb", 'config/initializers/sunrise.rb')
         
         template('config/database.yml', 'config/database.yml.sample')
         template('config/logrotate-config', 'config/logrotate-config.sample')

data/lib/generators/sunrise/templates/config/{sunrise.rb → active_record/sunrise.rb}

@@ -1,5 +1,5 @@
-# require 'meta_manager/orm/active_record'
-# require 'page_parts/orm/active_record'
+require 'meta_manager/orm/active_record'
+require 'page_parts/orm/active_record'
 
 # Use this hook to configure sunrise
 Sunrise.setup do |config|
@@ -41,11 +41,11 @@ Sunrise.setup do |config|
   # config.navigational_formats = [:html, :json]
 end
 
-#PublicActivity::Config.set do
-#  orm :mongoid
-#end
+PublicActivity::Config.set do
+  orm :active_record
+end
 
 #if Settings.table_exists?
 #  Settings.defaults[:some_setting] = "value"
 #  Settings.defaults[:some_setting2] = "value2"
-#end
+#end

data/lib/generators/sunrise/templates/config/mongoid/sunrise.rb

@@ -0,0 +1,51 @@
+require 'meta_manager/orm/mongoid'
+require 'page_parts/orm/mongoid'
+
+# Use this hook to configure sunrise
+Sunrise.setup do |config|
+  # Paginate records per page (default: 25)
+  # config.default_items_per_page = 25
+  
+  # Display audits events on dashboard (default: 50)
+  # config.activities_per_page = 50
+  
+  # By default show latest first (default: :desc)
+  # config.default_sort_mode = :desc
+  
+  # The display for a model instance (i.e. a single database record).
+  # config.label_methods = [:title, :name]
+  
+  # Defailt list template view (default: "thumbs")
+  # config.default_list_view = "thumbs"
+  
+  # Avariable lists views (default: [:list, :thumbs, :table])
+  # config.available_list_view = [:list, :thumbs, :table]
+  
+  # Defailt list template view (default: "sort_order")
+  # config.sort_column = "sort_order"
+  
+  # Find template before rendering (default: true)
+  # config.scoped_views = true
+  
+  # Set available locales in app (default: [])
+  # config.available_locales = []
+
+  # Set transliteration for babosa gem
+  # more info here: https://github.com/norman/babosa (default: :russian)
+  # config.transliteration = :russian
+
+  # Set list toolbar buttons (default: [:delete, :edit, :new, :sort, :export])
+  # config.default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]
+  
+  # Lists the formats that should be treated as navigational (default: [:html, :json])
+  # config.navigational_formats = [:html, :json]
+end
+
+PublicActivity::Config.set do
+ orm :mongoid
+end
+
+#if Settings.table_exists?
+#  Settings.defaults[:some_setting] = "value"
+#  Settings.defaults[:some_setting2] = "value2"
+#end

data/lib/generators/sunrise/templates/config/nginx-config

@@ -1,7 +1,7 @@
 # <%= app_name %>
 #
 upstream <%= app_name %>_backend {
-  server unix:/var/www/<%= app_name %>/tmp/sockets/unicorn.sock;
+  server unix:/var/www/<%= app_name %>/tmp/sockets/unicorn.sock fail_timeout=0;
 }
 
 server {
@@ -14,31 +14,10 @@ server {
   
   root /var/www/<%= app_name %>/public;
   
-  if (-f $request_filename) { 
-    break;
-  }
-
-  if (-f /cache$request_filename) { 
-    rewrite (.*) /cache$1 break;
-    break;
-  }
-
-  if (-f /cache$request_filename.html) { 
-    rewrite (.*) /cache$1.html break;
-    break;
-  }
+  try_files $uri $uri.html $uri/index.html /cache$uri/index.html /cache$uri.html /cache$uri @app;
   
-  if (-f $document_root/cache$request_uri.html) {
-    rewrite (.*) /cache$1.html break;
-  }
-  
-  if (-f $document_root/cache$request_uri/index.html) {
-    rewrite (.*) /cache$1/index.html break;
-  }
-  
-  # This directive prohibits direct access to the cache directory from outside
   location ^~ /cache {
-    internal;
+    return 404;
   }
   
   location ~ /\.[^\/]+ {
@@ -64,19 +43,12 @@ server {
     proxy_busy_buffers_size    64k;
     proxy_temp_file_write_size 64k;
 
-    if (!-f $request_filename) {
-      proxy_pass http://<%= app_name %>_backend;
-      break;
-    }
+    proxy_pass http://<%= app_name %>_backend;
   }
   
   location ~ ^/(assets|uploads|images|javascripts|stylesheets)/ {
     expires 1y;
     add_header Cache-Control public;
-   
-    # Some browsers still send conditional-GET requests if there's a
-    # Last-Modified header or an ETag header even if they haven't
-    # reached the expiry date sent in the Expires header.
     add_header Last-Modified "";
     add_header ETag "";
     break;
@@ -89,11 +61,7 @@ server {
    
   error_page 503 @503;
   location @503 {
-    # Serve static assets if found.
-    if (-f $request_filename) {
-      break;
-    }
-   
+    root /var/www/designinterior/public;
     rewrite ^(.*)$ /system/maintenance.html break;
   }
 }

data/lib/generators/sunrise/templates/models/mongoid/structure.rb

@@ -9,13 +9,13 @@ class Structure
   # Columns
   field :title, :type => String
   field :slug, :type => String
-  field :kind, :type => Integer, :default => 0
-  field :position, :type => Integer, :default => 0
+  field :structure_type_id, :type => Integer, :default => 0
+  field :position_type_id, :type => Integer, :default => 0
   field :is_visible, :type => Boolean, :default => true
   field :redirect_url, :type => String
 
-  index({:kind => 1})
-  index({:position => 1})
+  index({:structure_type_id => 1})
+  index({:position_type_id => 1})
   index({:parent_id => 1})
 
   tracked owner: ->(controller, model) { controller.try(:current_user) }

data/lib/sunrise/abstract_model.rb

@@ -3,7 +3,8 @@ require 'ostruct'
 
 module Sunrise
   class AbstractModel
-    
+    extend ::ActiveModel::Callbacks
+
     class << self
       
       # Gets the resource_name
@@ -49,6 +50,8 @@ module Sunrise
     delegate :config, :model, :to => 'self.class'
     delegate :label, :to => 'self.class.config'
     delegate :param_key, :singular, :plural, :route_key, :to => :model_name
+
+    define_model_callbacks :sort, :mass_destroy, :only => [:before, :after]
     
     def initialize(params = {})
       @model_name = model.model_name
@@ -117,10 +120,20 @@ module Sunrise
     end
     
     def update_sort(params)
-      if !params[:ids].blank?
-        update_sort_column(params[:ids])
-      elsif !params[:tree].blank?
-        update_sort_tree(params[:tree])
+      run_callbacks :sort do
+        if !params[:ids].blank?
+          update_sort_column(params[:ids])
+        elsif !params[:tree].blank?
+          update_sort_tree(params[:tree])
+        end
+      end
+    end
+
+    def destroy_all(params)
+      return if params[:ids].blank?
+
+      run_callbacks :mass_destroy do
+        model.where(:id => params[:ids]).destroy_all
       end
     end
     
@@ -139,14 +152,10 @@ module Sunrise
     
     def update_sort_column(ids)
       return nil if ids.empty?
-      
-      sql_case = '' 
+
       ids.each do |key, value| 
-        sql_case += "WHEN #{key} THEN #{value} "
+        model.where(:id => key).update_all(["#{@sort_column} = ?", value])
       end
-      sql_case += 'END'
-      
-      model.update_all("#{@sort_column} = CASE id #{sql_case}", ["id IN (?)", ids.keys.map(&:to_i)])
     end
     
     # Initialize new model, sets parent record and call build_defaults method

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

data/lib/sunrise.rb

@@ -47,12 +47,20 @@ module Sunrise
   LOCALIZE_STANDALONE_DAY_NAMES_MATCH = /^%A/
   
   def self.root_path
-    @root_path ||= Pathname.new( File.dirname(File.expand_path('../', __FILE__)) )
+    @root_path ||= Pathname.new(File.dirname(File.expand_path('../', __FILE__)))
   end
   
   def self.setup
     yield Config
   end
+
+  def self.activities
+    if defined?(Mongoid::Document)
+      PublicActivity::Activity.desc(:created_at)
+    else
+      PublicActivity::Activity.order("created_at DESC")
+    end
+  end
 end
 
 require 'sunrise/engine'