api_diff 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa1c35b2aa31a75e7db40781d62f929096e74e1627eba7408b6e6334cb88823a
-  data.tar.gz: 697603796cf1394821d86010bd7cbcd1d38d454fc7e35cda5fb4d3d04bea1534
+  metadata.gz: 5f502c34ac580dadc1abab3ddc39102ba86a4f4ec4cade0fe0c616310de5e6ed
+  data.tar.gz: 1638231a645d0610290f43add23960ca971ef366236d68466fe62a7d9ced26e2
 SHA512:
-  metadata.gz: 116ec8aae09c9c4e629d86e1e6a9a3411e72d6d619029029fb417a198f2503c7c996c6f32c25a640ff7b80484b4ca05de896e580275e6e9c65077b3ad91b25a6
-  data.tar.gz: f3634de840639177671f8a487f0ac4acedea0099d68ff019eae385fe261933be75d81b34dd33d994a7b582baebe60724125068e1a7cf4d72937a4453cb3b657a
+  metadata.gz: 9adadc2b1658936cca2eded8c2e2ca067b46533d9bc32c6a65955e86c4fefaa265729cc9655e2ff0ff853a47c016a99db72c7892b343b50cd7ee1d2f3b528849
+  data.tar.gz: cd7c77b6ddb6970115eadd74745bc5775808065d15baec0717e8ada95ea3ec6b0611798549d74012b10c46d7957ae71fd75b8d6aed9ff86d0a25dc1a0c85e442

data/lib/api_diff.rb

@@ -2,6 +2,7 @@ require "api_diff/version"
 require "api_diff/api"
 require "api_diff/type"
 require "api_diff/class"
+require "api_diff/struct"
 require "api_diff/interface"
 require "api_diff/enum"
 require "api_diff/function"

data/lib/api_diff/api.rb

@@ -1,9 +1,10 @@
 module ApiDiff
   class Api
-    attr_accessor :classes, :interfaces, :enums
+    attr_accessor :classes, :structs, :interfaces, :enums
 
     def initialize
       @classes = []
+      @structs = []
       @interfaces = []
       @enums = []
     end
@@ -12,6 +13,10 @@ module ApiDiff
       classes.find { |c| c.name == named || c.fully_qualified_name == fully_qualified_name }
     end
 
+    def struct(named: nil, fully_qualified_name: nil)
+      structs.find { |s| s.name == named || s.fully_qualified_name == fully_qualified_name }
+    end
+
     def interface(named: nil, fully_qualified_name: nil)
       interfaces.find { |i| i.name == named || i.fully_qualified_name == fully_qualified_name }
     end

data/lib/api_diff/struct.rb

@@ -0,0 +1,4 @@
+module ApiDiff
+  class Struct < Type
+  end
+end

data/lib/api_diff/swift_interface_parser.rb

@@ -17,6 +17,8 @@ module ApiDiff
         first_line = section.split("\n")[0]
         if first_line.include? "public class"
           parse_class(section, container_types)
+        elsif first_line.include? "public struct"
+          parse_struct(section, container_types)
         elsif first_line.include? "public protocol"
           parse_ptotocol(section, container_types)
         elsif first_line.start_with? "extension"
@@ -46,6 +48,18 @@ module ApiDiff
       parse_nested_types(class_content, [*container_types, name])
     end
 
+    def parse_struct(struct_content, container_types)
+      name = struct_content.match(/public struct (\w+)/)[1]
+
+      struct = Struct.new(name, qualified_name(name, container_types))
+      struct.parents = parse_parents(struct_content)
+      struct.properties = parse_properties(struct_content)
+      struct.functions = parse_functions(struct_content)
+      api.structs << struct
+
+      parse_nested_types(struct_content, [*container_types, name])
+    end
+
     def parse_ptotocol(protocol_content, container_types)
       name = protocol_content.match(/public protocol (\w+)/)[1]
 
@@ -62,6 +76,7 @@ module ApiDiff
       name = content.match(/extension ([\w\.]+)/)[1]
 
       base_type = api.class(fully_qualified_name: qualified_name(name, container_types))
+      base_type ||= api.struct(fully_qualified_name: qualified_name(name, container_types))
       base_type ||= api.interface(fully_qualified_name: qualified_name(name, container_types))
       base_type ||= api.enum(fully_qualified_name: qualified_name(name, container_types))
       raise Error.new "Unable to find base type for extension `#{name}`" if base_type.nil?

data/lib/api_diff/version.rb

@@ -1,3 +1,3 @@
 module ApiDiff
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/swift_interface_parser_test.rb

@@ -43,6 +43,26 @@ class SwiftInterfaceParserTest < Minitest::Test
     assert_equal "class Fourth : Codable, Hashable", fourth.declaration
   end
 
+  def test_struct
+    input = <<~EOF
+      public struct First {
+      }
+      public struct Second : Package.Parent {
+      }
+    EOF
+
+    api = parse(input)
+    structs = api.structs
+
+    first = structs[0]
+    assert_equal "First", first.name
+    assert_equal "struct First", first.declaration
+
+    second = structs[1]
+    assert_equal "Second", second.name
+    assert_equal "struct Second : Parent", second.declaration
+  end
+
   def test_properties
     input = <<~EOF
       public class FirstClass {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sebastian Ludwig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
-description: 
+description:
 email:
 - sebastian@lurado.de
 executables:
@@ -60,6 +60,7 @@ files:
 - lib/api_diff/kotlin_bcv_parser.rb
 - lib/api_diff/parser.rb
 - lib/api_diff/property.rb
+- lib/api_diff/struct.rb
 - lib/api_diff/swift_interface_parser.rb
 - lib/api_diff/type.rb
 - lib/api_diff/version.rb
@@ -72,7 +73,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sebastianludwig/api-diff
   source_code_uri: https://github.com/sebastianludwig/api_diff
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Bring APIs into an easily diff-able format
 test_files: