sunrise-core 0.1.3 → 0.1.4

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2011 Aimbulance
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,7 +1,10 @@
 = SunRise CMS
 
 == Install
+
+=== Include gems:
   
+  gem "mysql2", "~> 0.2.10"
   gem 'inherited_resources'
   gem 'paperclip'
   gem 'mime-types'
@@ -10,37 +13,32 @@
   gem 'cancan_namespace'
   gem 'devise'
   gem 'simple_form'
-  gem 'ckeditor', '3.5.2'
-  
-  gem 'enum_field', :git => 'git://github.com/galetahub/enum_field.git'
-  gem 'awesome_nested_set', :git => 'git://github.com/galetahub/awesome_nested_set.git'
-  gem 'salty_slugs', :git => 'git://github.com/galetahub/salty_slugs.git'
-  gem 'attach_file_field', :git => 'git://github.com/galetahub/attach_file_field.git'
+  gem 'ckeditor'
 
-  gem 'sunrise'
+  gem 'sunrise-cms'
 
-  rails generate sunrise:install
-  
-Feature for Rails 3.1: copy migrations from all plugins, engins:
+=== Generate all your need:
 
-  rake railties:install:migrations
+  rails generate sunrise:install
 
-Generate devise configurations:
+It's run all dependent generators:
 
-  rails generate devise:install
+* simple_form:install
+* sunrise:file_upload:install
+* devise:install
 
-Generate simple_form configurations:
-  
-  rails generate simple_form:install
+=== Configuration
 
-Generate file uploads assets:
+  cp config/database.yml.sample config/database.yml
+  cp config/application.yml.sample config/application.yml
   
-  rails generate sunrise:file_upload:install
-
-Migrate database:
+=== Database
 
+  rake db:create
   rake db:migrate
 
-Autoload generated models in application.rb:
+== Tests
+
+  rake spec
 
-  config.autoload_paths += %W(#{config.root}/app/models/defaults #{config.root}/app/sweepers)
+Copyright (c) 2011 Aimbulance, released under the MIT license

data/Rakefile

@@ -1,26 +1,30 @@
-# encoding: utf-8
+# encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require File.join(File.dirname(__FILE__), 'lib', 'sunrise', 'version')
 
-desc 'Default: run unit tests.'
-task :default => :test
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-desc 'Test the sunrise plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--options', "spec/spec.opts"]
 end
 
+task :default => :spec
+
 desc 'Generate documentation for the sunrise plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Sunrise Core'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/app/controllers/manage/assets_controller.rb

@@ -7,12 +7,12 @@ class Manage::AssetsController < Manage::BaseController
   authorize_resource
   
   def create
-    @asset ||= @klass.new(params[:asset])
+    @asset = @klass.new(params[:asset])
     
   	@asset.assetable_type = params[:assetable_type]
 		@asset.assetable_id = params[:assetable_id] || 0
 		@asset.guid = params[:guid]
-  	@asset.data = params[:data_file]
+  	@asset.data = params[:data]
   	@asset.user = current_user
     @asset.save
     
@@ -27,6 +27,7 @@ class Manage::AssetsController < Manage::BaseController
     
     respond_with(@asset) do |format|
       format.html { head :ok }
+      format.xml { render :xml => @asset.to_xml }
     end
   end
   
@@ -47,24 +48,6 @@ class Manage::AssetsController < Manage::BaseController
     end
     
     def find_klass
-      c_names = []
-      c_values = []
-      
-      unless params[:assetable_id].blank?
-        c_names << "assetable_id = ?"
-        c_values << params[:assetable_id].to_i
-        
-        c_names << "assetable_type = ?"
-        c_values << params[:assetable_type]
-      else
-        c_names << "guid = ?"
-        c_values << params[:guid]
-      end
-      
       @klass = params[:klass].blank? ? Asset : params[:klass].classify.constantize
-      
-      if params[:collection].blank?
-        @asset = @klass.where([c_names.join(' AND ')] + c_values).first
-      end
     end
 end

data/app/controllers/manage/structures_controller.rb

@@ -31,7 +31,7 @@ class Manage::StructuresController < Manage::BaseController
   protected
   
     def find_root
-      @structure ||= Structure.with_kind(StructureType.main).with_depth(0).find(:first)
+      @structure ||= Structure.with_kind(StructureType.main).roots.find(:first)
       @structure
     end
     

data/app/controllers/manage/users_controller.rb

@@ -7,16 +7,12 @@ class Manage::UsersController < Manage::BaseController
   before_filter :make_filter, :only=>[:index]
   before_filter :check_params, :only => [:create, :update]
   
-  cache_sweeper :user_sweeper, :only=>[:update, :destroy]
-  
   def create
-    @user = User.new(params[:user])
-    @user.roles_attributes = @roles
+    @user.attributes = params[:user]
     create! { manage_users_path } 
   end
   
   def update
-    @user.roles_attributes = @roles
     update!{ manage_users_path }
   end
   
@@ -61,8 +57,6 @@ class Manage::UsersController < Manage::BaseController
     
     def check_params
       unless params[:user].blank?
-        @roles = params[:user].delete(:roles_attributes)
-        
         if params[:user][:password].blank?
           params[:user].delete(:password)
           params[:user].delete(:password_confirmation)
@@ -71,8 +65,4 @@ class Manage::UsersController < Manage::BaseController
         @user.accessible = :all
       end
     end
-    
-    def find_user
-      @user = User.find(params[:id])
-    end
 end

data/{lib/generators/sunrise/templates → app}/sweepers/page_sweeper.rb

@@ -16,7 +16,6 @@ class PageSweeper < ActionController::Caching::Sweeper
 	private
 	
 	  def expire(item=nil)
-  	  expire_fragment(%r{/pages})
-  	  StructureSweeper.sweep!
+  	  Sunrise::Utils.clear_cache
 	  end
 end

data/{lib/generators/sunrise/templates → app}/sweepers/structure_sweeper.rb

@@ -13,17 +13,9 @@ class StructureSweeper < ActionController::Caching::Sweeper
 		expire(item)
 	end
 	
-	# Clear all orders cache files
-	def self.sweep!
-	  cache_store = Rails.application.config.action_controller.cache_store
-	  cache_store.clear if cache_store
-	    
-    Rails.logger.info("StructureSweeper clear all cache")
-	end
-	
 	private
 	
 	  def expire(item=nil)
-		  self.class.sweep!
+		  Sunrise::Utils.clear_cache
 	  end
 end

data/app/views/kaminari/manage/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="first">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+</span>

data/app/views/kaminari/manage/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>

data/app/views/kaminari/manage/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<span class="last">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</span>

data/app/views/kaminari/manage/_next_page.html.erb

@@ -0,0 +1,9 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<%= link_to_unless_span current_page.last?, image_tag('manage/page_next_arr.gif', :alt => t('views.pagination.next')), url, :rel => 'next', :remote => remote, :class => "next_page disabled" %>

data/app/views/kaminari/manage/_page.html.erb

@@ -0,0 +1,15 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+
+<% unless page.current? %>
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+<% else -%>
+  <%= content_tag(:span, page)%>
+<% end -%>

data/app/views/kaminari/manage/_paginator.html.erb

@@ -0,0 +1,23 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <div class="pagination">
+    <%#= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag %>
+    <%#= last_page_tag unless current_page.last? %>
+  </div>
+<% end -%>

data/app/views/kaminari/manage/_prev_page.html.erb

@@ -0,0 +1,10 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+
+<%= link_to_unless_span current_page.first?, image_tag('manage/page_prev_arr.gif', :alt => t('views.pagination.previous')), url, :rel => 'prev', :remote => remote, :class => "prev_page disabled" %>

data/app/views/layouts/manage.html.erb

@@ -11,7 +11,7 @@
  	<script src="https://www.google.com/jsapi?key=" type="text/javascript"></script>
   <script language="Javascript" type="text/javascript">
   //<![CDATA[
-    google.load("jquery", "1.5.1");
+    google.load("jquery", "1.6.2");
     google.load("jqueryui", "1.8.13");
   //]]>
   </script>

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

@@ -1,6 +1,6 @@
 <% param ||= "s"%>
 <ul class="lang-tabs" id="lang_tab_ul_<%=param%>">
-  <% Globalize.available_locales.each do |locale| %>
+  <% Sunrise.available_locales.each do |locale| %>
     <%= content_tag(:li, :class=>(I18n.locale.to_s == locale.to_s ? 'active' : 'not-active')) do %>
       <span><%= link_to_function t("manage.locale.#{locale}"), 'TabPanel.click(event)', :class=>locale, :id=>"#{param + locale.to_s}" %></span>
     <% end %>

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

@@ -2,6 +2,8 @@
   <div class="filt-bl">
     <%= link_to_function t('manage.model_filter.title'), "Manage.toggle_element('block_filter')", :class=>"dark-arr" %>
     
+    <%= 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') %>

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

@@ -16,7 +16,7 @@
       
       <div id="users" class="stage">
         <%= render :partial=>"manage/users/user", :collection => @users %>
-        <%= paginate @users %>
+        <%= paginate @users, :theme => 'manage' %>
       </div>
       
       <script type='text/javascript'>

data/config/locales/defaults/en.yml

@@ -145,5 +145,5 @@ en:
         less_than_or_equal_to: "must be less than or equal to %{count}"
         odd: "must be odd"
         even: "must be even"
-        record_invalid: "Validation failed: {{errors}}"
+        record_invalid: "Validation failed: %{errors}"
        # Append your own errors here or at the model/attributes scope.

data/config/locales/manage/en.yml

@@ -126,6 +126,7 @@ en:
       filter: "Filter"
       search: "Search"
       clear: "Clean"
+      total_count: "Total"
     
     position:
       down: "Lower down"
@@ -206,6 +207,8 @@ en:
       _: "-"
       created_at_desc: "by date descending"
       created_at_asc: "date ascending"
+      updated_at_desc: "updating descending"
+      updated_at_asc: "updating ascending"
       title_desc: "by title descending"
       title_asc: "by title ascending"
       name_desc: "by name descending"

data/config/locales/manage/ru.yml

@@ -126,6 +126,7 @@ ru:
       filter: "Фильтр"
       search: "Поиск"
       clear: "Очистить"
+      total_count: "Всего"
     
     position:
       down: "Опустить вниз"
@@ -206,6 +207,8 @@ ru:
       _: "-"
       created_at_desc: "по дате по убыванию"
       created_at_asc: "по дате по возрастанию"
+      updated_at_desc: "обновление по убыванию"
+      updated_at_asc: "обновление по возрастанию"
       title_desc: "по названию по убыванию"
       title_asc: "по названию по возрастанию"
       name_desc: "по названию по убыванию"

data/config/locales/manage/uk.yml

@@ -126,6 +126,7 @@ uk:
       filter: "Фільтр"
       search: "Пошук"
       clear: "Очистити"
+      total_count: "Всього"
     
     position:
       down: "Опустити вниз"
@@ -206,6 +207,8 @@ uk:
       _: "-"
       created_at_desc: "за датою за спаданням"
       created_at_asc: "за датою за зростанням"
+      updated_at_desc: "за датою оновлення за спаданням"
+      updated_at_asc: "за датою оновлення за зростанням"
       title_desc: "за назвою за спаданням"
       title_asc: "за назвою за зростанням"
       name_desc: "за назвою за спаданням"