piggly 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aca5c86391dab9ddd1b0529e469c67f440ce9c8
-  data.tar.gz: aa7ced6807ad226312f95fb428d6e1ea36aa6af4
+  metadata.gz: b7b807efe5c5d12d4a91d3be46379b423094471e
+  data.tar.gz: 733371c4f0c66f954ed0992b2084b48795fa4f61
 SHA512:
-  metadata.gz: 9a77dc4124175df8e45f1223e0b46c3dee9bb2f8282f0552b61dcccf4dc5348da072a5c5672bb77656c05f1b4e29fc9d0e47392d7d90fcad3396539f5c782e3e
-  data.tar.gz: 438b3ceb842971d0233eb16e9f41513b4494e50457e0bd8879f3aaa0858feeb4bf1ee11e17430b3b537f5c503e4a362deffa48b5a3739c24d38ca0f02536e7d2
+  metadata.gz: 6d545575f7e1a105b61be250cf8dcfd48748792d473e9737036265979449159a4c5f1f1d5862426c9da8508e2bfb127e545db52a4d1a85203edb2bc76dfdfdcb
+  data.tar.gz: ee79b0de1bce8668ad3e0354d2d132a7bc6d1a8f29446efa16c5a60b96a39a3257634d7b93dfb3823313f2595d036529c881480fa2d226ebc8f5887ce1a33f3c

data/README.md

@@ -23,7 +23,7 @@ these events and generates prettified source code that is annotated with coverag
 
 ## Features
 
-* Readable and easily-navigable reports (see [example] [5])
+* Readable and easily-navigable reports (see [example](http://kputnam.github.com/piggly/reports/index.html))
 * Language agnostic - write your tests in Ruby, Python, Java, SQL scripts etc
 * Branch, block, and loop coverage analysis
 * Instrumenting source-to-source compiler
@@ -39,8 +39,8 @@ these events and generates prettified source code that is annotated with coverag
 
 ## Requirements
 
-* [Treetop] [2]: `gem install treetop`
-* The [ruby-pg driver] [3]: `gem install pg`
+* [Treetop](http://github.com/nathansobo/treetop): `gem install treetop`
+* The [ruby-pg driver](http://bitbucket.org/ged/ruby-pg/): `gem install pg`
 * The examples require ActiveRecord: `gem install activerecord`
 
 ## How to Install
@@ -154,10 +154,4 @@ Once the report is built you can open it in `piggly/reports/index.html`.
 
 ## Bugs & Issues
 
-Please report any issues or feature requests on the [github tracker] [4].
-
-  [1]: http://github.com/relevance/rcov/
-  [2]: http://github.com/nathansobo/treetop
-  [3]: http://bitbucket.org/ged/ruby-pg/
-  [4]: http://github.com/kputnam/piggly/issues
-  [5]: http://kputnam.github.com/piggly/reports/index.html
+Please report any issues or feature requests on the [github tracker](http://github.com/kputnam/piggly/issues).

data/lib/piggly/config.rb

@@ -56,6 +56,7 @@ module Piggly
       :filters
 
     alias accumulate? accumulate
+    alias dry_run? dry_run
 
     def path(*args)
       self.class.path(*args)

data/lib/piggly/dumper/qualified_type.rb

@@ -1,6 +1,26 @@
 module Piggly
   module Dumper
 
+    # used for RETURN TABLE(...)
+    class RecordType
+      attr_reader :types, :names, :modes, :defaults
+
+      def initialize(types, names, modes, defaults)
+        @types, @names, @modes, @defaults =
+          types, names, modes, defaults
+      end
+
+      def quote
+        "table (#{@types.zip(@names, @modes, @defaults).map do |type, name, mode, default|
+          "#{name.quote + " " if name}#{type.quote}#{" default " + default if default}"
+        end.join(", ")})"
+      end
+
+      def table?
+        true
+      end
+    end
+
     class QualifiedType
       attr_reader :schema, :name
 
@@ -36,6 +56,10 @@ module Piggly
         @schema, @name, @array = schema, name, array
       end
 
+      def table?
+        false
+      end
+
       def shorten
         self.class.new(nil, @name, @array)
       end

data/lib/piggly/dumper/reified_procedure.rb

@@ -7,9 +7,20 @@ module Piggly
     #
     class ReifiedProcedure < SkeletonProcedure
 
-      def initialize(source, *args)
-        super(*args)
+      def initialize(source, oid, name, strict, secdef, setof, type, volatility, arg_modes, arg_names, arg_types, arg_defaults)
         @source = source.strip
+
+        if type.name == "record" and type.schema == "pg_catalog" and arg_modes.include?("t")
+          prefix       = arg_modes.take_while{|m| m != "t" }.length
+          type         = RecordType.new(arg_types[prefix..-1], arg_names[prefix..-1], arg_modes[prefix..-1], arg_defaults[prefix..-1])
+          arg_modes    = arg_modes[0, prefix]
+          arg_types    = arg_types[0, prefix]
+          arg_names    = arg_names[0, prefix]
+          arg_defaults = arg_defaults[0, prefix]
+          setof        = false
+        end
+
+        super(oid, name, strict, secdef, setof, type, volatility, arg_modes, arg_names, arg_types, arg_defaults)
       end
 
       # @return [String]
@@ -132,10 +143,13 @@ module Piggly
             hash["setof"]  == "t",
             QualifiedType.parse(hash["tschema"].to_s, hash["type"].to_s),
             volatility(hash["volatility"]),
-            coalesce(hash["arg_modes"].to_s.split(",").map{|x| mode(x.strip) }, ["in"]*hash["arg_count"].to_i),
+            coalesce(hash["arg_modes"].to_s.split(",").map{|x| mode(x.strip) },
+                     ["in"]*hash["arg_count"].to_i),
             hash["arg_names"].to_s.split(",").map{|x| QualifiedName.new(nil, x.strip) },
             hash["arg_types"].to_s.split(",").map{|x| QualifiedType.parse(x.strip) },
-            defaults(hash["arg_defaults"], hash["arg_defaults_count"].to_i, hash["arg_count"].to_i))
+            defaults(hash["arg_defaults"],
+                     hash["arg_defaults_count"].to_i,
+                     hash["arg_count"].to_i))
       end
 
       def coalesce(value, default)

data/lib/piggly/dumper/skeleton_procedure.rb

@@ -8,12 +8,13 @@ module Piggly
     class SkeletonProcedure
 
       attr_reader :oid, :name, :type, :arg_types, :arg_modes, :arg_names,
-        :strict, :type, :setof, :volatility, :secdef, :identifier
+        :strict, :setof, :volatility, :secdef, :identifier
 
       def initialize(oid, name, strict, secdef, setof, type, volatility, arg_modes, arg_names, arg_types, arg_defaults)
         @oid, @name, @strict, @secdef, @type, @volatility, @setof, @arg_modes, @arg_names, @arg_types, @arg_defaults =
           oid, name, strict, secdef, type, volatility, setof, arg_modes, arg_names, arg_types, arg_defaults
 
+
         @identifier = Digest::MD5.hexdigest(signature)
       end
 
@@ -21,26 +22,26 @@ module Piggly
       # @return [String]
       def arguments
         @arg_types.zip(@arg_names, @arg_modes, @arg_defaults).map do |type, name, mode, default|
-          "#{mode + " " if mode}#{name.quote + " " if name}#{type.quote}#{" DEFAULT " + default if default}"
+          "#{mode + " " if mode}#{name.quote + " " if name}#{type.quote}#{" default " + default if default}"
         end.join(", ")
       end
 
       # Returns source text for return type
       # @return [String]
       def setof
-        @setof ? "setof " : ""
+        @setof ? "setof " : nil
       end
 
       # Returns source text for strictness
       # @return [String]
       def strictness
-        @strict ? "strict" : ""
+        @strict ? "strict" : nil
       end
 
       # Returns source text for security
       # @return [String]
       def security
-        @secdef ? "security definer" : ""
+        @secdef ? "security definer" : nil
       end
 
       # Returns source SQL function definition statement

data/lib/piggly/reporter/procedure.rb

@@ -73,7 +73,19 @@ module Piggly
 
         string << arguments << " )"
         string << "\n<span class='tK'>RETURNS#{procedure.setof ? ' SETOF' : ''}</span>"
-        string << " <span class='tD'>#{procedure.type.shorten}</span>"
+
+        if procedure.type.table?
+          fields = procedure.type.types.zip(procedure.type.names).map do |rtype, rname|
+            rname = "<span class='tI'>#{rname}</span>\t"
+            rtype = "<span class='tD'>#{rtype}</span>"
+            "#{rname}#{rtype}"
+          end.join(",\n\t")
+
+          string << " <span class='tK'>TABLE</span> (\n\t" << fields << " )"
+        else
+          string << " <span class='tD'>#{procedure.type.shorten}</span>"
+        end
+
         string << "\n  <span class='tK'>SECURITY DEFINER</span>" if procedure.secdef
         string << "\n  <span class='tK'>STRICT</span>" if procedure.strict
         string << "\n  <span class='tK'>#{procedure.volatility.upcase}</span>"

data/lib/piggly/version.rb

@@ -2,9 +2,9 @@ module Piggly
   module VERSION
     MAJOR = 2
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
-    RELEASE_DATE = "2017-10-13"
+    RELEASE_DATE = "2017-10-23"
   end
 
   class << VERSION

data/spec/issues/032_spec.rb

@@ -4,8 +4,7 @@ module Piggly
   describe "github issue #32" do
 
     # note: both -r always subtracts and -s always adds
-    # from left-to-right (first-to-last), so -r Y -s Y
-    # or -s Y -r Y undo each other and have no effect.
+    # from left-to-right.
     #
     # if the first filter is -s, then the set starts empty
     # and -s adds to it.
@@ -13,7 +12,6 @@ module Piggly
     # if the first filter is -r, then the set starts with
     # all procedures and -r removes from it.
 
-
     def result(args)
       index = double("index", :procedures => [
                 double("public.a", :name => "public.a"),
@@ -21,8 +19,6 @@ module Piggly
                 double("public.c", :name => "public.c"),
                 double("public.d", :name => "public.d")])
       config = Command::Trace.configure(args.dup)
-      p config.object_id, config.filters.object_id
-
       result = Command::Trace.filter(config, index)
       result.map(&:name).sort
     end
@@ -52,7 +48,7 @@ module Piggly
       it "adds matching procs" do
         result(args).should == [
           "public.b",
-          "public.d"] #
+          "public.d"]
       end
     end
 
@@ -63,7 +59,7 @@ module Piggly
         result(args).should == [
           "public.a",
           "public.b",
-          "public.d"] #
+          "public.d"]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piggly
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Kvle Putnam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -158,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: PL/pgSQL code coverage tool
 test_files: []
-has_rdoc: false