sunrise-cms 0.7.0.rc2 → 1.0.0.rc1

data/lib/sunrise/config/model.rb

@@ -1,9 +1,10 @@
 require 'active_support/core_ext/string/inflections'
 require 'sunrise/config/base'
-require 'sunrise/config/list'
-require 'sunrise/config/edit'
-require 'sunrise/config/association'
+require 'sunrise/config/index'
+require 'sunrise/config/export'
+require 'sunrise/config/form'
 require 'sunrise/config/show'
+require 'sunrise/config/association'
 
 module Sunrise
   module Config
@@ -27,12 +28,12 @@ module Sunrise
         @object_label_method ||= Config.label_methods.find { |method| (@dummy_object ||= abstract_model.model.new).respond_to? method } || :sunrise_default_object_label_method
       end
       
-      register_instance_option(:default_list_view) do
-        Config.default_list_view
+      register_instance_option(:default_index_view) do
+        Config.default_index_view
       end
       
-      register_instance_option(:available_list_view) do
-        Config.available_list_view
+      register_instance_option(:available_index_views) do
+        Config.available_index_views
       end
       
       register_instance_option(:sort_column) do
@@ -44,19 +45,29 @@ module Sunrise
       end
       
       # Register accessors for all the sections in this namespace
-      [:list, :show, :edit, :association].each do |section|
+      [:index, :show, :export, :form, :association].each do |section|
         klass = "Sunrise::Config::#{section.to_s.classify}".constantize
-        send(:define_method, section) do |*args, &block|
+        
+        define_method(section) do |*args, &block|
           options = args.extract_options!
           name = args.first
-          key = name ? [section, name].compact.join('_').to_sym : section
+          key = name ? [section, name].compact.map(&:to_s).join('_').to_sym : section
+          
+          options[:name] ||= name
           
           if name === false || @sections[key] === false
             @sections[key] = false
+          elsif block
+            @sections[key] = PagePresenter.new(options, &block)
+          elsif @sections[key].is_a?(PagePresenter)
+            presenter = @sections[key]
+
+            instance = klass.new(abstract_model, self, presenter.options)
+            instance.instance_exec &presenter.block
+
+            @sections[key] = instance
           else
-            options[:name] ||= name
             @sections[key] ||= klass.new(abstract_model, self, options)
-            @sections[key].instance_eval &block if block
           end
           
           @sections[key]

data/lib/sunrise/config/navigation.rb

@@ -7,19 +7,18 @@ module Sunrise
       include Singleton
       include Sunrise::Engine.routes.url_helpers
       
-      attr_accessor :current_name
-      attr_reader :navigations
+      attr_accessor :presenters
       
       class << self
         # Configure menu items
-        def navigation(name, options = nil)
-          instance.current_name = name
-          yield instance if block_given?
+        def navigation(name, options = {}, &block)
+          instance.presenters ||= {}
+          instance.presenters[name] = PagePresenter.new(options, &block)
         end
         
-        def method_missing(m, *args, &block)
-          if instance.respond_to?(m)
-            instance.send(m, *args, &block)
+        def method_missing(method_name, *args, &block)
+          if instance.respond_to?(method_name)
+            instance.send(method_name, *args, &block)
           else
             super
           end
@@ -27,16 +26,39 @@ module Sunrise
       end
       
       def initialize
-        @navigations ||= {}
+        @navigations = nil
+        @presenters = {}
         @current_name = :main
       end
+
+      def navigations
+        @navigations ||= build_navigation
+      end
       
       def item(item_name, url = nil, options = {})
         url ||= index_path(:model_name => item_name)
         
-        @navigations[current_name] ||= []
-        @navigations[current_name] << NavigationItem.new(item_name, url, current_name, options)
+        @navigations[@current_name] ||= []
+        @navigations[@current_name] << NavigationItem.new(item_name, url, @current_name, options)
       end
+
+      protected
+
+        def build_navigation
+          @navigations = {}
+
+          presenters.each do |key, presenter|
+            @current_name = key.to_sym
+            run_registration_block &presenter.block
+          end
+
+          @navigations
+        end
+
+        # Runs the registration block inside this object
+        def run_registration_block(&block)
+          instance_exec &block if block_given?
+        end
     end
   end
 end

data/lib/sunrise/config/page_presenter.rb

@@ -0,0 +1,31 @@
+module Sunrise
+  module Config
+    # A simple object that gets used to present different aspects of views
+    #
+    # Initialize with a set of options and a block. The options become
+    # available using hash style syntax.
+    #
+    # Usage:
+    #
+    #     presenter = PagePresenter.new as: :table do
+    #       # some awesome stuff
+    #     end
+    #
+    #     presenter[:as]    #=> :table
+    #     presenter.block   #=> The block passed in to new
+    #
+    class PagePresenter
+      attr_reader :block, :options
+
+      delegate :has_key?, to: :options
+
+      def initialize(options = {}, &block)
+        @options, @block = options, block
+      end
+
+      def [](key)
+        @options[key]
+      end
+    end
+  end
+end

data/lib/sunrise/config.rb

@@ -1,6 +1,7 @@
 module Sunrise
   module Config
     autoload :Navigation, 'sunrise/config/navigation'
+    autoload :PagePresenter, 'sunrise/config/page_presenter'
     
     # Paginate records per page
     mattr_accessor :default_items_per_page
@@ -18,16 +19,16 @@ module Sunrise
     mattr_accessor :label_methods
     @@label_methods = [:title, :name]
     
-    # Defailt list template view
-    mattr_accessor :default_list_view
-    @@default_list_view = 'thumbs'
+    # Default index template view
+    mattr_accessor :default_index_view
+    @@default_index_view = :thumbs
     
-    mattr_accessor :available_list_view
-    @@available_list_view = [:list, :thumbs, :table]
+    mattr_accessor :available_index_views
+    @@available_index_views = [:tree, :thumbs, :table]
     
-    # Defailt list template view
+    # Default sort column
     mattr_accessor :sort_column
-    @@sort_column = 'sort_order'
+    @@sort_column = :sort_order
     
     # Find template before rendering
     mattr_accessor :scoped_views
@@ -42,19 +43,23 @@ module Sunrise
     mattr_accessor :transliteration
     @@transliteration = :russian
 
-    # Set list toolbar buttons
+    # Set index toolbar buttons
     mattr_accessor :default_toolbar_buttons
     @@default_toolbar_buttons = [:delete, :edit, :new, :sort, :export]
     
-    # Lists the formats that should be treated as navigational
+    # Index the formats that should be treated as navigational
     mattr_accessor :navigational_formats
     @@navigational_formats = [:html, :json]
 
+    # Welcome (root) controller path
+    mattr_accessor :root_controller
+    @@root_controller = "dashboard#index"
+
     def self.scoped_views?
       @@scoped_views === true
     end
     
-    def self.nav
+    def self.navigation
       ::SunriseNavigation.instance.navigations
     end
   end

data/lib/sunrise/engine.rb

@@ -14,7 +14,6 @@ module Sunrise
       
       ActiveSupport.on_load :active_record do
         ActiveRecord::Base.send :include, Sunrise::CarrierWave::Glue
-        ActiveRecord::Base.send :include, Sunrise::Utils::Mysql
       end
       
       ActiveSupport.on_load :action_view do

data/lib/sunrise/models/structure.rb

@@ -13,17 +13,17 @@ module Sunrise
         enumerated_attribute :position_type
         
         validates_presence_of :title
-        validates_numericality_of :position_type_id, :only_integer => true
-        validates_numericality_of :structure_type_id, :only_integer => true
+        validates_numericality_of :position_type_id, only_integer: true
+        validates_numericality_of :structure_type_id, only_integer: true
         
         acts_as_nested_set
 
-        before_validation :generate_slug, :if => :should_generate_new_slug?
+        before_validation :generate_slug, if: :should_generate_new_slug?
         
-        scope :visible, lambda { where(:is_visible => true) }
-        scope :with_type, lambda {|structure_type| where(:structure_type_id => structure_type.id) }
-        scope :with_depth, lambda {|level| where(:depth => level.to_i) }
-        scope :with_position, lambda {|position_type| where(:position_type_id => position_type.id) }
+        scope :visible, lambda { where(is_visible: true) }
+        scope :with_type, lambda {|structure_type| where(structure_type_id: structure_type.id) }
+        scope :with_depth, lambda {|level| where(depth: level.to_i) }
+        scope :with_position, lambda {|position_type| where(position_type_id: position_type.id) }
       end
       
       module ClassMethods

data/lib/sunrise/utils.rb

@@ -1,7 +1,6 @@
 module Sunrise
   module Utils
     autoload :Transliteration, 'sunrise/utils/transliteration'
-    autoload :Mysql, 'sunrise/utils/mysql'
     autoload :EvalHelpers, 'sunrise/utils/eval_helpers'
     autoload :CsvDocument, 'sunrise/utils/csv_document'
     autoload :SearchWrapper, 'sunrise/utils/search_wrapper'

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "0.7.0.rc2".freeze
+  VERSION = "1.0.0.rc1".freeze
 end

data/spec/controllers/sunrise/settings_controller_spec.rb

@@ -4,8 +4,8 @@ describe Sunrise::SettingsController do
   render_views  
   
   before(:all) do 
-    Settings.defaults[:some_setting] = "value"
-    Settings.defaults[:some_setting2] = "value2"
+    Settings.some_setting = "value"
+    Settings.some_setting2 = "value2"
   end
   
   describe "admin" do

data/spec/dummy/app/{models/sunrise → sunrise}/sunrise_post.rb

@@ -3,7 +3,7 @@ class SunrisePost < Sunrise::AbstractModel
   
   association :structure
   
-  list :thumbs do
+  index :thumbs do
     buttons [:new, :edit, :delete, :sort]
 
     field :title
@@ -16,13 +16,13 @@ class SunrisePost < Sunrise::AbstractModel
     end
   end
   
-  edit do
+  form do
     field :title
     field :content
     field :is_visible
   end
   
-  list :export do
+  export do
     scope { Post.includes(:structure) }
     
     field :id

data/spec/dummy/config/application.rb

@@ -17,17 +17,13 @@ require "sunrise-cms"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(
         #{config.root}/../../lib/generators/sunrise/templates/models/#{SUNRISE_ORM}
         #{config.root}/../../lib/generators/sunrise/templates/uploaders
         #{config.root}/../../lib/generators/sunrise/templates/models/sunrise
         #{config.root}/app/models/#{SUNRISE_ORM}
-        #{config.root}/app/models/sunrise)
+        #{config.root}/app/sunrise)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -55,9 +51,5 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
-
-    # Disable the default whitelisting that occurs in later versions of Rails
-    config.active_record.whitelist_attributes = false
   end
-end
-
+end

data/spec/dummy/config/environments/development.rb

@@ -27,4 +27,7 @@ Dummy::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  # Do not eager load code on boot.
+  config.eager_load = false
 end

data/spec/dummy/config/environments/production.rb

@@ -57,4 +57,10 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
 end

data/spec/dummy/config/environments/test.rb

@@ -11,9 +11,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -36,4 +33,9 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,90 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20130214090723) do
+
+  create_table "activities", force: true do |t|
+    t.integer  "trackable_id"
+    t.string   "trackable_type"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+    t.string   "key"
+    t.text     "parameters"
+    t.integer  "recipient_id"
+    t.string   "recipient_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "activities", ["owner_id", "owner_type"], name: "index_activities_on_owner_id_and_owner_type", using: :btree
+  add_index "activities", ["recipient_id", "recipient_type"], name: "index_activities_on_recipient_id_and_recipient_type", using: :btree
+  add_index "activities", ["trackable_id", "trackable_type"], name: "index_activities_on_trackable_id_and_trackable_type", using: :btree
+
+  create_table "audits", force: true do |t|
+    t.integer  "auditable_id"
+    t.string   "auditable_type"
+    t.integer  "associated_id"
+    t.string   "associated_type"
+    t.integer  "user_id"
+    t.string   "user_type"
+    t.string   "username"
+    t.string   "action"
+    t.text     "audited_changes"
+    t.integer  "version",         default: 0
+    t.string   "comment"
+    t.string   "remote_address"
+    t.datetime "created_at"
+  end
+
+  add_index "audits", ["associated_id", "associated_type"], name: "associated_index", using: :btree
+  add_index "audits", ["auditable_id", "auditable_type"], name: "auditable_index", using: :btree
+  add_index "audits", ["created_at"], name: "index_audits_on_created_at", using: :btree
+  add_index "audits", ["user_id", "user_type"], name: "user_index", using: :btree
+
+  create_table "meta_tags", force: true do |t|
+    t.string   "name",          limit: 50,                 null: false
+    t.text     "content"
+    t.boolean  "is_dynamic",               default: false
+    t.integer  "taggable_id",                              null: false
+    t.string   "taggable_type", limit: 50,                 null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "meta_tags", ["name"], name: "index_meta_tags_on_name", using: :btree
+  add_index "meta_tags", ["taggable_type", "taggable_id"], name: "index_meta_tags_on_taggable_type_and_taggable_id", using: :btree
+
+  create_table "page_parts", force: true do |t|
+    t.string   "key",           limit: 10, null: false
+    t.text     "content"
+    t.integer  "partable_id",              null: false
+    t.string   "partable_type", limit: 50, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "page_parts", ["key"], name: "index_page_parts_on_key", using: :btree
+  add_index "page_parts", ["partable_type", "partable_id"], name: "index_page_parts_on_partable_type_and_partable_id", using: :btree
+
+  create_table "posts", force: true do |t|
+    t.string   "title",                       null: false
+    t.text     "content"
+    t.boolean  "is_visible",   default: true
+    t.integer  "structure_id",                null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "posts", ["structure_id"], name: "index_posts_on_structure_id", using: :btree
+
+end

data/spec/models/avatar_spec.rb

@@ -51,7 +51,7 @@ describe Avatar do
     end
     
     it "file size should be valid" do
-      @avatar.data_file_size.should == 6428
+      @avatar.data_file_size.should == 6543
     end
     
     it "should be image" do

data/spec/models/sunrise/abstract_model_spec.rb

@@ -30,10 +30,6 @@ describe Sunrise::AbstractModel do
         @abstract_model.param_key.should == 'structure'
       end
       
-      it "should return current list view" do
-        @abstract_model.list_key.should == :list_tree
-      end
-      
       it "should not load parent record" do
         @abstract_model.parent_record.should be_nil
       end
@@ -48,8 +44,8 @@ describe Sunrise::AbstractModel do
       end
       
       it "should update current list view" do
-        model = Sunrise::Utils.get_model("structures", {:view => 'table'})
-        model.current_list.should == :table
+        model = Sunrise::Utils.get_model("structures", {:view => 'thumbs'})
+        model.current_list.should == :thumbs
       end
 
       it "should destroy all items" do
@@ -64,7 +60,7 @@ describe Sunrise::AbstractModel do
   
   describe "SunrisePage" do
     it "should not have config for list" do
-      SunrisePage.config.list.should == false
+      SunrisePage.config.index.should == false
     end
     
     it "should load structure model" do
@@ -78,6 +74,7 @@ describe Sunrise::AbstractModel do
       end
       
       it "should not render list config" do
+        @abstract_model.without_index?.should == true
         @abstract_model.list.should == false
       end
     end
@@ -85,7 +82,7 @@ describe Sunrise::AbstractModel do
   
   describe "SunriseUser" do
     it "should return empty list on not defined fields" do
-      SunrisePage.config.sections[:list_export].should be_nil
+      SunrisePage.config.sections[:list_table].should be_nil
     end
   end
 end

data/spec/requests/manager/default/edit_spec.rb

@@ -54,7 +54,7 @@ describe "Sunrise Manager Edit" do
       end
       
       it "should generate field to edit" do
-        should have_selector "textarea[@name='structure[main]']"
+        should have_selector "textarea[@name='structure[content]']"
         should have_selector "textarea[@name='structure[sidebar]']"
       end
     end

data/spec/requests/manager/default/new_spec.rb

@@ -25,7 +25,7 @@ describe "Sunrise Manager New" do
       end
       
       it "should generate field to edit" do
-        SunriseStructure.config.edit.fields.each do |f|
+        SunriseStructure.config.form.fields.each do |f|
           if ['structure_type_id', 'parent_id', 'position_type_id'].include?(f.name)
             should have_selector "select[@name='structure[#{f.name}]']"
           else

data/spec/requests/manager/default/update_spec.rb

@@ -42,11 +42,11 @@ describe "Sunrise Manager Edit" do
     
     describe "Update /manage/pages/:id/edit" do
       before(:each) do
-        @page.update_attributes({:main => "Main", :sidebar => "Sidebar"})
+        @page.update_attributes({:content => "Main", :sidebar => "Sidebar"})
         
         visit edit_path(:model_name => "pages", :id => @page.id)
         
-        fill_in "structure[main]", :with => "Main updated"
+        fill_in "structure[content]", :with => "Main updated"
         fill_in "structure[sidebar]", :with => "Sidebar updated"
         
         click_button "submit-button-hidden"
@@ -55,7 +55,7 @@ describe "Sunrise Manager Edit" do
       it "should update an object with correct attributes" do
         @page.reload
         
-        @page.main.should == "Main updated"
+        @page.content.should == "Main updated"
         @page.sidebar.should == "Sidebar updated"
       end
     end

data/spec/requests/manager/many/index_spec.rb

@@ -29,8 +29,9 @@ describe "Sunrise Manager Index many" do
         @post2 = FactoryGirl.create(:post, :title => "Good day", :structure => @page)
         
         visit index_path(:model_name => "posts", :parent_id => @page.id, :parent_type => @page.class.name)
-        
+
         fill_in "search[title]", :with => "Good day"
+
         click_button "submit-button-search"
       end
       

data/spec/requests/manager/many/new_spec.rb

@@ -22,7 +22,7 @@ describe "Sunrise Manager New many" do
       end
       
       it "should generate field to edit" do
-        SunrisePost.config.edit.fields.each do |f|
+        SunrisePost.config.form.fields.each do |f|
           if ['content'].include?(f.name)
             should have_selector "textarea[@name='post[#{f.name}]']"
           else        

data/spec/spec_helper.rb

@@ -36,6 +36,20 @@ CarrierWave.configure do |config|
   config.enable_processing = false
 end
 
+# use different dirs when testing
+CarrierWave::Uploader::Base.descendants.each do |klass|
+  next if klass.anonymous?
+  klass.class_eval do
+    def cache_dir
+      "#{Rails.root}/spec/support/uploads/tmp"
+    end
+
+    def store_dir
+      "#{Rails.root}/spec/support/uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+  end
+end
+
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -63,6 +77,10 @@ RSpec.configure do |config|
 
   config.before(:all) do
     DatabaseCleaner.clean
+  end
+
+  config.after(:each) do
+    FileUtils.rm_rf(Dir["#{Rails.root}/spec/support/uploads"])
   end  
 
   config.after(:all) do

data/spec/sunrise_spec.rb

@@ -14,7 +14,7 @@ describe Sunrise do
       Sunrise.setup do |c|
         c.default_items_per_page = 50
         c.default_sort_mode = :asc
-        c.default_list_view = 'table'
+        c.default_index_view = :table
         c.scoped_views = true
       end
     end
@@ -22,7 +22,7 @@ describe Sunrise do
     it "should store configuration" do
       Sunrise::Config.default_items_per_page.should == 50
       Sunrise::Config.default_sort_mode.should == :asc
-      Sunrise::Config.default_list_view.should == 'table'
+      Sunrise::Config.default_index_view.should == :table
       Sunrise::Config.scoped_views.should == true
     end
   end