code-ruby 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463ae3dc79fc4e22a6822e556ffbc299483203343ede2978409e9cfff74ba406
-  data.tar.gz: c1cf9ecfff4ea81e9e523f7c5951d8e51ded3595dae6b51c729f1d89c6d55e46
+  metadata.gz: d84bcfcb9ae6cbd546334c89b2aefd5a0b70bf4da537d0fe646c5f2a8030c4a3
+  data.tar.gz: d9894a0ee1a9c80fa1744b4b29c3b8065c6dedd310558d0f4210f252f5f330a2
 SHA512:
-  metadata.gz: fab95b9f2f6c0e46c3ae1e7fc77b6b55198bad7354c89b35947a4c326a84b68853d9b817a5779d409a35ea79496ada6d4ad3b344ec8201cdb720d3a5b320ed86
-  data.tar.gz: 8c4133efb5de0813fea888156341a35edf3daf458730a19080cfae9681d6c8dfa2e36d13ec87552327744f19e46775e4bbc1c73019e17860a2d08dec62ce0693
+  metadata.gz: f18605e6c94eccb892d45d09dddb06cf4f5fba5f2f1f30df077687812424ea97c0fde6c3c53f80bc075dfc362864307d17ef354ed5f45997c9ccc42faeb44658
+  data.tar.gz: 1333842f223896c4bff55a2359034420631680bfe6d2563458b1dc6546e95e7c1d50b42b577396866f3770592bc574b616aaf48d32acda843d80997a4179bb09

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.7.3)
+    code-ruby (0.7.6)
+      activesupport (~> 7)
       bigdecimal (~> 3)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -9,10 +10,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.2.0)
     bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.5.1)
+    drb (2.2.0)
+      ruby2_keywords
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     language-ruby (0.6.2)
       zeitwerk (~> 2)
+    minitest (5.22.2)
+    mutex_m (0.2.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -27,6 +47,9 @@ GEM
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
     ruby-prof (1.7.0)
+    ruby2_keywords (0.0.5)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     zeitwerk (2.6.13)
 
 PLATFORMS

data/code-ruby.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency "bigdecimal", "~> 3"
   s.add_dependency "language-ruby", "~> 0"
+  s.add_dependency "activesupport", "~> 7"
   s.add_dependency "zeitwerk", "~> 2"
 end

data/lib/code/object/duration.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/numeric/time"
+
+class Code
+  class Object
+    class Duration < Object
+      attr_reader :raw
+
+      def initialize(duration)
+        @raw = duration
+      end
+
+      def self.name
+        "Duration"
+      end
+
+      def call(**args)
+        operator = args.fetch(:operator, nil)
+
+        case operator.to_s
+        when "from_now"
+          sig(args)
+          code_from_now
+        else
+          super
+        end
+      end
+
+      def code_from_now
+        Time.new(raw.from_now)
+      end
+
+      def inspect
+        to_s
+      end
+
+      def to_s
+        raw.to_s
+      end
+    end
+  end
+end

data/lib/code/object/global.rb

@@ -12,7 +12,7 @@ class Code
         arguments = args.fetch(:arguments, [])
         output = args.fetch(:output)
         context = args.fetch(:context)
-        multi_fetch(args, *GLOBALS)
+        globals = multi_fetch(args, *GLOBALS)
         value = arguments.first&.value
 
         case operator.to_s
@@ -28,6 +28,9 @@ class Code
         when "Dictionary"
           sig(args) { Object.maybe }
           value ? value.code_to_dictionnary : Class.new(Dictionary)
+        when "fetch"
+          sig(args) { [Object, Function.maybe] }
+          context.code_fetch(*arguments.map(&:value), **globals)
         when "Function"
           sig(args) { Object.maybe }
           value ? value.code_to_function : Class.new(Function)

data/lib/code/object/integer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/numeric/time"
+
 class Code
   class Object
     class Integer < Number
@@ -103,6 +105,9 @@ class Code
         when "four?"
           sig(args)
           code_four?
+        when "hour", "hours"
+          sig(args)
+          code_hours
         when "increment!"
           sig(args) { Integer.maybe }
           code_increment!(value)
@@ -382,6 +387,10 @@ class Code
         Boolean.new(raw.zero?)
       end
 
+      def code_hours
+        Duration.new(raw.hours)
+      end
+
       def inspect
         to_s
       end

data/lib/code/object/time.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Code
+  class Object
+    class Time < Object
+      attr_reader :raw
+
+      def initialize(time)
+        @raw = time
+      end
+
+      def self.name
+        "Time"
+      end
+
+      def inspect
+        to_s
+      end
+
+      def to_s
+        raw.to_s
+      end
+    end
+  end
+end

data/lib/code/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../code"
 
-Code::Version = Gem::Version.new("0.7.5")
+Code::Version = Gem::Version.new("0.7.7")

data/lib/code-ruby.rb

@@ -5,6 +5,7 @@ require "stringio"
 require "timeout"
 require "zeitwerk"
 require "language-ruby"
+require "active_support"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/code-ruby.rb")

data/spec/code_spec.rb

@@ -159,6 +159,20 @@ RSpec.describe Code do
     )
   end
 
+  describe "#fetch" do
+    it "returns the value when present" do
+      expect(Code.evaluate("fetch(:downcase)", "{ downcase: 1 }")).to eq(
+        Code.evaluate("1")
+      )
+    end
+
+    it "returns the default value when not present" do
+      expect(Code.evaluate("fetch(:downcase) { 2 }")).to eq(
+        Code.evaluate("2")
+      )
+    end
+  end
+
   it "works with nested objects" do
     expect(
       Code.evaluate("items.first.title", ruby: { items: [{ title: "Hello" }] })
@@ -175,4 +189,8 @@ RSpec.describe Code do
       )
     ).to eq(Code.evaluate("[:Hello]"))
   end
+
+  it "works with time" do
+    Code.evaluate("1.hour.from_now")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Dorian Marié
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +120,7 @@ files:
 - lib/code/object/context.rb
 - lib/code/object/decimal.rb
 - lib/code/object/dictionary.rb
+- lib/code/object/duration.rb
 - lib/code/object/function.rb
 - lib/code/object/global.rb
 - lib/code/object/identifier_list.rb
@@ -116,6 +131,7 @@ files:
 - lib/code/object/range.rb
 - lib/code/object/ruby_function.rb
 - lib/code/object/string.rb
+- lib/code/object/time.rb
 - lib/code/parser.rb
 - lib/code/parser/addition.rb
 - lib/code/parser/and_operator.rb