blufin-lib 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18b8e80ef480a5dad4b4ce1d23d8c357ef41144
-  data.tar.gz: 3ac8da0829f69021888397ad1c8879d3ae7f48e2
+  metadata.gz: b67f2cab38a86d25509d04a27f4a29646951c644
+  data.tar.gz: 520e83c0929b0652df8fe8eb7a4d78afff27249e
 SHA512:
-  metadata.gz: f3527a65e1fba07c5915007e4b2925e01bf183eecbbde9e8087e99bf8ac43bf731b1a50577d589828c21220942e9dd6f9c8b13aeab95af1a06b5777ff4eec357
-  data.tar.gz: 743bba3db7bcc1cd51c4cd43b14fe94e55394e60b7586b6959c2766804043800c5f76ced3cc5fb987198cf57dfb0565cb2c90f3e3a4a9a87750fe994a6e5f9f8
+  metadata.gz: a0c9ba5176bd5f873d969296d303ea96f171cb4a48a02c4720d23f9d9141a77777a32af483a196a72c7e40e4838c6b0684b29860c5e7fdecbe9c20879e8624a4
+  data.tar.gz: 2745fab81a44b885f73c1961d73fa7a7cd68943bef5e2d2a2a44b518fa407140d87986a3d6c0bb0596ebad10062b03d40bd1e6764a4f68431b37103231983ff3

data/lib/scan/scanner_js.rb

@@ -11,6 +11,7 @@ module Blufin
             # Check path exists.
             Blufin::Terminal::error("Path does not exist: #{Blufin::Terminal::format_invalid(path)}") unless Blufin::Files::path_exists(path)
 
+            @path   = path
             @data   = {}
             @errors = []
 
@@ -27,9 +28,11 @@ module Blufin
         # @return void
         def self.scan_file(file)
 
-            @file                  = file
-            @data[@file]           = {}
-            @data[@file][:methods] = {}
+            @file                        = file
+            @file_short                  = Blufin::Strings::remove_surrounding_slashes(file.gsub(@path, ''))
+            @data[@file_short]           = {}
+            @data[@file_short][:methods] = {}
+            @data[@file_short][:file]    = file
 
             @line          = nil
             @line_number   = 0
@@ -120,6 +123,8 @@ module Blufin
                 ls             = line.gsub(/^\s*\*+\s*@returns\s+/, '').split(' ')
                 @docs[:return] = nil
                 @docs[:return] = extract_type(ls[0], true) if ls.any?
+            elsif line.strip == '*'
+                return
             else
                 raise RuntimeError, 'Something is wrong with this line, it failed to parse.'
             end
@@ -130,7 +135,7 @@ module Blufin
         def self.parse_method_definition(line)
             method_name    = line.strip.gsub(/\(.*$/, '')
             method_private = method_name =~ /^_/ ? true : false
-            raise RuntimeError, "Duplicate method: #{method_name}" if @data[@file][:methods].keys.include?(method_name)
+            raise RuntimeError, "Duplicate method: #{method_name}" if @data[@file_short][:methods].keys.include?(method_name)
             matches = line.match(/\(.*\)/)
             raise RuntimeError, 'Unable to extract method parameters.' unless matches.length == 1
             params = matches[0].strip.gsub(/^\(/, '').gsub(/\)$/, '')
@@ -142,7 +147,7 @@ module Blufin
                     raise RuntimeError, "Expected exactly one equal (=) sign, got: #{ps.length - 1}" unless ps.length == 2
                     param_extracted = ps[0].strip
                     raise RuntimeError, "Duplicate parameter: #{param_extracted}" if @params.has_key?(param_extracted)
-                    @params[param_extracted] = {:default => ps[1].strip}
+                    @params[param_extracted] = { :default => ps[1].strip }
                 elsif param =~ /\w+/
                     raise RuntimeError, "Duplicate parameter: #{param}" if @params.has_key?(param)
                     @params[param] = {}
@@ -150,9 +155,9 @@ module Blufin
                     raise RuntimeError, "Unrecognized parameter: #{param}"
                 end
             end
-            @docs                               = {:params => {}} unless @docs.is_a?(Hash)
-            @docs[:params]                      = {} unless @docs[:params].is_a?(Hash)
-            @data[@file][:methods][method_name] = {
+            @docs                                     = { :params => {} } unless @docs.is_a?(Hash)
+            @docs[:params]                            = {} unless @docs[:params].is_a?(Hash)
+            @data[@file_short][:methods][method_name] = {
                 :line        => @line,
                 :line_number => @line_number,
                 :docs        => @docs,

data/lib/version.rb

@@ -1 +1 @@
-BLUFIN_LIB_VERSION = '2.0.0'
+BLUFIN_LIB_VERSION = '2.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blufin-lib
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline