dm-core 1.0.1 → 1.0.2

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.1'
+DM_VERSION = '~> 1.0.2'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.email       = 'dan.kubb@gmail.com'
     gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Dan Kubb' ]
+    gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/dm-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
@@ -215,6 +215,7 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
+  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-core}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]

data/lib/dm-core/associations/many_to_many.rb

@@ -27,7 +27,7 @@ module DataMapper
         end
 
         # @api semipublic
-        alias target_key child_key
+        alias_method :target_key, :child_key
 
         # Intermediate association for through model
         # relationships

data/lib/dm-core/associations/many_to_one.rb

@@ -7,19 +7,19 @@ module DataMapper
         OPTIONS = superclass::OPTIONS.dup << :required << :key
 
         # @api semipublic
-        alias source_repository_name child_repository_name
+        alias_method :source_repository_name, :child_repository_name
 
         # @api semipublic
-        alias source_model child_model
+        alias_method :source_model, :child_model
 
         # @api semipublic
-        alias target_repository_name parent_repository_name
+        alias_method :target_repository_name, :parent_repository_name
 
         # @api semipublic
-        alias target_model parent_model
+        alias_method :target_model, :parent_model
 
         # @api semipublic
-        alias target_key parent_key
+        alias_method :target_key, :parent_key
 
         # @api semipublic
         def required?
@@ -64,7 +64,7 @@ module DataMapper
         end
 
         # @api semipublic
-        alias source_key child_key
+        alias_method :source_key, :child_key
 
         # Returns a hash of conditions that scopes query that fetches
         # target object

data/lib/dm-core/associations/one_to_many.rb

@@ -3,19 +3,19 @@ module DataMapper
     module OneToMany #:nodoc:
       class Relationship < Associations::Relationship
         # @api semipublic
-        alias target_repository_name child_repository_name
+        alias_method :target_repository_name, :child_repository_name
 
         # @api semipublic
-        alias target_model child_model
+        alias_method :target_model, :child_model
 
         # @api semipublic
-        alias source_repository_name parent_repository_name
+        alias_method :source_repository_name, :parent_repository_name
 
         # @api semipublic
-        alias source_model parent_model
+        alias_method :source_model, :parent_model
 
         # @api semipublic
-        alias source_key parent_key
+        alias_method :source_key, :parent_key
 
         # @api semipublic
         def child_key
@@ -23,7 +23,7 @@ module DataMapper
         end
 
         # @api semipublic
-        alias target_key child_key
+        alias_method :target_key, :child_key
 
         # Returns a Collection for this relationship with a given source
         #

data/lib/dm-core/associations/relationship.rb

@@ -209,7 +209,7 @@ module DataMapper
       # Access Relationship#child_key directly
       #
       # @api private
-      alias relationship_child_key child_key
+      alias_method :relationship_child_key, :child_key
       private :relationship_child_key
 
       # Returns model class used by parent side of the relationship

data/lib/dm-core/collection.rb

@@ -97,8 +97,8 @@ module DataMapper
       set_operation(:|, other)
     end
 
-    alias | union
-    alias + union
+    alias_method :|, :union
+    alias_method :+, :union
 
     # Return the intersection with another collection
     #
@@ -113,7 +113,7 @@ module DataMapper
       set_operation(:&, other)
     end
 
-    alias & intersection
+    alias_method :&, :intersection
 
     # Return the difference with another collection
     #
@@ -128,7 +128,7 @@ module DataMapper
       set_operation(:-, other)
     end
 
-    alias - difference
+    alias_method :-, :difference
 
     # Lookup a Resource in the Collection by key
     #
@@ -367,7 +367,7 @@ module DataMapper
     # the resources directly so that it can orphan them properly.
     #
     # @api private
-    alias superclass_slice slice
+    alias_method :superclass_slice, :slice
     private :superclass_slice
 
     # Simulates Array#slice and returns a new Collection
@@ -406,7 +406,7 @@ module DataMapper
       end
     end
 
-    alias slice []
+    alias_method :slice, :[]
 
     # Deletes and Returns the Resources given by an offset or a Range
     #
@@ -466,7 +466,7 @@ module DataMapper
       resources
     end
 
-    alias splice []=
+    alias_method :splice, :[]=
 
     # Return a copy of the Collection sorted in reverse
     #
@@ -526,7 +526,7 @@ module DataMapper
       super { |resource| resource_added(yield(resource_removed(resource))) }
     end
 
-    alias map! collect!
+    alias_method :map!, :collect!
 
     # Append one Resource to the Collection and relate it
     #
@@ -690,7 +690,7 @@ module DataMapper
     # Access LazyArray#replace directly
     #
     # @api private
-    alias superclass_replace replace
+    alias_method :superclass_replace, :replace
     private :superclass_replace
 
     # Replace the Resources within the Collection

data/lib/dm-core/core_ext/pathname.rb

@@ -13,8 +13,8 @@ class Pathname
     (self + path).expand_path
   end
 
-  # alias to_s to to_str when to_str not defined
+  # alias_method :to_s, :to to_str when to_str not defined
   unless public_instance_methods(false).any? { |m| m.to_sym == :to_str }
-    alias to_str to_s
+    alias_method :to_str, :to_s
   end
 end # class Pathname

data/lib/dm-core/model.rb

@@ -297,7 +297,7 @@ module DataMapper
       all[*args]
     end
 
-    alias slice []
+    alias_method :slice, :[]
 
     def at(*args)
       all.at(*args)

data/lib/dm-core/model/property.rb

@@ -109,7 +109,8 @@ module DataMapper
         create_reader_for(property)
         create_writer_for(property)
 
-        property
+        # FIXME: explicit return needed for YARD to parse this properly
+        return property
       end
 
       # Gets a list of all properties that have been defined on this Model in

data/lib/dm-core/property_set.rb

@@ -15,7 +15,7 @@ module DataMapper
       @properties[name]
     end
 
-    alias superclass_slice []=
+    alias_method :superclass_slice, :[]=
     private :superclass_slice
 
     # @api semipublic

data/lib/dm-core/query.rb

@@ -430,8 +430,8 @@ module DataMapper
       set_operation(:union, other)
     end
 
-    alias | union
-    alias + union
+    alias_method :|, :union
+    alias_method :+, :union
 
     # Return the intersection with another query
     #
@@ -447,7 +447,7 @@ module DataMapper
       set_operation(:intersection, other)
     end
 
-    alias & intersection
+    alias_method :&, :intersection
 
     # Return the difference with another query
     #
@@ -462,7 +462,7 @@ module DataMapper
       set_operation(:difference, other)
     end
 
-    alias - difference
+    alias_method :-, :difference
 
     # Clear conditions
     #
@@ -568,7 +568,7 @@ module DataMapper
       dup.slice!(*args)
     end
 
-    alias [] slice
+    alias_method :[], :slice
 
     # Slices collection by adding limit and offset to the
     # query, so a single query is executed

data/lib/dm-core/query/conditions/operation.rb

@@ -88,7 +88,7 @@ module DataMapper
         # @api semipublic
         attr_reader :operands
 
-        alias children operands
+        alias_method :children, :operands
 
         # Returns the classes that inherit from AbstractComparison
         #
@@ -232,8 +232,8 @@ module DataMapper
           Operation.new(:or, dup, other.dup).minimize
         end
 
-        alias | union
-        alias + union
+        alias_method :|, :union
+        alias_method :+, :union
 
         # Return the intersection of the operation and another operand
         #
@@ -248,7 +248,7 @@ module DataMapper
           Operation.new(:and, dup, other.dup).minimize
         end
 
-        alias & intersection
+        alias_method :&, :intersection
 
         # Return the difference of the operation and another operand
         #
@@ -263,7 +263,7 @@ module DataMapper
           Operation.new(:and, dup, Operation.new(:not, other.dup)).minimize
         end
 
-        alias - difference
+        alias_method :-, :difference
 
         # Minimize the operation
         #

data/lib/dm-core/repository.rb

@@ -46,7 +46,7 @@ module DataMapper
     attr_reader :name
 
     # @api semipublic
-    alias to_sym name
+    alias_method :to_sym, :name
 
     # Get the adapter for this repository
     #

data/lib/dm-core/resource.rb

@@ -254,7 +254,7 @@ module DataMapper
       persisted_state.get(properties[name])
     end
 
-    alias [] attribute_get
+    alias_method :[], :attribute_get
 
     # Sets the value of the attribute and marks the attribute as dirty
     # if it has been changed so that it may be saved. Do not set from
@@ -295,7 +295,7 @@ module DataMapper
       self.persisted_state = persisted_state.set(properties[name], value)
     end
 
-    alias []= attribute_set
+    alias_method :[]=, :attribute_set
 
     # Gets all the attributes of the Resource instance
     #

data/lib/dm-core/spec/setup.rb

@@ -96,7 +96,7 @@ module DataMapper
           @adapter ||= setup!
         end
 
-        alias :setup :adapter
+        alias_method :setup, :adapter
 
         def setup!
           adapter = DataMapper.setup(name, connection_uri)

data/lib/dm-core/support/lazy_array.rb

@@ -116,7 +116,7 @@ class LazyArray  # borrowed partially from StrokeDB
     end
   end
 
-  alias slice []
+  alias_method :slice, :[]
 
   def slice!(*args)
     index, length = extract_slice_arguments(*args)
@@ -144,7 +144,7 @@ class LazyArray  # borrowed partially from StrokeDB
     end
   end
 
-  alias splice []=
+  alias_method :splice, :[]=
 
   def reverse
     dup.reverse!
@@ -278,7 +278,7 @@ class LazyArray  # borrowed partially from StrokeDB
     @array.to_a
   end
 
-  alias to_ary to_a
+  alias_method :to_ary, :to_a
 
   def load_with(&block)
     @load_with_proc = block
@@ -293,7 +293,7 @@ class LazyArray  # borrowed partially from StrokeDB
     super || @array.kind_of?(klass)
   end
 
-  alias is_a? kind_of?
+  alias_method :is_a?, :kind_of?
 
   def respond_to?(method, include_private = false)
     super || @array.respond_to?(method)

data/lib/dm-core/support/logger.rb

@@ -153,7 +153,7 @@ module DataMapper
 
       message
     end
-    alias :push :<<
+    alias_method :push, :<<
 
     # Generate the logging methods for Extlib.logger for each log level.
     Levels.each_pair do |name, number|

data/spec/semipublic/shared/resource_state_shared_spec.rb

@@ -2,9 +2,9 @@ share_examples_for 'A method that delegates to the superclass #set' do
   it 'should delegate to the superclass' do
     # this is the only way I could think of to test if the
     # superclass method is being called
-    DataMapper::Resource::State.class_eval { alias original_set set; undef_method(:set) }
+    DataMapper::Resource::State.class_eval { alias_method :original_set, :set; undef_method(:set) }
     method(:subject).should raise_error(NoMethodError)
-    DataMapper::Resource::State.class_eval { alias set original_set; undef_method(:original_set) }
+    DataMapper::Resource::State.class_eval { alias_method :set, :original_set; undef_method(:original_set) }
   end
 end
 
@@ -12,9 +12,9 @@ share_examples_for 'A method that does not delegate to the superclass #set' do
   it 'should delegate to the superclass' do
     # this is the only way I could think of to test if the
     # superclass method is not being called
-    DataMapper::Resource::State.class_eval { alias original_set set; undef_method(:set) }
+    DataMapper::Resource::State.class_eval { alias_method :original_set, :set; undef_method(:set) }
     method(:subject).should_not raise_error(NoMethodError)
-    DataMapper::Resource::State.class_eval { alias set original_set; undef_method(:original_set) }
+    DataMapper::Resource::State.class_eval { alias_method :set, :original_set; undef_method(:original_set) }
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Dan Kubb
@@ -281,7 +281,7 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
+has_rdoc: yard
 homepage: http://github.com/datamapper/dm-core
 licenses: []