dm-visualizer 0.2.0 → 0.2.1

data/ChangeLog.md

@@ -1,3 +1,9 @@
+### 0.2.1 / 2011-02-12
+
+* Added {DataMapper::Visualizer::Project#each_relationship_for}.
+* Fixed a bug in {DataMapper::Visualizer::Project#each_relationship},
+  effecting dm-core 1.0.x projects.
+
 ### 0.2.0 / 2011-02-09
 
 * Require dm-core >= 1.0.0.

data/Gemfile

@@ -1,12 +1,11 @@
-require 'ore/specification'
-
 source :rubygems
 
 gemspec
 
 group(:development) do
-  gem 'kramdown',     '~> 0.12.0'
   gem 'rake',         '~> 0.8.7'
-  gem 'ore-tasks',	  '~> 0.3.0'
+  gem 'kramdown',     '~> 0.12.0'
+
+  gem 'ore-tasks',	  '~> 0.4.0'
   gem 'rspec',        '~> 2.4.0'
 end

data/README.md

@@ -1,7 +1,8 @@
 # dm-visualizer
 
-* [github.com/postmodern/dm-visualizer](http://github.com/postmodern/dm-visualizer/)
-* [github.com/postmodern/dm-visualizer/issues](http://github.com/postmodern/dm-visualizer/issues)
+* [Source](http://github.com/postmodern/dm-visualizer/)
+* [Issues](http://github.com/postmodern/dm-visualizer/issues)
+* [Documentation](http://rubydoc.info/gems/dm-visualizer/frames)
 * [Email](postmodern.mod3 at gmail.com)
 
 ## Description

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: dm-visualizer
-version: 0.2.0
+version: 0.2.1
 summary:
   Visualizes the Models, Properties and Relationships defined in a
   DataMapper based Ruby project.

data/lib/dm-visualizer/project.rb

@@ -232,11 +232,7 @@ module DataMapper
         # XXX: in dm-core 1.1.0, `Model#relationships` returns a
         # `DataMapper::RelationshipSet`, instead of a `Mash`, which does
         # not provide the `each_value` method.
-        model.relationships.each do |*args|
-          relationship = args.last
-
-          next if relationship.respond_to?(:through)
-
+        each_relationship_for(model) do |relationship|
           case relationship
           when Associations::ManyToOne::Relationship,
                Associations::OneToOne::Relationship
@@ -296,15 +292,8 @@ module DataMapper
         return enum_for(:each_relationship) unless block_given?
 
         each_model do |model|
-          # XXX: in dm-core 1.1.0, `Model#relationships` returns a
-          # `DataMapper::RelationshipSet`, instead of a `Mash`, which does
-          # not provide the `each_value` method.
-          model.relationships.each do |*args|
-            relationship = args.last
-
-            unless relationship.respond_to?(:through)
-              yield relationship, model
-            end
+          each_relationship_for(model) do |relationship|
+            yield relationship, model
           end
         end
       end
@@ -321,6 +310,35 @@ module DataMapper
         STDERR.puts "dm-visualizer: #{message}"
       end
 
+      #
+      # Enumerates over each DataMapper relationship in a model.
+      #
+      # @yield [relationship]
+      #   The given block will be passed each relationship in the model.
+      #
+      # @yieldparam [DataMapper::Relationship] relationship
+      #   A relationship.
+      #
+      # @since 0.2.1
+      #
+      def each_relationship_for(model)
+        # XXX: in dm-core 1.1.0, `Model#relationships` returns a
+        # `DataMapper::RelationshipSet`, instead of a `Mash`, which does
+        # not provide the `each_value` method.
+        model.relationships.each do |args|
+          relationship = case args
+                         when Array
+                           args.last
+                         else
+                           args
+                         end
+
+          unless relationship.respond_to?(:through)
+            yield relationship
+          end
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-visualizer
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 21
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Postmodern
@@ -15,28 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
   prerelease: false
-  type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   name: ruby-graphviz
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,28 +33,28 @@ dependencies:
         - 9
         - 10
         version: 0.9.10
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: dm-core
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 6
         - 0
-        version: 0.6.0
-  prerelease: false
-  type: :development
-  requirement: *id003
+        version: 1.0.0
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +65,26 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: yard
   type: :development
-  requirement: *id004
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  version_requirements: *id004
 description: DataMapper Visualizer is both a library and a command-line utility for visualizing the Models, Properties and Relationships defined in a DataMapper based Ruby project.
-email: postmodern.mod3@gmail.com
+email: 
+- postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
@@ -91,37 +92,37 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- lib/dm-visualizer/rake/graphviz_task.rb
+- spec/dm_visualizer_spec.rb
+- spec/helpers/projects/library/lib/blog/user.rb
+- ChangeLog.md
+- spec/visualization_spec.rb
+- spec/helpers/projects/library/lib/blog.rb
+- lib/dm-visualizer/project.rb
+- spec/helpers/projects/library/lib/blog/post.rb
 - spec/spec_helper.rb
-- spec/project_examples.rb
-- gemspec.yml
-- .rspec
-- spec/helpers/projects/rails/app/models/user.rb
-- lib/dm-visualizer/rake/task.rb
 - .yardopts
-- spec/visualization_spec.rb
-- spec/project_spec.rb
 - spec/helpers/projects/rails/app/models/post.rb
-- spec/helpers/project.rb
-- lib/dm-visualizer/graphviz.rb
+- lib/dm-visualizer/rake/rails/tasks.rb
+- lib/dm-visualizer/rake/rails/graphviz_task.rb
+- dm-visualizer.gemspec
 - lib/dm-visualizer/visualization.rb
-- lib/dm-visualizer/rake/graphviz_task.rb
-- Gemfile
-- spec/helpers/projects/library/lib/blog/comment.rb
-- Rakefile
 - README.md
-- LICENSE.txt
-- spec/dm_visualizer_spec.rb
-- lib/dm-visualizer/rake/rails/tasks.rb
-- spec/helpers/projects/rails/app/models/comment.rb
-- spec/helpers/projects/library/lib/blog/post.rb
+- Rakefile
 - lib/dm-visualizer.rb
-- dm-visualizer.gemspec
-- spec/helpers/projects/library/lib/blog/user.rb
-- spec/helpers/projects/library/lib/blog.rb
-- lib/dm-visualizer/rake/rails/graphviz_task.rb
-- lib/dm-visualizer/project.rb
-- ChangeLog.md
-has_rdoc: true
+- Gemfile
+- spec/helpers/projects/rails/app/models/comment.rb
+- lib/dm-visualizer/graphviz.rb
+- LICENSE.txt
+- spec/helpers/projects/rails/app/models/user.rb
+- spec/helpers/project.rb
+- spec/project_spec.rb
+- spec/helpers/projects/library/lib/blog/comment.rb
+- .rspec
+- gemspec.yml
+- lib/dm-visualizer/rake/task.rb
+- spec/project_examples.rb
+has_rdoc: yard
 homepage: http://github.com/postmodern/dm-visualizer
 licenses: 
 - MIT
@@ -153,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dm-visualizer
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Visualizes the Models, Properties and Relationships defined in a DataMapper based Ruby project.