Merge pull request #1832 from pchaigno/optimize-generated

Optimization of generated?

lib/linguist/generated.rb

@@ -51,20 +51,20 @@ module Linguist
     #
     # Return true or false
     def generated?
-      minified_files? ||
-      compiled_coffeescript? ||
       xcode_file? ||
-      generated_parser? ||
-      generated_net_docfile? ||
       generated_net_designer_file? ||
-      generated_postscript? ||
-      generated_protocol_buffer? ||
-      generated_jni_header? ||
       composer_lock? ||
       node_modules? ||
       godeps? ||
-      vcr_cassette? ||
-      generated_by_zephir?
+      generated_by_zephir? ||
+      minified_files? ||
+      compiled_coffeescript? ||
+      generated_parser? ||
+      generated_net_docfile? ||
+      generated_postscript? ||
+      generated_protocol_buffer? ||
+      generated_jni_header? ||
+      vcr_cassette?
     end
 
     # Internal: Is the blob an Xcode file?

test/test_generated.rb

@@ -0,0 +1,53 @@
+require_relative "./helper"
+
+class TestGenerated < Test::Unit::TestCase
+  include Linguist
+
+  def samples_path
+    File.expand_path("../../samples", __FILE__)
+  end
+
+  class DataLoadedError < StandardError; end
+
+  def generated_without_loading_data(name)
+    blob = File.join(samples_path, name)
+    assert_nothing_raised(DataLoadedError, "Data was loaded when calling generated? on #{name}") do
+      Generated.generated?(blob, lambda { raise DataLoadedError.new })
+    end
+  end
+
+  def generated_loading_data(name)
+    blob = File.join(samples_path, name)
+    assert_raise(DataLoadedError, "Data wasn't loaded when calling generated? on #{name}") do
+      Generated.generated?(blob, lambda { raise DataLoadedError.new })
+    end
+  end
+
+  def test_check_generated_without_loading_data
+    # Xcode project files
+    generated_without_loading_data("Binary/MainMenu.nib")
+    generated_without_loading_data("Dummy/foo.xcworkspacedata")
+    generated_without_loading_data("Dummy/foo.xcuserstate")
+
+    # .NET designer file
+    generated_without_loading_data("Dummu/foo.designer.cs")
+
+    # Composer generated composer.lock file
+    generated_without_loading_data("JSON/composer.lock")
+
+    # Node modules
+    generated_without_loading_data("Dummy/node_modules/foo.js")
+
+    # Godep saved dependencies
+    generated_without_loading_data("Godeps/Godeps.json")
+    generated_without_loading_data("Godeps/_workspace/src/github.com/kr/s3/sign.go")
+
+    # Generated by Zephir
+    generated_without_loading_data("Zephir/filenames/exception.zep.c")
+    generated_without_loading_data("Zephir/filenames/exception.zep.h")
+    generated_without_loading_data("Zephir/filenames/exception.zep.php")
+
+    # Minified files
+    generated_loading_data("JavaScript/jquery-1.6.1.min.js")
+  end
+end