Ruby MRI 1.9.3 Compatability Fixes

Author: did

Gemfile

@@ -33,7 +33,7 @@ gem 'mimetype-fu'
 gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
 gem 'heroku', '1.19.1'
 gem 'httparty', '>= 0.6.1'
-gem 'RedCloth', '4.2.7'
+gem 'RedCloth', '4.2.8'
 gem 'delayed_job', '2.1.4'
 gem 'delayed_job_mongoid', '1.0.2'
 gem 'rubyzip'
@@ -68,15 +68,15 @@ group :test do
   gem 'ZenTest'
   gem 'growl-glue'
   gem 'rspec-rails', '2.6.1'
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '~> 1.1'
   gem 'pickle'
   gem 'xpath', '~> 0.1.4'
   gem 'capybara'
   gem 'database_cleaner'
 
   gem 'spork', '~> 0.9.0.rc'
   gem 'launchy'
-  gem 'mocha', :git => 'git://github.com/floehopper/mocha.git'
+  gem 'mocha', '0.9.12' # :git => 'git://github.com/floehopper/mocha.git'
 end
 
 group :production do

Gemfile.lock

@@ -1,18 +1,11 @@
-GIT
-  remote: git://github.com/floehopper/mocha.git
-  revision: afa87804ca2124ff5e77f007a84a26ee0667eec8
-  specs:
-    mocha (0.9.12)
-      metaclass (~> 0.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
     POpen4 (0.1.4)
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    RedCloth (4.2.7)
+    RedCloth (4.2.8)
     SystemTimer (1.2.3)
     ZenTest (4.6.1)
     abstract (1.0.0)
@@ -170,10 +163,10 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    metaclass (0.0.1)
     mime-types (1.16)
     mimemagic (0.1.8)
     mimetype-fu (0.1.2)
+    mocha (0.9.12)
     mongo (1.3.1)
       bson (>= 1.3.1)
     mongoid (2.0.2)
@@ -286,7 +279,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  RedCloth (= 4.2.7)
+  RedCloth (= 4.2.8)
   SystemTimer
   ZenTest
   actionmailer-with-request
@@ -306,7 +299,7 @@ DEPENDENCIES
   devise (= 1.3.4)
   devise_bushido_authenticatable (= 1.0.0.alpha10)
   dragonfly (~> 0.9.1)
-  factory_girl_rails
+  factory_girl_rails (~> 1.1)
   fog (= 0.8.2)
   formtastic (~> 1.2.3)
   growl-glue
@@ -321,7 +314,7 @@ DEPENDENCIES
   locomotive_liquid (= 2.2.2)
   locomotive_mongoid_acts_as_tree (= 0.1.5.7)
   mimetype-fu
-  mocha!
+  mocha (= 0.9.12)
   mongoid (~> 2.0.2)
   pickle
   rack-cache

config/cucumber.yml

@@ -1,7 +1,7 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --require features --strict --tags ~@wip"
 %>
 default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features

features/step_definitions/admin_steps.rb

@@ -5,7 +5,7 @@
 end
 
 Given /^I am an authenticated "([^"]*)"$/ do |role|
-  @member = Site.first.memberships.where(:role => role.downcase).first || Factory(role.downcase.to_sym, :site => Site.first)
+  @member = Site.first.memberships.where(:role => role.downcase).first || FactoryGirl.create(role.downcase.to_sym, :site => Site.first)
 
   Given %{I go to login}
   And %{I fill in "Email" with "#{@member.account.email}"}

features/step_definitions/content_types_steps.rb

@@ -1,6 +1,6 @@
 Given %r{^I have a custom model named "([^"]*)" with$} do |name, fields|
   site = Site.first
-  content_type = Factory.build(:content_type, :site => site, :name => name)
+  content_type = FactoryGirl.build(:content_type, :site => site, :name => name)
   fields.hashes.each do |field|
     if (target_name = field.delete('target')).present?
       target_content_type = site.content_types.where(:name => target_name).first

features/step_definitions/page_steps.rb

@@ -2,7 +2,7 @@
 
 # helps create a simple content page (parent: "index") with a slug, contents, and template
 def create_content_page(page_slug, page_contents, template = nil)
-  @home = @site.pages.where(:slug => "index").first || Factory(:page)
+  @home = @site.pages.where(:slug => "index").first || FactoryGirl.create(:page)
   page = @site.pages.create(:slug => page_slug, :body => page_contents, :parent => @home, :title => "some title", :published => true, :raw_template => template)
   page.should be_valid
   page

features/step_definitions/site_steps.rb

@@ -5,16 +5,16 @@
 # - I have the site: "some site" set up with name: "Something", domain: "test2"
 #
 Given /^I have the site: "([^"]*)" set up(?: with #{capture_fields})?$/ do |site_factory, fields|
-  @site = Factory(site_factory, parse_fields(fields))
+  @site = FactoryGirl.create(site_factory, parse_fields(fields))
   @site.should_not be_nil
 
   @admin = @site.memberships.first.account
   @admin.should_not be_nil
 end
 
 Given /^I have a designer and an author$/ do
-  Factory(:designer, :site => Site.first)
-  Factory(:author, :site => Site.first)
+  FactoryGirl.create(:designer, :site => Site.first)
+  FactoryGirl.create(:author, :site => Site.first)
 end
 
 Then /^I should be a administrator of the "([^"]*)" site$/ do |name|

features/step_definitions/theme_asset_steps.rb

@@ -2,7 +2,7 @@
 
 # helps create a theme asset
 def create_plain_text_asset(name, type)
-  asset = Factory.build(:theme_asset, {
+  asset = FactoryGirl.build(:theme_asset, {
     :site => @site,
     :plain_text_name => name,
     :plain_text => 'Lorem ipsum',

locomotive_cms.gemspec

@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mimetype-fu'
   s.add_dependency 'actionmailer-with-request'
   s.add_dependency 'httparty', '>= 0.6.1'
-  s.add_dependency 'RedCloth', '4.2.7'
+  s.add_dependency 'RedCloth', '4.2.8'
   s.add_dependency 'delayed_job', '2.1.4'
   s.add_dependency 'delayed_job_mongoid', '1.0.2'
   s.add_dependency 'rubyzip'

spec/cells/admin/global_actions_spec.rb

@@ -4,7 +4,7 @@
 
   render_views
 
-  let(:menu) { render_cell('admin/global_actions', :show, :current_admin => Factory.build('admin user'), :current_site_url => 'http://www.yahoo.fr') }
+  let(:menu) { render_cell('admin/global_actions', :show, :current_admin => FactoryGirl.build('admin user'), :current_site_url => 'http://www.yahoo.fr') }
 
   describe 'show menu' do
 

spec/controllers/admin/api_contents_controller_spec.rb

@@ -3,7 +3,7 @@
 describe Admin::ApiContentsController do
 
   before(:each) do
-    @site = Factory('existing site')
+    @site = FactoryGirl.create('existing site')
     @site.content_types.first.tap do |content_type|
       content_type.content_custom_fields.build :label => 'Name', :kind => 'string', :required => true
       content_type.content_custom_fields.build :label => 'Description', :kind => 'text'