sunrise-cms 0.5.3 → 0.6.0

data/spec/models/structure_spec.rb

@@ -18,7 +18,7 @@ describe Structure do
     end
     
     it "should not be valid with invalid position" do
-      @structure.position = 'wrong'
+      @structure.position_type_id = 'wrong'
       @structure.should_not be_valid
     end
     

data/spec/orm/active_record.rb

@@ -3,6 +3,3 @@ require 'active_record'
 
 ActiveRecord::Migrator.migrate File.expand_path("../../dummy/db/migrate/", __FILE__)
 ActiveRecord::Migrator.migrate File.expand_path("../../../db/migrate/", __FILE__)
-
-require "audited-activerecord"
-Audited.audit_class = Audited::Adapters::ActiveRecord::Audit

data/spec/orm/mongoid.rb

@@ -1,4 +1,15 @@
-require 'mongoid'
+require "mongoid"
 require "database_cleaner"
+require "public_activity"
 
 DatabaseCleaner[:mongoid].strategy = :truncation
+
+PublicActivity::Config.set do
+  orm :mongoid
+end
+
+# Hook for rspec-rails
+module ActiveRecord
+  module TestFixtures
+  end
+end

data/spec/requests/dashboard_spec.rb

@@ -4,7 +4,10 @@ describe "Sunrise Manager Dashboard" do
   subject { page }
   before(:all) do 
     @admin = FactoryGirl.create(:admin_user, :email => "#{Time.now.to_i}@gmail.com")    
-    @audit = FactoryGirl.create(:audit)
+
+    @post = FactoryGirl.create(:post)
+    @user = FactoryGirl.create(:redactor_user)
+    @event = @post.create_activity :key => 'post.create', :owner => @user
   end
 
   context "admin" do
@@ -20,7 +23,7 @@ describe "Sunrise Manager Dashboard" do
       end
       
       it "should render records" do
-        dom_id = ["audit", "event", @audit.id].join('_')
+        dom_id = ["activity", @event.id].join('_')
         should have_selector("#" + dom_id)
       end
     end

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

@@ -12,8 +12,8 @@ describe "Sunrise Manager New" do
         visit new_path(:model_name => "structures")
         
         fill_in "structure[title]", :with => "Good day"
-        select(StructureType.page.title, :from => "structure[kind]")
-        select(PositionType.menu.title, :from => "structure[position]")
+        select(StructureType.page.title, :from => "structure[structure_type_id]")
+        select(PositionType.menu.title, :from => "structure[position_type_id]")
         check('structure[is_visible]')
         
         click_button "submit-button-hidden"

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

@@ -38,8 +38,8 @@ describe "Sunrise Manager Edit" do
         should have_selector "input[@name='structure[redirect_url]']"
         should have_selector "input[@name='structure[slug]']"
         should have_selector "#structure_parent_id"
-        should have_selector "#structure_kind"
-        should have_selector "#structure_position"
+        should have_selector "#structure_structure_type_id"
+        should have_selector "#structure_position_type_id"
         should have_selector "input[@name='structure[is_visible]']"
       end
     end

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

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

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

@@ -19,8 +19,8 @@ describe "Sunrise Manager Edit" do
         #save_and_open_page
         
         fill_in "structure[title]", :with => "Title updated"
-        select(StructureType.posts.title, :from => "structure_kind")
-        select(PositionType.default.title, :from => "structure_position")
+        select(StructureType.posts.title, :from => "structure_structure_type_id")
+        select(PositionType.default.title, :from => "structure_position_type_id")
         uncheck('structure[is_visible]')
         
         click_button "submit-button-hidden"

data/vendor/assets/images/sunrise/icons/commented.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<g id="Layer_1" display="none">
+	<path display="inline" d="M66.015,81.127L53.93,63H16V18h68v45H69.64L66.015,81.127z M20,59h36.07l7.915,11.873L66.36,59H80V22H20   V59z"/>
+</g>
+<g id="Layer_2">
+	<path fill="#BBB" d="M72,18H28c-6.627,0-12,5.373-12,12v21c0,6.627,5.373,12,12,12h26.025l10.843,16.407L68.357,63H72c6.627,0,12-5.373,12-12   V30C84,23.373,78.627,18,72,18z"/>
+</g>
+</svg>

data/vendor/assets/images/sunrise/icons/create.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<polygon style="fill:#BBB;" points="100,37.5 62.5,37.5 62.5,0 37.5,0 37.5,37.5 0,37.5 0,62.5 37.5,62.5 37.5,100 62.5,100   62.5,62.5 100,62.5 "/>
+</svg>

data/vendor/assets/images/sunrise/icons/destroy.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<g id="Captions">
+</g>
+<g id="Your_Icon">
+	<path style="fill:#BBB;" d="M74.977,19.731H57.126c0.016-0.155,0.023-0.313,0.023-0.472c0-2.602-2.109-4.712-4.713-4.712h-4.872   c-2.602,0-4.712,2.11-4.712,4.712c0,0.159,0.008,0.317,0.023,0.472H25.023c-2.603,0-4.712,2.11-4.712,4.712   s2.109,4.711,4.712,4.711h0.591v52.013c0,2.405,1.802,4.384,4.127,4.673C30.124,85.94,30.522,86,30.937,86h38.127   c0.413,0,0.811-0.06,1.191-0.158c2.328-0.287,4.133-2.268,4.133-4.674V29.155h0.589c2.602,0,4.712-2.109,4.712-4.711   S77.578,19.731,74.977,19.731z M53.636,76.575h-7.54v-47.42h7.54V76.575z M41.384,29.155v47.42h-6.345v-47.42H41.384z    M64.963,76.575h-6.615v-47.42h6.615V76.575z"/>
+</g>
+</svg>

data/vendor/assets/images/sunrise/icons/update.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<path fill="#BBB" d="M4.744,4.743c-6.325,6.325-6.325,16.578,0,22.903L27.646,4.743C21.322-1.582,11.068-1.582,4.744,4.743z"/>
+<path fill="#BBB" d="M60.893,83.794L100,100L83.795,60.893l-49.881-49.88L11.012,33.914L60.893,83.794z M66.105,73.646
+	c2.082-2.084,6.023-1.517,6.893-0.647c-0.868-0.868-1.436-4.812,0.646-6.894s6.242-2.822,6.242-2.822l9.312,22.47l-3.446,3.446
+	l-22.47-9.311C63.282,79.889,64.023,75.729,66.105,73.646z"/>
+</svg>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,6 +268,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: public_activity
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -339,7 +355,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -347,7 +363,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -375,7 +391,7 @@ files:
 - app/views/layouts/sunrise/application.html.erb
 - app/views/sunrise/dashboard/_header.html.erb
 - app/views/sunrise/dashboard/index.html.erb
-- app/views/sunrise/dashboard/_event.html.erb
+- app/views/sunrise/dashboard/_activity.html.erb
 - app/views/sunrise/settings/_header_edit.html.erb
 - app/views/sunrise/settings/_form.html.erb
 - app/views/sunrise/settings/edit.html.erb
@@ -432,6 +448,7 @@ files:
 - app/assets/javascripts/sunrise/jquery.ddmenu.js.coffee
 - app/helpers/sunrise/manager_helper.rb
 - app/helpers/sunrise/application_helper.rb
+- app/helpers/sunrise/dashboard_helper.rb
 - app/helpers/sunrise/structure_helper.rb
 - app/controllers/sunrise/manager_controller.rb
 - app/controllers/sunrise/application_controller.rb
@@ -529,7 +546,6 @@ files:
 - lib/generators/sunrise/templates/models/mongoid/role_type.rb
 - lib/generators/sunrise/templates/models/mongoid/avatar.rb
 - lib/generators/sunrise/templates/models/mongoid/asset.rb
-- lib/generators/sunrise/templates/models/mongoid/history_tracker.rb
 - lib/generators/sunrise/templates/models/mongoid/settings.rb
 - lib/generators/sunrise/templates/models/mongoid/position_type.rb
 - lib/generators/sunrise/templates/models/mongoid/picture.rb
@@ -582,6 +598,10 @@ files:
 - vendor/assets/images/sunrise/treeview-gray-line2.gif
 - vendor/assets/images/sunrise/ico_opt.jpg
 - vendor/assets/images/sunrise/ico_edit.jpg
+- vendor/assets/images/sunrise/icons/update.svg
+- vendor/assets/images/sunrise/icons/destroy.svg
+- vendor/assets/images/sunrise/icons/create.svg
+- vendor/assets/images/sunrise/icons/commented.svg
 - vendor/assets/images/sunrise/top_arr_down.png
 - vendor/assets/images/sunrise/tab_table.png
 - vendor/assets/images/sunrise/page_arr_hover.png
@@ -596,9 +616,9 @@ files:
 - vendor/assets/images/sunrise/ico_del.png
 - vendor/assets/images/sunrise/audit/created_at.png
 - vendor/assets/images/sunrise/audit/remote_address.png
-- vendor/assets/images/sunrise/audit/user.png
-- vendor/assets/images/sunrise/audit/action.png
-- vendor/assets/images/sunrise/audit/auditable.png
+- vendor/assets/images/sunrise/audit/trackable.png
+- vendor/assets/images/sunrise/audit/key.png
+- vendor/assets/images/sunrise/audit/owner.png
 - vendor/assets/images/sunrise/chosen-sprite.png
 - vendor/assets/images/sunrise/right_but_bg.png
 - vendor/assets/images/sunrise/tree_dnd1.png
@@ -629,6 +649,7 @@ files:
 - vendor/assets/images/smoothness/ui-bg_flat_75_ffffff_40x100.png
 - vendor/assets/images/smoothness/ui-bg_glass_75_dadada_1x400.png
 - vendor/assets/images/smoothness/ui-icons_454545_256x240.png
+- vendor/assets/images/gravatar-140.png
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
 - vendor/assets/javascripts/jquery.tmpl.min.js
 - vendor/assets/javascripts/chosen.jquery.js
@@ -640,40 +661,6 @@ files:
 - Rakefile
 - README.md
 - CHANGELOG.rdoc
-- spec/tmp/spec/support/helpers/controller_macros.rb
-- spec/tmp/spec/spec_helper.rb
-- spec/tmp/spec/factories/structure_factory.rb
-- spec/tmp/spec/factories/user_factory.rb
-- spec/tmp/spec/controllers/pages_controller_spec.rb
-- spec/tmp/spec/controllers/welcome_controller_spec.rb
-- spec/tmp/app/views/layouts/application.html.erb
-- spec/tmp/app/views/pages/show.html.erb
-- spec/tmp/app/views/shared/_notice.html.erb
-- spec/tmp/app/models/defaults/role_type.rb
-- spec/tmp/app/models/defaults/avatar.rb
-- spec/tmp/app/models/defaults/asset.rb
-- spec/tmp/app/models/defaults/settings.rb
-- spec/tmp/app/models/defaults/position_type.rb
-- spec/tmp/app/models/defaults/picture.rb
-- spec/tmp/app/models/defaults/structure.rb
-- spec/tmp/app/models/defaults/attachment_file.rb
-- spec/tmp/app/models/defaults/ability.rb
-- spec/tmp/app/models/defaults/structure_type.rb
-- spec/tmp/app/models/defaults/user.rb
-- spec/tmp/app/models/sunrise/sunrise_user.rb
-- spec/tmp/app/models/sunrise/sunrise_page.rb
-- spec/tmp/app/models/sunrise/sunrise_navigation.rb
-- spec/tmp/app/models/sunrise/sunrise_structure.rb
-- spec/tmp/app/uploaders/attachment_file_uploader.rb
-- spec/tmp/app/uploaders/picture_uploader.rb
-- spec/tmp/app/uploaders/avatar_uploader.rb
-- spec/tmp/config/routes.rb
-- spec/tmp/config/application.rb
-- spec/tmp/config/database.yml.sample
-- spec/tmp/config/nginx-config.sample
-- spec/tmp/config/logrotate-config.sample
-- spec/tmp/config/initializers/sunrise.rb
-- spec/tmp/db/seeds.rb
 - spec/support/hooks/structure.rb
 - spec/support/helpers/controller_macros.rb
 - spec/support/helpers/controller_helper.rb
@@ -704,6 +691,9 @@ files:
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/public_activity/post/_create.html.erb
+- spec/dummy/app/views/public_activity/post/_update.html.erb
+- spec/dummy/app/views/public_activity/post/_destroy.html.erb
 - spec/dummy/app/views/welcome/index.html.erb
 - spec/dummy/app/views/sunrise/manager/users/thumbs/_record.html.erb
 - spec/dummy/app/models/active_record/post.rb
@@ -739,6 +729,7 @@ files:
 - spec/dummy/config/mongoid.yml
 - spec/dummy/db/migrate/20111227143901_create_page_parts.rb
 - spec/dummy/db/migrate/20111228152051_create_posts.rb
+- spec/dummy/db/migrate/20130214090723_create_activities.rb
 - spec/dummy/db/migrate/20120105114018_create_meta_tags.rb
 - spec/dummy/db/migrate/20111227111941_install_acts_as_audited.rb
 - spec/dummy/script/rails
@@ -778,7 +769,6 @@ files:
 - spec/factories/asset_factory.rb
 - spec/factories/user_factory.rb
 - spec/factories/post_factory.rb
-- spec/factories/audit_factory.rb
 - spec/sunrise_spec.rb
 - spec/controllers/sunrise/dashboard_controller_spec.rb
 - spec/controllers/sunrise/shared_controller_spec.rb
@@ -809,40 +799,6 @@ signing_key:
 specification_version: 3
 summary: Rails CMS
 test_files:
-- spec/tmp/spec/support/helpers/controller_macros.rb
-- spec/tmp/spec/spec_helper.rb
-- spec/tmp/spec/factories/structure_factory.rb
-- spec/tmp/spec/factories/user_factory.rb
-- spec/tmp/spec/controllers/pages_controller_spec.rb
-- spec/tmp/spec/controllers/welcome_controller_spec.rb
-- spec/tmp/app/views/layouts/application.html.erb
-- spec/tmp/app/views/pages/show.html.erb
-- spec/tmp/app/views/shared/_notice.html.erb
-- spec/tmp/app/models/defaults/role_type.rb
-- spec/tmp/app/models/defaults/avatar.rb
-- spec/tmp/app/models/defaults/asset.rb
-- spec/tmp/app/models/defaults/settings.rb
-- spec/tmp/app/models/defaults/position_type.rb
-- spec/tmp/app/models/defaults/picture.rb
-- spec/tmp/app/models/defaults/structure.rb
-- spec/tmp/app/models/defaults/attachment_file.rb
-- spec/tmp/app/models/defaults/ability.rb
-- spec/tmp/app/models/defaults/structure_type.rb
-- spec/tmp/app/models/defaults/user.rb
-- spec/tmp/app/models/sunrise/sunrise_user.rb
-- spec/tmp/app/models/sunrise/sunrise_page.rb
-- spec/tmp/app/models/sunrise/sunrise_navigation.rb
-- spec/tmp/app/models/sunrise/sunrise_structure.rb
-- spec/tmp/app/uploaders/attachment_file_uploader.rb
-- spec/tmp/app/uploaders/picture_uploader.rb
-- spec/tmp/app/uploaders/avatar_uploader.rb
-- spec/tmp/config/routes.rb
-- spec/tmp/config/application.rb
-- spec/tmp/config/database.yml.sample
-- spec/tmp/config/nginx-config.sample
-- spec/tmp/config/logrotate-config.sample
-- spec/tmp/config/initializers/sunrise.rb
-- spec/tmp/db/seeds.rb
 - spec/support/hooks/structure.rb
 - spec/support/helpers/controller_macros.rb
 - spec/support/helpers/controller_helper.rb
@@ -873,6 +829,9 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/public_activity/post/_create.html.erb
+- spec/dummy/app/views/public_activity/post/_update.html.erb
+- spec/dummy/app/views/public_activity/post/_destroy.html.erb
 - spec/dummy/app/views/welcome/index.html.erb
 - spec/dummy/app/views/sunrise/manager/users/thumbs/_record.html.erb
 - spec/dummy/app/models/active_record/post.rb
@@ -908,6 +867,7 @@ test_files:
 - spec/dummy/config/mongoid.yml
 - spec/dummy/db/migrate/20111227143901_create_page_parts.rb
 - spec/dummy/db/migrate/20111228152051_create_posts.rb
+- spec/dummy/db/migrate/20130214090723_create_activities.rb
 - spec/dummy/db/migrate/20120105114018_create_meta_tags.rb
 - spec/dummy/db/migrate/20111227111941_install_acts_as_audited.rb
 - spec/dummy/script/rails
@@ -947,9 +907,9 @@ test_files:
 - spec/factories/asset_factory.rb
 - spec/factories/user_factory.rb
 - spec/factories/post_factory.rb
-- spec/factories/audit_factory.rb
 - spec/sunrise_spec.rb
 - spec/controllers/sunrise/dashboard_controller_spec.rb
 - spec/controllers/sunrise/shared_controller_spec.rb
 - spec/controllers/sunrise/settings_controller_spec.rb
 - spec/controllers/sunrise/manager_controller_spec.rb
+has_rdoc: 

data/app/views/sunrise/dashboard/_event.html.erb

@@ -1,15 +0,0 @@
-<%= content_tag(:tr, :id => ["audit", "event", event.id].join("_"), :class => "event") do -%>
-  <td><%= I18n.l(event.created_at, :format => "%d.%m.%Y") %></td>
-  <% if event.user -%>
-    <td><%= link_to event.user.name, edit_path(:model_name => "users", :id => event.user_id) %></td>
-  <% else -%>
-    <td><%= event.username || [event.user_type, event.user_id].join('#') %></td>
-  <% end -%>
-  <td><%= event.action %></td>
-  <td>
-    <%= link_to_if ['create', 'update'].include?(event.action), 
-      [event.auditable_type, event.auditable_id].join('#'), 
-      edit_path(:model_name => event.auditable_type.tableize, :id => event.auditable_id) %>
-  </td>
-  <td><%= event.remote_address %></td>
-<% end -%>

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

@@ -1,31 +0,0 @@
-class HistoryTracker
-  include Mongoid::History::Tracker
-
-  def user
-    @user ||= modifier
-  end
-
-  def username
-    user.try(:name)
-  end
-
-  def user_type
-    "User"
-  end
-
-  def user_id
-    user.try(:id)
-  end
-
-  def auditable_type
-    "Post"
-  end
-
-  def auditable_id
-    1
-  end
-
-  def remote_address
-    nil
-  end
-end

data/spec/factories/audit_factory.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-if Object.const_defined?("Audited")
-  FactoryGirl.define do
-    factory :audit, :class => Audited.audit_class do |a|
-      a.action "create"
-      a.audited_changes :title => "Updated"
-      a.association :user, :factory => :default_user
-      a.association :auditable, :factory => :post
-    end
-  end
-else
-  FactoryGirl.define do
-    factory :audit, :class => HistoryTracker do
-      action "create"
-      modified :title => "Updated"
-      original :title => "original"
-      version 1
-
-      after(:build) do |a| 
-        a.trackable = FactoryGirl.create(:post)
-      end
-    end
-  end
-end