@@ -9,7 +9,7 @@ include FileUtils REMARKABLE_GEMS = [ :remarkable, :remarkable_activerecord, - :remarkable_datamapper, + # :remarkable_datamapper, :remarkable_rails ] Rakefile @@ -64,8 +64,7 @@ unless RAILS_I18N require 'i18n' rescue LoadError require 'rubygems' - # TODO Move to i18n gem as soon as it gets updated - gem 'svenfuchs-i18n' + gem 'i18n' require 'i18n' end remarkable/lib/remarkable/i18n.rb @@ -18,7 +18,7 @@ end ########### Specs -RAILS_VERSIONS = ['2.1.2', '2.2.2', '2.3.4'] +RAILS_VERSIONS = ['2.2.2', '2.3.4'] desc "Run the specs under spec with supported Rails versions" task :pre_commit do remarkable_activerecord/Rakefile @@ -108,7 +108,6 @@ module Remarkable def describe(*args, &block) if described_class && args.first.is_a?(Hash) attributes = args.shift - connector = Remarkable.t "remarkable.active_record.describe.connector", :default => " and " description = if self.describe_subject_attributes.blank? @@ -130,7 +129,7 @@ module Remarkable :key => translated_key.downcase, :value => value.inspect) end - description << pieces.join(connector) + description += pieces.join(connector) args.unshift(description) # Creates an example group, set the subject and eval the given block. remarkable_activerecord/lib/remarkable_activerecord/describe.rb @@ -1,7 +1,5 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -RAILS_I18N = true - class Post attr_accessor :published, :public, :deleted remarkable_activerecord/spec/describe_spec.rb @@ -1,7 +1,7 @@ # encoding: utf-8 require 'rubygems' -RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.3' +RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.4' gem 'activesupport', RAILS_VERSION require 'active_support' remarkable_activerecord/spec/spec_helper.rb @@ -1,10 +1,10 @@ # encoding: utf-8 require 'rubygems' -RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.3' DM_VERSION = '0.10.0' -gem 'activesupport', RAILS_VERSION +# TODO Remove ActiveSupport dependence +gem 'activesupport', '2.3.4' require 'active_support' gem 'addressable' @@ -22,11 +22,10 @@ require 'dm-core' gem 'dm-validations', DM_VERSION require 'dm-validations' -gem 'svenfuchs-i18n' +# Require i18n by hand +gem 'i18n' require 'i18n' -require 'pp' # DEBUG ONLY - ENV['SQLITE3_SPEC_URI'] ||= 'sqlite3::memory:' ENV['ADAPTER'] = 'sqlite3' remarkable_datamapper/spec/spec_helper.rb @@ -20,7 +20,7 @@ end ########### Specs -RAILS_VERSIONS = ['2.1.2', '2.2.2', '2.3.4'] +RAILS_VERSIONS = ['2.2.2', '2.3.4'] desc "Run the specs under spec with supported Rails versions" task :pre_commit do remarkable_rails/Rakefile @@ -1,7 +1,7 @@ require 'rubygems' RAILS_ENV = 'test' -RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.3' +RAILS_VERSION = ENV['RAILS_VERSION'] || '2.3.4' # Load Rails gem 'activesupport', RAILS_VERSION remarkable_rails/spec/spec_helper.rb 37489601ccdca53722a1d90e62714346aaa2ba18 José Valim jose.valim@gmail.com http://github.com/carlosbrando/remarkable/commit/f6a4d09877e36ea2c029dea59437086d2ed61689 f6a4d09877e36ea2c029dea59437086d2ed61689 2009-09-08T02:08:27-07:00 2009-09-08T02:08:27-07:00 Remove 2.1.2 dependency and kick remarkable active record specs back to life on Rails 2.3.4. 2f6c25ecda8c7b2a84523201387864356c9c75cf José Valim jose.valim@gmail.com