code_stats2 0.1.7 → 0.1.8

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake_ext'
 
-project(
+project \
   name: "code_stats",
   official_name: 'code_stats2',
   gem: true,
@@ -11,5 +11,4 @@ project(
   dirs: %w(bin),
 
   author: "Alexey Petrushin",
-  homepage: "http://github.com/alexeypetrushin/code_stats"
-)
+  homepage: "http://github.com/alexeypetrushin/code_stats"

data/lib/code_stats/languages.rb

@@ -46,7 +46,10 @@ module CodeStats::Languages
 
   module CComments
     def code
-      @code ||= text.substitute(/\/\*.+?\*\/\n?/m, '').substitute(/^\/\/.+?[\n\z]/m, '').substitute(/\/\/.+?$/, '')
+      @code ||= text.
+        substitute(/\/\*.+?\*\/\n?/m, '').
+        substitute(/^\/\/.+?[\n\z]/m, '').
+        substitute(/\/\/.+?$/, '')
     end
   end
 
@@ -92,7 +95,10 @@ module CodeStats::Languages
     extensions :coffee
 
     def code
-      @code ||= text.substitute(/###.+?###\n?/m, '').substitute(/^#.+?[\n\z]/m, '').substitute(/#.+?$/, '')
+      @code ||= text.
+        substitute(/###.+?###\n?/m, '').
+        substitute(/^#.+?[\n\z]/m, '').
+        substitute(/#.+?$/, '')
     end
   end
 
@@ -139,4 +145,16 @@ module CodeStats::Languages
       @code ||= text.substitute(/^;.+?[\n\z]/m, '').substitute(/;.+?$/, '')
     end
   end
+
+  class Scala < Java
+    extensions :scala
+  end
+
+  class Html < Abstract
+    extensions :html, :xhtml
+
+    def code
+      @code ||= text.substitute(/<!--.+?-->\n?/m, '')
+    end
+  end
 end

data/lib/code_stats/project.rb

@@ -4,7 +4,7 @@ class CodeStats::Project
 
   AVAILIABLE_OPTIONS = [:spec_filter, :skip_filter]
   DEFAUL_SPEC_FILTER = /\/tests?\/|\/specs?\//
-  DEFAUL_SKIP_FILTER = /\/docs?\/|\/(s|ex)amples?\/|\/guides?\/|\/.git\/|\/tmp\/|\/old\/|database\.php/
+  DEFAUL_SKIP_FILTER = /\/docs?\/|\/(s|ex)amples?\/|\/guides?\/|\/.git\/|\/tmp\/|\/old\/|database\.php|\/vendor\//
 
   def initialize path, options = {}
     @path, @name = path, path.to_entry.name

data/spec/languages_spec.rb

@@ -29,7 +29,7 @@ comment_a
  */
 // comment_b
 // comment_b2
-code_b // comment_b3
+code_b// comment_b3
 JAVA
   end
 end
@@ -49,7 +49,7 @@ comment_a
  */
 // comment_b
 // comment_b2
-code_b // comment_b3
+code_b// comment_b3
 JAVA_SCRIPT
   end
 
@@ -89,7 +89,7 @@ describe "Ruby" do
 code_a
 # comment_a
 # comment_a2
-code_b # comment_b3
+code_b# comment_b3
 RUBY
   end
 end
@@ -109,7 +109,7 @@ comment_a
  */
 // comment_b
 // comment_b2
-code_b // comment_b3
+code_b// comment_b3
 CPP
   end
 end
@@ -129,7 +129,7 @@ comment_a2
 ###
 # comment_b
 # comment_b2
-code_b # comment_b3
+code_b# comment_b3
 COFFEE_SCRIPT
   end
 end
@@ -143,7 +143,7 @@ describe "Yaml" do
 code_a
 # comment_a
 # comment_a2
-code_b # comment_b3
+code_b# comment_b3
 YAML
   end
 end
@@ -201,7 +201,7 @@ comment_a
  */
 // comment_b
 // comment_b2
-code_b // comment_b3
+code_b// comment_b3
 PHP
   end
 end
@@ -215,7 +215,7 @@ describe "Python" do
 code_a
 # comment_a
 # comment_a2
-code_b # comment_b3
+code_b# comment_b3
 PYTHON
   end
 end
@@ -229,7 +229,46 @@ describe "Clojure" do
 code_a
 ; comment_a
 ; comment_a2
-code_b ; comment_b3
+code_b; comment_b3
 CLOJURE
   end
+end
+
+describe "Scala" do
+  it_should_behave_like "language"
+
+  before do
+    @extension = :scala
+    @script = <<-SCALA
+code_a
+/*
+comment_a
+*/
+/*
+ * comment_a2
+ */
+// comment_b
+// comment_b2
+code_b// comment_b3
+SCALA
+  end
+end
+
+describe "Html" do
+  it_should_behave_like "language"
+
+  before do
+    @extension = :html
+    @script = <<-HTML
+code_a
+<!--
+comment_a
+-->
+<!--
+ comment_a2
+-->
+code_b<!-- comment_b3 -->
+
+HTML
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_stats2
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2012-03-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2829590 !ruby/object:Gem::Requirement
+  requirement: &70218106161240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2829590
+  version_requirements: *70218106161240
 - !ruby/object:Gem::Dependency
   name: vfs
-  requirement: &2829350 !ruby/object:Gem::Requirement
+  requirement: &70218106160220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2829350
+  version_requirements: *70218106160220
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2829110 !ruby/object:Gem::Requirement
+  requirement: &70218106159260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2829110
+  version_requirements: *70218106159260
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2828870 !ruby/object:Gem::Requirement
+  requirement: &70218106158380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2828870
+  version_requirements: *70218106158380
 description: 
 email: 
 executables:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Language-agnostic Code Statistics