vendor/plugins/model_stubbing/init.rb @@ -11,7 +11,7 @@ <p><%= 'This user can moderate the following forums. Click one to remove.'[:remove_moderated_forum] %></p> <ul class="flat"> - <% @user.forums.find(:all, :select => "#{Forum.table_name}.*, #{Moderatorship.table_name}.id as moderatorship_id").each do |forum| -%> + <% @user.forums.moderatable.each do |forum| -%> <li> <%= link_to forum.name, moderatorship_path(forum.moderatorship_id), :method => :delete, :confirm => "#{'Remove user as moderator for'[:remove_user_as_moderator]} #{forum.name}?" %> </li> app/views/users/show.html.erb @@ -50,7 +50,7 @@ module ModelStubbing # if options are given first, assume that base_name is default when Hash options = base_name - base_name = nil + base_name = self when nil else unless options[:copy] || block.nil? vendor/plugins/model_stubbing/lib/model_stubbing.rb @@ -115,7 +115,7 @@ module ModelStubbing ModelStubbing.records.clear ModelStubbing.stub_current_time_with(current_time) if current_time return unless database? - ActiveRecord::Base.send :increment_open_transactions + ActiveRecord::Base.connection.increment_open_transactions ActiveRecord::Base.connection.begin_db_transaction end vendor/plugins/model_stubbing/lib/model_stubbing/definition.rb @@ -2,7 +2,7 @@ module ModelStubbing # Models hold one or more stubs. class Model attr_accessor :name, :plural, :singular - attr_reader :definition, :stubs, :model_class, :options + attr_reader :definition, :stubs, :model_class, :options, :ordered_stubs # Creates a stub for this model. A stub with no name is assumed to be the default # stub. A global key for the definition is also created based on the singular @@ -17,13 +17,14 @@ module ModelStubbing end def initialize(definition, klass, options = {}, &block) - @definition = definition - @model_class = klass - @name = options.delete(:name) || default_name.to_sym - @plural = options.delete(:plural) || name - @singular = options.delete(:singular) || name.to_s.singularize - @options = options - @stubs = {} + @definition = definition + @model_class = klass + @name = options.delete(:name) || default_name.to_sym + @plural = options.delete(:plural) || name + @singular = options.delete(:singular) || name.to_s.singularize + @options = options + @stubs = {} + @ordered_stubs = [] unless @model_class.respond_to?(:mock_id) class << @model_class define_method :mock_id do @@ -92,7 +93,11 @@ module ModelStubbing def insert purge - @stubs.values.each &:insert + @ordered_stubs.each do |name| + if stub = @stubs[name] + stub.insert + end + end end def purge @@ -104,5 +109,19 @@ module ModelStubbing def connection @connection ||= model_class.respond_to?(:connection) && model_class.connection end + + protected + def method_missing(model_name, stub_name, *args) + named_model = @definition.models[model_name] + if named_model.nil? + raise "No #{model_name.inspect} model found when calling #{model_name}(#{stub_name})" + end + stub = named_model.stubs[stub_name] + if stub.nil? + raise "No #{stub_name.inspect} stub found in the #{model_name.inspect} model when calling #{model_name}(#{stub_name})" + else + stub + end + end end end \ No newline at end of file vendor/plugins/model_stubbing/lib/model_stubbing/model.rb @@ -19,6 +19,8 @@ module ModelStubbing end @global_key = (name == :default ? @model.singular : "#{name}_#{@model.singular}").to_sym + @model.ordered_stubs << name + @model.ordered_stubs.uniq! @model.all_stubs[@global_key] = @model.stubs[name] = self end @@ -39,7 +41,11 @@ module ModelStubbing # pass :id => :new to specify you want a new record, not one in the database def record(attributes = {}) this_record_key = record_key(attributes) - ModelStubbing.records[this_record_key] ||= instantiate(this_record_key, attributes) + if attributes[:id] != :new && ModelStubbing.records.key?(this_record_key) + ModelStubbing.records[this_record_key] + else + ModelStubbing.records[this_record_key] = instantiate(this_record_key, attributes) + end end def inspect @@ -157,7 +163,6 @@ module ModelStubbing def record_key(attributes) return @record_key if @record_key && attributes.empty? key = [model.model_class.name, @global_key, @attributes.merge(attributes).inspect] * ":" - key << model.model_class.base_class.mock_id.to_s if attributes[:id] == :new @record_key = key if attributes.empty? key end vendor/plugins/model_stubbing/lib/model_stubbing/stub.rb @@ -1,10 +1,9 @@ namespace :stubs do - desc "Load a ModelStubbing definition into the database. Specify Stub file with STUBS= and Definition with DEF=" task :load do root = File.dirname(__FILE__) + '/../../../../' require File.expand_path(root + "config/environment") - + begin require 'spec' rescue @@ -12,15 +11,10 @@ namespace :stubs do require 'spec' end require 'model_stubbing' - - # note to Rick: I've taken to using 'stubs.rb' instead of 'model_stubs.rb' - # because 'model_stubs' has a tab-completion collision with 'spec/models' and - # that drives me batty. Change the default to 'spec/model_stubs' if you want, - # you won't hurt my feelings. + require root + (ENV['STUBS'] || 'spec/stubs') defn = (ENV['DEF'] || 'default').intern ModelStubbing.definitions[defn].insert! end - end \ No newline at end of file vendor/plugins/model_stubbing/tasks/stubs.rake 94f575daace57ebeca4db0af9abec01bdcade50f 80228688c179a6d05405c653631a4fab5616c006 Court3nay courtenay@caboo.se http://github.com/courtenay/altered_beast/commit/bd2322c7877d3f51daf9ea7320a25a0219896305 bd2322c7877d3f51daf9ea7320a25a0219896305 2008-10-14T15:51:56-07:00 2008-10-14T15:51:56-07:00 Merge branch 'master' of git@git.caboo.se:altered_beast 96e6e8256347c9822ce80cff18b5a0c6bbbed4e7 Court3nay courtenay@caboo.se