yard-contracts 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd22dd96ef9f882ddf7bd040a48de5baaa0bb6c
-  data.tar.gz: 86617b4be5048bb5aca873a4b1f58a36d990f2a0
+  metadata.gz: 3162a34884d61da98b5669091f169634cc93f6fb
+  data.tar.gz: 73567abca501f0f141d97c303b662e2f1e85a141
 SHA512:
-  metadata.gz: 6b9564e8f9cb753cbda5074674d35aeda2ba554b09420885614159181d48292e846bf74c2a72e0750f2db2f54574963e2aea773d93d7b64c75c01d74776bc20b
-  data.tar.gz: bd9b379569cef1d3fe1f7dbda8f8fd29adb677ad957036e9a090435264e9f6004af84d5dd41bd2ace0115169f60eb3cda1874f30be9c452aa06675b10944685e
+  metadata.gz: 0a661e034c825fae56aff68007aaf8ef5eee74b7c0fa0e762967c2ec3bf395a483fe6f0e36a627181103217704f0ab0c95aefa085e39002ece51e4d7dafd49e9
+  data.tar.gz: 66d42a3d74c1f71415bbea835909e4788322d30ad84c094c7ff4ccdacf72349f0d71346ade1a388b45af0f40d8e5c84d756c32af2252d60b82f6650dd26b865c

data/lib/yard-contracts/formatters.rb

@@ -3,95 +3,6 @@ require 'contracts/builtin_contracts'
 module Contracts
   # A namespace for classes related to formatting.
   module Formatters
-    # Used to format contracts for the `Expected:` field of error output.
-    class Expected
-      def initialize(contract, full = true)
-        @contract, @full = contract, full
-      end
-
-      # Formats any type of Contract.
-      def contract(contract = @contract)
-        if contract.is_a?(Hash)
-          hash_contract(contract)
-        elsif contract.is_a?(Array)
-          array_contract(contract)
-        else
-          InspectWrapper.new(contract, @full)
-        end
-      end
-
-      # Formats Hash contracts.
-      def hash_contract(hash)
-        @full = true
-        hash.inject({}) do |repr, (k, v)|
-          repr.merge(k => InspectWrapper.new(contract(v), @full))
-        end.inspect
-      end
-
-      # Formats Array contracts.
-      def array_contract(array)
-        @full = true
-        array.map { |v| InspectWrapper.new(contract(v), @full) }.inspect
-      end
-    end
-
-    # A wrapper class to produce correct inspect behaviour for different
-    # contract values - constants, Class contracts, instance contracts etc.
-    class InspectWrapper
-      def initialize(value, full = true)
-        @value, @full = value, full
-      end
-
-      # Inspect different types of contract values.
-      # Contracts module prefix will be removed from classes.
-      # Custom to_s messages will be wrapped in round brackets to differentiate
-      # from standard Strings.
-      # Primitive values e.g. 42, true, nil will be left alone.
-      def inspect
-        return '' unless full?
-        return @value.inspect if empty_val?
-        return @value.to_s if plain?
-        return delim(@value.to_s) if useful_to_s?
-        @value.inspect.gsub(/^Contracts::/, '')
-      end
-
-      def delim(value)
-        @full ? "(#{value})" : "#{value}"
-      end
-
-      # Eliminates eronious quotes in output that plain inspect includes.
-      def to_s
-        inspect
-      end
-
-      private
-
-      def empty_val?
-        @value.nil? || @value == ''
-      end
-
-      def full?
-        @full ||
-          @value.is_a?(Hash) || @value.is_a?(Array) ||
-          (!plain? && useful_to_s?)
-      end
-
-      def plain?
-        # Not a type of contract that can have a custom to_s defined
-        !@value.is_a?(CallableClass) && @value.class != Class
-      end
-
-      def useful_to_s?
-        # Useless to_s value or no custom to_s behavious defined
-        @value.to_s != '' &&
-          if @value.class == Class # It's a class contract
-            @value.to_s != @value.name
-          else # It's an instance contract
-            !@value.to_s.match(/#\<\w+:.+\>/)
-          end
-      end
-    end
-
     class TypesAST
       def initialize(types)
         @types = types[0..-2]
@@ -170,7 +81,7 @@ module Contracts
         result = {}
         hash.each do |h|
           result[h[0].jump(:label).last.to_sym] =
-            Contracts::Formatters::InspectWrapper.new(type(h[1]))
+            Contracts::Formatters::InspectWrapper.create(type(h[1]))
         end
         result
       end
@@ -179,7 +90,7 @@ module Contracts
       def array_type(array)
         # This works because Ast inherits from Array.
         array.map do |v|
-          Contracts::Formatters::InspectWrapper.new(type(v))
+          Contracts::Formatters::InspectWrapper.create(type(v))
         end.inspect
       end
     end
@@ -227,7 +138,7 @@ module Contracts
             named_count = 1
           end
 
-          type = Contracts::Formatters::InspectWrapper.new(type)
+          type = Contracts::Formatters::InspectWrapper.create(type)
           desc = Contracts::Formatters::Expected.new(con, false).contract
           # The pluses are to escape things like curly brackets
           desc = "#{desc}".empty? ? '' : "+#{desc}+"
@@ -240,7 +151,7 @@ module Contracts
       def return
         type, type_ast = @result
         con = get_contract_value(type)
-        type = Contracts::Formatters::InspectWrapper.new(
+        type = Contracts::Formatters::InspectWrapper.create(
           TypeAST.new(type_ast).type
         )
         desc = Contracts::Formatters::Expected.new(con, false).contract

data/lib/yard-contracts/version.rb

@@ -1,3 +1,3 @@
 module YARDContracts
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard-contracts
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Simon George
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard