@@ -11,6 +11,7 @@ merb_more_gem_paths = %w[ merb-action-args merb-assets merb-slices + merb-actionorm merb-auth merb-cache merb-exceptions @@ -44,7 +45,8 @@ merb_release = { "merb-param-protection", "merb_datamapper", "merb", - "merb-more" + "merb-more", + "merb-actionorm" ] } Rakefile @@ -29,7 +29,7 @@ module ActionORM module Core module ClassMethods def supports?(obj) - find_key(obj) + !find_key(obj).nil? end def for(obj) merb-actionorm/lib/merb-actionorm/action_orm/core.rb @@ -93,4 +93,33 @@ describe "merb-actionorm" do end end + describe "FakeModel" do + before(:all) do + class FakeModel + def valid? + false + end + def new_record? + true + end + def errors + FakeErrors.new(self) + end + def to_s + 'fake_model' + end + end + ActionORM.use :driver => ActionORM::Drivers::AbstractDriver, :for => FakeModel + @model_instance = FakeModel.new + end + + it "should support the orm" do + ActionORM.supports?(@model_instance).should be_true + end + + it "should know if a record is a new record or not" do + ActionORM.for(@model_instance).new_record?.should be_true + end + end + end \ No newline at end of file merb-actionorm/spec/merb-actionorm_spec.rb @@ -3,6 +3,7 @@ require 'merb-actionorm' action_orm_path = File.join(File.dirname(__FILE__), '..', 'lib', 'merb-actionorm', 'action_orm') require File.join(action_orm_path, 'test_orm_model') require File.join(action_orm_path, 'drivers','test_orm_driver') +require 'rubygems' begin gem 'sequel' merb-actionorm/spec/spec_helper.rb @@ -23,6 +23,7 @@ spec = Gem::Specification.new do |s| s.email = EMAIL s.homepage = HOMEPAGE s.add_dependency("merb-auth-core", ">= #{Merb::VERSION}") + s.add_dependency("merb-actionorm", ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*") merb-auth/merb-auth-more/Rakefile @@ -1,6 +1,8 @@ require "digest/sha1" +require 'merb-actionorm' require File.expand_path(File.dirname(__FILE__) / "..") / "strategies" / "abstract_password" + class Merb::Authentication module Mixins # This mixin provides basic salted user password encryption. @@ -66,7 +68,7 @@ class Merb::Authentication def encrypt_password return if password.blank? - self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{Merb::Authentication::Strategies::Basic::Base.login_param}--") if new_record? + self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{Merb::Authentication::Strategies::Basic::Base.login_param}--") if ActionORM.for(self).new_record? self.crypted_password = encrypt(password) end merb-auth/merb-auth-more/lib/merb-auth-more/mixins/salted_user.rb @@ -32,6 +32,7 @@ spec = Gem::Specification.new do |s| s.email = GEM_EMAIL s.homepage = PROJECT_URL s.add_dependency('merb-core', ">= #{Merb::VERSION}") + s.add_dependency('merb-actionorm', ">= #{Merb::VERSION}") s.require_path = 'lib' s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*") end merb-helpers/Rakefile @@ -1,6 +1,7 @@ module Merb module Helpers + require 'merb-actionorm' @@helpers_dir = File.dirname(__FILE__) / 'merb-helpers' @@helpers_files = Dir["#{@@helpers_dir}/*_helpers.rb"].collect {|h| h.match(/\/(\w+)\.rb/)[1]} merb-helpers/lib/merb-helpers.rb @@ -131,7 +131,7 @@ module Merb::Helpers::Form::Builder attrs[:method] = :post unless attrs[:method] == :get # Use a fake PUT if the object is not new, otherwise use the method # passed in. Defaults to :post if no method is set. - method ||= (@obj.respond_to?(:new_record?) && !@obj.new_record?) || (@obj.respond_to?(:new?) && !@obj.new?) ? :put : :post + method ||= (ActionORM.supports?(@obj) && !ActionORM.for(@obj).new_record?) || (@obj.respond_to?(:new?) && !@obj.new?) ? :put : :post attrs[:enctype] = "multipart/form-data" if attrs.delete(:multipart) || @multipart merb-helpers/lib/merb-helpers/form/builder.rb @@ -55,3 +55,5 @@ class FakeModel 'fake_model' end end + +ActionORM.use :driver => ActionORM::Drivers::AbstractDriver, :for => FakeModel \ No newline at end of file merb-helpers/spec/fixture/app/models/first_generic_fake_model.rb @@ -4,13 +4,13 @@ require "merb-core" require File.join(File.dirname(__FILE__),"..",'lib',"merb-helpers") require "date" require "webrat" +require 'merb-actionorm' # Please read merb_helpers_form_spec.rb # for more info on how to test helpers # full stack specs are required # use the app in spec/fixture to test helpers - default_options = { :environment => 'test', :adapter => 'runner', merb-helpers/spec/spec_helper.rb @@ -17,7 +17,7 @@ GEM_VERSION = Merb::VERSION + PKG_BUILD RELEASE_NAME = "REL #{GEM_VERSION}" -GEM_DEPENDENCIES = [["dm-core", ">=0.9.5"], ["dm-migrations", ">=0.9.5"], ["merb-core", "~> #{GEM_VERSION}"]] +GEM_DEPENDENCIES = [["dm-core", ">=0.9.5"], ["dm-migrations", ">=0.9.5"], ["merb-core", "~> #{GEM_VERSION}"], ["merb-actionorm", "~> #{GEM_VERSION}"]] require "extlib/tasks/release" merb_datamapper/Rakefile @@ -1,5 +1,6 @@ if defined?(Merb::Plugins) dependency 'dm-core' + require 'merb-actionorm' require File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection" require File.dirname(__FILE__) / "merb" / "session" / "data_mapper_session" @@ -93,7 +94,7 @@ if defined?(Merb::Plugins) private def set_timestamps - return unless dirty? || new_record? + return unless dirty? || ActionORM.for(self).new_record? TIMESTAMP_PROPERTIES.each do |name,(_type,proc)| if model.properties.has_property?(name) model.properties[name].set(self, proc.call(self, model.properties[name])) unless attribute_dirty?(name) merb_datamapper/lib/merb_datamapper.rb fe3d2b64a42f84e695fa806700a2bdc77cc188e6 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/784ac7d71780d1a7cfb9152ba4cb0e18a990ab7a 784ac7d71780d1a7cfb9152ba4cb0e18a990ab7a 2009-04-20T15:27:44-07:00 2009-04-20T15:27:44-07:00 fixed a bug in actionorm and started switching gems to use actionorm def9682d9ccd33a681a6e28880819ad0e389a165 Matt Aimonetti mattaimonetti@gmail.com