rails-erd 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d754b17dc91d089d0e6bbccfce2bf4d269db3b7b
-  data.tar.gz: f87e6ed6a771e3956a44edb77aba932e626203a2
+  metadata.gz: 537ccea2a689d7fc5eafcf6879b4f72f9a143c63
+  data.tar.gz: 22934779369b6203496dc48792b5442697131bfd
 SHA512:
-  metadata.gz: 278db5cb89bda7905a7ba8fda35cdfd5466fafd4231bbf86272a9463a088a015be01daee8033432bfe1a1fddad872e6728fe1b75e37ad7b9e78c433bd3974c91
-  data.tar.gz: c02232f93661c164eefdbc04289569e3a6579ec1146271e5ce94ece1cbdcecb8dacc3b2f86f2c67ea2c0a05210a052869a70c09a6fc7c71138ef9e7916382223
+  metadata.gz: 1539881900c1f05e0dbafbfba086dd4bcfee51a323c608b5f7d02b362d69818e9c7543a93e4a6d40f18443a243fefe2518fe944507983c466f7ca8724f1e01c3
+  data.tar.gz: 91502bc3daa15a4aff18bdd0cfd1b6993b1b8607f5aed5f5a224d4c36dfd99b5f1fc7d755a29242cdd9c14f726b2aff6fbc55eefcf8d402ee6a04de51cd37a6d

data/lib/rails_erd/diagram.rb

@@ -150,8 +150,8 @@ module RailsERD
 
     def filtered_entities
       @domain.entities.reject { |entity|
-        options.exclude && entity.model && [options.exclude].flatten.include?(entity.name.to_s) or
-        options.only && entity.model && ![options.only].flatten.include?(entity.name.to_s) or
+        options.exclude && entity.model && [options.exclude].flatten.include?(entity.name.to_sym) or
+        options.only && entity.model && ![options.only].flatten.include?(entity.name.to_sym) or
         !options.inheritance && entity.specialized? or
         !options.polymorphism && entity.generalized? or
         !options.disconnected && entity.disconnected?

data/lib/rails_erd/domain/attribute.rb

@@ -14,13 +14,18 @@ module RailsERD
           attributes.sort! if RailsERD.options[:sort]
 
           if RailsERD.options[:prepend_primary]
-            primary_key = ActiveRecord::Base.get_primary_key(model)
-            primary = attributes.detect{ |column| column.name == primary_key }
+            attributes = prepend_primary(model, attributes)
+          end
+
+          attributes
+        end
+
+        def prepend_primary(model, attributes)
+          primary_key = ActiveRecord::Base.get_primary_key(model)
+          primary = attributes.index { |column| column.name == primary_key }
 
-            if primary
-              attributes.delete(primary)
-              attributes.unshift(primary)
-            end
+          if primary
+            attributes[primary], attributes[0] = attributes[0], attributes[primary]
           end
 
           attributes

data/lib/rails_erd/tasks.rake

@@ -8,7 +8,7 @@ namespace :erd do
       RailsERD.options[option.to_sym] = case ENV[option]
       when "true", "yes" then true
       when "false", "no" then false
-      when /,/ then ENV[option].split(/\s*,\s*/).map(&:to_sym)
+      when /,/ then ENV[option].split(/\s*,\s*/)
       else ENV[option].to_sym
       end
     end

data/lib/rails_erd/version.rb

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

data/test/test_helper.rb

@@ -11,6 +11,10 @@ require "rails_erd/domain"
 
 ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
 
+if ActiveSupport::TestCase.respond_to?(:test_order=)
+  ActiveSupport::TestCase.test_order = :random
+end
+
 class ActiveSupport::TestCase
   include RailsERD
 

data/test/unit/attribute_test.rb

@@ -44,8 +44,8 @@ class AttributeTest < ActiveSupport::TestCase
     assert_equal %w{id a}, Domain::Attribute.from_model(Domain.new, Foo).map(&:name)
   end
 
-  test "from_model should return attributes with PK first if sort is false and prepend_primary is true" do
-    RailsERD.options[:sort]            = false
+  test "from_model should return attributes with PK first if prepend_primary is true" do
+    RailsERD.options[:sort]            = true
     RailsERD.options[:prepend_primary] = true
 
     create_model "Foo"

data/test/unit/diagram_test.rb

@@ -126,27 +126,27 @@ class DiagramTest < ActiveSupport::TestCase
   test "generate should filter excluded entity" do
     create_model "Book"
     create_model "Author"
-    assert_equal [Book], retrieve_entities(:exclude => ['Author']).map(&:model)
+    assert_equal [Book], retrieve_entities(:exclude => [:Author]).map(&:model)
   end
 
   test "generate should filter excluded entities" do
     create_model "Book"
     create_model "Author"
     create_model "Editor"
-    assert_equal [Book], retrieve_entities(:exclude => ['Author', 'Editor']).map(&:model)
+    assert_equal [Book], retrieve_entities(:exclude => [:Author, :Editor]).map(&:model)
   end
 
   test "generate should include only specified entity" do
     create_model "Book"
     create_model "Author"
-    assert_equal [Book], retrieve_entities(:only => ['Book']).map(&:model)
+    assert_equal [Book], retrieve_entities(:only => [:Book]).map(&:model)
   end
 
   test "generate should include only specified entities" do
     create_model "Book"
     create_model "Author"
     create_model "Editor"
-    assert_equal [Author, Editor], retrieve_entities(:only => ['Author', 'Editor']).map(&:model)
+    assert_equal [Author, Editor], retrieve_entities(:only => [:Author, :Editor]).map(&:model)
   end
 
   test "generate should filter disconnected entities if disconnected is false" do

data/test/unit/rake_task_test.rb

@@ -160,6 +160,6 @@ Error occurred while loading application: FooBar (RuntimeError)
   test "options task should set known array command line options" do
     ENV["attributes"] = "content,timestamps"
     Rake::Task["erd:options"].execute
-    assert_equal [:content, :timestamps], RailsERD.options.attributes
+    assert_equal %w[content timestamps], RailsERD.options.attributes
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-erd
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Rolf Timmermans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord