@@ -14,4 +14,4 @@ profile_results.* TAGS lib/coverage.html *.rbc -_Yardoc \ No newline at end of file +_Yardoc .gitignore @@ -142,4 +142,3 @@ -- 0.3.0 * HasManyAssociation::Set now has a nil? method, so we can do stuff like cage.animal.nil? - CHANGELOG @@ -19,4 +19,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +OTHER DEALINGS IN THE SOFTWARE. MIT-LICENSE @@ -1 +1 @@ -See: http://wiki.datamapper.org/doku.php?id=what_needs_to_be_done \ No newline at end of file +See: http://wiki.datamapper.org/doku.php?id=what_needs_to_be_done TODO @@ -14,7 +14,7 @@ module DataMapper attr_reader :name, :uri attr_accessor :resource_naming_convention, :field_naming_convention - + def type_map self.class.type_map end @@ -32,7 +32,7 @@ module DataMapper # # Pushes the given Transaction onto the per thread Transaction stack so that - # everything done by this Adapter is done within the context of said + # everything done by this Adapter is done within the context of said # Transaction. # # ==== Parameters @@ -56,7 +56,7 @@ module DataMapper # # Retrieve the current transaction for this Adapter. - # + # # Everything done by this Adapter is done within the context of this Transaction. # # ==== Returns @@ -103,27 +103,27 @@ module DataMapper def delete(repository, resource) raise NotImplementedError end - + def create_model_storage(repository, model) raise NotImplementedError end - + def destroy_model_storage(repository, model) raise NotImplementedError end - + def alter_model_storage(repository, *args) raise NotImplementedError end - + def create_property_storage(repository, property) raise NotImplementedError end - + def destroy_property_storage(repository, property) raise NotImplementedError end - + def alter_property_storage(repository, *args) raise NotImplementedError end lib/data_mapper/adapters/abstract_adapter.rb @@ -93,7 +93,7 @@ module DataMapper raise ArgumentError.new("target_method should be a symbol") unless name.is_a?(Symbol) raise ArgumentError.new("method_sym should be a symbol") if method_sym && ! method_sym.is_a?(Symbol) raise ArgumentError.new("You need to pass :class or :instance as scope") unless [:class, :instance].include?(scope) - + hooks_with_scope(scope)[name][type] ||= [] hooks_with_scope(scope)[name][type] << if block lib/data_mapper/hook.rb @@ -16,14 +16,14 @@ require "time" # httpdate # DataMapper.logger.info(message<String>) # DataMapper.logger.debug(message<String>) # -# Flush the buffer to +# Flush the buffer to # DataMapper.logger.flush # # Remove the current log object # DataMapper.logger.close -# +# # ==== Private DataMapper Logger API -# +# # To initialize the logger you create a new object, proxies to set_log. # DataMapper::Logger.new(log{String, IO},level{Symbol, String}) module DataMapper @@ -49,10 +49,10 @@ module DataMapper # debug: low-level information for developers # # DataMapper::Logger::LEVELS[:fatal, :error, :warn, :info, :debug] - LEVELS = + LEVELS = { - :fatal => 7, - :error => 6, + :fatal => 7, + :error => 6, :warn => 4, :info => 3, :debug => 0 @@ -115,7 +115,7 @@ module DataMapper # To replace an existing logger with a new one: # DataMapper::Logger.set_log(log{String, IO},level{Symbol, String}) - # + # # ==== Parameters # log<IO,String> # Either an IO object or a name of a logfile. @@ -156,8 +156,8 @@ module DataMapper @log = nil end - # Appends a string and log level to logger's buffer. - # Note that the string is discarded if the string's log level less than the logger's log level. + # Appends a string and log level to logger's buffer. + # Note that the string is discarded if the string's log level less than the logger's log level. # Note that if the logger is aio capable then the logger will use non-blocking asynchronous writes. # # ==== Parameters @@ -176,7 +176,7 @@ module DataMapper alias << push # Generate the following logging methods for DataMapper.logger as described in the api: - # :fatal, :error, :warn, :info, :debug + # :fatal, :error, :warn, :info, :debug LEVELS.each_pair do |name, number| class_eval <<-LEVELMETHODS, __FILE__, __LINE__ # DOC @@ -192,5 +192,5 @@ module DataMapper end end # class Logger - + end # module DataMapper lib/data_mapper/logger.rb @@ -3,21 +3,21 @@ module DataMapper def self.subclasses @@subclasses ||= [] end - + def self.subclasses=(obj) @@subclasses = obj end - + def self.inherited(klass) subclasses << klass - + class << klass def models @models ||= [] end end end - + def self.migrate(repository_name) subclasses.collect do |migrator| migrator.migrate(repository_name) @@ -25,4 +25,3 @@ module DataMapper end end end - \ No newline at end of file lib/data_mapper/migrator.rb @@ -1,11 +1,11 @@ module DataMapper - + # Use these modules to set naming conventions. # The default is UnderscoredAndPluralized. # You assign a naming convention like so: # # repository(:default).adapter.resource_naming_convention = NamingConventions::Underscored - # + # # You can also easily assign a custom convention with a Proc: # # repository(:default).adapter.resource_naming_convention = lambda do |value| @@ -21,30 +21,30 @@ module DataMapper # adapter = DataMapper.setup(:default, "mock://localhost/mock") # adapter.resource_naming_convention = DataMapper::NamingConventions::Underscored module NamingConventions - + module UnderscoredAndPluralized def self.call(value) DataMapper::Inflection.pluralize(DataMapper::Inflection.underscore(value)).gsub('/','_') end end # module UnderscoredAndPluralized - + module UnderscoredAndPluralizedWithoutModule def self.call(value) - DataMapper::Inflection.pluralize(DataMapper::Inflection.underscore(DataMapper::Inflection.demodulize(value))) + DataMapper::Inflection.pluralize(DataMapper::Inflection.underscore(DataMapper::Inflection.demodulize(value))) end end # module UnderscoredAndPluralizedWithoutModule - + module Underscored def self.call(value) DataMapper::Inflection.underscore(value) end end # module Underscored - + module Yaml def self.call(value) DataMapper::Inflection.pluralize(DataMapper::Inflection.underscore(value)) + ".yaml" end end # module Yaml - + end # module NamingConventions end # module DataMapper lib/data_mapper/naming_conventions.rb @@ -116,9 +116,9 @@ module DataMapper r__dup end end - + private - + def initialize(properties = []) raise ArgumentError, "+properties+ should be an Array, but was #{properties.class}", caller unless Array === properties lib/data_mapper/property_set.rb @@ -9,7 +9,7 @@ module DataMapper class RepositoryNotSetupError < StandardError; end class IncompleteResourceError < StandardError; end - + class PersistenceError < StandardError; end end # module DataMapper lib/data_mapper/support/errors.rb @@ -3,5 +3,5 @@ module Kernel # Will not overwrite if a method of the same name is pre-defined. def repository(*args, &block) DataMapper.repository(*args, &block) - end + end end # module Kernel lib/data_mapper/support/kernel.rb @@ -1,14 +1,14 @@ -class Object +class Object unless instance_methods.include?('instance_variable_defined?') def instance_variable_defined?(method) instance_variables.include?(method.to_s) end end - + def find_const(nested_name) NESTED_CONSTANTS[nested_name] end - + private NESTED_CONSTANTS = Hash.new do |h,k| klass = Object @@ -17,5 +17,5 @@ class Object end h[k] = klass end - + end # class Object lib/data_mapper/support/object.rb @@ -1,5 +1,5 @@ module DataMapper - + class Transaction attr_reader :transaction_primitives, :adapters, :state @@ -29,8 +29,8 @@ module DataMapper # DataMapper::Repositories will have their @adapters added. # DataMapper::Resource subclasses will have all the repositories of all their properties added. # DataMapper::Resource instances will have all repositories of all their properties added. - # block<Block>:: A block (taking one argument, the Transaction) to execute within this - # transaction. The transaction will begin and commit around the block, and rollback if + # block<Block>:: A block (taking one argument, the Transaction) to execute within this + # transaction. The transaction will begin and commit around the block, and rollback if # an exception is raised. # def link(*things, &block) @@ -68,8 +68,8 @@ module DataMapper # Commit the transaction # # ==== Parameters - # block<Block>:: A block (taking the one argument, the Transaction) to execute within this - # transaction. The transaction will begin and commit around the block, and rollback if + # block<Block>:: A block (taking the one argument, the Transaction) to execute within this + # transaction. The transaction will begin and commit around the block, and rollback if # an exception is raised. # # If no block is given, it will simply commit any changes made since the Transaction did #begin. @@ -237,4 +237,3 @@ module DataMapper end end - lib/data_mapper/transaction.rb @@ -158,9 +158,9 @@ module DataMapper def self.load(value, property) value end - + def self.bind(property) - # This method should not modify the state of this type class, and + # This method should not modify the state of this type class, and # should produce no side-effects on the type class. It's just a # hook to allow your custom-type to modify the property it's bound to. end lib/data_mapper/type.rb @@ -1,18 +1,18 @@ module DataMapper class TypeMap - + attr_accessor :parent, :chains - + def initialize(parent = nil, &blk) @parent, @chains = parent, {} - + blk.call(self) unless blk.nil? end - + def map(type) @chains[type] ||= TypeChain.new end - + def lookup(type) if type_mapped?(type) lookup_from_map(type) @@ -20,11 +20,11 @@ module DataMapper lookup_by_type(type) end end - + def lookup_from_map(type) lookup_from_parent(type).merge(map(type).translate) end - + def lookup_from_parent(type) if !@parent.nil? && @parent.type_mapped?(type) @parent[type] @@ -32,40 +32,40 @@ module DataMapper {} end end - + def lookup_by_type(type) raise "TypeMap Exception: type #{type} must have a default primitive or type map entry" unless type.respond_to?(:primitive) && !type.primitive.nil? lookup(type.primitive).merge(Type::PROPERTY_OPTIONS.inject({}) {|h, k| h[k] = type.send(k); h}) end - + alias [] lookup - + def type_mapped?(type) @chains.has_key?(type) || (@parent.nil? ? false : @parent.type_mapped?(type)) end - + class TypeChain attr_accessor :primitive, :attributes - + def initialize @attributes = {} end - + def to(primitive) @primitive = primitive self end - + def with(attributes) raise "method 'with' expects a hash" unless Hash === attributes @attributes.merge!(attributes) self end - + def translate @attributes.merge((@primitive.nil? ? {} : {:primitive => @primitive})) end end end -end \ No newline at end of file +end lib/data_mapper/type_map.rb @@ -3,5 +3,5 @@ module DataMapper class Boolean < DataMapper::Type primitive TrueClass end # class Boolean - end # module Types -end # module DataMapper \ No newline at end of file + end # module Types +end # module DataMapper lib/data_mapper/types/boolean.rb @@ -14,10 +14,10 @@ module DataMapper save end EOS - + model.send(:scope_stack) << DataMapper::Query.new(repository, model, property.name => nil) - - end + + end end end -end \ No newline at end of file +end lib/data_mapper/types/paranoid_boolean.rb @@ -13,10 +13,10 @@ module DataMapper save end EOS - + model.send(:scope_stack) << DataMapper::Query.new(repository, model, property.name => nil) - - end + + end end end -end \ No newline at end of file +end lib/data_mapper/types/paranoid_datetime.rb @@ -6,5 +6,5 @@ module DataMapper size 65535 lazy true end # class Text - end # module Types -end # module DataMapper \ No newline at end of file + end # module Types +end # module DataMapper lib/data_mapper/types/text.rb @@ -2,9 +2,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) if HAS_SQLITE3 describe 'association proxying' do - + before(:all) do - + class Zebra include DataMapper::Resource @@ -12,51 +12,51 @@ if HAS_SQLITE3 property :name, String property :age, Integer has n, :stripes - + end class Stripe include DataMapper::Resource - + property :id, Integer, :serial => true property :name, String property :age, Integer property :zebra_id, Integer - + belongs_to :zebra - + end - + Zebra.auto_migrate!(:sqlite3) Stripe.auto_migrate!(:sqlite3) - + repository(:sqlite3) do - + nancy = Zebra.new(:age => 11) nancy.name = 'nance' nancy.save - + bessie = Zebra.new(:age => 10) bessie.name = 'Bessie' bessie.save - + steve = Zebra.new(:age => 8) steve.name = 'Steve' steve.save - + @babe = Stripe.new @babe.name = 'Babe' @babe.save - + @snowball = Stripe.new @snowball.name = 'snowball' @snowball.save - + nancy.stripes << @babe nancy.stripes << @snowball end end - + it "should proxy the relationships of the model" do repository(:sqlite3) do zebras = Zebra.all @@ -66,5 +66,5 @@ if HAS_SQLITE3 end end end - -end \ No newline at end of file + +end spec/integration/collection_spec.rb @@ -5,7 +5,7 @@ module DataMapper def create(repository, instance) instance end - + def exists?(storage_name) true end @@ -16,12 +16,12 @@ end module DataObjects module Mock - + def self.logger end - + def self.logger=(value) end - + end end spec/lib/mock_adapter.rb @@ -93,27 +93,27 @@ describe DataMapper::Adapters::AbstractAdapter do it "should raise NotImplementedError when #delete_set is called" do lambda { @adapter.delete_set(:repository, :query) }.should raise_error(NotImplementedError) end - + it "should raise NotImplementedError when #create_model_storage is called" do lambda { @adapter.create_model_storage(:repository, :resource) }.should raise_error(NotImplementedError) end - + it "should raise NotImplementedError when #destroy_model_storage is called" do lambda { @adapter.destroy_model_storage(:repository, :resource) }.should raise_error(NotImplementedError) end - + it "should raise NotImplementedError when #alter_model_storage is called" do lambda { @adapter.alter_model_storage(:repository, :resource) }.should raise_error(NotImplementedError) end - + it "should raise NotImplementedError when #create_property_storage is called" do lambda { @adapter.create_property_storage(:repository, :property) } end - + it "should raise NotImplementedError when #destroy_property_storage is called" do lambda { @adapter.destroy_property_storage(:repository, :property) } end - + it "should raise NotImplementedError when #alter_property_storage is called" do lambda { @adapter.alter_property_storage(:repository, :property) } end spec/unit/adapters/abstract_adapter_spec.rb @@ -13,8 +13,8 @@ describe "DataMapper::Associations" do class C include DataMapper::Resource - - repository(:r) do + + repository(:r) do has 1, :b end end @@ -136,7 +136,7 @@ describe "DataMapper::Associations" do it "should create a many-to-many relationship if references are circular" do Manufacturer.should_receive(:many_to_many).with(:subsidiaries, { :max=> @n, :class_name =>"Manufacturer", :min => @n }) - + class Manufacturer has n..n, :subsidiaries, :class_name => 'Manufacturer' end spec/unit/associations_spec.rb @@ -4,12 +4,12 @@ describe DataMapper do describe ".prepare" do it "should pass the default repository to the block if no argument is given" do DataMapper.should_receive(:repository).with(nil).and_return :default_repo - + DataMapper.prepare do |r| r.should == :default_repo end end - + it "should allow custom type maps to be defined inside the prepare block" do lambda { DataMapper.prepare do |r| @@ -18,4 +18,4 @@ describe DataMapper do }.should_not raise_error end end -end \ No newline at end of file +end spec/unit/data_mapper_spec.rb @@ -5,29 +5,29 @@ describe DataMapper::Migrator do before(:each) do DataMapper::Migrator.subclasses.clear end - + after(:each) do DataMapper::Migrator.subclasses.clear end - + it "should keep track of subclasses" do lambda { Class.new(DataMapper::Migrator) }.should change{ DataMapper::Migrator.subclasses.size }.by(1) end - + it "should define a class level 'models' method for each subclass" do klass = Class.new(DataMapper::Migrator) - + klass.should respond_to(:models) end - + it "should keep subclass models seperated" do klass_a = Class.new(DataMapper::Migrator) klass_b = Class.new(DataMapper::Migrator) - + klass_a.models << :foo - + klass_b.models.should be_empty - + klass_a.models.should == [:foo] end -end \ No newline at end of file +end spec/unit/migrator_spec.rb @@ -10,15 +10,15 @@ describe "DataMapper::NamingConventions" do DataMapper::NamingConventions::UnderscoredAndPluralized.call('User').should == 'users' DataMapper::NamingConventions::UnderscoredAndPluralized.call('UserAccountSetting').should == 'user_account_settings' end - + it "should coerce a string into the UnderscoredAndPluralized convention joining namespace with underscore" do DataMapper::NamingConventions::UnderscoredAndPluralized.call('Model::User').should == 'model_users' - DataMapper::NamingConventions::UnderscoredAndPluralized.call('Model::UserAccountSetting').should == 'model_user_account_settings' + DataMapper::NamingConventions::UnderscoredAndPluralized.call('Model::UserAccountSetting').should == 'model_user_account_settings' end - + it "should coerce a string into the UnderscoredAndPluralizedWithoutModule convention" do DataMapper::NamingConventions::UnderscoredAndPluralizedWithoutModule.call('Model::User').should == 'users' - DataMapper::NamingConventions::UnderscoredAndPluralizedWithoutModule.call('Model::UserAccountSetting').should == 'user_account_settings' + DataMapper::NamingConventions::UnderscoredAndPluralizedWithoutModule.call('Model::UserAccountSetting').should == 'user_account_settings' end it "should coerce a string into the Yaml convention" do spec/unit/naming_conventions_spec.rb @@ -79,15 +79,15 @@ describe DataMapper::PropertySet do @properties.instance_variable_get("@property_for").should_not be_empty @properties.dup.instance_variable_get("@property_for").should be_empty end - + it 'should be able to retarget a new model' do copy = Icon.properties.dup(Boat) copy.should have(4).entries - + copy.each do |property| property.model.should == Boat end - + copy << DataMapper::Property.new(Icon, :z_index, Integer, {}) copy.should have(5).entries Icon.properties.should have(4).entries spec/unit/property_set_spec.rb @@ -2,33 +2,33 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper' describe DataMapper::TypeMap do - + before(:each) do @tm = DataMapper::TypeMap.new end - + describe "#map" do it "should return a type map chain" do @tm.map(String).should be_instance_of(DataMapper::TypeMap::TypeChain) end - + it "should return the original chain if the type has already been mapped" do tc = @tm.map(String) @tm.map(String).should == tc end end - + describe "#lookup" do it "should the primitive's mapping the class has a primitive type" do @tm.map(String).to(:varchar) - + lambda { @tm.lookup(DM::Text) }.should_not raise_error end - + it "should merge in the parent type map's translated match" do - + end - + describe "#lookup_from_map" do it "should merge the translated type match into the parent match" do @tm.map(String).to(:varchar) @@ -39,7 +39,7 @@ describe DataMapper::TypeMap do child.lookup_from_map(String).should == {:primitive => :varchar, :size => 100} end end - + describe "#lookup_by_type" do it "should raise an exception if the type is not mapped and does not have a primitive" do klass = Class.new @@ -47,68 +47,68 @@ describe DataMapper::TypeMap do end end end - + describe "#map" do it "should create a new TypeChain if there is no match" do @tm.chains.should_not have_key(String) - + DataMapper::TypeMap::TypeChain.should_receive(:new) - + @tm.map(String) end - + it "should not create a new TypeChain if there is a match" do @tm.map(String) - + DataMapper::TypeMap::TypeChain.should_not_receive(:new) - + @tm.map(String) end end - + describe DataMapper::TypeMap::TypeChain do describe "#to" do it "should be a setter for @primitive" do tc = DataMapper::TypeMap::TypeChain.new - + lambda { tc.to(:primitive) }.should change { tc.primitive }.to(:primitive) end - + it "should return itself" do tc = DataMapper::TypeMap::TypeChain.new - + tc.to(:primitive).should == tc end end - + describe "#with" do it "should return itself" do tc = DataMapper::TypeMap::TypeChain.new - + tc.with(:key => :value).should == tc end - + it "should raise an error if the argument is not a hash" do tc = DataMapper::TypeMap::TypeChain.new - + lambda { tc.with(:key) }.should raise_error("method 'with' expects a hash") end - + it "should merge the argument hash into the attributes hash" do tc = DataMapper::TypeMap::TypeChain.new - - tc.with(:key => :value).with(:size => 10).attributes.should == {:key => :value, :size => 10} + + tc.with(:key => :value).with(:size => 10).attributes.should == {:key => :value, :size => 10} end end - + describe "#translate" do it "should merge the attributes hash with the primitive value" do DataMapper::TypeMap::TypeChain.new.to(:int).with(:size => 10).translate.should == {:primitive => :int, :size => 10} end - + it "should overwrite any :primitive entry set using the 'with' method" do DataMapper::TypeMap::TypeChain.new.to(:int).with(:primitive => :varchar).translate.should == {:primitive => :int} end end end -end \ No newline at end of file +end spec/unit/type_map_spec.rb @@ -20,11 +20,11 @@ describe DataMapper::Type do value.reverse end end - + class TestResource include DataMapper::Resource end - + class TestType3 < DataMapper::Type primitive String size 10 @@ -85,19 +85,19 @@ describe DataMapper::Type do before do @property = DataMapper::Property.new TestResource, :name, TestType3, {} end - + it "should return a object of the same type" do TestType3.load("helo", @property).class.should == TestType3 end - + it "should contain the property" do TestType3.load("helo", @property).property.should == @property end - + it "should contain the value" do TestType3.load("helo", @property).value.should == "helo" end - + it "should return the value" do obj = TestType3.load("helo", @property) TestType3.dump(obj, @property).should == "helo" spec/unit/type_spec.rb 07cdcc271dbdd18ba80b6a2c472b0ad43696e10e Alex Coles alexbcoles@mac.com http://github.com/sam/dm-core/commit/0956c1206c3960749588b03bbbbc411a71aace3e 0956c1206c3960749588b03bbbbc411a71aace3e 2008-05-13T02:34:02-07:00 2008-05-13T02:34:02-07:00 Whitespace cleanup 36481e4ae2bf38adc162140b2749f25c59c3081a Alex Coles alexbcoles@mac.com