sunrise-cms 0.6.11 → 0.7.0.rc1

data/app/assets/javascripts/sunrise/application.js

@@ -1,6 +1,10 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+
+//= require jquery.ui.sortable
+//= require jquery.ui.datepicker
+//= require datepicker/jquery.ui.datepicker-uk
+//= require datepicker/jquery.ui.datepicker-ru
 
 //= require sunrise/jquery.tmpl.min
 //= require sunrise/jquery.cookie
@@ -8,9 +12,6 @@
 //= require sunrise/chosen.jquery
 //= require sunrise/chosen.overflow.fix
 
-//= require datepicker/jquery.ui.datepicker-uk
-//= require datepicker/jquery.ui.datepicker-ru
-
 //= require sunrise/jquery.editable
 //= require sunrise/jquery.dialog
 //= require sunrise/jquery.tooltip

data/app/assets/javascripts/sunrise/jquery.dialog.js.coffee

@@ -101,9 +101,9 @@ class SortDialog extends Dialog
     $('.sort-item').each (index) ->
       items['ids[' + $(this).data('record-id') + ']'] = index + 1
       
-    $.ajax
+    $.rails.ajax
       url: @element.data 'url'
-      method: 'POST'
+      type: 'POST'
       data: items
       success: ->
         klass.hide()

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

@@ -7,6 +7,9 @@
  *= require sunrise/customize.css
  *= require sunrise/plugins.css
  *= require sunrise/chosen.css
- *= require smoothness/jquery-ui-1.8.16.custom.css
  *= require uploader/application
+
+ *= require jquery.ui.core
+ *= require jquery.ui.theme
+ *= require jquery.ui.datepicker
 */

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

@@ -30,7 +30,7 @@
           :class => 'but-container del', 
           :title => 'Delete', 
           :method=>:delete,
-          :confirm => t('manage.confirm_delete') %>
+          :data => { :confirm => t('manage.confirm_delete') } %>
         </div>
       </div>
     <% end %>

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

@@ -1,5 +1,6 @@
 <div class="but-holder">
   <div class="act-but">
-    <%= link_to image_tag('sunrise/empty.gif'), mass_destroy_path, :class => 'but-container del disabled', :title => 'Delete', :"data-confirm-message" => t('manage.confirm_mass_delete'), :"data-editable" => 'destroy' %>
+    <%= link_to image_tag('sunrise/empty.gif'), mass_destroy_path, :class => 'but-container del disabled', :title => 'Delete', 
+      :data => { :confirm => t('manage.confirm_mass_delete'), :editable => 'destroy'} %>
   </div>
 </div>

data/app/views/sunrise/manager/structures/thumbs/_record.html.erb

@@ -21,7 +21,8 @@
   <div class="but-block" style="display: none">
     <div class="act-but">
       <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)), 
-          :method=>:delete, :confirm=>t("manage.confirm_delete"), :class=>"but-container del", :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
+          :method=>:delete, :data => {:confirm=>t("manage.confirm_delete")}, :class=>"but-container del", 
+          :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
     </div>
     
     <div class="act-but">

data/app/views/sunrise/manager/structures/tree/_record.html.erb

@@ -9,7 +9,7 @@
     <% else %>
       <%= link_to '', edit_path(abstract_model.parent_hash.merge(:id => record.id)), :class => "btn_edit", :id => dom_id(record, :edit) if can?(:edit, record, :context => :sunrise) %>
         
-        <%= link_to '', delete_path(abstract_model.parent_hash.merge(:id => record.id)), :method => :delete, :confirm => t("manage.confirm_delete"), :class => "btn_del", :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
+        <%= link_to '', delete_path(abstract_model.parent_hash.merge(:id => record.id)), :method => :delete, :data => { :confirm => t("manage.confirm_delete")}, :class => "btn_del", :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
     <% end %>
     
     <a href="#" class="dnd_link"></a>

data/app/views/sunrise/manager/table/_record.html.erb

@@ -12,7 +12,7 @@
         <div class="act-but">
           <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)), 
             :method=>:delete, 
-            :confirm=>t("manage.confirm_delete"), 
+            :data => { :confirm => t("manage.confirm_delete") }, 
             :class=>"but-container del", 
             :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise)%>
         </div>

data/app/views/sunrise/manager/thumbs/_record.html.erb

@@ -25,7 +25,7 @@
     <div class="act-but">
       <%= link_to image_tag('sunrise/empty.gif'), delete_path(abstract_model.parent_hash.merge(:id => record.id)),
           :method=>:delete, 
-          :confirm=>t("manage.confirm_delete"), 
+          :data => {:confirm => t("manage.confirm_delete") }, 
           :class=>"but-container del", 
           :id => dom_id(record, :delete) if can?(:delete, record, :context => :sunrise) %>
     </div>

data/app/views/sunrise/shared/services.json.jbuilder

@@ -1,4 +1,4 @@
-json.array! @services do |json, service|
+json.array! @services do |service|
   json.id service.id
   json.title service.title
   json.url edit_path(:model_name => ActiveModel::Naming.plural(service), :id => service.id)

data/config/routes.rb

@@ -18,7 +18,7 @@ Sunrise::Engine.routes.draw do
       scope ":id" do
         get "/", :to => :show, :as => "show"
         get "/edit", :to => :edit, :as => "edit"
-        put "/edit", :to => :update, :as => "update"
+        patch "/edit", :to => :update, :as => "update"
         get "/delete", :to => :delete, :as => "delete"
         delete "/delete", :to => :destroy, :as => "destroy"
       end

data/db/migrate/20120611095315_create_settings.rb

@@ -3,12 +3,12 @@ class CreateSettings < ActiveRecord::Migration
     create_table(:settings) do |t|
       t.string  :var, :limit => 50, :null => false
       t.text    :value
-      t.integer :target_id
-      t.string  :target_type, :limit => 30
+      t.integer :thing_id
+      t.string  :thing_type, :limit => 30
       t.timestamps
     end
     
-    add_index :settings, [:var, :target_type, :target_id], :unique => true
+    add_index :settings, [:thing_type, :thing_id, :var], :unique => true
   end
   
   def self.down

data/lib/generators/sunrise/install_generator.rb

@@ -33,7 +33,7 @@ module Sunrise
       # copy models
       def copy_models
         directory "models/#{orm}", "app/models/defaults"
-        directory "models/sunrise", "app/models/sunrise"
+        directory "models/sunrise", "app/sunrise"
       end
       
       # Add devise routes
@@ -48,7 +48,7 @@ module Sunrise
         log :autoload_paths, "models/defaults"
         sentinel = /\.autoload_paths\s+\+=\s+\%W\(\#\{config\.root\}\/extras\)\s*$/
       
-        code = 'config.autoload_paths += %W(#{config.root}/app/models/defaults #{config.root}/app/models/sunrise)'
+        code = 'config.autoload_paths += %W(#{config.root}/app/models/defaults #{config.root}/app/sunrise)'
           
         in_root do
           inject_into_file 'config/application.rb', "    #{code}\n", { :after => sentinel, :verbose => false }

data/lib/generators/sunrise/templates/models/active_record/asset.rb

@@ -6,5 +6,5 @@ class Asset < ActiveRecord::Base
 
   validates_presence_of :data
 	
-	default_scope order("#{quoted_table_name}.sort_order")
+	default_scope lambda { order("#{quoted_table_name}.sort_order") }
 end 

data/lib/generators/sunrise/templates/models/active_record/settings.rb

@@ -1,6 +1,13 @@
-class Settings < ActiveRecord::Base
-  include Sunrise::Models::Settings
+require "rails-settings-cached"
+
+class Settings < RailsSettings::CachedSettings
   include PublicActivity::Model
 
   tracked owner: ->(controller, model) { controller.try(:current_user) }
+
+  def self.update_attributes(attributes)
+    attributes.each do |key, value|
+      self[key] = value
+    end
+  end
 end 

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

@@ -3,8 +3,7 @@ class Structure < ActiveRecord::Base
   include PageParts::Extension
   include MetaManager::Taggable
   include PublicActivity::Model
-  include ActiveModel::ForbiddenAttributesProtection
 
   tracked owner: ->(controller, model) { controller.try(:current_user) }
-  # page_parts :content
+  page_parts :content
 end

data/lib/generators/sunrise/templates/models/active_record/user.rb

@@ -1,12 +1,10 @@
 class User < ActiveRecord::Base
   include Sunrise::Models::User
   include PublicActivity::Model
-  include ActiveModel::ForbiddenAttributesProtection
   
   # Include default devise modules.
   devise :database_authenticatable, :confirmable, :lockable, :timeoutable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :encryptable, :encryptor => :sha512
+         :recoverable, :rememberable, :trackable, :validatable
 
   fileuploads :avatar
   

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

@@ -1,7 +1,6 @@
 class Settings
   include Mongoid::Document
   include Mongoid::Timestamps
-  include Sunrise::Models::Settings
   include PublicActivity::Model
   
   # Columns

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

@@ -19,5 +19,5 @@ class Structure
   index({:parent_id => 1})
 
   tracked owner: ->(controller, model) { controller.try(:current_user) }
-  # page_parts :content, :sidebar
+  page_parts :content
 end

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

@@ -48,8 +48,7 @@ class User
 
   # Include default devise modules.
   devise :database_authenticatable, :confirmable, :lockable, :timeoutable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :encryptable, :encryptor => :sha512
+         :recoverable, :rememberable, :trackable, :validatable
   
   fileuploads :avatar
 

data/lib/sunrise/carrierwave/base_uploader.rb

@@ -91,8 +91,8 @@ module Sunrise
       end
       
       def image?(new_file = nil)
-        ctype = (file || new_file).content_type
-        ctype.include?('image') && !['photoshop', 'psd'].any? {|t| ctype.include?(t) }
+        _type = (file || new_file).content_type
+        _type.include?('image') && !['photoshop', 'psd'].any? {|p| _type.include?(p) }
       end
       
       def dimensions

data/lib/sunrise/config/model.rb

@@ -16,7 +16,7 @@ module Sunrise
       end
       
       register_instance_option(:label) do
-        (@label ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:default => abstract_model.model.model_name.demodulize.underscore.humanize)
+        (@label ||= {})[::I18n.locale] ||= abstract_model.model.model_name.human(:default => abstract_model.model.model_name.to_s.underscore.humanize)
       end
       
       # The display for a model instance (i.e. a single database record).

data/lib/sunrise/core_ext/string.rb

@@ -1,30 +1,12 @@
 require 'active_support/inflector/inflections'
 
 class String
-  def is_int?
-    self =~ /^[-+]?[0-9]*$/
-  end
-  
-	def no_html
-		str = self.dup
-		str.gsub!(/<\/?[^>]*>/, '')
-		str.strip!
-		str.gsub!('&nbsp;', '')
-		str
-	end
-	
-	def words_count
-		frequencies = Hash.new(0)  
-		downcase.scan(/(\w+([-'.]\w+)*)/) { |word, ignore| frequencies[word] += 1 }
-		return frequencies
-	end
-	
-	def parameterize(sep = '-')
-	  value = Sunrise::Utils::Transliteration.transliterate(self)
+  def parameterize(sep = '-')
+    value = Sunrise::Utils::Transliteration.transliterate(self)
     ActiveSupport::Inflector.parameterize(value, sep)
   end
-	
-	def self.randomize(length = 8)
-	  Array.new(length) { (rand(122-97) + 97).chr }.join
-	end
-end
+
+  def self.randomize(length = 8)
+    Array.new(length) { (rand(122-97) + 97).chr }.join
+  end
+end

data/lib/sunrise/models/user.rb

@@ -14,10 +14,9 @@ module Sunrise
         
         has_one :avatar, :as => :assetable, :dependent => :destroy, :autosave => true
         
-        before_validation :generate_login, :if => :has_login?
-        before_validation :set_default_role, :if => :role_empty?
+        after_initialize :set_default_role
         
-        validates_presence_of :name
+        validates :name, :presence => true
         validate :check_role
         
         scope :with_email, lambda {|email| where(:email => email) }
@@ -64,10 +63,6 @@ module Sunrise
       def role_empty?
         self.role_type_id.nil?
       end
-      
-      def has_login?
-        respond_to?(:login)
-      end
       	
       def role_symbols
         [role_type.try(:code)]
@@ -79,34 +74,16 @@ module Sunrise
       
       def state
         return 'active'   if active_for_authentication?
-        return 'register' unless confirmed?
+        return 'confirm'  unless confirmed?
         return 'suspend'  if access_locked?
         return 'pending'
       end
       
-      def events_for_current_state
-        events = []
-        events << 'activate' unless confirmed?
-        events << 'unlock' if access_locked?
-        # TODO: ban access for active users
-        # events << 'suspend' if active_for_authentication?
-        events
-      end
-      
       protected
         
         def set_default_role
           self.role_type ||= ::RoleType.default
         end
-        
-        def generate_login
-          self.login ||= begin
-            unless email.blank?
-              tmp_login = email.split('@').first 
-      		    tmp_login.parameterize.downcase.gsub(/[^A-Za-z0-9-]+/, '-').gsub(/-+/, '-')
-      		  end
-          end
-        end
 
         def check_role
           errors.add(:role_type_id, :invalid) unless ::RoleType.legal?(role_type_id)

data/lib/sunrise/version.rb

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