modaldiagrams 1.1.5 → 1.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 07b972b3850d455e380e6175eebfddc828a0752a
+  data.tar.gz: d08b305b7bc0c6cba6e68eb062ebfc48e12e2f2f
+SHA512:
+  metadata.gz: 339eedfe6d76945cb2bcbf121d801350be76a516f892beedd24fdd88388f04ea92511ecab64e77a8338b33984e7011c27e282bb47f8f087e1134cd57bb10d4cd
+  data.tar.gz: 1b4715176655f360dce0a9e47c80e9734788f22bc4b8502b7ce31d214bc5806a46fa708f79b7d500db414c0c88740ed55c2e8224997f5dc8744d62f2e2ee9be7

data/Rakefile

@@ -1,42 +1,12 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "modaldiagrams"
-  gem.homepage = "http://github.com/jgoizueta/modaldiagrams"
-  gem.license = "MIT"
-  gem.summary = %Q{DB diagramming tool fo Rails ActiveRecord applications}
-  gem.description = %Q{modaldiagrams provides Rake tasks for diagramming ActiveRecord databases. It generates Graphviz dot files.}
-  gem.email = "jgoizueta@gmail.com"
-  gem.authors = ["Javier Goizueta"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'bundler/gem_tasks'
 
 task :default => :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = ModalDiagrams::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "modaldiagrams #{version}"

data/lib/modaldiagrams/modaldiagrams.rb

@@ -35,10 +35,12 @@ module ModalDiagrams
       model_selection_options = {
           :all_models => cfg.include_all_models,
           :dynamic_models => cfg.include_dynamic_models,
-          :include_files => false
+          :include_files => false,
+          :exclude_models => cfg.exclude_models
       }
 
-      models = dbmodels(model_selection_options.merge(:exclude_sti_models => true))
+      models, excluded_models = dbmodels(model_selection_options.merge(:exclude_sti_models => true))
+      excluded_class_names = excluded_models.map(&:name)
 
       models.each do |cls|
         if cls.respond_to?(:reflect_on_all_associations) && ActiveRecord::Base.connection.table_exists?(cls.table_name)
@@ -72,6 +74,7 @@ module ModalDiagrams
           cluster_classes[cluster] ||= []
           cluster_classes[cluster] << cls.to_s
           cls.reflect_on_all_associations.each do |assoc|
+            next if assoc.class_name.in?(excluded_class_names)
             target,type = nil,nil
             case assoc.macro
             when :has_many
@@ -139,7 +142,7 @@ module ModalDiagrams
       end
 
       if cfg.show_sti
-        sti_classes = dbmodels(model_selection_options.merge(:exclude_non_sti_models => true))
+        sti_classes, exc = dbmodels(model_selection_options.merge(:exclude_non_sti_models => true))
         sti_classes.each do |sti_class|
           cls = sti_class.base_class
           if cls.respond_to?(:cluster)
@@ -167,7 +170,7 @@ module ModalDiagrams
       end
 
       fn = Rails.root.join('db/diagrams/diagram.dot')
-      mkdir_p fn.dirname
+      FileUtils.mkdir_p fn.dirname
       File.open(fn,'w') do |f|
         add_diagram_header f
         cluster_id = 0
@@ -205,6 +208,7 @@ module ModalDiagrams
     #   :dynamic_models            # Return dynamically defined models too (not defined in a model file)
     #   :exclude_sti_models        # Exclude derived (STI) models
     #   :exclude_non_sti_models    # Exclude top level models
+    #   :exclude_models            # Array of models to exclude from the diagrams
     #   :include_files             # Return also the model definition file pathnames (return pairs of [model, file])
     #   :only_app_files            #   But return nil for files not in the app proper
     #   :only_app_tree_files       #   But return nil for files not in the app directory tree (app, vendor...)
@@ -247,8 +251,17 @@ module ModalDiagrams
       non_sti_models, sti_models = models.partition{|model| model.base_class==model}
 
       models = []
-      models += non_sti_models unless options[:exclude_non_sti_models]
-      models += sti_models unless options[:exclude_sti_models]
+      excluded_models = []
+      if options[:exclude_non_sti_models]
+        excluded_models += non_sti_models
+      else
+        models += non_sti_models
+      end
+      if options[:exclude_sti_models]
+        excluded_models += sti_models
+      else
+        models += sti_models
+      end
       if options[:include_files]
         models = models.map{|model| [model, files[model.to_s]]}
         if options[:only_app_files] || options[:only_app_tree_files]
@@ -261,7 +274,12 @@ module ModalDiagrams
           models = models.map{|model, file| [model, file && (file.starts_with?(suffix) ? file : nil)]}
         end
       end
-      models
+      excluded_models = []
+      if options[:exclude_models].present?
+        excluded_models = Array(options[:exclude_models]).map{|m| String===m ? m.constantize : m}
+        models -= excluded_models
+      end
+      [models, excluded_models]
     end
 
     def has_table?(cls)

data/lib/modaldiagrams/version.rb

@@ -0,0 +1,3 @@
+module ModalDiagrams
+  VERSION = "1.1.6"
+end

data/lib/modaldiagrams.rb

@@ -1,3 +1,4 @@
+require 'modaldiagrams/version'
 require 'modaldiagrams/parameters'
 require 'modaldiagrams/modaldiagrams'
 

metadata

@@ -1,182 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: modaldiagrams
 version: !ruby/object:Gem::Version
-  version: 1.1.5
-  prerelease: 
+  version: 1.1.6
 platform: ruby
 authors:
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: modalsettings
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: modalsupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: modalsettings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: modalfields
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 description: modaldiagrams provides Rake tasks for diagramming ActiveRecord databases.
   It generates Graphviz dot files.
-email: jgoizueta@gmail.com
+email:
+- jgoizueta@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
-- TODO
+extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
 - README.rdoc
 - Rakefile
-- TODO
-- VERSION
 - lib/modaldiagrams.rb
 - lib/modaldiagrams/modaldiagrams.rb
 - lib/modaldiagrams/parameters.rb
 - lib/modaldiagrams/tasks.rb
+- lib/modaldiagrams/version.rb
 - lib/tasks.rb
 - lib/tasks/diagrams.rake
 - lib/tasks/diagrams_clean.rake
 - lib/tasks/diagrams_pdf.rake
 - lib/tasks/diagrams_png.rake
 - lib/tasks/diagrams_ps.rake
-- modaldiagrams.gemspec
-homepage: http://github.com/jgoizueta/modaldiagrams
+homepage: https://github.com/jgoizueta/modaldiagrams
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3964054576026403237
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DB diagramming tool fo Rails ActiveRecord applications
 test_files: []

data/Gemfile

@@ -1,15 +0,0 @@
-source "http://rubygems.org"
-
-gem 'modalsettings'
-gem 'modalsupport', '>= 0.9.2'
-
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.0"
-  gem "jeweler", "~> 1.8.4"
-  gem 'modalfields', '>= 1.2.0'
-end

data/Gemfile.lock

@@ -1,110 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.0)
-    erubis (2.7.0)
-    git (1.2.5)
-    hike (1.2.1)
-    i18n (0.6.1)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    journey (1.0.4)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    modalfields (1.2.0)
-      activerecord (>= 2.3.5)
-      activesupport (>= 2.3.5)
-      rails (>= 2.3.0)
-    modalsettings (1.0.0)
-      modalsupport (>= 0.8.1)
-    modalsupport (0.9.2)
-    multi_json (1.3.6)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    shoulda (3.1.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.2)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.3.0)
-      activesupport (>= 3.0.0)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.1.0)
-  jeweler (~> 1.8.4)
-  modalfields (>= 1.2.0)
-  modalsettings
-  modalsupport (>= 0.9.2)
-  rdoc (~> 3.12)
-  shoulda

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2012 Javier Goizueta
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-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.

data/TODO

@@ -1,4 +0,0 @@
-TODO
-*  Write tests (use simple demo data model whose diagrams will serve as a generic diagram legend as well)
-*  If the use of requires_presence_of with has_many and has_one associations could be detected, specific
-   arrowheads could be used for "one or more" (e.g. crowtee) and "one only" (e.g. teetee) associations.

data/VERSION

@@ -1 +0,0 @@
-1.1.5

data/modaldiagrams.gemspec

@@ -1,76 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "modaldiagrams"
-  s.version = "1.1.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Javier Goizueta"]
-  s.date = "2014-02-19"
-  s.description = "modaldiagrams provides Rake tasks for diagramming ActiveRecord databases. It generates Graphviz dot files."
-  s.email = "jgoizueta@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc",
-    "TODO"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "lib/modaldiagrams.rb",
-    "lib/modaldiagrams/modaldiagrams.rb",
-    "lib/modaldiagrams/parameters.rb",
-    "lib/modaldiagrams/tasks.rb",
-    "lib/tasks.rb",
-    "lib/tasks/diagrams.rake",
-    "lib/tasks/diagrams_clean.rake",
-    "lib/tasks/diagrams_pdf.rake",
-    "lib/tasks/diagrams_png.rake",
-    "lib/tasks/diagrams_ps.rake",
-    "modaldiagrams.gemspec"
-  ]
-  s.homepage = "http://github.com/jgoizueta/modaldiagrams"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "DB diagramming tool fo Rails ActiveRecord applications"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<modalsettings>, [">= 0"])
-      s.add_runtime_dependency(%q<modalsupport>, [">= 0.9.2"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<modalfields>, [">= 1.2.0"])
-    else
-      s.add_dependency(%q<modalsettings>, [">= 0"])
-      s.add_dependency(%q<modalsupport>, [">= 0.9.2"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<modalfields>, [">= 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<modalsettings>, [">= 0"])
-    s.add_dependency(%q<modalsupport>, [">= 0.9.2"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<modalfields>, [">= 1.2.0"])
-  end
-end
-