sunrise-cms 0.7.0.rc2 → 1.0.0.rc1

data/README.md

@@ -2,11 +2,23 @@
 
 Open source mini content management system for programmers.
 
+## Setup
+
+For rails 4.x.x:
+
+```ruby
+  gem "sunrise-cms", :require => "sunrise"
+```
+
+For rails 3.x.x:
+
+```ruby
+  gem "sunrise-cms", "~> 0.7.x" :require => "sunrise"
+```
+
 ## Instructions
 
 ### ActiveRecord
-  
-List of gems for [active_record](https://gist.github.com/4529926#file-gemfile-active_record).
 
 ```bash
 $> rails g devise:install
@@ -24,8 +36,6 @@ $> rails g public_activity:migration
 
 ### Mongoid
 
-List of gems for [mongoid](https://gist.github.com/4529926#file-gemfile-mongoid).
-
 ```bash
 $> rails g sunrise:install --orm=mongoid
 ```
@@ -42,7 +52,7 @@ class SunriseProduct < Sunrise::AbstractModel
 
   after_sort :clear_cache
   
-  list :thumbs do
+  index :thumbs do
     scope { Product.includes(:picture) }
     preview lambda { |product| product.picture.try(:url, :thumb) }
 
@@ -51,7 +61,7 @@ class SunriseProduct < Sunrise::AbstractModel
     field :total_stock
   end
 
-  list :export do
+  export do
     scope { Product.includes(:picture).recently.with_state(:finished) }
 
     field :id
@@ -71,7 +81,7 @@ class SunriseProduct < Sunrise::AbstractModel
     field :is_visible
   end
   
-  edit do
+  form do
     field :title
     field :price
     field :total_stock
@@ -139,15 +149,6 @@ For more info look at jbuilder https://rubygems.org/gems/jbuilder.
 
 ### Strong parameters
 
-Sunrise include gem [strong_parameters](https://github.com/rails/strong_parameters)
-In all models your need include module ActiveModel::ForbiddenAttributesProtection:
-
-``` ruby
-class Post < ActiveRecord::Base
-  include ActiveModel::ForbiddenAttributesProtection
-end
-```
-
 Now in sunrise file you can perform attributes check. 
 By default permited_attributes allow edit all attributes.
 
@@ -192,4 +193,4 @@ config.to_prepare do
 end
 ```
 
-Copyright (c) 2013 Fodojo, released under the MIT license
+Copyright (c) 2014 Fodojo, released under the MIT license

data/app/assets/stylesheets/sunrise/main.css

@@ -1177,7 +1177,7 @@ a.close-but:hover {
 	border: solid 1px #ccc;
 	padding: 10px;
 	width: 255px;
-	height: 50px;
+	height: 40px;
 	font-size: 12px;
 }
 .sort-wrapper .sort-items-holder .sort-item:hover {

data/app/controllers/sunrise/manager_controller.rb

@@ -55,18 +55,15 @@ module Sunrise
     end
     
     def export
-      abstract_model.current_list = "export"
-      @records = abstract_model.apply_scopes(params)
-      options = { :filename => abstract_model.export_filename,
-                  :columns => abstract_model.export_columns }
+      @records = abstract_model.apply_scopes(params, false)
       
       respond_to do |format|
         format.xml  { render :xml => @records }
         format.json { render :json => @records }
-        format.csv  { render options.merge(:csv => @records) }
+        format.csv  { render abstract_model.export_options.merge(:csv => @records) }
         
         if defined?(Mime::XLSX)
-          format.xlsx { render options.merge(:xlsx => @records) }
+          format.xlsx { render abstract_model.export_options.merge(:xlsx => @records) }
         end
       end
     end
@@ -155,7 +152,7 @@ module Sunrise
       end
       
       def redirect_after_update(record = nil)
-        if abstract_model.without_list?
+        if abstract_model.without_index?
           index_path(:model_name => abstract_model.plural)
         else
           scoped_index_path

data/app/controllers/sunrise/settings_controller.rb

@@ -3,7 +3,7 @@ module Sunrise
     authorize_resource :class => false
     
     def edit
-      @settings = Settings.all
+      @settings = Settings.get_all
       respond_with(@settings)
     end
     

data/app/views/layouts/sunrise/application.html.erb

@@ -22,7 +22,7 @@
 	
 	<div class="footer">
 	  <div class="fwrapper">
-      <%= image_tag("sunrise/created.png", :alt => "Example.com") %>
+      <%= image_tag("sunrise/created.png", :title => "fodojo.com") %>
 	  </div>
 	</div>
   	

data/app/views/sunrise/manager/_form.html.erb

@@ -7,7 +7,7 @@
 	  <div class="wysiwyg-holder">
 	    <%= render :partial => "sunrise/shared/available_locales", :locals => {:form => f} if abstract_model.translate? %>
       
-      <%= render :partial => 'field', :collection => abstract_model.edit_fields, :locals => {:form => f} %>
+      <%= render :partial => 'field', :collection => abstract_model.form_fields, :locals => {:form => f} %>
 	  </div>
 	  
 	  <% if abstract_model.sidebar_groups? -%>

data/app/views/sunrise/shared/_filter.html.erb

@@ -15,7 +15,7 @@
 		    <%= link_to t('manage.filter'), scoped_index_path, :class => "filter-but ddmenu", :rel => "filter" %>
 			<% end %>
 			
-			<% unless abstract_model.without_list? %>
+			<% unless abstract_model.without_index? %>
         <div class="tabs-holder">
         	<%= content_tag :div, :class => 'tabs-item' do %>
         	  <% if abstract_model.current_list == :table %>
@@ -23,7 +23,7 @@
         	  <% else %>
           	  <%= link_to image_tag('sunrise/empty.gif'), {:view=>"table"}, :class => "table", :title => t('manage.buttons.table') %>
         	  <% end %>
-        	<% end  if abstract_model.config.available_list_view.include?(:table) -%>
+        	<% end  if abstract_model.config.available_index_views.include?(:table) -%>
         	
         	<%= content_tag :div, :class => 'tabs-item' do %>
 			      <% if abstract_model.current_list == :thumbs %>
@@ -31,7 +31,7 @@
         	  <% else %>
           	  <%= link_to image_tag('sunrise/empty.gif'), {:view=>"thumbs"}, :class => "list", :title => t('manage.buttons.thumbs') %>
         	  <% end %>
-				  <% end if abstract_model.config.available_list_view.include?(:thumbs) -%>
+				  <% end if abstract_model.config.available_index_views.include?(:thumbs) -%>
         </div>
         
         <% if abstract_model.sort_available? %>

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

@@ -2,7 +2,7 @@
   <div class="rel-holder">
     <div class="menu-holder">
       <ul class="main-menu">
-        <% Sunrise::Config.nav.each do |key, value| %>
+        <% Sunrise::Config.navigation.each do |key, value| %>
           <li>
             <%= link_to "##{key}", :class => "ddmenu", :rel => key do -%>
               <%= content_tag(:span, :class => key) do -%>
@@ -25,7 +25,7 @@
       </ul>
     </div>
 
-    <% Sunrise::Config.nav.each do |key, value| -%>
+    <% Sunrise::Config.navigation.each do |key, value| -%>
       <%= content_tag(:div, :id => "#{key}-container", :class => ["sub-wrapper", key], :style => "display: none;") do -%>
         <div class="sub-inner">
           <%= content_tag(:ul, :class => ["#{key}-list", "default-list"]) do -%>

data/app/views/sunrise/shared/_toolbar.html.erb

@@ -2,7 +2,7 @@
   <div class="act-buttons-wrapper">
     <div class="but-holder"><div class="check"><input type="checkbox" /></div></div>
 
-    <% unless abstract_model.without_list? %>
+    <% unless abstract_model.without_index? %>
       <% abstract_model.list.buttons.each do |name| %>
         <% if can? name, abstract_model.model, :context => :sunrise %>
           <%= render :partial => "sunrise/manager/buttons/#{name}", :locals => {:model => abstract_model} %>

data/config/routes.rb

@@ -1,26 +1,25 @@
 Sunrise::Engine.routes.draw do
-  root :to => "dashboard#index"
+  root to: Sunrise::Config.root_controller
   
-  get "/services", :to => "shared#services", :as => "services"
-  get "/dashboard/p/:page", :to => "dashboard#index", :page => /\d+/
+  get "/dashboard/p/:page", to: "dashboard#index", page: /\d+/
   
-  resource :settings, :only => [:edit, :update]
+  resource :settings, only: [:edit, :update]
   
   controller "manager" do
     scope ":model_name" do
-      get "/", :to => :index, :as => "index", :via => [:get, :post]
-      get "/export.:format", :to => :export, :as => "export"
-      post "/sort", :to => :sort, :as => "sort"
-      get "/new", :to => :new, :as => "new"
-      post "/new", :to => :create, :as => "create"
-      delete "/mass_destroy", :to => :mass_destroy, :as => "mass_destroy"
+      get "/", to: :index, as: :index
+      get "/export.:format", to: :export, as: :export
+      post "/sort", to: :sort, as: :sort
+      get "/new", to: :new, as: :new
+      post "/new", to: :create, as: :create
+      delete "/mass_destroy", to: :mass_destroy, as: :mass_destroy
       
       scope ":id" do
-        get "/", :to => :show, :as => "show"
-        get "/edit", :to => :edit, :as => "edit"
-        patch "/edit", :to => :update, :as => "update"
-        get "/delete", :to => :delete, :as => "delete"
-        delete "/delete", :to => :destroy, :as => "destroy"
+        get "/", to: :show, as: :show
+        get "/edit", to: :edit, as: :edit
+        patch "/edit", to: :update, as: :update
+        get "/delete", to: :delete, as: :delete
+        delete "/delete", to: :destroy, as: :destroy
       end
     end
   end

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

@@ -15,13 +15,13 @@ Sunrise.setup do |config|
   # 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"
+  # Default list template view (default: "thumbs")
+  # config.default_index_view = "thumbs"
   
   # Avariable lists views (default: [:list, :thumbs, :table])
-  # config.available_list_view = [:list, :thumbs, :table]
+  # config.available_index_views = [:list, :thumbs, :table]
   
-  # Defailt list template view (default: "sort_order")
+  # Default sort order column (default: "sort_order")
   # config.sort_column = "sort_order"
   
   # Find template before rendering (default: true)
@@ -39,13 +39,16 @@ Sunrise.setup do |config|
   
   # Lists the formats that should be treated as navigational (default: [:html, :json])
   # config.navigational_formats = [:html, :json]
+
+  # Welcome (root) controller path
+  # config.root_controller = "dashboard#index"
 end
 
 PublicActivity::Config.set do
   orm :active_record
 end
 
-#if Settings.table_exists?
-#  Settings.defaults[:some_setting] = "value"
-#  Settings.defaults[:some_setting2] = "value2"
-#end
+# if Settings.table_exists?
+#  Settings.some_setting = "value"
+#  Settings.some_setting2 = "value2"
+# end

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

@@ -15,13 +15,13 @@ Sunrise.setup do |config|
   # 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"
+  # Default list template view (default: "thumbs")
+  # config.default_index_view = "thumbs"
   
   # Avariable lists views (default: [:list, :thumbs, :table])
-  # config.available_list_view = [:list, :thumbs, :table]
+  # config.available_index_views = [:list, :thumbs, :table]
   
-  # Defailt list template view (default: "sort_order")
+  # Default sort order column (default: "sort_order")
   # config.sort_column = "sort_order"
   
   # Find template before rendering (default: true)
@@ -39,6 +39,9 @@ Sunrise.setup do |config|
   
   # Lists the formats that should be treated as navigational (default: [:html, :json])
   # config.navigational_formats = [:html, :json]
+
+  # Welcome (root) controller path
+  # config.root_controller = "dashboard#index"
 end
 
 PublicActivity::Config.set do
@@ -46,6 +49,6 @@ PublicActivity::Config.set do
 end
 
 #if Settings.table_exists?
-#  Settings.defaults[:some_setting] = "value"
-#  Settings.defaults[:some_setting2] = "value2"
+#  Settings.some_setting = "value"
+#  Settings.some_setting2 = "value2"
 #end

data/lib/generators/sunrise/templates/models/sunrise/sunrise_navigation.rb

@@ -1,14 +1,13 @@
 class SunriseNavigation < Sunrise::Config::Navigation
-  navigation :main do |m|
-    m.item :dashboard,  root_path, :class => "icon1"
-    m.item :structures, index_path(:model_name => "structures"), :class => "icon2"
-    m.item :users,      index_path(:model_name => "users"), :class => "icon3"
-    m.item :services,   "#", :class => "icon4"
-    m.item :settings,   edit_settings_path, :class => "icon4"
+  navigation :main do
+    item :dashboard,  root_path, class: "icon1"
+    item :structures, index_path(model_name: "structures"), class: "icon2"
+    item :users,      index_path(model_name: "users"), class: "icon3"
+    item :settings,   edit_settings_path, class: "icon4"
   end
   
-  navigation :creates do |c|
-    c.item :structures, new_path(:model_name => "structures")
-    c.item :users,      new_path(:model_name => "users")
+  navigation :creates do
+    item :structures, new_path(model_name: "structures")
+    item :users,      new_path(model_name: "users")
   end
 end

data/lib/generators/sunrise/templates/models/sunrise/sunrise_page.rb

@@ -1,10 +1,10 @@
 class SunrisePage < Sunrise::AbstractModel
   self.resource_name = "Structure"
   
-  list false
+  index false
   
-  edit do
-    field :main, :as => :text
-    field :sidebar, :as => :text
+  form do
+    field :content, as: :text
+    field :sidebar, as: :text
   end
 end

data/lib/generators/sunrise/templates/models/sunrise/sunrise_structure.rb

@@ -2,10 +2,10 @@
 class SunriseStructure < Sunrise::AbstractModel
   self.resource_name = "Structure"
   
-  default_list_view :tree
-  available_list_view [:tree, :thumbs]
+  default_index_view :tree
+  available_index_views [:tree, :thumbs]
   
-  list :tree do    
+  index :tree do
     field :title
     field :updated_at
     field :id
@@ -17,16 +17,16 @@ class SunriseStructure < Sunrise::AbstractModel
     field :is_visible
   end
   
-  edit do
+  form do
     field :title
     field :redirect_url
     field :slug
-    field :parent_id, :collection => lambda { Structure.nested_set_options() {|i| "#{'–' * i.depth} #{i.title}"} }, :if => lambda { |s| s.moveable? }
-    field :structure_type_id, :collection => lambda { StructureType.all }, :include_blank => false
-    field :position_type_id, :collection => lambda { PositionType.all }, :include_blank => false
+    field :parent_id, collection: lambda { Structure.nested_set_options() {|i| "#{'–' * i.depth} #{i.title}"} }, if: lambda { |s| s.moveable? }
+    field :structure_type_id, collection: lambda { StructureType.all }, include_blank: false
+    field :position_type_id, collection: lambda { PositionType.all }, include_blank: false
     field :is_visible
 
-    group :meta_tags, :holder => :sidebar do
+    group :meta_tags, holder: :sidebar do
       field :tag_title
       field :tag_keywords
       field :tag_description

data/lib/generators/sunrise/templates/models/sunrise/sunrise_user.rb

@@ -1,7 +1,7 @@
 class SunriseUser < Sunrise::AbstractModel
   self.resource_name = "User"
   
-  list :table do    
+  index :table do    
     field :email
     field :updated_at
     field :id
@@ -12,12 +12,12 @@ class SunriseUser < Sunrise::AbstractModel
     end
   end
 
-  list :thumbs do    
+  index :thumbs do    
     scope { User.includes(:avatar) }
     preview lambda { |user| user.avatar.try(:url, :thumb) }
     
-    field :email, :label => false
-    field :updated_at, :label => false
+    field :email, label: false
+    field :updated_at, label: false
     field :id
     
     group :search do
@@ -25,8 +25,14 @@ class SunriseUser < Sunrise::AbstractModel
       field :name
     end
   end
+
+  export do
+    field :id
+    field :name
+    field :email
+  end
   
-  edit do
+  form do
     permited_attributes lambda { |user| 
       user.admin? ? :all : [:name, :password, :password_confirmation, :avatar_attributes] 
     }
@@ -35,16 +41,10 @@ class SunriseUser < Sunrise::AbstractModel
     field :email
     field :password
     field :password_confirmation
-    field :role_type_id, :collection => lambda { RoleType.all }
+    field :role_type_id, collection: lambda { RoleType.all }
     
-    group :bottom, :holder => :bottom do
-      field :avatar, :as => :uploader
+    group :bottom, holder: :bottom do
+      field :avatar, as: :uploader
     end
   end
-  
-  list :export do
-    field :id
-    field :name
-    field :email
-  end
 end

data/lib/generators/sunrise/templates/uploaders/avatar_uploader.rb

@@ -2,7 +2,7 @@ class AvatarUploader < Sunrise::CarrierWave::BaseUploader
   process :quality => 90
   
   version :thumb do
-    process :resize_to_fill => [50, 50]
+    process :resize_to_fill => [100, 100]
   end
   
   version :small do

data/lib/sunrise/abstract_model.rb

@@ -55,8 +55,8 @@ module Sunrise
     
     def initialize(params = {})
       @model_name = model.model_name
-      @current_list = config.default_list_view
-      @available_list_view = config.available_list_view
+      @current_list = config.default_index_view
+      @available_index_views = config.available_index_views
       @sort_column = config.sort_column
       @request_params = params.symbolize_keys
       self.current_list = params[:view]
@@ -68,16 +68,11 @@ module Sunrise
     
     # Save current list view
     def current_list=(value)
-      unless value.blank?
-        @current_list = value.to_s.downcase.to_sym
+      if value && @available_index_views.include?(value.to_sym)
+        @current_list = value.to_sym
       end
     end
     
-    # Key which stored list settings
-    def list_key
-      ["list", current_list].compact.join('_').to_sym
-    end
-    
     # Load association record
     def parent_record
       @parent_record ||= find_parent_record
@@ -91,13 +86,13 @@ module Sunrise
     
     # Get current list settings
     def list
-      return false if without_list?
-      config.sections[list_key] ||= Config::List.new(self.class)
+      return false if without_index?
+      config.index(current_list)
     end
     
-    # Is list config disabled
-    def without_list?
-      config.sections[:list] === false
+    # Is index config disabled
+    def without_index?
+      config.index === false
     end
     
     def search_available?
@@ -167,15 +162,15 @@ module Sunrise
     end
     
     # Convert request params to model scopes
-    def apply_scopes(params = nil)
-      raise ::AbstractController::ActionNotFound.new("List config is turn off") if without_list?
+    def apply_scopes(params = nil, pagination = true)
+      raise ::AbstractController::ActionNotFound.new("List config is turn off") if without_index?
       params ||= @request_params
       
       scope = default_scope(params)
 
       if current_list == :tree
         scope = scope.roots
-      else
+      elsif pagination
         scope = page_scope(scope, params[:page], params[:per])
       end
 
@@ -187,7 +182,7 @@ module Sunrise
       params ||= @request_params
       
       scope = model.sunrise_search(params[:search]) if model.respond_to?(:sunrise_search) && !params[:search].blank?
-      scope ||= model.scoped
+      scope ||= model.where(nil)
       
       scope = scope.merge(association_scope) unless parent_record.nil?
       scope = scope.merge(sort_scope(params[:sort])) unless params[:sort].blank?
@@ -221,20 +216,27 @@ module Sunrise
     
     # List of columns names to be exported
     def export_columns
-      list.fields ? list.fields.map(&:name) : model.column_names
+      @export_columns ||= (config.export ? config.export.fields.map(&:name) : model.column_names)
     end
     
     # Filename for export data
     def export_filename
       @export_filename ||= [plural, Time.now.strftime("%Y-%m-%d_%Hh%Mm%S")].join('_')
     end
+
+    def export_options
+      { 
+        :filename => export_filename,
+        :columns => export_columns 
+      }
+    end
     
-    def edit_fields
-      config.edit.fields || []
+    def form_fields
+      config.form.fields || []
     end
 
     def permit_attributes(params, user = nil)
-      value = config.edit.permited_attributes
+      value = config.form.permited_attributes
 
       attrs = case value
       when Proc then value.call(user)
@@ -252,17 +254,17 @@ module Sunrise
     
     # Has translated columns
     def translate?
-      !config.edit.groups[:translate].blank?
+      !config.form.groups[:translate].blank?
     end
     
     # Files to translate
     def translate_fields
-      config.edit.groups[:translate].try(:fields) || []
+      config.form.groups[:translate].try(:fields) || []
     end
     
     # Find sidebar groups
     def sidebar_groups
-      @sidebar_groups ||= config.edit.groups.values.select { |v| v.sidebar? }
+      @sidebar_groups ||= config.form.groups.values.select { |v| v.sidebar? }
     end
     
     # Check if sidebar groups exists
@@ -272,7 +274,7 @@ module Sunrise
     
     # Find bottom groups
     def bottom_groups
-      @bottom_groups ||= config.edit.groups.values.select { |v| v.bottom? }
+      @bottom_groups ||= config.form.groups.values.select { |v| v.bottom? }
     end
     
     protected
@@ -299,4 +301,4 @@ module Sunrise
         !(@request_params[:parent_id].blank? || @request_params[:parent_type].blank?)
       end
   end
-end
+end

data/lib/sunrise/config/export.rb

@@ -0,0 +1,26 @@
+require 'sunrise/config/base'
+require 'sunrise/config/has_groups'
+require 'sunrise/config/has_fields'
+
+module Sunrise
+  module Config
+    class Export < Base
+      include Sunrise::Config::HasFields
+      
+      # Column to sort
+      register_instance_option :sort_column do
+        abstract_model.model.primary_key
+      end
+      
+      # Sort direction
+      register_instance_option :sort_mode do
+        Sunrise::Config.default_sort_mode
+      end
+      
+      # Default scope
+      register_instance_option(:scope) do
+        nil
+      end
+    end
+  end
+end

data/lib/sunrise/config/{edit.rb → form.rb}

@@ -3,7 +3,7 @@ require 'sunrise/config/has_fields'
 
 module Sunrise
   module Config
-    class Edit < Base
+    class Form < Base
       include Sunrise::Config::HasFields
       include Sunrise::Config::HasGroups
 

data/lib/sunrise/config/{list.rb → index.rb}

@@ -4,7 +4,7 @@ require 'sunrise/config/has_fields'
 
 module Sunrise
   module Config
-    class List < Base
+    class Index < Base
       include Sunrise::Config::HasFields
       include Sunrise::Config::HasGroups