api_diff 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 310a7da2f0d41ae551be866edc09039b488c7128a9ca5337acaf0902aa4beecd
-  data.tar.gz: cfe5d1f1cdc4daf8eba8f1c5b8e6b1b7945fd3f0bd629c65b82cd9755f5bea60
+  metadata.gz: da95c670b708585e0f5a7dc1c1ffff7a003bf9e283dfe0189a7456e279fd8aeb
+  data.tar.gz: 84a0502b97dc4aa46e54d7f7d112900beaae001af293aa5c0b427937b17bf552
 SHA512:
-  metadata.gz: 00e2213f1595896419c9e3ca890eed716d8ad25cb36e127795ae8cf7bc394af09e4322ab81a382ff4080fae8c0d8d7bf7fdcb8e3a8a634a61d6fcc0112689192
-  data.tar.gz: e1ec8e8cd85683fef1c6e0a823136f0b79389cd1b64084d1b369a7e00b38728498aa52e7f52315ab9f70620a1fdea57213a35617acbb2773f26e0a998cb042a0
+  metadata.gz: 6f5b05ba569e101be84e9f144324c50ae0f7dce7e44c6c3052f355bb5b0f60067f9eee7f5f2a2af26b8066006c4b509fe1d92fe65610a90ed71108bd132cc649
+  data.tar.gz: d2ff8b714d6b441d1b11375e0fed18b893d2768f9a54cb106ef1f3382e1154a241e17dd805ea3257c144c7440579617a8e148a720db921aec3c7eba35f0ff39f

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,9 +17,11 @@ 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.include? "extension"
+        elsif first_line.start_with? "extension"
           parse_extension(section, container_types)
         elsif first_line.include? "public enum"
           parse_enum(section, container_types)
@@ -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]
 
@@ -61,9 +75,10 @@ module ApiDiff
     def parse_extension(content, container_types)
       name = content.match(/extension ([\w\.]+)/)[1]
 
-      base_type = api.class(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))
+      base_type = api.class(fully_qualified_name: name)
+      base_type ||= api.struct(fully_qualified_name: name)
+      base_type ||= api.interface(fully_qualified_name: name)
+      base_type ||= api.enum(fully_qualified_name: name)
       raise Error.new "Unable to find base type for extension `#{name}`" if base_type.nil?
       base_type.parents.append(*parse_parents(content)).uniq!
       base_type.properties.append(*parse_properties(content)).uniq!

data/lib/api_diff/version.rb

@@ -1,3 +1,3 @@
 module ApiDiff
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

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/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.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Sebastian Ludwig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2022-07-19 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,11 +88,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
 summary: Bring APIs into an easily diff-able format
 test_files:
+- test/kotlin_bcv_parser_test.rb
 - test/swift_interface_parser_test.rb
 - test/test_helper.rb
-- test/kotlin_bcv_parser_test.rb