Namespace Updates

Rakefile

@@ -1,28 +1,21 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
-#require 'cucumber/rake/task'
-require 'spree_core/testing_support/common_rake'
+# encoding: utf-8
+require 'bundler'
+Bundler::GemHelper.install_tasks
+Bundler.setup
 
+require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
-#Cucumber::Rake::Task.new
 
-# task :default => [:spec, :cucumber ]
-task :default => [:spec]
+require 'spree/core/testing_support/common_rake'
 
-spec = eval(File.read('spree_static_content.gemspec'))
-
-Gem::PackageTask.new(spec) do |p|
-  p.gem_spec = spec
-end
+desc "Default Task"
+task :default => [ :spec ]
 
-desc "Release to gemcutter"
-task :release => :package do
-  require 'rake/gemcutter'
-  Rake::Gemcutter::Tasks.new(spec).define
-  Rake::Task['gem:push'].invoke
+namespace :test_app do
+  desc 'Rebuild test and cucumber databases'
+  task :rebuild_dbs do
+    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test && rake db:drop db:migrate RAILS_ENV=cucumber")
+  end
 end
 
 desc "Generates a dummy app for testing"

VERSION

@@ -1 +1 @@
-0.70.3
+1.0.0.beta

Versionfile

@@ -1,3 +1,4 @@
+"1.0.0.x" => { :version => '1.0.0.beta', :ref => '02f368e6a371554c50b07ac0ef4ff06d735fbbb6' }
 "0.70.x" => { :version => '0.70.3', :ref => '1861f4cd08c0ffa9940f0c81e69ea29b4541dbbd' }
 "0.60.x" => { :tag => "v0.60.2", :version => '0.60.2'}
 "0.50.x" => { :version => '0.40.2', :ref => '45b0050b96809c8fb0f21940f9407e9012a6d420' }

app/controllers/admin/pages_controller.rb → app/controllers/spree/admin/pages_controller.rb

@@ -1,14 +1,14 @@
-class Admin::PagesController < Admin::ResourceController
+class Spree::Admin::PagesController < Spree::Admin::ResourceController
   update.after :expire_cache
-  
+
   def new
     @page = @object
   end
-  
+
   def edit
     @page = @object
   end
-    
+
   private
   def expire_cache
     expire_page :controller => '/static_content', :action => 'show', :path => @object.slug

app/controllers/static_content_controller.rb → app/controllers/spree/static_content_controller.rb

@@ -1,23 +1,23 @@
-class StaticContentController < Spree::BaseController
+class Spree::StaticContentController < Spree::BaseController
   caches_action :show
-  
+
   def show
     path = case params[:path]
     when Array
       '/' + params[:path].join("/")
     when String
-      params[:path]
+      '/' + params[:path]
     when nil
       request.path
     end
 
-    unless @page = Page.visible.find_by_slug(path)
+    unless @page = Spree::Page.visible.find_by_slug(path)
       render_404
     end
   end
-  
+
   private
-  
+
   def accurate_title
     @page ? (@page.meta_title ? @page.meta_title : @page.title) : nil
   end

app/models/page.rb → app/models/spree/page.rb

@@ -1,20 +1,20 @@
-class Page < ActiveRecord::Base
+class Spree::Page < ActiveRecord::Base
   default_scope :order => "position ASC"
 
   validates_presence_of :title
   validates_presence_of [:slug, :body], :if => :not_using_foreign_link?
-  
+
   scope :visible, where(:visible => true)
   scope :header_links, where(:show_in_header => true).visible
   scope :footer_links, where(:show_in_footer => true).visible
   scope :sidebar_links, where(:show_in_sidebar => true).visible
-  
-  
+
+
   before_save :update_positions_and_slug
 
   def initialize(*args)
     super(*args)
-    last_page = Page.last
+    last_page = Spree::Page.last
     self.position = last_page ? last_page.position + 1 : 0
   end
 
@@ -26,11 +26,11 @@ def link
 
   def update_positions_and_slug
     unless new_record?
-      return unless prev_position = Page.find(self.id).position
+      return unless prev_position = Spree::Page.find(self.id).position
       if prev_position > self.position
-        Page.update_all("position = position + 1", ["? <= position AND position < ?", self.position, prev_position])
+        Spree::Page.update_all("position = position + 1", ["? <= position AND position < ?", self.position, prev_position])
       elsif prev_position < self.position
-        Page.update_all("position = position - 1", ["? < position AND position <= ?", prev_position,  self.position])
+        Spree::Page.update_all("position = position - 1", ["? < position AND position <= ?", prev_position,  self.position])
       end
     end
 
@@ -40,15 +40,15 @@ def update_positions_and_slug
     end
     return true
   end
-  
+
   def not_using_foreign_link?
     foreign_link.blank?
   end
 
   def slug_link
     ensure_slash_prefix slug
   end
-  
+
   def ensure_slash_prefix(str)
     str.index('/') == 0 ? str : '/' + str
   end

app/overrides/static_content_admin_tab.rb

@@ -1,4 +1,4 @@
-Deface::Override.new(:virtual_path => "layouts/admin",
+Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :name => "static_content_admin_tab",
                      :insert_bottom => "[data-hook='admin_tabs']",
                      :text => "<%= tab(:pages) %>")

app/views/admin/pages/edit.html.erb → app/views/spree/admin/pages/edit.html.erb

@@ -1,5 +1,5 @@
 <h1><%= t("static_content.editing_page") %></h1>
-<%= render "shared/error_messages", :target => @page %>
+<%= render "spree/shared/error_messages", :target => @page %>
 
 <%= semantic_form_for([:admin, @page]) do |f| -%>
   <%= render :partial => "form", :locals => { :f => f } %>

app/views/admin/pages/index.html.erb → app/views/spree/admin/pages/index.html.erb

@@ -11,9 +11,9 @@
 
 <table class="index">
 	<tr>
-		<th><%= Page.human_attribute_name(:title) %></th>
+		<th><%= Spree::Page.human_attribute_name(:title) %></th>
 		<th><%= t("static_content.link") %></th>
-		<th><%= Page.human_attribute_name(:visible) %></th>
+		<th><%= Spree::Page.human_attribute_name(:visible) %></th>
 		<th><%= t("action") %></th>
   </tr>
 	<tbody>

app/views/admin/pages/new.html.erb → app/views/spree/admin/pages/new.html.erb

@@ -1,5 +1,5 @@
 <h1><%= t("static_content.new_page") %></h1>
-<%= render "shared/error_messages", :target => @page %>
+<%= render "spree/shared/error_messages", :target => @page %>
 
 <%= semantic_form_for([:admin, @page]) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>

app/views/static_content/show.html.erb → app/views/spree/static_content/show.html.erb

@@ -3,9 +3,9 @@
 <% end -%>
 <% content_for :sidebar do %>
   <% if "products" == @current_controller && @taxon %>
-    <%= render :partial => "shared/filters" %>
+    <%= render :partial => "spree/shared/filters" %>
   <% else %>
-    <%= render :partial => "shared/taxonomies" %>
+    <%= render :partial => "spree/shared/taxonomies" %>
   <% end %>
 <% end %>
 <h1><%= @page.title %></h1>

config/routes.rb

@@ -1,9 +1,11 @@
-Rails.application.routes.draw do
+Spree::Core::Engine.routes.append do
 
   namespace :admin do
     resources :pages
   end
 
   match '/static/*path', :to => 'static_content#show', :via => :get, :as => 'static'
 
+  match '/*path', :to => 'static_content#show', :via => :get, :as => 'static'
+
 end

db/migrate/20090625125735_extend_pages.rb

@@ -1,11 +1,18 @@
 class ExtendPages < ActiveRecord::Migration
+  class Page < ActiveRecord::Base
+  end
+
   def self.up
     change_table :pages do |t|
       t.boolean :show_in_header, :default => false, :null => false
       t.boolean :show_in_footer, :default => false, :null => false
       t.string  :foreign_link
       t.integer :position, :default => 1, :null => false
-      Page.all(:order => "updated_at ASC").each_with_index{|page,x| page.update_attribute(:position, x+1)}
+      if Page.table_exists?
+        Page.all(:order => "updated_at ASC").each_with_index{|page,x| page.update_attribute(:position, x+1)}
+      else
+        Spree::Page.all(:order => "updated_at ASC").each_with_index{|page,x| page.update_attribute(:position, x+1)}
+      end
 
     end
   end

db/migrate/20090814113100_add_visible_to_pages.rb

@@ -1,10 +1,17 @@
 class AddVisibleToPages < ActiveRecord::Migration
+  class Page < ActiveRecord::Base
+  end
+
   def self.up
     add_column :pages, :visible, :boolean
-    Page.update_all :visible => true 
+    if Page.table_exists?
+      Page.update_all :visible => true
+    else
+      Spree::Page.update_all :visible => true
+    end
   end
- 
+
   def self.down
     remove_column :pages, :visible
   end
-end
+end

db/migrate/20111201184855_prefix_table_names.rb

@@ -0,0 +1,5 @@
+class PrefixTableNames < ActiveRecord::Migration
+  def change
+    rename_table :pages, :spree_pages
+  end
+end

lib/spree_static_content.rb

@@ -1,21 +1,3 @@
-require 'spree_core'
+require 'spree/core'
 require 'formtastic'
-
-module SpreeStaticContent
-  class Engine < Rails::Engine
-    engine_name 'spree_static_content'
-
-    def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-
-      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
-      end
-    end
-    config.to_prepare &method(:activate).to_proc
-    config.autoload_paths += %W(#{config.root}/lib)
-  end
-end
-
+require 'spree_static_content/engine'

lib/spree_static_content/engine.rb

@@ -0,0 +1,17 @@
+module SpreeStaticContent
+  class Engine < Rails::Engine
+    engine_name 'spree_static_content'
+
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/overrides/**/*.rb")) do |c|
+        Rails.application.config.cache_classes ? require(c) : load(c)
+      end
+    end
+    config.to_prepare &method(:activate).to_proc
+    config.autoload_paths += %W(#{config.root}/lib)
+  end
+end

spec/models/page_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Page do
+describe Spree::Page do
   before(:each) do
-    @page = Page.create(
+    @page = Spree::Page.create(
     :title => 'test page',
     :slug => 'test-page',
     :body => 'this is a test page'
@@ -12,9 +12,9 @@
   it "should be valid" do
     @page.should be_valid
   end
-  
+
   it "should add an / to the slug" do
     @page.slug.should == "/test-page"
   end
-  
+
 end