wheels 0.1.16 → 0.1.17

data/VERSION

@@ -1 +1 @@
-0.1.16
+0.1.17

data/app/controllers/pages_controller.rb

@@ -2,7 +2,7 @@ class PagesController < InheritedResources::Base
   respond_to :js, :html
   ajax_loading
   before_filter :authenticate_user!, :except=>[:show]
-  before_filter :authorize_resource, :except=>[:index, :show]
+  before_filter :authorize_resource!, :except=>[:index, :show]
 
   has_scope :tagged_with, :as => :tag
 
@@ -20,7 +20,7 @@ class PagesController < InheritedResources::Base
       @page = @sitemap.try(:resource)
     end
     if @page
-      @child_pages = @sitemap.children.is_a?(Array) ? [] : @sitemap.children.accessible_by(current_ability)
+      @child_pages = Sitemap.accessible_by(current_ability).where(:parent_id=>@sitemap.id)
 
       if can_access_resources?
         respond_with @page, @sitemap, @child_pages, @attachments

data/app/helpers/application_helper.rb

@@ -9,58 +9,6 @@ module ApplicationHelper
     content_tag(:li, content_tag(:a, content_tag(:span, name, :class=>name.underscore), :href=>url), :class=>_class)
   end
 
-#  def your_basic_form(object, *options)
-#    if object.methods.include? :form_fields then options = object.form_fields.merge(options)
-#    options[:submit] ||= ""
-#    concat(capture do
-#      content_tag('div',
-#        form_for(object, remote=>options[:remote]|| false) {|f|
-#          if object.errors.any?
-#            content_tag('div',
-#              content_tag('h2', "#{pluralize(resource.errors.count, "error")} prohibited this change:") +
-#              content_tag('ul',
-#                resource.errors.full_messages.map{|msg| content_tag('li', msg)}.join('\n')
-#              )
-#            , :id=>'errorExplanation' )
-#          end
-#          options.except(:remote).each do |key, value|
-#            form_field(key, value, f)
-#          end
-#        },
-#      :class=>'form')
-#    end)
-#  end
-
-#  def form_field(key, value, form_helper)
-#    capture do
-#      if value.is_a?(Hash) || (value.is_a? Symbol && value.to_s.ends_with('_attributes')) #  This means it's a field group.
-#        content_tag('div',
-#          content_tag('div', key.to_s, :class=>'fieldGroupTitle') +
-#          value.is_a?(Hash) ?
-#            value.map{|t,u| form_field(t,u)}.join('\n') :
-#            basic_fields_for(key, value, form_helper),
-#        :class=>'fieldGroup')
-#      else
-#        content_tag('div',
-#          content_tag('div',
-#            form_helper.label(key),
-#          :class=>'fieldName') +
-#          content_tag('div',
-#            form_helper.send(value, key),
-#          :class=>'fieldValue'),
-#        :class=>'field')
-#      end
-#    end
-#  end
-
-#  def basic_fields_for(key, value, form_helper)
-#    capture do
-#      form_helper.fields_for value.to_s.gsub(/_attributes/, '').to_sym{|f|
-
-#      }
-#    end
-#  end
-
   def sidebar_content(&block)
     @sidebar = true
     content_for(:sidebar) do

data/app/models/sitemap.rb

@@ -55,10 +55,14 @@ class Sitemap < ActiveRecord::Base
   end
 
   #  Callbacks
-  def reload_root
+  def self.reload_root
     Sitemap.instance_variable_set('@_root', nil)
   end
 
+  def reload_root
+    Sitemap.reload_root
+  end
+
   def on_before_destroy
     resource.destroy if resource && resource.sitemaps.size==1
   end

data/app/views/discussions/show.html.haml

@@ -8,7 +8,7 @@
           Posted By #{message.author.email} on #{message.updated_at}
         .box_content!= message.message
 
-= content_for :links do
+= sidebar_content do
   %ul
     - if can? :create, Discussion, :forum_id=>@forum.id
       %li= link_to "Reply to this discussion", new_forum_discussion_forum_message_path(@forum, @discussion)

data/app/views/forums/show.html.haml

@@ -12,7 +12,7 @@
           - if can? :manage, discussion
             = link_to "Manage", edit_forum_discussion_path(@forum, discussion)
 
-= content_for :links do
+= sidebar_content do
   - if can? :create, Discussion, :forum_id=>@forum.id
     %li= link_to "New topic in this forum", new_forum_discussion_path(@forum)
   - if can? :manage, @forum

data/lib/wheels/wheels_engine.rb

@@ -1,7 +1,6 @@
 # lib/my_engine.rb
 module WheelsEngine
   class Engine < Rails::Engine
-    engine_name :wheels_engine
   end
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+end

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.1.16"
+  s.version = "0.1.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2010-09-23}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -306,6 +306,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Generator builds a web site with blog, user profile, etc.}
+  s.test_files = [
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 16
-  version: 0.1.16
+  - 17
+  version: 0.1.17
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 -07:00
+date: 2010-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -323,6 +323,7 @@ files:
 - lib/wheels/user.rb
 - lib/wheels/wheels_engine.rb
 - wheels.gemspec
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/tylergannon/wheels
 licenses: []
@@ -355,5 +356,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Generator builds a web site with blog, user profile, etc.
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb