modularity 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f12124ad13bb239a891eb310290f11b78ec59afe6c8b06a5e93a31de25419a62
-  data.tar.gz: 9b742d62111676d20497e9c847f8a31eca318b292768385b85236f4815eb4f46
+  metadata.gz: 3500f4c9d90a6b3b13f9a1a7aca62a5cc3ddcfc06865e26ccb7283ac9af29b97
+  data.tar.gz: b6dda8d76433413451f2fbafaa4b4fde63b16b5397942132cfb7b7a0eb1292d6
 SHA512:
-  metadata.gz: ec89142e9de11baa4f818bd89f33c102cad9695ca03d9b53e4db5519dc0f8dd2a46ac1ed48383a8576e6039948a7a202ef6602aa0ffea5ea4c71c7b8fb3bc171
-  data.tar.gz: 9888756a4e7f8a964127211a4d1237aa9abea0983ffadac3d1a45862d9d7e1e349a13178d447dbef22c4edd0cd0f84bb60dda9ebe5f089dd0ed6c30f99dd12a4
+  metadata.gz: 274f172610a0900ec8348a45488b8e54c061d5809942f16094f886e7e8e1ddf828635640568db36b0177d2b575c9f319ce75ba07bfb473b1a5e00180f3a6c0d0
+  data.tar.gz: 031fa42034a8453d3cd0e0742109c7a2652e4de41b1be4d04d891e20a74e822b2105257ebb6ec470e09eae12dd043cd51501faf05e97c1b44d2c435c287fc473

data/.github/workflows/test.yml

@@ -16,10 +16,16 @@ jobs:
         include:
         - ruby: 2.5.7
           gemfile: Gemfile
+        - ruby: 2.6.10
+          gemfile: Gemfile
         - ruby: 2.7.4
           gemfile: Gemfile
         - ruby: 3.0.2
           gemfile: Gemfile
+        - ruby: 3.1.2
+          gemfile: Gemfile
+        - ruby: 3.2.1
+          gemfile: Gemfile
     env:
       BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
     steps:

data/CHANGELOG.md

@@ -9,6 +9,19 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ### Compatible changes
 
+## 3.2.0 - 2023-03-01
+
+### Compatible changes
+ 
+- Add support for Ruby 3.2
+
+
+## 3.1.0 - 2022-06-01
+
+### Compatible changes
+
+- Add support for separation of positional and keyword arguments in ruby 3
+
 
 ## 3.0.1 - 2022-03-09
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modularity (3.0.1)
+    modularity (3.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -9,7 +9,7 @@ GEM
     byebug (11.1.3)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    gemika (0.6.1)
+    gemika (0.8.1)
     method_source (1.0.0)
     pry (0.13.1)
       coderay (~> 1.1)

data/README.md

@@ -13,7 +13,7 @@ in a way that is less awkward than using modules.
 
 Add the following to your `Gemfile`:
 
-```
+```ruby
 gem 'modularity'
 ```
 
@@ -32,7 +32,7 @@ and macros.
 
 Here is an example of a `strip_field` macro, which created setter methods that remove leading and trailing whitespace from newly assigned values:
 
-```
+```ruby
 # app/models/article.rb
 class Article < ActiveRecord::Base
   include DoesStripFields[:name, :brand]
@@ -61,7 +61,7 @@ Using a module to add both instance methods and class methods is
 [very awkward](http://redcorundum.blogspot.com/2006/06/mixing-in-class-methods.html).
 Modularity does away with the clutter and lets you say this:
 
-```
+```ruby
 # app/models/model.rb
 class Model
   include Mixin
@@ -88,7 +88,7 @@ Models are often concerned with multiple themes like "authentication", "contact
 a couple of validations and callbacks here, and some method there. Modularity lets you organize your model into multiple
 partial classes, so each file can deal with a single aspect of your model:
 
-```
+```ruby
 # app/models/user.rb
 class User < ActiveRecord::Base
   include DoesAuthentication

data/lib/modularity/as_trait.rb

@@ -2,14 +2,19 @@ module Modularity
 
   class ParametrizedTrait < Module
 
-    def initialize(blank_trait, args)
+    def initialize(blank_trait, args, kwargs)
       @args = args
+      @kwargs = kwargs
       @macro = blank_trait.instance_variable_get(:@modularity_macro)
       include(blank_trait)
     end
 
     def included(base)
-      base.class_exec(*@args, &@macro)
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+        base.class_exec(*@args, &@macro)
+      else
+        base.class_exec(*@args, **@kwargs, &@macro)
+      end
     end
 
   end
@@ -27,9 +32,16 @@ module Modularity
 
       end
 
-      def self.[](*args)
-        blank_trait = self
-        ParametrizedTrait.new(blank_trait, args)
+      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
+        def self.[](*args)
+          blank_trait = self
+          ParametrizedTrait.new(blank_trait, args, {})
+        end
+      else
+        def self.[](*args, **kwargs)
+          blank_trait = self
+          ParametrizedTrait.new(blank_trait, args, kwargs)
+        end
       end
 
     end

data/lib/modularity/version.rb

@@ -1,3 +1,3 @@
 module Modularity
-  VERSION = '3.0.1'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modularity
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies: []
 description: Traits and partial classes for Ruby
 email: