mulang 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9175932c143b6a0841997e1400944429565ba33beb09aabbbd9183117a041791
-  data.tar.gz: b9f93712987684230b357cbf4fcccd9a231fce0873c67f38db57cfe6c7f5fed0
+  metadata.gz: 57cbb3086b4bddd286d787889961a658c45b2a32c5a131f5f86404ee714607f3
+  data.tar.gz: '047820d569e4a86ece08c14a117777444991c0c5d4e53012a033ef68806d4883'
 SHA512:
-  metadata.gz: d8cb2ca9a340f56f504e8c70be5d44b24d3c7ebb344eb93695abed8d6c136dd9a2196a84169e238d9d2afc8e5a4c22fa946b65804cf83a4a3580625a51bceab7
-  data.tar.gz: 94bd5b78f772d46e15e341d4264fdf7bca020081dfe9e3ddff05dd04df3664cedeac77413577bd0c641bc7ae441f980b932b9d9601d0a8c9083d00c77521517b
+  metadata.gz: e4a096e0a186d663cb521b8cea49877433c1622329f78cc5c884338085fddceb69918861c550aa1afc86e8e3d8b26e2fa5436c74a4a6da951609cb7f8697be65
+  data.tar.gz: 1e01645471e77d50392af5f2716cbdb7881da28998d4fa13a0f64b6df37a9b16327edb72804000ed23f551d90756d67a31a735810ae2795986ef801231dc212a

data/lib/locales/en.yml

@@ -123,6 +123,7 @@ en:
       HasRedundantLocalVariableReturn: '%{binding} has unnecesary local variables; please try returning the expression directly'
       HasRedundantParameter: '%{binding} has unnecessary parameters, that can be removed using point-free'
       HasRedundantReduction: '%{binding} uses <i>%{keyword_is}</i>, but it does not artihmetic'
+      HasRedundantRepeat: '%{binding} has an unnecesary <i>%{keyword_repeat}</i>'
       HasTooManyMethods: '%{binding} has too many methods'
       HasTooShortBindings: '%{binding} is a too short identifier'
       HasTooShortIdentifiers: '%{binding} is a too short identifier'

data/lib/locales/es.yml

@@ -127,6 +127,7 @@ es:
       HasRedundantLocalVariableReturn: '%{binding} usa variables locales innecesarias; podés retornar directamente la expresión'
       HasRedundantParameter: '%{binding} tiene parámetros innecesarios (se pueden eliminar mediante point-free)'
       HasRedundantReduction: '%{binding} usa <i>%{keyword_is}</i>, pero no realiza cálculos'
+      HasRedundantRepeat: '%{binding} tiene un <i>%{keyword_repeat}</i> innecesario'
       HasTooManyMethods: '%{binding} tiene demasiados métodos'
       HasTooShortBindings: '%{binding} es un identificador muy corto'
       HasTooShortIdentifiers: '%{binding} es un identificador muy corto'

data/lib/locales/pt.yml

@@ -122,11 +122,12 @@ pt:
       HasMisspelledIdentifiers: '%{binding}  está incorreto. Verifique a ortografia e tente não usar abreviaturas'
       HasRedundantBooleanComparison: '%{binding}  faz comparações booleanas desnecessárias'
       HasRedundantGuards: '%{binding}  possui protetores desnecessários'
-      HasRedundantIf: '%{binding}  tem desnecessário ifs'
+      HasRedundantIf: '%{binding} <i>%{keyword_if}</i> desnecessário'
       HasRedundantLambda: '%{binding}  possui lambdas desnecessários'
       HasRedundantLocalVariableReturn: '%{binding}  usa variáveis ​​locais desnecessárias; você pode retornar a expressão diretamente'
       HasRedundantParameter: '%{binding}  possui parâmetros desnecessários (pode ser removido por ponto-livre)'
       HasRedundantReduction: '%{binding}  usa <i>%{keyword_is}</i>, mas não executa cálculos'
+      HasRedundantRepeat: '%{binding} tem <i>%{keyword_repeat}</i> desnecessário'
       HasTooManyMethods: '%{binding} tem muitos métodos'
       HasTooShortBindings: '%{binding}  é um identificador muito curto'
       HasTooShortIdentifiers: '%{binding} é um identificador muito curto'

data/lib/mulang/code.rb

@@ -22,8 +22,7 @@ module Mulang
     end
 
     def expect(binding='*', inspection)
-      expectation = {binding: binding, inspection: inspection}
-      Mulang::Expectation.parse expectation
+      expectation = Mulang::Expectation.parse(binding: binding, inspection: inspection).as_v2.to_h
       expectation_results_for(analyse(expectations: [expectation])).first['result']
     end
 

data/lib/mulang/expectation.rb

@@ -1,7 +1,6 @@
-class Mulang::Expectation
-
+module Mulang::Expectation
   SMELLS = %w(DiscardsExceptions DoesConsolePrint DoesNilTest DoesNullTest DoesTypeTest
-              HasAssignmentReturn HasCodeDuplication HasEmptyIfBranches HasLongParameterList
+              HasAssignmentReturn HasCodeDuplication HasEmptyIfBranches HasRedundantRepeat HasLongParameterList
               HasMisspelledBindings HasMisspelledIdentifiers
               HasRedundantBooleanComparison HasRedundantGuards HasRedundantIf
               HasRedundantLambda HasRedundantLocalVariableReturn HasRedundantParameter
@@ -9,28 +8,10 @@ class Mulang::Expectation
               HasWrongCaseBinding HasWrongCaseIdentifiers IsLongCode OverridesEqualOrHashButNotBoth
               ReturnsNil ReturnsNull UsesCut UsesFail UsesUnificationOperator)
 
-  attr_accessor :binding, :inspection
-
-  def initialize(binding, inspection)
-    @binding = binding
-    @inspection = inspection
-  end
-
-  def check!
-    raise "Wrong binding in #{to_h}" unless binding?
-    raise "Wrong inspection #{to_h}" unless inspection?
-  end
-
-  def translate(keywords = nil)
-    Mulang::Expectation::I18n.translate self, keywords
-  end
-
-  def to_h
-    {binding: binding, inspection: inspection.to_s}
-  end
-
   def self.guess_type(expectation)
-    if expectation[:inspection] =~ /(Not\:)?Has.*/ && !has_smell?(expectation[:inspection])
+    if expectation[:binding] == '<<custom>>'
+      Custom
+    elsif expectation[:inspection] =~ /(Not\:)?Has.*/ && !has_smell?(expectation[:inspection])
       V0
     else
       V2
@@ -42,72 +23,14 @@ class Mulang::Expectation
   end
 
   def self.parse(expectation)
-    guess_type(expectation).new(
-      expectation[:binding],
-      Mulang::Inspection.parse(expectation[:inspection]))
+    guess_type(expectation).parse(expectation)
   end
 
   def self.valid?(expectation)
-    !!Mulang::Inspection.parse(expectation['inspection']) rescue false
-  end
-
-  class V0 < Mulang::Expectation
-    INSPECTIONS = %w(HasBinding HasTypeDeclaration HasTypeSignature HasVariable HasArity HasDirectRecursion
-                     HasComposition HasComprehension HasForeach HasIf HasGuards HasConditional HasLambda HasRepeat HasWhile
-                     HasUsage HasAnonymousVariable HasNot HasForall HasFindall)
-
-
-    def binding?
-      binding.present?
-    end
-
-    def inspection?
-      inspection.present? && INSPECTIONS.include?(inspection.type)
-    end
-
-    def as_v2
-      if has? 'Binding' then as_v2_declare ''
-      elsif has? 'TypeDeclaration' then as_v2_declare 'TypeAlias'
-      elsif has? 'TypeSignature' then as_v2_declare 'TypeSignature'
-      elsif has? 'Variable' then as_v2_declare 'Variable'
-      elsif has? 'Arity' then as_v2_declare "ComputationWithArity#{inspection.target.value}"
-      elsif has? 'DirectRecursion' then as_v2_declare "Recursively"
-      elsif has? 'Usage'
-        V2.new binding, new_inspection('Uses', Mulang::Inspection::Target.named(inspection.target.value))
-      else as_v2_use
-      end
-    end
-
-    def has?(simple_type)
-      inspection.type == "Has#{simple_type}"
-    end
-
-    def as_v2_use
-      V2.new binding, new_inspection(inspection.type.gsub('Has', 'Uses'), nil)
-    end
-
-    def as_v2_declare(simple_type)
-      V2.new '*', new_inspection("Declares#{simple_type}", Mulang::Inspection::Target.named(binding))
-    end
-
-    def new_inspection(type, target)
-      Mulang::Inspection.new(type, target, negated: inspection.negated?)
-    end
-  end
-
-  class V2 < Mulang::Expectation
-    def binding?
-      true
-    end
-
-    def inspection?
-      true
-    end
-
-    def as_v2
-      self
-    end
+    guess_type(expectation).valid?(expectation)
   end
 end
 
 require_relative './expectation/i18n'
+require_relative './expectation/custom'
+require_relative './expectation/standard'

data/lib/mulang/expectation/custom.rb

@@ -0,0 +1,31 @@
+class Mulang::Expectation::Custom
+  attr_accessor :name
+
+  def initialize(name)
+    @name = name
+  end
+
+  def translate(*)
+    name
+  end
+
+  def to_h
+    {binding: '<<custom>>', inspection: name}
+  end
+
+  def custom?
+    true
+  end
+
+  def standard?
+    false
+  end
+
+  def self.parse(expectation)
+    new expectation[:inspection]
+  end
+
+  def self.valid?(_)
+    true
+  end
+end

data/lib/mulang/expectation/standard.rb

@@ -0,0 +1,95 @@
+class Mulang::Expectation::Standard
+  attr_accessor :binding, :inspection
+
+  def initialize(binding, inspection)
+    @binding = binding
+    @inspection = inspection
+  end
+
+  def check!
+    raise "Wrong binding in #{to_h}" unless binding?
+    raise "Wrong inspection #{to_h}" unless inspection?
+  end
+
+  def translate(keywords = nil)
+    Mulang::Expectation::I18n.translate self, keywords
+  end
+
+  def to_h
+    {binding: binding, inspection: inspection.to_s}
+  end
+
+  def custom?
+    false
+  end
+
+  def standard?
+    true
+  end
+
+  def self.parse(expectation)
+    new expectation[:binding], Mulang::Inspection.parse(expectation[:inspection])
+  end
+
+  def self.valid?(expectation)
+    !!Mulang::Inspection.parse(expectation['inspection']) rescue false
+  end
+end
+
+class Mulang::Expectation::V0 < Mulang::Expectation::Standard
+  INSPECTIONS = %w(HasBinding HasTypeDeclaration HasTypeSignature HasVariable HasArity HasDirectRecursion
+                   HasComposition HasComprehension HasForeach HasIf HasGuards HasConditional HasLambda HasRepeat HasWhile
+                   HasUsage HasAnonymousVariable HasNot HasForall HasFindall)
+
+
+  def binding?
+    binding.present?
+  end
+
+  def inspection?
+    inspection.present? && INSPECTIONS.include?(inspection.type)
+  end
+
+  def as_v2
+    if has? 'Binding' then as_v2_declare ''
+    elsif has? 'TypeDeclaration' then as_v2_declare 'TypeAlias'
+    elsif has? 'TypeSignature' then as_v2_declare 'TypeSignature'
+    elsif has? 'Variable' then as_v2_declare 'Variable'
+    elsif has? 'Arity' then as_v2_declare "ComputationWithArity#{inspection.target.value}"
+    elsif has? 'DirectRecursion' then as_v2_declare "Recursively"
+    elsif has? 'Usage'
+      Mulang::Expectation::V2.new binding, new_inspection('Uses', Mulang::Inspection::Target.named(inspection.target.value))
+    else as_v2_use
+    end
+  end
+
+  def has?(simple_type)
+    inspection.type == "Has#{simple_type}"
+  end
+
+  def as_v2_use
+    Mulang::Expectation::V2.new binding, new_inspection(inspection.type.gsub('Has', 'Uses'), nil)
+  end
+
+  def as_v2_declare(simple_type)
+    Mulang::Expectation::V2.new '*', new_inspection("Declares#{simple_type}", Mulang::Inspection::Target.named(binding))
+  end
+
+  def new_inspection(type, target)
+    Mulang::Inspection.new(type, target, negated: inspection.negated?)
+  end
+end
+
+class Mulang::Expectation::V2 < Mulang::Expectation::Standard
+  def binding?
+    true
+  end
+
+  def inspection?
+    true
+  end
+
+  def as_v2
+    self
+  end
+end

data/lib/mulang/inspection.rb

@@ -28,7 +28,7 @@ module Mulang
     end
 
     def to_s
-      "#{negated_to_s}#{type}#{target_to_s}"
+      "#{negated_to_s}#{type}#{target_to_s}#{matcher_to_s}"
     end
 
     def negated_to_s
@@ -39,6 +39,10 @@ module Mulang
       target ? ":#{target.to_s}" : nil
     end
 
+    def matcher_to_s
+      matcher ? ":#{matcher.to_s}" : nil
+    end
+
     def self.parse_binding_name(binding_s)
       if binding_s.start_with? 'Intransitive:'
         binding_s[13..-1]

data/lib/mulang/inspection/matcher.rb

@@ -10,6 +10,10 @@ class Mulang::Inspection::Matcher
     @value = value
   end
 
+  def to_s
+    "#{type.to_s.camelcase}#{value ? ":#{value}" : nil}"
+  end
+
   def self.parse(type, value)
     return nil unless type
     raise "Invalid matcher #{type}" unless type.in? TYPES

data/lib/mulang/version.rb

@@ -1,4 +1,4 @@
 module Mulang
-  VERSION = "5.0.0"
-  MULANG_VERSION = "5.0.0"
+  VERSION = "5.1.0"
+  MULANG_VERSION = "5.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulang
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-core
@@ -96,7 +96,9 @@ files:
 - lib/mulang.rb
 - lib/mulang/code.rb
 - lib/mulang/expectation.rb
+- lib/mulang/expectation/custom.rb
 - lib/mulang/expectation/i18n.rb
+- lib/mulang/expectation/standard.rb
 - lib/mulang/inspection.rb
 - lib/mulang/inspection/matcher.rb
 - lib/mulang/inspection/target.rb