refinerycms-core 0.9.9.17 → 0.9.9.18

data/app/views/shared/_menu.html.erb

@@ -15,9 +15,11 @@
   -%>
       <nav id='<%= dom_id %>' class='<%= css %>'>
         <ul>
+          <% roots.each_with_index do |menu_branch, index| %>
           <%= render :partial => '/shared/menu_branch',
-                     :collection => roots,
                      :locals => {
+                       :menu_branch => menu_branch,
+                       :menu_branch_counter => index,
                        :hide_children => hide_children,
                        :sibling_count => (roots.length - 1),
                        :collection => collection,
@@ -25,6 +27,7 @@
                        :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
                      }
           -%>
+          <% end %>
         </ul>
       </nav>
   <% end -%>

data/app/views/shared/_menu_branch.html.erb

@@ -13,16 +13,19 @@
   <%= 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
-               } -%>
+      <% children.each_with_index do |child, index| %>
+        <%=
+          render :partial => '/shared/menu_branch',
+                 :locals => {
+                   :menu_branch => child,
+                   :menu_branch_counter => index,
+                   :apply_css => local_assigns[:apply_css],
+                   :hide_children => !!hide_children,
+                   :collection => collection,
+                   :selected_item => selected_item,
+                   :sibling_count => children.size - 1
+                 } -%>
+      <% end %>
     </ul>
   <% end -%>
 </li>

data/lib/gemspec.rb

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
   s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
-  s.add_dependency 'rails',                       '~> 3.0.7.rc1'
+  s.add_dependency 'rails',                       '~> 3.0.7.rc2'
   s.add_dependency 'rdoc',                        '>= 2.5.11' # helps fix ubuntu
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'

data/lib/generators/refinerycms_generator.rb

@@ -105,6 +105,12 @@ class RefinerycmsGenerator < ::Refinery::Generators::EngineInstaller
     }.sort.each do |path|
       copy_file path, path.to_s.gsub(self.class.source_root.to_s, Rails.root.to_s)
     end
+
+    # Ensure i18n exists and is up to date.
+    if defined?(::Refinery::I18n)
+      require 'generators/refinerycms_i18n_generator'
+      ::RefinerycmsI18n.new.generate
+    end
   end
 
 end

data/lib/generators/templates/.gitignore

@@ -3,12 +3,12 @@
 db/*.sqlite3
 db/*.sqlite3-journal
 *.log
+tmp
 tmp/**/*
 
 # Documentation
 doc/api
 doc/app
-doc/*
 .yardoc
 .yardopts
 
@@ -29,7 +29,7 @@ index/**/*
 # Refinery Specific
 *.tmproj
 *.autobackupbyrefinery.*
-/refinerycms-*.gem
+refinerycms-*.gem
 .autotest
 
 # Mac
@@ -57,6 +57,9 @@ nbproject
 # RubyMine
 .idea
 
+# E-texteditor
+.eprj
+
 # Backup
 *~
 

data/lib/generators/templates/app/views/sitemap/index.xml.builder

@@ -2,21 +2,24 @@ xml.instruct!
 
 xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
 
-  @pages.each do |page|
-   # exclude sites that are external to our own domain.
-   page_url = if page.url.is_a?(Hash)
-     # This is how most pages work without being overriden by link_url
-     page.url.merge({:only_path => false})
-   elsif page.url.to_s !~ /^http/
-     # handle relative link_url addresses.
-     "#{request.protocol}#{request.host_with_port}#{page.url}"
-   end
+  @locales.each do |locale|
+    ::I18n.locale = locale
+    Page.live.in_menu.includes(:parts).each do |page|
+     # exclude sites that are external to our own domain.
+     page_url = if page.url.is_a?(Hash)
+       # This is how most pages work without being overriden by link_url
+       page.url.merge({:only_path => false})
+     elsif page.url.to_s !~ /^http/
+       # handle relative link_url addresses.
+       [request.protocol, request.host_with_port, page.url].join
+     end
 
-   # Add XML entry only if there is a valid page_url found above.
-   xml.url do
-     xml.loc url_for(page_url)
-     xml.lastmod page.updated_at.to_date
-   end if page_url.present?
+     # Add XML entry only if there is a valid page_url found above.
+     xml.url do
+       xml.loc url_for(page_url)
+       xml.lastmod page.updated_at.to_date
+     end if page_url.present? and page.show_in_menu?
+    end
   end
 
 end

data/lib/generators/templates/config/initializers/devise.rb

@@ -1,3 +1,5 @@
+require 'devise'
+
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 ::Devise.setup do |config|

data/lib/refinery/crud.rb

@@ -2,20 +2,25 @@
 # Simply override any methods in your action controller you want to be customised
 # Don't forget to add:
 #   resources :plural_model_name_here
+# or for scoped:
+#   scope(:as => 'module_module', :module => 'module_name') do
+#      resources :plural_model_name_here
+#    end
 # to your routes.rb file.
 # Full documentation about CRUD and resources go here:
-# -> http://caboo.se/doc/classes/ActionController/Resources.html#M003716
+# -> http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Resources.html#method-i-resources
 # Example (add to your controller):
-# crudify :foo, {:title_attribute => 'name'}
+# crudify :foo, {:title_attribute => 'name'} for CRUD on Foo model
+# crudify 'foo/bar', :{title_attribute => 'name'} for CRUD on Foo::Bar model
 
 module Refinery
   module Crud
 
     def self.default_options(model_name)
-      singular_name = model_name.to_s
-      class_name = singular_name.camelize
-      plural_name = singular_name.pluralize
+      class_name = model_name.to_s.include?("/") ? "::#{model_name.to_s.camelize}" : model_name.to_s.camelize
       this_class = class_name.constantize.base_class
+      singular_name = model_name.to_s.underscore.gsub("/","_")
+      plural_name = singular_name.pluralize
 
       {
         :conditions => '',
@@ -23,12 +28,15 @@ module Refinery
         :order => ('position ASC' if this_class.table_exists? and this_class.column_names.include?('position')),
         :paging => true,
         :per_page => false,
-        :redirect_to_url => "admin_#{plural_name}_url",
+        :redirect_to_url => "admin_#{model_name.to_s.gsub('/', '_').pluralize}_url",
         :searchable => true,
         :search_conditions => '',
         :sortable => true,
         :title_attribute => "title",
-        :xhr_paging => false
+        :xhr_paging => false,
+        :class_name => class_name,
+        :singular_name => singular_name,
+        :plural_name => plural_name
       }
     end
 
@@ -41,10 +49,9 @@ module Refinery
 
       def crudify(model_name, options = {})
         options = ::Refinery::Crud.default_options(model_name).merge(options)
-
-        class_name = model_name.to_s.camelize
-        singular_name = class_name.demodulize.underscore
-        plural_name = singular_name.pluralize
+        class_name = options[:class_name]
+        singular_name = options[:singular_name]
+        plural_name = options[:plural_name]
 
         module_eval %(
           prepend_before_filter :find_#{singular_name},

data/lib/tasks/refinery.rake

@@ -132,9 +132,6 @@ namespace :refinery do
   desc "Un-crudify a method on a controller that uses crudify"
   task :uncrudify => :environment do
     if (model_name = ENV["model"]).present? and (action = ENV["action"]).present?
-      class_name = model_name.to_s.camelize
-      singular_name = class_name.demodulize.underscore
-      plural_name = singular_name.pluralize
 
       crud_lines = Refinery.roots('core').join('lib', 'refinery', 'crud.rb').read
       if (matches = crud_lines.scan(/(\ +)(def #{action}.+?protected)/m).first).present? and
@@ -146,9 +143,9 @@ namespace :refinery do
         crud_method.gsub!('#{options[:redirect_to_url]}', default_crud_options[:redirect_to_url])
         crud_method.gsub!('#{options[:conditions].inspect}', default_crud_options[:conditions].inspect)
         crud_method.gsub!('#{options[:title_attribute]}', default_crud_options[:title_attribute])
-        crud_method.gsub!('#{singular_name}', singular_name)
-        crud_method.gsub!('#{class_name}', class_name)
-        crud_method.gsub!('#{plural_name}', plural_name)
+        crud_method.gsub!('#{singular_name}', default_crud_options[:singular_name])
+        crud_method.gsub!('#{class_name}', default_crud_options[:class_name])
+        crud_method.gsub!('#{plural_name}', default_crud_options[:plural_name])
         crud_method.gsub!('\\#{', '#{')
 
         puts crud_method

data/public/stylesheets/refinery/refinery.css

@@ -1071,7 +1071,7 @@ ul#page_parts_controls img {
 }
 #page_part_editors {
   clear:left;
-  min-height: 446px;
+/*  min-height: 446px;*/
 }
 a#toggle_advanced_options {
 	background: url('/images/refinery/icons/page_white_gear.png') no-repeat 0px 3px;

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.17}
+  s.version           = %q{0.9.9.18}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-04-15}
+  s.date              = %q{2011-04-16}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 0.9.9.17'
-  s.add_dependency 'refinerycms-settings',        '= 0.9.9.17'
+  s.add_dependency 'refinerycms-base',            '= 0.9.9.18'
+  s.add_dependency 'refinerycms-settings',        '= 0.9.9.18'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
   s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
-  s.add_dependency 'rails',                       '~> 3.0.7.rc1'
+  s.add_dependency 'rails',                       '~> 3.0.7.rc2'
   s.add_dependency 'rdoc',                        '>= 2.5.11' # helps fix ubuntu
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.17
+  version: 0.9.9.18
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 Z
+date: 2011-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-base
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.17
+        version: 0.9.9.18
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.17
+        version: 0.9.9.18
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.7.rc1
+        version: 3.0.7.rc2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency