code-ruby 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a866affca8019509c1e7836990f7a3488990e5bf64f8c8e3b6a976ed7e1bab6
-  data.tar.gz: 23ad1030abf7de9981adcf65267c195b85d1026995aa74fa566427c4c74660c5
+  metadata.gz: 44b144b44b3cff354f959404a790db624dd3c57690b9443c596c1a53e3c128ea
+  data.tar.gz: 3443010c854864268a599a9b0383518c560cdfa055d45a9122630b24d8b1b168
 SHA512:
-  metadata.gz: 9b9b495235c6b7e32d00ae42b372c5b42e6a12123d8adda974044d7eceee36a5d802a68c72c52b9926b295b00ea803bb696697bf6377dcad370f539d23f3cc4c
-  data.tar.gz: be2c356e043c80850ac786da56ec5a380fc624d75f953eedc18817728e70d31f75d4c3e2be5782808da8e50c4c0d445ae6ac9ee150166262d7809f2ea72d1423
+  metadata.gz: 016fa10fc17de26a7bc94ddfbc5281265d1a80f6281de93f2bb4cb7513060230399cfbfa4173526940adf20608de88904fdd9590defd1f8193bd25b720ab227f
+  data.tar.gz: 6469efaf79c5336ddc26c61ab4c015678425222729317fed8f74b1af8dba932ba0189dce090da88430294eec7bd7acecc834854e1ab2c5b466164eb80a2cd027

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (1.5.6)
+    code-ruby (1.5.7)
       activesupport
       base64
       bigdecimal

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

data/lib/code/concerns/shared.rb

@@ -16,7 +16,7 @@ class Code
           code_new(*code_arguments.raw)
         when "!", "not"
           sig(args)
-          code_exclamation_point
+          code_exclamation_mark
         when "!=", "different"
           sig(args) { Object }
           code_different(code_value)
@@ -34,10 +34,13 @@ class Code
           code_exclusive_range(code_value)
         when "==", "equal"
           sig(args) { Object }
-          code_equal_equal(code_value)
+          code_equal(code_value)
         when "===", "strict_equal"
           sig(args) { Object }
-          code_equal_equal_equal(code_value)
+          code_strict_equal(code_value)
+        when "!==", "strict_different"
+          sig(args) { Object }
+          code_strict_different(code_value)
         when "falsy?"
           sig(args)
           code_falsy?
@@ -109,6 +112,12 @@ class Code
         when "name"
           sig(args)
           code_name
+        when "nothing?"
+          sig(args)
+          code_nothing?
+        when "something?"
+          sig(args)
+          code_something?
         when /=$/
           sig(args) { Object }
 
@@ -166,13 +175,13 @@ class Code
         Object::Boolean.new(self != code_other)
       end
 
-      def code_equal_equal(other)
+      def code_equal(other)
         code_other = other.to_code
 
         Object::Boolean.new(self == code_other)
       end
 
-      def code_exclamation_point
+      def code_exclamation_mark
         Object::Boolean.new(falsy?)
       end
 
@@ -198,12 +207,18 @@ class Code
         self
       end
 
-      def code_equal_equal_equal(other)
+      def code_strict_equal(other)
         code_other = other.to_code
 
         Object::Boolean.new(self === code_other)
       end
 
+      def code_strict_different(other)
+        code_other = other.to_code
+
+        Object::Boolean.new(!(self === code_other))
+      end
+
       def falsy?
         !truthy?
       end
@@ -302,10 +317,22 @@ class Code
         code_inspect.raw
       end
 
+      def code_nothing?
+        Boolean.new(nothing?)
+      end
+
+      def code_something?
+        Boolean.new(something?)
+      end
+
       def nothing?
         false
       end
 
+      def something?
+        !nothing?
+      end
+
       def code_falsy?
         Object::Boolean.new(falsy?)
       end

data/lib/code/object/date.rb

@@ -141,13 +141,15 @@ class Code
         code_month = month.to_code
         code_day = day.to_code
 
-        raw.change(
-          **{
-            year: code_year.raw,
-            month: code_month.raw,
-            day: code_day.raw
-          }.compact
-        )
+        if code_year.something? || code_month.something? || code_day.something?
+          raw.change(
+            **{
+              year: code_year.raw,
+              month: code_month.raw,
+              day: code_day.raw
+            }.compact
+          )
+        end
 
         self
       end

data/lib/code/object/dictionary.rb

@@ -210,7 +210,7 @@ class Code
             raw.any? do |key, value|
               code_argument
                 .call(
-                  arguments: List.new([key, value, self, Integer.new(index)]),
+                  arguments: List.new([key, value, Integer.new(index), self]),
                   **globals
                 )
                 .truthy?
@@ -257,7 +257,7 @@ class Code
               Nothing.new
             else
               code_default.call(
-                arguments: List.new([code_first, self, code_index]),
+                arguments: List.new([code_first, code_index, self]),
                 **globals
               )
             end
@@ -298,7 +298,7 @@ class Code
           raw.delete_if.with_index do |(code_key, code_value), index|
             argument.call(
               arguments:
-                List.new([code_key, code_value, self, Integer.new(index)]),
+                List.new([code_key, code_value, Integer.new(index), self]),
               **globals
             ).truthy?
           end
@@ -315,7 +315,7 @@ class Code
         else
           raw.delete_if.with_index do |(key, value), index|
             code_argument.call(
-              arguments: List.new([key, value, self, Integer.new(index)]),
+              arguments: List.new([key, value, Integer.new(index), self]),
               **globals
             ).falsy?
           end
@@ -343,7 +343,7 @@ class Code
 
         raw.each.with_index do |(key, value), index|
           code_argument.call(
-            arguments: List.new([key, value, self, Integer.new(index)]),
+            arguments: List.new([key, value, Integer.new(index), self]),
             **globals
           )
         end
@@ -660,17 +660,21 @@ class Code
         code_function = function.to_code
 
         Dictionary.new(
-          raw.map.with_index do |(key, value), index|
-            [
-              key.to_code,
-              code_function.call(
-                arguments: List.new([key.to_code, value.to_code, index.to_code, self]),
-                **globals
-              )
-            ]
-          rescue Error::Next => e
-            [key.to_code, e.code_value]
-          end.to_h
+          raw
+            .map
+            .with_index do |(key, value), index|
+              [
+                key.to_code,
+                code_function.call(
+                  arguments:
+                    List.new([key.to_code, value.to_code, index.to_code, self]),
+                  **globals
+                )
+              ]
+            rescue Error::Next => e
+              [key.to_code, e.code_value]
+            end
+            .to_h
         )
       end
 

data/lib/code/object/function.rb

@@ -41,9 +41,9 @@ class Code
             if code_parameter.regular_splat?
               code_arguments
             elsif code_parameter.keyword_splat?
-              code_arguments
-                .raw
-                .detect { |code_argument| code_argument.is_a?(Dictionary) } || Dictionary.new
+              code_arguments.raw.detect do |code_argument|
+                code_argument.is_a?(Dictionary)
+              end || Dictionary.new
             elsif code_parameter.keyword?
               code_arguments
                 .raw
@@ -52,6 +52,7 @@ class Code
                   code_dictionary.code_has_value?(parameter.code_name).truthy?
                 end
                 &.code_get(parameter.code_name)
+                .to_code
             else
               code_arguments.raw[index].to_code
             end

data/lib/code/object/list.rb

@@ -528,7 +528,7 @@ class Code
       def code_get(argument)
         code_argument = argument.to_code
 
-        raw[code_argument] || Nothing.new
+        raw[code_argument.raw] || Nothing.new
       end
 
       def code_set(key, value)

data/lib/code/object/string.rb

@@ -52,6 +52,9 @@ class Code
         when "substitute"
           sig(args) { [String, String.maybe] }
           code_substitute(*code_arguments.raw)
+        when "upcase"
+          sig(args)
+          code_upcase
         else
           super
         end
@@ -61,6 +64,10 @@ class Code
         String.new(raw.downcase)
       end
 
+      def code_upcase
+        String.new(raw.upcase)
+      end
+
       def code_include?(value)
         code_value = value.to_code
         Boolean.new(raw.include?(code_value.raw))

data/lib/code/parser/equality.rb

@@ -19,7 +19,7 @@ class Code
         str("<")
       end
 
-      def exclamation_point
+      def exclamation_mark
         str("!")
       end
 
@@ -32,9 +32,10 @@ class Code
       end
 
       def operator
-        (equal << equal << equal) | (equal << equal) |
-          (lesser << equal << greater) | (exclamation_point << equal) |
-          (equal << tilde) | (tilde << equal) | (exclamation_point << tilde)
+        (exclamation_mark  << equal << equal) | (equal << equal << equal) |
+          (equal << equal) | (lesser << equal << greater) |
+          (exclamation_mark << equal) | (equal << tilde) | (tilde << equal) |
+          (exclamation_mark << tilde)
       end
     end
   end

data/lib/code/parser/name.rb

@@ -99,7 +99,15 @@ class Code
         str("else")
       end
 
-      def special_character
+      def exclamation_mark
+        str("!")
+      end
+
+      def question_mark
+        str("?")
+      end
+
+      def reserved_character
         ampersand | equal | pipe | dot | colon | comma | space | newline |
           opening_curly_bracket | closing_curly_bracket | opening_parenthesis |
           closing_parenthesis | opening_square_bracket |
@@ -108,11 +116,15 @@ class Code
       end
 
       def character
-        special_character.absent << any
+        reserved_character.absent << any
       end
 
       def separator
-        special_character | any.absent
+        reserved_character | any.absent
+      end
+
+      def special_characters
+        exclamation_mark | question_mark
       end
 
       def root
@@ -120,7 +132,8 @@ class Code
           begin_keyword << separator
         ).absent << (else_keyword << separator).absent <<
           (elsif_keyword << separator).absent <<
-          (end_keyword << separator).absent << character.repeat(1)
+          (end_keyword << separator).absent <<
+          special_characters.absent << character.repeat(1)
       end
     end
   end

data/lib/code/parser/negation.rb

@@ -3,7 +3,7 @@
 class Code
   class Parser
     class Negation < Language
-      def exclamation_point
+      def exclamation_mark
         str("!")
       end
 
@@ -16,7 +16,7 @@ class Code
       end
 
       def operator
-        exclamation_point | tilde | plus
+        exclamation_mark | tilde | plus
       end
 
       def negation

data/spec/code_spec.rb

@@ -4,136 +4,145 @@ require "spec_helper"
 
 RSpec.describe Code do
   (
-    %w[
-      {}.zero?
-      {}.any?
-      {}.many?
-      1.zero?
-      1.any?
-      1.many?
-      1.0.zero?
-      1.0.any?
-      1.0.many?
-      [].zero?
-      [].any?
-      [].many?
-      Base64
-      Base64.new
-      Smtp
-      Smtp.new
-      Time.monday?
-      Time.tuesday?
-      Time.wednesday?
-      Time.thursday?
-      Time.friday?
-      Time.saturday?
-      Time.sunday?
-      Time.now.monday?
-      Time.now.tuesday?
-      Time.now.wednesday?
-      Time.now.thursday?
-      Time.now.friday?
-      Time.now.saturday?
-      Time.now.sunday?
-      Time.now.second
-      Time.now.seconds
-      Time.now.minute
-      Time.now.minutes
-      Time.now.hour
-      Time.now.hours
-      Time.now.day
-      Time.now.days
-      Time.now.month
-      Time.now.months
-      Time.now.year
-      Time.now.years
-      Time.second
-      Time.seconds
-      Time.minute
-      Time.minutes
-      Time.hour
-      Time.hours
-      Time.day
-      Time.days
-      Time.month
-      Time.months
-      Time.year
-      Time.years
-      1.day.ago
-      1.day.from_now
-      1.hour.ago
-      1.hour.from_now
-      2.days.ago
-      2.days.from_now
-      2.hours.ago
-      2.hours.ago.hour
-      2.hours.from_now
-      2.hours.from_now.hour
-      Time.hour
-      Date.hour
-      Boolean.new
-      Boolean.new(true)
-      Boolean.new(false)
-      Class.new
-      Class.new(Boolean)
-      Class.new(Class)
-      Context.new
-      Context.new(a:1)
-      Date.new
-      Date.new.hour
-      Date.new("2024-03-05")
-      Date.new("2024-03-05").hour
-      Date.today
-      Date.yesterday
-      Date.tomorrow
-      Date.tomorrow.hour
-      Decimal.new
-      Decimal.new(0)
-      Decimal.new(1.2)
-      Dictionary.new
-      Dictionary.new(a:1)
-      Duration.new
-      Duration.new(1.day)
-      Duration.new("P1D")
-      Function.new
-      Integer.new
-      Integer.new(0)
-      Integer.new(1)
-      Integer.new(1.2)
-      List.new
-      List.new([])
-      List.new([1,2])
-      Nothing.new
-      Nothing.new(1)
-      Object.new
-      Object.new(1)
-      Range.new
-      Range.new(1,2)
-      Range.new(-1)
-      Range.new(1,2,exclude_end:false)
-      Range.new(1,2,exclude_end:true)
-      String.new
-      String.new(:hello)
-      Time.new
-      Time.new("2024-03-05.06:10:59.UTC")
-      Time.now
-      Time.tomorrow
-      Time.yesterday
-      Time.tomorrow
-      Code.new
-      Parameter.new
-      IdentifierList.new
-      IdentifierList.new([])
-      Time.new(nothing).before?
-      Html.link_to
-      Html.link_to('/')
-      Html.link_to('Home','/')
-      Json.parse('1')
-      Json.parse('[]')
-      Json.parse('{}')
-      Json.parse('random-string')
-      {}["".to_string]
-    ] + ["Time.hour >= 6 and Time.hour <= 23"]
+    [
+      "{ a: 1, b: 2 }.transform_values { |key| key.upcase }",
+      "{ a: { b: [1, 2, 3, 4] } }.dig(:a, :b, 2)",
+      "{ a: 1, b: 2 }.transform_values { |key, value, index| index * 2 }",
+      "{ a: 1, b: 2 }.transform_values { |key, value, index, dictionary| dictionary.a }",
+      "sum = (a, b: 2) => { a + b } sum(1)",
+      "Object.new !== Object.new"
+    ] +
+      %w[
+        Date.new.change
+        {}.zero?
+        {}.any?
+        {}.many?
+        1.zero?
+        1.any?
+        1.many?
+        1.0.zero?
+        1.0.any?
+        1.0.many?
+        [].zero?
+        [].any?
+        [].many?
+        Base64
+        Base64.new
+        Smtp
+        Smtp.new
+        Time.monday?
+        Time.tuesday?
+        Time.wednesday?
+        Time.thursday?
+        Time.friday?
+        Time.saturday?
+        Time.sunday?
+        Time.now.monday?
+        Time.now.tuesday?
+        Time.now.wednesday?
+        Time.now.thursday?
+        Time.now.friday?
+        Time.now.saturday?
+        Time.now.sunday?
+        Time.now.second
+        Time.now.seconds
+        Time.now.minute
+        Time.now.minutes
+        Time.now.hour
+        Time.now.hours
+        Time.now.day
+        Time.now.days
+        Time.now.month
+        Time.now.months
+        Time.now.year
+        Time.now.years
+        Time.second
+        Time.seconds
+        Time.minute
+        Time.minutes
+        Time.hour
+        Time.hours
+        Time.day
+        Time.days
+        Time.month
+        Time.months
+        Time.year
+        Time.years
+        1.day.ago
+        1.day.from_now
+        1.hour.ago
+        1.hour.from_now
+        2.days.ago
+        2.days.from_now
+        2.hours.ago
+        2.hours.ago.hour
+        2.hours.from_now
+        2.hours.from_now.hour
+        Time.hour
+        Date.hour
+        Boolean.new
+        Boolean.new(true)
+        Boolean.new(false)
+        Class.new
+        Class.new(Boolean)
+        Class.new(Class)
+        Context.new
+        Context.new(a:1)
+        Date.new
+        Date.new.hour
+        Date.new("2024-03-05")
+        Date.new("2024-03-05").hour
+        Date.today
+        Date.yesterday
+        Date.tomorrow
+        Date.tomorrow.hour
+        Decimal.new
+        Decimal.new(0)
+        Decimal.new(1.2)
+        Dictionary.new
+        Dictionary.new(a:1)
+        Duration.new
+        Duration.new(1.day)
+        Duration.new("P1D")
+        Function.new
+        Integer.new
+        Integer.new(0)
+        Integer.new(1)
+        Integer.new(1.2)
+        List.new
+        List.new([])
+        List.new([1,2])
+        Nothing.new
+        Nothing.new(1)
+        Object.new
+        Object.new(1)
+        Range.new
+        Range.new(1,2)
+        Range.new(-1)
+        Range.new(1,2,exclude_end:false)
+        Range.new(1,2,exclude_end:true)
+        String.new
+        String.new(:hello)
+        Time.new
+        Time.new("2024-03-05.06:10:59.UTC")
+        Time.now
+        Time.tomorrow
+        Time.yesterday
+        Time.tomorrow
+        Code.new
+        Parameter.new
+        IdentifierList.new
+        IdentifierList.new([])
+        Time.new(nothing).before?
+        Html.link_to
+        Html.link_to('/')
+        Html.link_to('Home','/')
+        Json.parse('1')
+        Json.parse('[]')
+        Json.parse('{}')
+        Json.parse('random-string')
+        {}["".to_string]
+      ] + ["Time.hour >= 6 and Time.hour <= 23"]
   ).each { |input| it(input) { described_class.evaluate(input) } }
 
   [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Dorian Marié