RubyGems - typo - Versions diffs - 5.1.3 → 5.1.98 - Mend

typo 5.1.3 → 5.1.98

Files changed (938) hide show

data/app/views/layouts/administration.html.erb CHANGED Viewed

@@ -1,52 +1,56 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-	<title>Typo Administration:  <%= controller.controller_name %></title>
-	<meta http-equiv="imagetoolbar" content="no" />
-	<%= javascript_include_tag :fckeditor %>
-	<%= stylesheet_link_tag "administration", "lightbox" %>
-	<%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo", "lightbox" %>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+  <title>Typo Administration:  <%= controller.controller_name %></title>
+  <meta http-equiv="imagetoolbar" content="no" />
+  <%= javascript_include_tag :fckeditor if current_user.editor == 2 %>
+  <%= javascript_include_tag 'quicktags' if current_user.editor == 0 %>
+  <%= stylesheet_link_tag "administration", "lightbox" %>
+  <%= stylesheet_link_tag "administration_rtl" if ( _("Localization.rtl") == "1") %>
+  <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls", "typo", "lightbox", "administration" %>
 </head>
 <body>
-	<div id="container">
-		<div id="topnav">
-			<ul id="tabs">
-				<% for pm in current_user.project_modules %>
-					<%= content_tag :li, (link_to _(pm.human_name), pm.menus.first.url, :class => send("class_#{pm.name}")) %>
-				<% end %>
-				<li><%= current_user_notice %></li>
-				<%= tab _('your blog'), :controller => "/articles" %>
-			</ul>
-		</div>
-		<% if not first_render =~ /login|signup|logout/ %>
-		<div class="tasks">
-			<ul>
-				<%= @content_for_tasks %>
-			</ul>
-			<div style="clear:both;"></div>
-		</div>
-		<% end %>
+  <div id="container">
+    <div id="topnav">
+      <ul id="tabs">
+        <li class="right"><%= link_to _('your blog'), this_blog.base_url %></li>
+        <li class="right"><%= link_to _("log out"), :controller => "/accounts", :action=>"logout" %></li>
+        <% for pm in current_user.project_modules %>
+          <%= content_tag :li, (link_to _(pm.human_name), pm.menus.first.url), :class => send("class_#{pm.name}") %>
+        <% end %>
+        <li class="right"><%= link_to _('Dashboard'), :controller => '/admin' %></li>
+      </ul>
+    </div>
+    <% if not @_render_stack.first =~ /login|signup|logout/ %>
+    <div id="subtabs">
+      <ul>
+        <%= yield :tasks %>
+      </ul>
+      <div style="clear:both;"></div>
+    </div>
+    <% end %>
-		<div id="overall">
-			<% if flash[:notice] or flash[:error] %>
-			<div id="flash">
-				<%= render_flash rescue nil %>
-			</div>
-			<% end %>
+    <div id="overall">
+      <% if flash[:notice] or flash[:error] %>
+      <div id="flash">
+        <%= render_flash rescue nil %>
+      </div>
+      <% end %>
-			<div id="main">
-				<h2><%= @page_heading %></h2>
+      <div id="main">
+        <%= show_page_heading %>
-				<%= @content_for_layout %>
-			</div>
-			<div id="footer">
-				Typo <%=h TYPO_VERSION %> <%= _("with %s AER OS XK iconset %s", '<a href="http://gnome-look.org/content/show.php/AER-OS-XK?content=49990">', '</a>') %>
-			</div>
-		</div>
-	</div>
+        <%= yield  %>
+      </div>
+    </div>
+    <div id="footer">
+      Typo <%=h TYPO_VERSION %>
+    </div>
+  </div>
 </body>
 </html>

data/app/views/shared/_loginform.html.erb CHANGED Viewed

@@ -1,14 +1,20 @@
 <% form_tag :action=> "login" do %>
 <ul>
   <li>
-    <label for="user_login"><%= _('Username')%>:</label>
+    <label for="user_login"><%= _('Login')%></label>
     <input type="text" name="user_login" id="user_login" value=""/>
   </li>
   <li>
-    <label for="user_password"><%= _('Password') %>:</label>
+    <label for="user_password"><%= _('Password') %></label>
     <input type="password" name="user_password" id="user_password" />
+  </li>
+  <li>
+    <label for="remember_me"><%= _('Remember me')%>
+      <%= check_box_tag 'remember_me' %>
+    </label>
   </li>
 	<li class="r"><input type="submit" name="login" value= "<%= _('Login') %> &#187;" class="primary" id="submit" /></li>
 </ul>
-<p><%= link_to "&laquo; " + _('Back to ') + this_blog.blog_name, this_blog.base_url %></p>
+<p><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></p>
 <% end %>

data/app/views/shared/_search.html.erb CHANGED Viewed

@@ -1,10 +1,5 @@
 <% form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
- <label for="q">Live Search:</label><input type="text" id="q" name="q" value="" size="15" />
-<%= image_tag "spinner-blue.gif", :id => 'search_spinner', :style => 'display:none;' %>
+  <label for="q"><%= _("Search") %></label><br />
+  <input type="text" id="q" name="q" value="" size="15" />
+  <input type='submit' value='<%= _("Search") %>' />
 <% end %>
-<%= observe_field "q", :frequency => 1,
-    :url => { :controller => "live", :action => "search" },
-    :loading => "Element.show('search_spinner')",
-    :complete => "Element.hide('search_spinner')",
-    :update => "search-results",
-    :with => "'q=' + encodeURIComponent($F('q'))" -%>

data/config/boot.rb CHANGED Viewed

@@ -1,45 +1,109 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-  unless RUBY_PLATFORM =~ /mswin32/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
-  end
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
-  RAILS_ROOT = root_path
-end
+    def booted?
+      defined? Rails::Initializer
+    end
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails/railties")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    require 'rubygems'
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems
-      rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+    end
+  end
-      if rails_gem
-        require_gem "rails", "=#{rails_gem.version.version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
       else
-        STDERR.puts %(Cannot find gem for Rails ~>#{version}.0:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-  )
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      end
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+      def load_rubygems
+        require 'rubygems'
+        min_version = '1.1.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
         exit 1
       end
-    else
-      gem "rails"
-      require 'initializer'
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
     end
   end
+end
-  Rails::Initializer.run(:set_load_path)
-end
+# All that for this:
+Rails.boot!

data/config/environment.rb CHANGED Viewed

@@ -21,14 +21,14 @@ Rails::Initializer.run do |config|
   # Otherwise, I can't localize plugins <= localization
   # Forcing manually the load of the textfilters plugins fixes the bugs with apache in production.
   config.plugins = [ 'localization', :all ]
   config.load_paths += %W(
     vendor/rubypants
     vendor/akismet
     vendor/redcloth/lib
     vendor/bluecloth/lib
     vendor/flickr
-    vendor/syntax/lib
+    vendor/gems/coderay
     vendor/sparklines/lib
     vendor/uuidtools/lib
     vendor/mocha/lib
@@ -44,6 +44,10 @@ Rails::Initializer.run do |config|
     app/apis
   ).map {|dir| "#{RAILS_ROOT}/#{dir}"}.select { |dir| File.directory?(dir) }
+  # Declare the gems in vendor/gems, so that we can easily freeze and/or
+  # install them.
+  config.gem 'coderay'
   # Force all environments to use the same logger level
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
@@ -54,14 +58,12 @@ Rails::Initializer.run do |config|
   # Enable page/fragment caching by setting a file-based store
   # (remember to create the caching directory and make it readable to the application)
-  config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
+  config.action_controller.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
   # Activate observers that should always be running
   # config.active_record.observers = :cacher, :garbage_collector
   config.active_record.observers = :email_notifier, :web_notifier
-  config.active_record.allow_concurrency = false
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
@@ -81,7 +83,6 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
-Inflector.inflections {|i| i.uncountable %w(feedback)}
 # Include your application configuration below
@@ -148,7 +149,13 @@ if RAILS_ENV != 'test'
   begin
     ActiveRecord::Base.connection.select_all("select * from sessions")
   rescue
-    Migrator.migrate
+    begin
+      ActiveRecord::Base.connection.current_database
+      Migrator.migrate
+    rescue
+      # if there are no database, migrator doesn't no start
+      # use case : rake db:create in rails tasks
+    end
   end
 end

data/config/environments/development.rb CHANGED Viewed

@@ -17,3 +17,5 @@ def log_to(stream)
   ActiveRecord::Base.logger = Logger.new(stream)
   ActiveRecord::Base.clear_active_connections!
 end
+config.log_level = :debug

data/config/initializers/access_rules.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# Localization.lang = ''
 # LisiaSoft::AccessControl, permit to manage, backend, and frontend access.
 # Based on the LoginSystem of Lipisadmin
 # You can define on the fly, roles access, for example:
@@ -43,68 +44,60 @@
 AccessControl.map :require => [ :admin, :publisher, :contributor ]  do |map|
   map.permission "admin/base"
+  map.permission "admin/cache"
+  map.permission "admin/dashboard"
+  map.permission "admin/textfilters"
-  map.project_module :dashboard, "admin/dashboard" do |project|
-    project.menu    _("Typo"),               { :action => :index }
-    project.submenu _("Typo documentation"), "http://typosphere.org/main_page"
-  end
   map.project_module :write, nil do |project|
-    project.menu    _("Write"),                 { :controller => "admin/content",    :action => "new" }
-    project.submenu _("Write a posts"),         { :controller => "admin/content",    :action => "new" }
-	  project.submenu _("Write a page"),         { :controller => "admin/pages",       :action => "new" }
+    project.menu    "Write",            { :controller => "admin/content",    :action => "new" }
+    project.submenu "Article",          { :controller => "admin/content",    :action => "new" }
+	  project.submenu "Page",             { :controller => "admin/pages",      :action => "new" }
   end
   map.project_module :content, nil do |project|
-    project.menu    _("Manage"),                { :controller => "admin/content",    :action => "index" }
-    project.submenu _("Manage posts"),          { :controller => "admin/content",    :action => "index" }
-	  project.submenu _("Manage pages"),          { :controller => "admin/pages",       :action => "index" }
-	  project.submenu _("Manage categories"),     { :controller => "admin/categories", :action => "index" }
-	  project.submenu _("Manage uploads"),        { :controller => "admin/resources",  :action => "index" }
-	  project.submenu _("Manage tags"),           { :controller => "admin/tags",       :action => "index" }
+    project.menu    "Manage",           { :controller => "admin/content",    :action => "index" }
+    project.submenu "Articles",         { :controller => "admin/content",    :action => "index" }
+	project.submenu "Pages",            { :controller => "admin/pages",      :action => "index" }
+	project.submenu "Categories",       { :controller => "admin/categories", :action => "index" }
+	project.submenu "Uploads",          { :controller => "admin/resources",  :action => "index" }
+	project.submenu "Tags",             { :controller => "admin/tags",       :action => "index" }
   end
   map.project_module :feedback, nil do |project|
-    project.menu    _("Feedback"),              { :controller => "admin/feedback",  :confirmed => "f" }
-    project.submenu _("Unapproved comments"),   { :controller => "admin/feedback",  :confirmed     => "f" }
-    project.submenu _("Limit to spam"),         { :controller => "admin/feedback",  :published  => "f" }
-    project.submenu _("Blacklist"),             { :controller => "admin/blacklist", :action => "index" }
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "show" }
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "new" }
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "edit" }
-    project.submenu _(""),                      { :controller => "admin/comments", :action => "destroy" }
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "show" }
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "new" }
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "edit" }
-    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "destroy" }
+    project.menu    "Comments",              { :controller => "admin/feedback" }
+    project.submenu "All comments",          { :controller => "admin/feedback" }
+    project.submenu "Limit to ham",          { :controller => "admin/feedback",  :ham => 'f' }
+    project.submenu "Unapproved comments",   { :controller => "admin/feedback",  :confirmed  => "f" }
+    project.submenu "Limit to spam",         { :controller => "admin/feedback",  :published  => "f" }
+    project.submenu "",                      { :controller => "admin/comments", :action => "show" }
+    project.submenu "",                      { :controller => "admin/comments", :action => "new" }
+    project.submenu "",                      { :controller => "admin/comments", :action => "edit" }
+    project.submenu "",                      { :controller => "admin/comments", :action => "destroy" }
+    project.submenu "",                      { :controller => "admin/trackbacks", :action => "show" }
+    project.submenu "",                      { :controller => "admin/trackbacks", :action => "new" }
+    project.submenu "",                      { :controller => "admin/trackbacks", :action => "edit" }
+    project.submenu "",                      { :controller => "admin/trackbacks", :action => "destroy" }
   end
-  map.project_module :themes, "admin/themes" do |project|
-    project.menu    _("Themes"),                { :action     => "index"  }
-    project.submenu _("Choose theme"),          { :action     => "index"  }
-    project.submenu _("Theme editor"),          { :action     => "editor" }
+  map.project_module :themes, nil do |project|
+    project.menu    "Design",                { :controller => "admin/themes", :action => "index"  }
+    project.submenu "Theme editor",          { :controller => "admin/themes", :action => "editor" }
+    project.submenu "Sidebar",               { :controller => "admin/sidebar", :action => "index" }
   end
-  map.project_module :sidebar, "admin/sidebar" do |project|
-    project.menu    _("Sidebar"),               { :action     => "index" }
+  map.project_module :settings, nil do |project|
+    project.menu    "Settings",              { :controller => "admin/settings", :action => "index" }
+    project.submenu "General settings",      { :controller => "admin/settings", :action => "index" }
+    project.submenu "Write",                 { :controller => "admin/settings", :action => "write" }
+    project.submenu "Read",                  { :controller => "admin/settings", :action => "read" }
+    project.submenu "Feedback",              { :controller => "admin/settings", :action => "feedback" }
+    project.submenu "SEO",                   { :controller => "admin/settings", :action => "seo" }
+    project.submenu "Blacklist",             { :controller => "admin/blacklist", :action => "index" }
   end
   map.project_module :users, "admin/users" do |project|
-    project.menu    _("Users"),                 { :action => "index" }
-    project.submenu _("Users"),                 { :action => "index" }
+    project.menu    "Users",                 { :action => "index" }
+    project.submenu "Users",                 { :action => "index" }
   end
-  map.project_module :settings, nil do |project|
-    project.menu    _("Settings"),              { :controller => "admin/settings", :action => "index" }
-    project.submenu _("General settings"),      { :controller => "admin/settings", :action => "index" }
-    project.submenu _("Read"),                  { :controller => "admin/settings", :action => "read" }
-    project.submenu _("Write"),                 { :controller => "admin/settings", :action => "write" }
-    project.submenu _("Feedback"),              { :controller => "admin/settings", :action => "feedback" }
-    project.submenu _("Spam"),                  { :controller => "admin/settings", :action => "spam" }
-    project.submenu _("Podcasts"),              { :controller => "admin/settings", :action => "podcast" }
-    project.submenu _("Text Filters"),          { :controller => "admin/textfilters", :action => "index" }
-    project.submenu _("Empty Fragment Cache"),  { :controller => "admin/cache",    :action => "sweep" }
-    project.submenu _("Rebuild cached HTML"),   { :controller => "admin/cache",    :action => "sweep_html" }
-  end
-end
+end

data/config/initializers/inflector.rb ADDED Viewed

	@@ -0,0 +1 @@
1	+ ActiveSupport::Inflector.inflections {\|i\| i.uncountable %w(feedback)}

data/config/routes.rb CHANGED Viewed

@@ -41,24 +41,14 @@ end
 ActionController::Routing::Routes.draw do |map|
   # default
-  map.index '', :controller  => 'articles', :action => 'index'
+  map.root :controller  => 'articles', :action => 'index'
   map.admin 'admin', :controller  => 'admin/dashboard', :action => 'index'
-  # admin/comments controller needs parent article id
-  map.connect 'admin/comments/article/:article_id/:action/:id',
-    :controller => 'admin/comments', :action => nil, :id => nil
-  map.connect 'admin/trackbacks/article/:article_id/:action/:id',
-    :controller => 'admin/trackbacks', :action => nil, :id => nil
-  map.connect 'admin/content/:action/:id', :controller => 'admin/content'
   # make rss feed urls pretty and let them end in .xml
   # this improves caches_page because now apache and webrick will send out the
   # cached feeds with the correct xml mime type.
-  map.xml 'articles.rss',
-  :controller => 'articles', :action => 'index', :format => 'rss'
-  map.xml 'articles.atom',
-  :controller => 'articles', :action => 'index', :format => 'atom'
+  map.xml 'articles.:format', :controller => 'articles', :action => 'index', :format => /rss|atom/
   map.xml 'xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'
   map.xml 'xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'
   map.xml 'xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'
@@ -72,6 +62,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :comments, :name_prefix => 'admin_'
   map.resources :trackbacks
+  map.resources :users
   map.datestamped_resources(:articles,
                             :collection => {
@@ -103,7 +94,9 @@ ActionController::Routing::Routes.draw do |map|
   map.inflected_resource(:tags, :path_prefix => '')
   map.connect '/tag/:id/page/:page',
-  :controller => 'tags', :action => 'show'
+    :controller => 'tags', :action => 'show'
+  map.connect '/tags/page/:page',
+    :controller => 'tags', :action => 'index'
   map.resources(:feedback)
@@ -112,7 +105,7 @@ ActionController::Routing::Routes.draw do |map|
     :controller => 'articles', :action => 'index',
     :page => /\d+/
-  date_options = { :year => /\d{4}/, :month => /(?:0?[1-9]|1[12])/, :day => /(?:0[1-9]|[12]\d|3[01])/ }
+  date_options = { :year => /\d{4}/, :month => /(?:0?[1-9]|1[012])/, :day => /(?:0[1-9]|[12]\d|3[01])/ }
   map.with_options(:conditions => {:method => :get}) do |get|
     get.with_options(date_options.merge(:controller => 'articles')) do |dated|
@@ -161,10 +154,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '*from', :controller => 'redirect', :action => 'redirect'
-  returning(map.connect(':controller/:action/:id')) do |default_route|
-    # Ick!
-    default_route.write_generation
+  map.connect(':controller/:action/:id') do |default_route|
     class << default_route
       def recognize_with_deprecation(path, environment = {})
         RAILS_DEFAULT_LOGGER.info "#{path} hit the default_route buffer"
@@ -174,9 +164,9 @@ ActionController::Routing::Routes.draw do |map|
       def generate_with_deprecation(options, hash, expire_on = {})
         RAILS_DEFAULT_LOGGER.info "generate(#{options.inspect}, #{hash.inspect}, #{expire_on.inspect}) reached the default route"
-#         if RAILS_ENV == 'test'
-#           raise "Don't rely on default route generation"
-#         end
+        #         if RAILS_ENV == 'test'
+        #           raise "Don't rely on default route generation"
+        #         end
         generate_without_deprecation(options, hash, expire_on)
       end
       alias_method_chain :generate, :deprecation

data/db/migrate/001_initial_schema.rb CHANGED Viewed

@@ -129,7 +129,6 @@ class InitialSchema < ActiveRecord::Migration
       drop_table :users
       drop_table :articles
       drop_table :categories
-      drop_table :articles_categories
       drop_table :blacklist_patterns
       drop_table :comments
       drop_table :pings

data/db/migrate/003_add_article_user_id.rb CHANGED Viewed

@@ -12,6 +12,17 @@ class AddArticleUserId < ActiveRecord::Migration
     modify_tables_and_update(:add_column, BareArticle, :user_id, :integer) do |art|
       art.user_id = (BareUser.find_by_name(art.author).id rescue nil)
     end
+    user_first = BareUser.first
+    if user_first.nil?
+      user_id = 1
+    else
+      user_id = user_first.id
+    end
+    BareArticle.find(:all, :conditions => 'user_id IS NULL').each do |art|
+      art.user_id = user_id
+      art.save!
+    end
   end
   def self.down

data/db/migrate/020_superclass_articles.rb CHANGED Viewed

@@ -3,7 +3,7 @@ class Bare20Article < ActiveRecord::Base
   # need to point the primary key somewhere else so we can manually
   # set this field for each article.
-  set_primary_key :boguskey
+  #set_primary_key :boguskey
 end
 class Bare20Content < ActiveRecord::Base
@@ -14,7 +14,7 @@ class Bare20Content < ActiveRecord::Base
 # script wants to set 'id' and 'type', we need to fool activerecord by
 # setting them to bogus values.
   set_inheritance_column :bogustype
-  set_primary_key :boguskey
+  #set_primary_key :boguskey
 end
 class SuperclassArticles < ActiveRecord::Migration
@@ -26,7 +26,8 @@ class SuperclassArticles < ActiveRecord::Migration
     STDERR.puts "Merging Articles into Contents table"
     # Make sure our index is in a known state
-    add_index :articles, :permalink rescue nil
+    # Comment because in migration 001, there are already a creation of this index
+    #add_index :articles, :permalink rescue nil
     Bare20Article.transaction do
       create_table :contents do |t|

data/db/migrate/021_superclass_comments.rb CHANGED Viewed

@@ -12,8 +12,8 @@ class SuperclassComments < ActiveRecord::Migration
     STDERR.puts "Merging Comments into Contents table"
     # Get our indices into a known good state.
     # Mutter dark imprecations at having to do this.
-    add_index(:comments, :article_id) rescue nil
-    remove_index(:contents, :article_id) rescue nil
+    #add_index(:comments, :article_id) rescue nil
+    #remove_index(:contents, :article_id) rescue nil
     modify_tables_and_update([:add_column, BareContent, :article_id, :integer],
                              [:add_column, BareContent, :email,      :string ],
                              [:add_column, BareContent, :url,        :string ],

data/db/migrate/022_superclass_trackbacks.rb CHANGED Viewed

@@ -12,7 +12,8 @@ class SuperclassTrackbacks < ActiveRecord::Migration
     STDERR.puts "Merging Trackbacks into Content table"
     # Ensure that the index we're going to remove in the transaction
     # is actually there (otherwise Postgres breaks)
-    add_index(:trackbacks, :article_id) rescue nil
+    # Comment because already in migration 001
+    #add_index(:trackbacks, :article_id) rescue nil
     modify_tables_and_update([:add_column,   BareContent,   :blog_name, :string],
                              [:remove_index, BareTrackback, :article_id        ]) do
       BareContent.transaction do