refinerycms 0.9.8.5 → 0.9.8.6

data/db/migrate/20100913234704_create_refinery_schema.rb

@@ -0,0 +1,151 @@
+class CreateRefinerySchema < ActiveRecord::Migration
+  def self.up
+    create_table ::Image.table_name, :force => true do |t|
+      t.string   "image_mime_type"
+      t.string   "image_name"
+      t.integer  "image_size"
+      t.integer  "image_width"
+      t.integer  "image_height"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "image_uid"
+      t.string   "image_ext"
+    end
+
+    create_table ::Inquiry.table_name, :force => true do |t|
+      t.string   "name"
+      t.string   "email"
+      t.string   "phone"
+      t.text     "message"
+      t.integer  "position"
+      t.boolean  "open",       :default => true
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.boolean  "spam",       :default => false
+    end
+
+    create_table ::InquirySetting.table_name, :force => true do |t|
+      t.string   "name"
+      t.text     "value"
+      t.boolean  "destroyable"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table ::PagePart.table_name, :force => true do |t|
+      t.integer  "page_id"
+      t.string   "title"
+      t.text     "body"
+      t.integer  "position"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    add_index ::PagePart.table_name, ["id"], :name => "index_#{::PagePart.table_name}_on_id"
+    add_index ::PagePart.table_name, ["page_id"], :name => "index_#{::PagePart.table_name}_on_page_id"
+
+    create_table ::Page.table_name, :force => true do |t|
+      t.string   "title"
+      t.integer  "parent_id"
+      t.integer  "position"
+      t.string   "path"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "meta_keywords"
+      t.text     "meta_description"
+      t.boolean  "show_in_menu",        :default => true
+      t.string   "link_url"
+      t.string   "menu_match"
+      t.boolean  "deletable",           :default => true
+      t.string   "custom_title"
+      t.string   "custom_title_type",   :default => "none"
+      t.boolean  "draft",               :default => false
+      t.string   "browser_title"
+      t.boolean  "skip_to_first_child", :default => false
+      t.integer  "lft"
+      t.integer  "rgt"
+      t.integer  "depth"
+      t.string   "cached_slug"
+    end
+
+    add_index ::Page.table_name, ["depth"], :name => "index_#{::Page.table_name}_on_depth"
+    add_index ::Page.table_name, ["id"], :name => "index_#{::Page.table_name}_on_id"
+    add_index ::Page.table_name, ["lft"], :name => "index_#{::Page.table_name}_on_lft"
+    add_index ::Page.table_name, ["parent_id"], :name => "index_#{::Page.table_name}_on_parent_id"
+    add_index ::Page.table_name, ["rgt"], :name => "index_#{::Page.table_name}_on_rgt"
+
+    create_table ::RefinerySetting.table_name, :force => true do |t|
+      t.string   "name"
+      t.text     "value"
+      t.boolean  "destroyable",             :default => true
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "scoping"
+      t.boolean  "restricted",              :default => false
+      t.string   "callback_proc_as_string"
+    end
+
+    add_index ::RefinerySetting.table_name, ["name"], :name => "index_#{::RefinerySetting.table_name}_on_name"
+
+    create_table ::Resource.table_name, :force => true do |t|
+      t.string   "file_mime_type"
+      t.string   "file_name"
+      t.integer  "file_size"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "file_uid"
+      t.string   "file_ext"
+    end
+
+    create_table ::Role.table_name, :force => true do |t|
+      t.string "title"
+    end
+
+    create_table ::RolesUsers.table_name, :id => false, :force => true do |t|
+      t.integer "user_id"
+      t.integer "role_id"
+    end
+
+    create_table ::Slug.table_name, :force => true do |t|
+      t.string   "name"
+      t.integer  "sluggable_id"
+      t.integer  "sequence",                     :default => 1, :null => false
+      t.string   "sluggable_type", :limit => 40
+      t.string   "scope",          :limit => 40
+      t.datetime "created_at"
+    end
+
+    add_index ::Slug.table_name, ["name", "sluggable_type", "scope", "sequence"], :name => "index_#{::Slug.table_name}_on_name_and_sluggable_type_and_scope_and_sequence", :unique => true
+    add_index ::Slug.table_name, ["sluggable_id"], :name => "index_#{::Slug.table_name}_on_sluggable_id"
+
+    create_table ::UserPlugin.table_name, :force => true do |t|
+      t.integer "user_id"
+      t.string  "name"
+      t.integer "position"
+    end
+
+    add_index ::UserPlugin.table_name, ["name"], :name => "index_#{::UserPlugin.table_name}_on_title"
+    add_index ::UserPlugin.table_name, ["user_id", "name"], :name => "index_unique_#{::UserPlugin.table_name}", :unique => true
+
+    create_table ::User.table_name, :force => true do |t|
+      t.string   "login",             :null => false
+      t.string   "email",             :null => false
+      t.string   "crypted_password",  :null => false
+      t.string   "password_salt",     :null => false
+      t.string   "persistence_token"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "perishable_token"
+    end
+
+    add_index ::User.table_name, ["id"], :name => "index_#{::User.table_name}_on_id"
+  end
+
+  def self.down
+    [::Image, ::Page, ::PagePart, ::RefinerySetting, ::Slug, ::User].reject{|m|
+      !(defined?(m) and m.respond_to?(:table_name))
+    }.each do |model|
+      drop_table model.table_name
+    end
+  end
+end

data/db/migrate/20100926142529_add_value_type_to_refinery_settings.rb

@@ -0,0 +1,9 @@
+class AddValueTypeToRefinerySettings < ActiveRecord::Migration
+  def self.up
+    add_column ::RefinerySetting.table_name, :form_value_type, :string
+  end
+
+  def self.down
+    remove_column ::RefinerySetting.table_name, :form_value_type
+  end
+end

data/db/migrate/20100929035252_add_missing_indexes_to_roles_users.rb

@@ -0,0 +1,11 @@
+class AddMissingIndexesToRolesUsers < ActiveRecord::Migration
+  def self.up
+    add_index ::RolesUsers.table_name, [:role_id, :user_id]
+    add_index ::RolesUsers.table_name, [:user_id, :role_id]
+  end
+
+  def self.down
+    remove_index ::RolesUsers.table_name, :column => [:role_id, :user_id]
+    remove_index ::RolesUsers.table_name, :column => [:user_id, :role_id]
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100913234704) do
+ActiveRecord::Schema.define(:version => 20100929035252) do
 
   create_table "images", :force => true do |t|
     t.string   "image_mime_type"
@@ -95,6 +95,7 @@ ActiveRecord::Schema.define(:version => 20100913234704) do
     t.string   "scoping"
     t.boolean  "restricted",              :default => false
     t.string   "callback_proc_as_string"
+    t.string   "form_value_type"
   end
 
   add_index "refinery_settings", ["name"], :name => "index_refinery_settings_on_name"
@@ -118,6 +119,9 @@ ActiveRecord::Schema.define(:version => 20100913234704) do
     t.integer "role_id"
   end
 
+  add_index "roles_users", ["role_id", "user_id"], :name => "index_roles_users_on_role_id_and_user_id"
+  add_index "roles_users", ["user_id", "role_id"], :name => "index_roles_users_on_user_id_and_role_id"
+
   create_table "slugs", :force => true do |t|
     t.string   "name"
     t.integer  "sluggable_id"

data/db/seeds/pages.rb

@@ -41,42 +41,3 @@ about_us_page.parts.create({
               :body => "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus fringilla nisi a elit. Duis ultricies orci ut arcu. Ut ac nibh. Duis blandit rhoncus magna. Pellentesque semper risus ut magna. Etiam pulvinar tellus eget diam. Morbi blandit. Donec pulvinar mauris at ligula. Sed pellentesque, ipsum id congue molestie, lectus risus egestas pede, ac viverra diam lacus ac urna. Aenean elit.</p>",
               :position => 1
             })
-
-contact_us_page = Page.create(:title => "Contact",
-            :link_url => "/contact",
-            :menu_match => "^/(inquiries|contact).*$",
-            :deletable => false,
-            :position => (page_position += 1))
-contact_us_page.parts.create({
-              :title => "Body",
-              :body => "<p>Get in touch with us. Just use the form below and we'll get back to you as soon as we can.</p>",
-              :position => 0
-            })
-contact_us_page.parts.create({
-              :title => "Side Body",
-              :body => "<p>163 Evergreen Terrace<br/>Happyville<br/>USA.<br/>Phone: 1-800 CALLUSNOW</p>",
-              :position => 1
-            })
-contact_us_page_position = -1
-
-thank_you_page = contact_us_page.children.create(:title => "Thank You",
-            :link_url => "/contact/thank_you",
-            :menu_match => "^/(inquiries|contact)/thank_you$",
-            :show_in_menu => false,
-            :deletable => false,
-            :position => (contact_us_page_position += 1))
-thank_you_page.parts.create({
-              :title => "Body",
-              :body => "<p>We've received your inquiry and will get back to you with a response shortly.</p><p><a href='/'>Return to the home page</a></p>",
-              :position => 0
-            })
-
-privacy_policy_page = contact_us_page.children.create(:title => "Privacy Policy",
-            :deletable => true,
-            :show_in_menu => false,
-            :position => (contact_us_page_position += 1))
-privacy_policy_page.parts.create({
-              :title => "Body",
-              :body => "<p>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>",
-              :position => 0
-            })

data/db/seeds/pages_for_inquiries.rb

@@ -0,0 +1,40 @@
+page_position = Page.maximum(:position, :conditions => {:parent_id => nil})
+
+contact_us_page = Page.create(:title => "Contact",
+            :link_url => "/contact",
+            :menu_match => "^/(inquiries|contact).*$",
+            :deletable => false,
+            :position => (page_position += 1))
+contact_us_page.parts.create({
+              :title => "Body",
+              :body => "<p>Get in touch with us. Just use the form below and we'll get back to you as soon as we can.</p>",
+              :position => 0
+            })
+contact_us_page.parts.create({
+              :title => "Side Body",
+              :body => "<p>163 Evergreen Terrace<br/>Happyville<br/>USA.<br/>Phone: 1-800 CALLUSNOW</p>",
+              :position => 1
+            })
+contact_us_page_position = -1
+
+thank_you_page = contact_us_page.children.create(:title => "Thank You",
+            :link_url => "/contact/thank_you",
+            :menu_match => "^/(inquiries|contact)/thank_you$",
+            :show_in_menu => false,
+            :deletable => false,
+            :position => (contact_us_page_position += 1))
+thank_you_page.parts.create({
+              :title => "Body",
+              :body => "<p>We've received your inquiry and will get back to you with a response shortly.</p><p><a href='/'>Return to the home page</a></p>",
+              :position => 0
+            })
+
+privacy_policy_page = contact_us_page.children.create(:title => "Privacy Policy",
+            :deletable => true,
+            :show_in_menu => false,
+            :position => (contact_us_page_position += 1))
+privacy_policy_page.parts.create({
+              :title => "Body",
+              :body => "<p>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>",
+              :position => 0
+            })

data/vendor/refinerycms/authentication/app/models/roles_users.rb

@@ -0,0 +1,6 @@
+class RolesUsers < ActiveRecord::Base
+
+  belongs_to :role
+  belongs_to :user
+
+end

data/vendor/refinerycms/authentication/features/lost_password.feature

@@ -1,3 +1,4 @@
+@refinerycms @users @users-password
 Feature: Lost Password
     In order to restore my password
     As a lost soul

data/vendor/refinerycms/authentication/features/manage_users.feature

@@ -1,4 +1,4 @@
-@users @users-manage
+@refinerycms @users @users-manage
 Feature: Manage Users
   In order to control who can access my website's backend
   As an administrator

data/vendor/refinerycms/authentication/features/step_definitions/lost_password.rb

@@ -1,8 +1,8 @@
 Given /^I have a user with email "(.*)"$/ do |email|
-  Factory(:user, :email => email)
+  Factory(:refinery_user, :email => email)
 end
 
 Given /^I am (not )?requesting password reset$/ do |action|
-  @user = Factory(:user, :updated_at => 11.minutes.ago)
+  @user = Factory(:refinery_user, :updated_at => 11.minutes.ago)
   @user.reset_perishable_token! if action.nil?
 end

data/vendor/refinerycms/authentication/features/support/factories.rb

@@ -9,6 +9,7 @@ end
 
 Factory.define :refinery_user, :parent => :user do |u|
   u.roles { [ Role[:refinery] ] }
+
   u.after_create do |user|
     Refinery::Plugins.registered.each_with_index do |plugin, index|
       user.plugins.create(:name => plugin.name, :position => index)

data/vendor/refinerycms/authentication/spec/models/user_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+Dir[File.expand_path('../../../features/support/factories.rb', __FILE__)].each {|f| require f}
+
+describe User do
+  include AuthenticatedTestHelper
+
+  context "Roles" do
+    context "add_role" do
+      it "raises Exception when Role object is passed" do
+        user = Factory(:user)
+        lambda{ user.add_role(Role.new)}.should raise_exception
+      end
+
+      it "adds a Role to the User when role not yet assigned to User" do
+        user = Factory(:user)
+        lambda {
+          user.add_role(:new_role)
+        }.should change(user.roles, :count).by(1)
+        user.roles.collect(&:title).should include("NewRole")
+      end
+
+      it "does not add a Role to the User when this Role is already assigned to User" do
+        user = Factory(:refinery_user)
+        lambda {
+          user.add_role(:refinery)
+        }.should_not change(user.roles, :count).by(1)
+        user.roles.collect(&:title).should include("Refinery")
+      end
+    end
+
+    context "has_role" do
+      it "raises Exception when Role object is passed" do
+        user = Factory(:user)
+        lambda{ user.has_role?(Role.new)}.should raise_exception
+      end
+
+      it "returns the true if user has Role" do
+        user = Factory(:refinery_user)
+        user.has_role?(:refinery).should be_true
+      end
+
+      it "returns false if user hasn't the Role" do
+        user = Factory(:refinery_user)
+        user.has_role?(:refinery_fail).should be_false
+      end
+
+    end
+
+  end
+
+end

data/vendor/refinerycms/core/app/views/admin/_head.html.erb

@@ -25,10 +25,7 @@
 
   <%= jquery_include_tags(:caching => js_caching) -%>
 
-  <% #TODO: Find out why the master branch doesn't work! %>
-  <%#= javascript_include_tag 'http://github.com/rails/jquery-ujs/raw/master/src/rails.js' %>
-  <%= javascript_include_tag 'http://github.com/rails/jquery-ujs/raw/f01a685c8200b76c4cc2c606accb135da5ad5444/src/rails.js' %>
-
+  <%= javascript_include_tag 'rails' %>
 
   <%= javascript_include_tag 'jquery/jquery.corner.js',
                              'jquery/jquery.textTruncate.js',

data/vendor/refinerycms/core/app/views/shared/_menu.html.erb

@@ -3,14 +3,19 @@
   css ||= 'menu'
   hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) unless defined?(hide_children)
   cache_key = [Refinery.base_cache_key]
+  cache_key << dom_id
   cache_key << (action_suffix ||= RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu"))
-  cache_key << extra_suffix if defined?(extra_suffix) and extra_suffix.present?
   cache_key << request.path
-  cache(cache_key.compact.join('_')) do
-    # Select top menu items unless 'roots' is passed in.
+  cache_if(RefinerySetting.find_or_set(:menu_cache_enabled, true), cache_key.compact.join('_')) do
+    # Select top menu items unless 'roots' is supplied.
     collection ||= @menu_pages
-    roots ||= collection.select { |m| m.parent_id == nil }
-    if roots.any?
+    # In order to match items that aren't shown in menu and highlight their associations.
+    # This can be supplied if the logic different in your case.
+    unless defined?(selected_item)
+      selected_item = collection.detect{|page| selected_page?(page)}
+      selected_item = @page if selected_item.nil?
+    end
+    if (roots ||= collection.select { |m| m.parent_id.nil? }).any?
       sibling_count = roots.size - 1
 -%>
       <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
@@ -21,6 +26,7 @@
                        :hide_children => hide_children,
                        :sibling_count => sibling_count,
                        :collection => collection,
+                       :selected_item => selected_item,
                        :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
                      }
           -%>

data/vendor/refinerycms/core/app/views/shared/_menu_branch.html.erb

@@ -1,26 +1,26 @@
 <%
-  css = if ((defined?(apply_css) && apply_css) || !defined?(apply_css)) and
-           (classes = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil)).any?
-    "class='#{classes.join(' ')}'"
+  if !!local_assigns[:apply_css] and (classes = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil, collection, selected_item ||= nil)).any?
+    css = "class='#{classes.join(' ')}'"
   end
   dom_id = ("id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
 
   hide_children = (defined?(hide_children) && hide_children)
   children = hide_children ? [] : collection.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
 -%>
-<li<%= ['', css, dom_id].join(' ').gsub(/\ *$/, '') %>>
-  <%= link_to menu_branch.title, menu_branch.url %>
-
-  <% if children.present? %>
+<li<%= ['', css, dom_id].compact.join(' ').gsub(/\ *$/, '') %>>
+  <%= link_to menu_branch.title, menu_branch.url -%>
+  <% if children.present? -%>
     <ul class='clearfix'>
       <%=
         render :partial => "/shared/menu_branch",
                :collection => children,
                :locals => {
+                 :apply_css => local_assigns[:apply_css],
                  :hide_children => hide_children,
                  :collection => collection,
+                 :selected_item => selected_item,
                  :sibling_count => children.size - 1
                } -%>
     </ul>
-  <% end %>
+  <% end -%>
 </li>