dm-visualizer 0.1.0 → 0.2.0

data/.rspec

@@ -0,0 +1 @@
+--colour --format documentation

data/ChangeLog.md

@@ -1,3 +1,14 @@
+### 0.2.0 / 2011-02-09
+
+* Require dm-core >= 1.0.0.
+* {DataMapper::Visualizer::Rake::GraphVizTask} now defines tasks for
+  generating Relational and Schema diagrams, with PNG and SVG output.
+* Fixed a bug in {DataMapper::Visualizer::Rake::Rails::Tasks} which
+  prevented dm-visualizer from working in newer dm-rails applications.
+* Filter-out foreign-key columns in
+  {DataMapper::Visualizer::Project#each_property}.
+* Tested against dm-core 1.0.2 and 1.1.0.
+
 ### 0.1.0 / 2010-05-27
 
 * Initial release:

data/Gemfile

@@ -0,0 +1,12 @@
+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 'rspec',        '~> 2.4.0'
+end

data/LICENSE.txt

@@ -1,5 +1,4 @@
-
-Copyright (c) 2010 Hal Brodigan
+Copyright (c) 2010-2011 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +18,3 @@ 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.
-

data/README.md

@@ -2,7 +2,7 @@
 
 * [github.com/postmodern/dm-visualizer](http://github.com/postmodern/dm-visualizer/)
 * [github.com/postmodern/dm-visualizer/issues](http://github.com/postmodern/dm-visualizer/issues)
-* Postmodern (postmodern.mod3 at gmail.com)
+* [Email](postmodern.mod3 at gmail.com)
 
 ## Description
 
@@ -14,13 +14,15 @@ DataMapper based Ruby project.
 
 * Safely loads the models of a project.
 * Supports using [Gem Bundler](http://gembundler.com/).
-* Generates GraphViz diagrams for a project.
-  * Provides Rake tasks for both Ruby libraries and Rails3 apps.
-* Supports both DataMapper 0.10.2 and 1.0.0.
+* Generates GraphViz diagrams for a project:
+  * Supports generating Relational and Schema diagrams.
+  * Provides PNG and SVG output.
+  * Provides Rake tasks for both Ruby libraries and dm-rails apps.
+* Supports DataMapper >= 1.0.0.
 
 ## Examples
 
-Add the `dm:doc:graphviz` rake task to a Ruby library:
+Add the `dm:doc:graphviz` rake tasks to a Ruby library:
 
     require 'dm-visualizer/rake/graphviz_task'
     DataMapper::Visualizer::Rake::GraphVizTask.new(
@@ -28,7 +30,7 @@ Add the `dm:doc:graphviz` rake task to a Ruby library:
       :require => ['my_library/models']
     )
 
-Add the `db:doc:graphviz` rake task to a Rails3 / [dm-rails](http://github.com/datamapper/dm-rails) app:
+Add the `db:doc:graphviz` rake tasks to a [dm-rails](http://github.com/datamapper/dm-rails) app:
 
     require 'dm-visualizer/rake/rails/graphviz_task'
     DataMapper::Visualizer::Rake::Rails::GraphVizTask.new
@@ -36,7 +38,7 @@ Add the `db:doc:graphviz` rake task to a Rails3 / [dm-rails](http://github.com/d
 ## Requirements
 
 * [ruby-graphviz](http://rubygems.org/gems/ruby-graphviz) >= 0.9.10
-* [dm-core](http://github.com/datamapper/dm-core) >= 0.10.2
+* [dm-core](http://github.com/datamapper/dm-core) >= 1.0.0
 
 ## Install
 
@@ -44,5 +46,6 @@ Add the `db:doc:graphviz` rake task to a Rails3 / [dm-rails](http://github.com/d
 
 ## License
 
-See {file:LICENSE.txt} for license information.
+Copyright (c) 2010-2011 Hal Brodigan
 
+See {file:LICENSE.txt} for license information.

data/Rakefile

@@ -1,44 +1,22 @@
 require 'rubygems'
-require 'rake'
+require 'bundler'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'dm-visualizer'
-    gem.license = 'MIT'
-    gem.summary = %Q{Visualizes the Models, Properties and Relationships defined in a DataMapper based Ruby project.}
-    gem.description = %Q{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.}
-    gem.email = 'postmodern.mod3@gmail.com'
-    gem.homepage = 'http://github.com/postmodern/dm-visualizer'
-    gem.authors = ['Postmodern']
-    gem.add_dependency 'ruby-graphviz', '>= 0.9.10'
-    gem.add_dependency 'dm-core', '>= 0.10.2'
-    gem.add_dependency 'thor', '>= 0.13.4'
-    gem.add_development_dependency 'rspec', '~> 1.3.0'
-    gem.add_development_dependency 'yard', '~> 0.5.3'
-    gem.has_rdoc = 'yard'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:development, :doc)
+rescue Bundler::BundlerError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs += ['lib', 'spec']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--options', '.specopts']
-end
+require 'rake'
 
-task :spec => :check_dependencies
-task :default => :spec
+require 'ore/tasks'
+Ore::Tasks.new
 
-begin
-  require 'yard'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+task :default => :spec
 
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/dm-visualizer.gemspec

@@ -1,100 +1,15 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{dm-visualizer}
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Postmodern"]
-  s.date = %q{2010-05-27}
-  s.description = %q{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.}
-  s.email = %q{postmodern.mod3@gmail.com}
-  s.extra_rdoc_files = [
-    "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     ".specopts",
-     ".yardopts",
-     "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "dm-visualizer.gemspec",
-     "lib/dm-visualizer.rb",
-     "lib/dm-visualizer/graphviz.rb",
-     "lib/dm-visualizer/project.rb",
-     "lib/dm-visualizer/rake/graphviz_task.rb",
-     "lib/dm-visualizer/rake/rails/graphviz_task.rb",
-     "lib/dm-visualizer/rake/rails/tasks.rb",
-     "lib/dm-visualizer/rake/task.rb",
-     "lib/dm-visualizer/visualization.rb",
-     "spec/dm_visualizer_spec.rb",
-     "spec/helpers/project.rb",
-     "spec/helpers/projects/library/lib/blog.rb",
-     "spec/helpers/projects/library/lib/blog/comment.rb",
-     "spec/helpers/projects/library/lib/blog/post.rb",
-     "spec/helpers/projects/library/lib/blog/user.rb",
-     "spec/helpers/projects/rails/app/models/comment.rb",
-     "spec/helpers/projects/rails/app/models/post.rb",
-     "spec/helpers/projects/rails/app/models/user.rb",
-     "spec/project_examples.rb",
-     "spec/project_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/visualization_spec.rb"
-  ]
-  s.has_rdoc = %q{yard}
-  s.homepage = %q{http://github.com/postmodern/dm-visualizer}
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Visualizes the Models, Properties and Relationships defined in a DataMapper based Ruby project.}
-  s.test_files = [
-    "spec/project_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/visualization_spec.rb",
-     "spec/project_examples.rb",
-     "spec/helpers/project.rb",
-     "spec/helpers/projects/library/lib/blog.rb",
-     "spec/helpers/projects/library/lib/blog/post.rb",
-     "spec/helpers/projects/library/lib/blog/user.rb",
-     "spec/helpers/projects/library/lib/blog/comment.rb",
-     "spec/helpers/projects/rails/app/models/post.rb",
-     "spec/helpers/projects/rails/app/models/user.rb",
-     "spec/helpers/projects/rails/app/models/comment.rb",
-     "spec/dm_visualizer_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby-graphviz>, [">= 0.9.10"])
-      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.2"])
-      s.add_runtime_dependency(%q<thor>, [">= 0.13.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.5.3"])
-    else
-      s.add_dependency(%q<ruby-graphviz>, [">= 0.9.10"])
-      s.add_dependency(%q<dm-core>, [">= 0.10.2"])
-      s.add_dependency(%q<thor>, [">= 0.13.4"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<yard>, ["~> 0.5.3"])
-    end
-  else
-    s.add_dependency(%q<ruby-graphviz>, [">= 0.9.10"])
-    s.add_dependency(%q<dm-core>, [">= 0.10.2"])
-    s.add_dependency(%q<thor>, [">= 0.13.4"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<yard>, ["~> 0.5.3"])
+begin
+  Ore::Specification.new do |gemspec|
+    # custom logic here
+  end
+rescue NameError
+  begin
+    require 'ore/specification'
+    retry
+  rescue LoadError
+    STDERR.puts "The 'dm-visualizer.gemspec' file requires Ore."
+    STDERR.puts "Run `gem install ore-core` to install Ore."
   end
 end
-

data/gemspec.yml

@@ -0,0 +1,23 @@
+name: dm-visualizer
+version: 0.2.0
+summary:
+  Visualizes the Models, Properties and Relationships defined in a
+  DataMapper based Ruby project.
+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.
+
+license: MIT
+authors: Postmodern
+email: postmodern.mod3@gmail.com
+homepage: http://github.com/postmodern/dm-visualizer
+has_yard: true
+
+dependencies:
+  ruby-graphviz: >= 0.9.10
+  dm-core: >= 1.0.0
+
+development_dependencies:
+  bundler: ~> 1.0.0
+  yard: ~> 0.6.0

data/lib/dm-visualizer/graphviz.rb

@@ -19,7 +19,7 @@ module DataMapper
       # The output file
       attr_accessor :file
 
-      # The output file format (`:png`)
+      # The output file format (`:svg`)
       attr_accessor :format
 
       # The colors to use
@@ -37,7 +37,7 @@ module DataMapper
       # @option options [String] :file
       #   The output file path.
       #
-      # @option options [Symbol] :format (:png)
+      # @option options [Symbol] :format (:svg)
       #   The format of the generated graph.
       #
       # @option options [Hash] :colors
@@ -51,7 +51,7 @@ module DataMapper
       def initialize(options={})
         super(options)
 
-        @format = :png
+        @format = :svg
 
         @colors = {
           :one_to_many => 'blue',
@@ -111,8 +111,8 @@ module DataMapper
             "#{property_name(property)}: #{property_type_name(property)}"
           end
 
-          foreign_keys = project.each_foreign_key(model).map do |key,model|
-            "#{foreign_key_name(key)}: #{model_name(model)}"
+          foreign_keys = project.each_foreign_key(model).map do |key,value|
+            "#{foreign_key_name(key)}: #{model_name(value)}"
           end
 
           columns = (properties + foreign_keys)

data/lib/dm-visualizer/project.rb

@@ -1,8 +1,6 @@
 require 'set'
 require 'dm-core'
 
-require 'enumerator'
-
 module DataMapper
   module Visualizer
     #
@@ -31,7 +29,7 @@ module DataMapper
       # @option options [Array] :include
       #   The directories to include into the `$LOAD_PATH` global variable.
       #
-      # @option options [Boolean, Array] :bundle
+      # @option options [Enumerable, Symbol, String, Boolean] :bundle
       #   Specifies which groups of dependencies to activate using Bundler.
       #
       # @option options [Array] :require
@@ -41,7 +39,7 @@ module DataMapper
       #   The path globs to require.
       #
       def initialize(options={})
-        @bundle = nil
+        @bundle = Set[]
         @include_dirs = Set[]
         @require_paths = Set[]
         @require_globs = Set[]
@@ -52,12 +50,15 @@ module DataMapper
           end
         end
 
-        if options[:bundle]
-          @bundle = Set[]
-
+        case options[:bundle]
+        when String, Symbol
+          @bundle << options[:bundle].to_sym
+        when Enumerable
           options[:bundle].each do |group|
             @bundle << group.to_sym
           end
+        when true
+          @bundle << :default
         end
 
         if options[:require]
@@ -81,15 +82,15 @@ module DataMapper
 
         begin
           require 'bundler'
-        rescue LoadError => e
+        rescue LoadError
           log "Gemfile exists, but bundler is not installed"
           log "Run `gem install bundler` to install bundler."
         end
 
         begin
           Bundler.setup(*@bundle)
-        rescue Bundler::BundleError => e
-          log e.message
+        rescue Bundler::BundleError => error
+          log error.message
           log "Run `bundle install` to install missing gems"
         end
 
@@ -108,7 +109,7 @@ module DataMapper
         end
 
         # use Bundler if a Gemfile is present
-        bundle! if (@bundle && File.file?('Gemfile'))
+        bundle! unless @bundle.empty?
 
         return true
       end
@@ -135,9 +136,9 @@ module DataMapper
         @require_paths.each do |path|
           begin
             require path
-          rescue LoadError => e
+          rescue LoadError => error
             log "dm-visualizer: unable to load #{path}"
-            log "dm-visualizer: #{e.message}"
+            log "dm-visualizer: #{error.message}"
           end
         end
 
@@ -148,9 +149,9 @@ module DataMapper
 
               begin
                 require relative_path
-              rescue LoadError => e
+              rescue LoadError => error
                 log "dm-visualizer: unable to load #{relative_path} from #{dir}"
-                log "dm-visualizer: #{e.message}"
+                log "dm-visualizer: #{error.message}"
               end
             end
           end
@@ -195,9 +196,7 @@ module DataMapper
       #   If no block is given, an Enumerator object will be returned.
       #
       def each_model_inheritence
-        unless block_given?
-          return Enumerator.new(self,:each_model_inheritence)
-        end
+        return enum_for(:each_model_inheritence) unless block_given?
 
         each_model do |model|
           direct_ancestor = model.ancestors[1]
@@ -208,32 +207,6 @@ module DataMapper
         end
       end
 
-      #
-      # Enumerates over each DataMapper property from a given model.
-      #
-      # @param [DataMapper::Model] model
-      #   The given model.
-      #
-      # @yield [property]
-      #   The given block will be passed every property from the given
-      #   model.
-      #
-      # @yieldparam [DataMapper::Property] property
-      #   The property.
-      #
-      # @return [Enumerator]
-      #   If no block is given, an Enumerator object will be returned.
-      #
-      def each_property(model)
-        unless block_given?
-          return Enumerator.new(self,:each_property,model)
-        end
-
-        model.properties.each do |property|
-          yield property
-        end
-      end
-
       #
       # Enumerates over every foreign-key in a given model.
       #
@@ -254,11 +227,14 @@ module DataMapper
       #   If no block is given, an Enumerator object will be returned.
       #
       def each_foreign_key(model)
-        unless block_given?
-          return Enumerator.new(self,:each_foreign_key,model)
-        end
+        return enum_for(:each_foreign_key,model) unless block_given?
+
+        # 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
 
-        model.relationships.each_value do |relationship|
           next if relationship.respond_to?(:through)
 
           case relationship
@@ -270,6 +246,36 @@ module DataMapper
         end
       end
 
+      #
+      # Enumerates over each DataMapper property from a given model.
+      #
+      # @param [DataMapper::Model] model
+      #   The given model.
+      #
+      # @yield [property]
+      #   The given block will be passed every property from the given
+      #   model.
+      #
+      # @yieldparam [DataMapper::Property] property
+      #   The property.
+      #
+      # @return [Enumerator]
+      #   If no block is given, an Enumerator object will be returned.
+      #
+      def each_property(model)
+        return enum_for(:each_property,model) unless block_given?
+
+        foreign_keys = Set[]
+
+        each_foreign_key(model) do |name,parent_model|
+          foreign_keys << name
+        end
+        
+        model.properties.each do |property|
+          yield property unless foreign_keys.include?(property.name)
+        end
+      end
+
       #
       # Enumerates over each DataMapper relationship between each model.
       #
@@ -287,10 +293,15 @@ module DataMapper
       #   If no block is given, an Enumerator object will be returned.
       #
       def each_relationship
-        return Enumerator.new(self,:each_relationship) unless block_given?
+        return enum_for(:each_relationship) unless block_given?
 
         each_model do |model|
-          model.relationships.each_value do |relationship|
+          # 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

data/lib/dm-visualizer/rake/graphviz_task.rb

@@ -1,16 +1,24 @@
 require 'dm-visualizer/rake/task'
 require 'dm-visualizer/graphviz'
 
+require 'set'
+
 module DataMapper
   module Visualizer
     module Rake
       class GraphVizTask < Task
 
-        # The relational diagram GraphViz visualizer
-        attr_reader :relational
+        # The types of GraphViz diagrams.
+        DIAGRAMS = Set[:relational, :schema]
+
+        # The image formats for GraphViz diagrams.
+        FORMATS = Set[:png, :svg]
+
+        # The types of diagrams to generate.
+        attr_reader :diagrams
 
-        # The schema diagram GraphViz visualizer
-        attr_reader :schema
+        # The formats of the diagrams to generate.
+        attr_reader :formats
 
         #
         # Creates a new `dm:doc:graphviz` task.
@@ -18,6 +26,18 @@ module DataMapper
         # @param [Hash] options
         #   Additional options.
         #
+        # @option options [Boolean] :relational
+        #   Specifies whether to generate a relational diagram.
+        #
+        # @option options [Boolean] :schema
+        #   Specifies whether to generate a schema diagram.
+        #
+        # @option options [Boolean] :png
+        #   Specifies whether to generate a PNG image.
+        #
+        # @option options [Boolean] :svg
+        #   Specifies whether to generate a SVG image.
+        #
         # @yield [task]
         #   The given block will be passed the newly created task.
         #
@@ -26,38 +46,50 @@ module DataMapper
         #
         # @see GraphViz.new
         #
-        def initialize(options={})
-          @relational = GraphViz.new(options.merge(
-            :naming => :relational,
-            :file => 'doc/relational_diagram'
-          ))
+        def initialize(options={},&block)
+          extract_options = lambda { |keys|
+            if keys.any? { |key| options[key] }
+              keys.select { |key| options.delete(key) }
+            else
+              keys
+            end
+          }
 
-          @schema = GraphViz.new(options.merge(
-            :naming => :schema,
-            :file => 'doc/schema_diagram'
-          ))
+          @diagrams = extract_options[DIAGRAMS]
+          @formats = extract_options[FORMATS]
 
-          super
+          super(options,&block)
         end
 
         #
         # Defines the `dm:doc:graphviz` namespace.
         #
         def define
+          graphviz = lambda { |type,format|
+            GraphViz.new(@options.merge(
+              :naming => type,
+              :file => "doc/#{type}_diagram",
+              :format => format
+            ))
+          }
+
           super do
-            namespace :graphviz do
-              desc 'Generates a GraphViz relational diagram of the DataMapper Models'
-              task :relational do
-                @relational.visualize!
-              end
+            namespace(:graphviz) do
+              @diagrams.each do |type|
+                namespace(type) do
+                  @formats.each do |format|
+                    desc "Generates a #{format.to_s.upcase} GraphViz #{type} diagram of the DataMapper Models"
+                    task(format) do
+                      graphviz[type, format].visualize!
+                    end
+                  end
+                end
 
-              desc 'Generates a GraphViz schema diagram of the DataMapper Models'
-              task :schema do
-                @schema.visualize!
+                task(type => @formats.map { |format| "#{type}:#{format}" })
               end
             end
 
-            task :graphviz => ['graphviz:relational', 'graphviz:schema']
+            task(:graphviz => @diagrams.map { |type| "graphviz:#{type}" })
           end
         end
 

data/lib/dm-visualizer/rake/rails/tasks.rb

@@ -3,9 +3,16 @@ module DataMapper
     module Rake
       module Rails
         module Tasks
+          #
+          # Disables Bundler by default.
+          #
+          def initialize(options={},&block)
+            super({:bundle => false}.merge(options),&block)
+          end
+
           #
           # Overrides the Rake `task` method to make sure every defined
-          # task depends on `dm:load_models`.
+          # task depends on `environment`.
           #
           # @param [Array] arguments
           #   The arguments of the task.
@@ -14,7 +21,7 @@ module DataMapper
             if arguments.first.kind_of?(Hash)
               super(*arguments)
             else
-              super(arguments.first => 'db:load_models')
+              super(arguments.first => :environment)
             end
           end
         end

data/lib/dm-visualizer/rake/task.rb

@@ -4,9 +4,16 @@ module DataMapper
   module Visualizer
     module Rake
       class Task < ::Rake::TaskLib
+
+        # Options for the DataMapper Visualizer.
+        attr_reader :options
+
         #
         # Creates a new task.
         #
+        # @param [Hash] options
+        #   Options for the DataMapper Visualizer.
+        #
         # @yield [task]
         #   The given block will be passed the newly created task.
         #   
@@ -14,6 +21,11 @@ module DataMapper
         #   The new Task.
         #
         def initialize(options={})
+          @options = {
+            :bundle => File.file?('Gemfile')
+          }
+          @options.merge!(options)
+
           yield self if block_given?
 
           define()

data/lib/dm-visualizer/visualization.rb

@@ -9,13 +9,6 @@ module DataMapper
     #
     class Visualization
 
-      # The inflector to use
-      Inflector = if Object.const_defined?('ActiveSupport')
-                    ActiveSupport::Inflector
-                  else
-                    Extlib::Inflection
-                  end
-
       # The project that will be visualized
       attr_reader :project
 
@@ -90,7 +83,7 @@ module DataMapper
                  obj.class.name
                end
 
-        name = Inflector.demodulize(name) unless @full_names
+        name = DataMapper::Inflector.demodulize(name) unless @full_names
 
         return name
       end
@@ -134,7 +127,7 @@ module DataMapper
       #   The property type name.
       #
       def property_type_name(property)
-        class_name(property.type || property.class)
+        class_name(property.class)
       end
 
       #

data/spec/dm_visualizer_spec.rb

@@ -3,7 +3,4 @@ require 'dm-visualizer'
 require 'spec_helper'
 
 describe DataMapper::Visualizer do
-  it "should define a VERSION constant" do
-    DataMapper::Visualizer.const_defined?('VERSION').should == true
-  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1 @@
-require 'rubygems'
-
-gem 'rspec', '~> 1.3.0'
-
-require 'spec'
-require 'dm-visualizer/version'
+require 'rspec'

data/spec/visualization_spec.rb

@@ -6,10 +6,6 @@ require 'helpers/project'
 describe DataMapper::Visualizer::Visualization do
   include Helpers::Project
 
-  it "should detect which inflector DataMapper is using" do
-    DataMapper::Visualizer::Visualization::Inflector.should_not be_nil
-  end
-
   describe "defaults" do
     before(:all) do
       @vis = DataMapper::Visualizer::Visualization.new(
@@ -23,7 +19,7 @@ describe DataMapper::Visualizer::Visualization do
     end
 
     it "should return the class names of Objects" do
-      @vis.class_name(Blog::Post.body).should == 'Property'
+      @vis.class_name(Blog::Post.body).should == 'Text'
     end
 
     it "should return the names of properties" do
@@ -78,11 +74,13 @@ describe DataMapper::Visualizer::Visualization do
     end
 
     it "should not demodulize the names of Objects" do
-      @vis.class_name(Blog::Post.body).should == 'DataMapper::Property'
+      object = Blog::Post.new
+
+      @vis.class_name(object).should == 'Blog::Post'
     end
 
     it "should not demodulize property type names" do
-      @vis.property_type_name(Blog::Post.body).should == 'DataMapper::Types::Text'
+      @vis.property_type_name(Blog::Post.body).should =~ /::Text$/
     end
 
     it "should not demodulize model names" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-visualizer
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Postmodern
@@ -15,89 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -07:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-graphviz
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: dm-core
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 9
-        - 10
-        version: 0.9.10
+        - 0
+        version: 1.0.0
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: ruby-graphviz
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 47
         segments: 
         - 0
+        - 9
         - 10
-        - 2
-        version: 0.10.2
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thor
+        version: 0.9.10
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 13
-        - 4
-        version: 0.13.4
   type: :runtime
-  version_requirements: *id003
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: yard
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 7
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 6
+        - 0
+        version: 0.6.0
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 23
         segments: 
+        - 1
         - 0
-        - 5
-        - 3
-        version: 0.5.3
+        - 0
+        version: 1.0.0
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  requirement: *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
 executables: []
@@ -105,47 +89,45 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- ChangeLog.md
-- LICENSE.txt
 - README.md
 files: 
-- .gitignore
-- .specopts
+- 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
-- ChangeLog.md
-- LICENSE.txt
-- README.md
-- Rakefile
-- VERSION
-- dm-visualizer.gemspec
-- lib/dm-visualizer.rb
+- 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/project.rb
-- lib/dm-visualizer/rake/graphviz_task.rb
-- lib/dm-visualizer/rake/rails/graphviz_task.rb
-- lib/dm-visualizer/rake/rails/tasks.rb
-- lib/dm-visualizer/rake/task.rb
 - lib/dm-visualizer/visualization.rb
-- spec/dm_visualizer_spec.rb
-- spec/helpers/project.rb
-- spec/helpers/projects/library/lib/blog.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
+- lib/dm-visualizer.rb
+- dm-visualizer.gemspec
 - spec/helpers/projects/library/lib/blog/user.rb
-- spec/helpers/projects/rails/app/models/comment.rb
-- spec/helpers/projects/rails/app/models/post.rb
-- spec/helpers/projects/rails/app/models/user.rb
-- spec/project_examples.rb
-- spec/project_spec.rb
-- spec/spec_helper.rb
-- spec/visualization_spec.rb
-has_rdoc: yard
+- 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
 homepage: http://github.com/postmodern/dm-visualizer
 licenses: 
 - MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -162,28 +144,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: dm-visualizer
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Visualizes the Models, Properties and Relationships defined in a DataMapper based Ruby project.
 test_files: 
 - spec/project_spec.rb
-- spec/spec_helper.rb
-- spec/visualization_spec.rb
-- spec/project_examples.rb
-- spec/helpers/project.rb
-- spec/helpers/projects/library/lib/blog.rb
-- spec/helpers/projects/library/lib/blog/post.rb
-- spec/helpers/projects/library/lib/blog/user.rb
-- spec/helpers/projects/library/lib/blog/comment.rb
-- spec/helpers/projects/rails/app/models/post.rb
-- spec/helpers/projects/rails/app/models/user.rb
-- spec/helpers/projects/rails/app/models/comment.rb
 - spec/dm_visualizer_spec.rb
+- spec/visualization_spec.rb

data/.gitignore

@@ -1,9 +0,0 @@
-doc
-pkg
-tmp/*
-.DS_Store
-.yardoc
-*.db
-*.log
-*.swp
-*~

data/.specopts

@@ -1 +0,0 @@
---colour --format specdoc

data/VERSION

@@ -1 +0,0 @@
-0.1.0