rails-erd 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c30fa295be10915a3d5d8e67c20bc05d10aee6d
-  data.tar.gz: ef14cf496c1f5fc4b608b9672c18a56d7ad3e978
+  metadata.gz: f023a0096d3737d00670e9d713e766855426f578
+  data.tar.gz: ebb61ceddc34a6d03ebb7157688335a41321ecc5
 SHA512:
-  metadata.gz: b03cf48dde711acfe6ae9988cf794629ecaec62cea8e6efabcc04bf43d743c2898b7d4b377c0fca85a944e67635e900a4a90df2477d48fcfbcb68cf42002354a
-  data.tar.gz: 5aa2246b32e02b5a8ff0729c84b4f1cdd2476b2c296293a8d7b447eb55bce26998c289528b2e98acb8e66f6bec756aaed2654b2efc5d0bac7c03019af1625be8
+  metadata.gz: 297d5f2899e0fbe308fe461c7304480efd00c10f904d58f5af14ee01b5ce2708167f49e4f366ff93ee9ac5e21b316da34d7b118c36a107965af07d0a3d404774
+  data.tar.gz: e757d823c41be9a73cf83b7e4485c6e596ece8874ac3e80de697a7536db6eab14906ac8a434936c99b94f83c515c2e0e2e16b0906870fd0a69185dcce75a679b

data/lib/rails_erd/domain/attribute.rb

@@ -125,7 +125,7 @@ module RailsERD
       # Returns any non-standard limit for this attribute. If a column has no
       # limit or uses a default database limit, this method returns +nil+.
       def limit
-        return if native_type == 'geometry'
+        return if native_type == 'geometry' || native_type == 'geography'
         return column.limit.to_i if column.limit != native_type[:limit] and column.limit.respond_to?(:to_i)
         column.precision.to_i if column.precision != native_type[:precision] and column.precision.respond_to?(:to_i)
       end

data/lib/rails_erd/version.rb

@@ -1,4 +1,4 @@
 module RailsERD
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
   BANNER  = "RailsERD #{VERSION}"
 end

data/test/test_helper.rb

@@ -2,11 +2,15 @@ require "rubygems"
 require "bundler/setup"
 
 require "active_record"
+
 if ActiveSupport::VERSION::MAJOR >= 4
   require "minitest/autorun"
+  require 'mocha/mini_test'
 else
   require "test/unit"
+  require 'mocha/test_unit'
 end
+
 require "rails_erd/domain"
 
 ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"

data/test/unit/graphviz_test.rb

@@ -4,7 +4,7 @@ require "rails_erd/diagram/graphviz"
 class GraphvizTest < ActiveSupport::TestCase
   def setup
     RailsERD.options.filetype = :png
-    RailsERD.options.warn = false
+    RailsERD.options.warn     = false
   end
 
   def teardown
@@ -75,26 +75,30 @@ class GraphvizTest < ActiveSupport::TestCase
       belongs_to :bar
     end
     create_model "Bar", :column => :string
+
+    Diagram.any_instance.expects(:save)
     Diagram::Graphviz.create
-    assert File.exists?("erd.png")
   end
 
   test "create should create output for domain without attributes" do
     create_simple_domain
+
+    Diagram.any_instance.expects(:save)
     Diagram::Graphviz.create
-    assert File.exists?("erd.png")
   end
 
   test "create should write to file with dot extension if type is dot" do
     create_simple_domain
-    Diagram::Graphviz.create :filetype => :dot
-    assert File.exists?("erd.dot")
+
+    Diagram.any_instance.expects(:save)
+    Diagram::Graphviz.create(:filetype => :dot)
   end
 
   test "create should create output for filenames that have spaces" do
     create_simple_domain
-    Diagram::Graphviz.create :filename => "erd with spaces"
-    assert File.exists?("erd_with_spaces.png")
+
+    Diagram.any_instance.expects(:save)
+    Diagram::Graphviz.create(:filename => "erd with spaces")
   end
 
   test "create should write to file with dot extension without requiring graphviz" do
@@ -105,7 +109,7 @@ class GraphvizTest < ActiveSupport::TestCase
         def output_and_errors_from_command(*args); raise end
       end
       assert_nothing_raised do
-        Diagram::Graphviz.create :filetype => :dot
+        Diagram::Graphviz.create(:filetype => :dot)
       end
     ensure
       GraphViz.class_eval do
@@ -119,14 +123,16 @@ class GraphvizTest < ActiveSupport::TestCase
       belongs_to :bar
     end
     create_model "Bar", :column => :string
+
+    Diagram.any_instance.expects(:save)
     Diagram::Graphviz.create(:orientation => :vertical)
-    assert File.exists?("erd.png")
   end
 
   test "create should create output for domain if orientation is vertical" do
     create_simple_domain
+
+    Diagram.any_instance.expects(:save)
     Diagram::Graphviz.create(:orientation => :vertical)
-    assert File.exists?("erd.png")
   end
 
   test "create should not create output if there are no connected models" do
@@ -144,24 +150,16 @@ class GraphvizTest < ActiveSupport::TestCase
     assert_match /No entities found/, message
   end
 
-  test "create should write to given file name plus extension if present" do
-    begin
-      create_simple_domain
-      Diagram::Graphviz.create :filename => "foobar"
-      assert File.exists?("foobar.png")
-    ensure
-      FileUtils.rm "foobar.png" rescue nil
-    end
-  end
-
   test "create should abort and complain if output directory does not exist" do
     message = nil
+
     begin
       create_simple_domain
-      Diagram::Graphviz.create :filename => "does_not_exist/foo"
+      Diagram::Graphviz.create(:filename => "does_not_exist/foo")
     rescue => e
       message = e.message
     end
+
     assert_match /Output directory 'does_not_exist' does not exist/, message
   end
 

data/test/unit/rake_task_test.rb

@@ -33,8 +33,9 @@ class RakeTaskTest < ActiveSupport::TestCase
   # Diagram generation =======================================================
   test "generate task should create output based on domain model" do
     create_simple_domain
+
+    Diagram.any_instance.expects(:save)
     Rake::Task["erd:generate"].execute
-    assert File.exists?("erd.dot")
   end
 
   test "generate task should not create output if there are no connected models" do
@@ -45,27 +46,35 @@ class RakeTaskTest < ActiveSupport::TestCase
   test "generate task should eager load application environment" do
     eager_loaded, environment_loaded = nil
     create_app
+
     Rails.application.class_eval do
       define_method :eager_load! do
         eager_loaded = true
       end
     end
+
     Rake::Task.define_task :environment do
       environment_loaded = true
     end
+
     create_simple_domain
+
     Rake::Task["erd:generate"].invoke
+
     assert_equal [true, true], [eager_loaded, environment_loaded]
   end
 
   test "generate task should complain if active record is not loaded" do
     create_app
+
     Rails.application.class_eval do
       define_method :eager_load! do end
     end
+
     Rake::Task.define_task :environment
     Object.send :remove_const, :ActiveRecord
     message = nil
+
     begin
       Rake::Task["erd:generate"].invoke
     rescue => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-erd
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord