code-ruby 0.8.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70c443c88335cbe52c883ee9443aa32649b0fc3d294864fc69118bc2aa56688a
-  data.tar.gz: 25fcebbe1193d7f75c820f550400187f6082ac0e58346291d0fc53114a497a09
+  metadata.gz: f5dda57442d7fc50b08ceb9998021e623f226a0b8de3cdaf58fecd05d0ba3a30
+  data.tar.gz: bead8ebd992882ea955f10d24e10f110a5c9955926e0e4850cddbcb4e3afe34c
 SHA512:
-  metadata.gz: 0f558cf8b686f6457a83fcd383243810e6a2d611d7e1dd039991fce5947c740df19d445d3ae0dcefc4973c7282e1e201cd380b3ee5f5ec67588d257ac4b61db7
-  data.tar.gz: acea5e97f3b15e08392331ef776827fe3a115a42603bdc958c0dd348835fb5330ac333626ca0337f22d5b5d45d50f615ef71d66132b9876b04efa9a2abda607c
+  metadata.gz: 136c900a7f0efab8fbf2ada6bc90c018689f5545b350b1b3b77c19e07ebd2eb18addb6852a12ede8c7bb692ad48af341c9decab8740b26d92fd5f45ec2a5ffa6
+  data.tar.gz: 24881df454cb5e179265232a37c45a1d1322ed0606ed3caf82fc56ee3526df1b3dc3c1f06301f5887e48b5da65e2b01b9c4e8424c703ab47923325c3b5ee1d6f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (0.8.1)
+    code-ruby (0.8.4)
       activesupport (~> 7)
       bigdecimal (~> 3)
       language-ruby (~> 0)

data/lib/code/object/duration.rb

@@ -17,6 +17,9 @@ class Code
         operator = args.fetch(:operator, nil)
 
         case operator.to_s
+        when "ago"
+          sig(args)
+          code_ago
         when "from_now"
           sig(args)
           code_from_now
@@ -25,6 +28,10 @@ class Code
         end
       end
 
+      def code_ago
+        Time.new(raw.ago)
+      end
+
       def code_from_now
         Time.new(raw.from_now)
       end

data/lib/code/object/integer.rb

@@ -82,6 +82,9 @@ class Code
         when "clone"
           sig(args)
           code_clone
+        when "day", "days"
+          sig(args)
+          code_days
         when "decrement!"
           sig(args) { Integer.maybe }
           code_decrement!(value)
@@ -389,6 +392,10 @@ class Code
         Duration.new(raw.hours)
       end
 
+      def code_days
+        Duration.new(raw.days)
+      end
+
       def inspect
         to_s
       end

data/lib/code/object/time.rb

@@ -19,6 +19,9 @@ class Code
         operator = args.fetch(:operator, nil)
 
         case operator.to_s
+        when "now"
+          sig(args)
+          code_now
         when "tomorrow"
           sig(args)
           code_tomorrow
@@ -32,6 +35,38 @@ class Code
         new(::Time.zone.tomorrow.beginning_of_day)
       end
 
+      def self.code_now
+        ::Time.zone ||= DEFAULT_ZONE
+        new(::Time.zone.now.beginning_of_day)
+      end
+
+      def call(**args)
+        operator = args.fetch(:operator, nil)
+        arguments = args.fetch(:arguments, [])
+        value = arguments.first&.value
+
+        case operator.to_s
+        when "after?"
+          sig(args) { Time.maybe }
+          code_after?(value)
+        when "before?"
+          sig(args) { Time.maybe }
+          code_before?(value)
+        else
+          super
+        end
+      end
+
+      def code_after?(other)
+        other ||= Time.code_now
+        Boolean.new(raw.after?(other.raw))
+      end
+
+      def code_before?(other)
+        other ||= Time.code_now
+        Boolean.new(raw.before?(other.raw))
+      end
+
       def inspect
         to_s
       end

data/lib/code/object.rb

@@ -146,7 +146,7 @@ class Code
     end
 
     def self.name
-      raise NotImplementedError, "name"
+      "Object"
     end
 
     def self.to_s

data/lib/code/version.rb

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

data/spec/code_spec.rb

@@ -4,17 +4,6 @@ require "spec_helper"
 
 RSpec.describe Code do
   [
-    %w[9975×14÷8 17456.25],
-    ["\r\n", "nothing"],
-    ["1 + 1", "2"],
-    ["a = 1", "1"],
-    ["a = 1 b = 2 c = a + b c", "3"],
-    ["a = 1 a += 1 a", "2"],
-    ["a = b = c = 1 a + b + c", "3"],
-    ["3.times {}", "3"],
-    ["a = 1 3.times { a += 1 } a", "4"],
-    ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
-    ['user = {} user.name = "Dorian" user.name', ":Dorian"],
     [
       "user = { name: :Dorian, age: 31 } user.delete_if(String) user.keys",
       '["age"]'
@@ -23,116 +12,136 @@ RSpec.describe Code do
       "(user = { name: :Dorian, age: 31 }).transform_values { user.name }.age",
       ":Dorian"
     ],
+    %w[!!1 true],
+    %w[!!true true],
+    %w[!false true],
+    %w["" ''],
+    %w["Hello".downcase :hello],
+    %w['' ""],
+    %w[+1 1],
+    %w[+1.0 1.0],
+    %w[+true true],
+    %w[--1 1],
+    %w[--1.0 1.0],
+    %w[-1 -1],
+    %w[-1.0 -1.0],
+    %w[0 0],
+    %w[0b10 2],
+    %w[0o10 8],
+    %w[0x10 16],
+    %w[1.0e1 10.0],
+    %w[1.1 1.1],
+    %w[10e1.0 100.0],
+    %w[1e1 10],
+    %w[9975×14÷8 17456.25],
+    %w[:Hello.include?(:H) true],
+    %w[:admin? :admin?],
+    %w[:hello :hello],
+    %w[:update!.to_string :update!],
+    %w[false false],
+    %w[true true],
+    %w[{} {}],
+    ["'Hello Dorian'", '"Hello Dorian"'],
+    ["'Hello \\{name}'", ':Hello + " \\{name}"'],
+    ["'Hello {1}'", '"Hello 1"'],
+    ["(true false)", "false"],
     ["1 & 1", "1"],
-    ["true && false", "false"],
-    ["true && true", "true"],
-    ["1 | 2", "3"],
+    ["1 + 1", "2"],
+    ["1 < 2", "true"],
+    ["1 << 1", "2"],
+    ["1 <= 1", "true"],
+    ["1 == 1 and 2 == 2", "true"],
+    ["1 == 1", "true"],
+    ["1 > 2", "false"],
+    ["1 >= 1", "true"],
+    ["1 >> 1", "0"],
     ["1 ^ 2", "3"],
-    %w[true true],
-    %w[false false],
+    ["1 | 2", "3"],
+    ["1.day.ago.after?(1.day.from_now)", 'false'],
+    ["1.day.ago.before?(1.day.from_now)", 'true'],
+    ["1.day.from_now.after?(1.day.ago)", 'true'],
+    ["1.day.from_now.before?(1.day.ago)", 'false'],
+    ["1.day.ago.after?", 'false'],
+    ["1.day.ago.before?", 'true'],
+    ["1.day.from_now.after?", "true"],
+    ["1.day.from_now.before?", "false"],
+    ["2 * 3 + 2", "8"],
+    ["2 * 3", "6"],
+    ["2 ** 3 ** 2", "512"],
+    ["2 ** 3", "8"],
+    ["2 + 2 * 3", "8"],
+    ["2 / 4", "0.5"],
+    ["3.times {}", "3"],
+    ["4 % 3", "1"],
+    ["[,,].include?(4)", "false"],
+    ["[,].include?(4)", "false"],
+    ["[1, 2, 3,  \n  ].include?(4)", "false"],
+    ["[1, 2, 3,].include?(4)", "false"],
+    ["[1, 2, 3]", "[1, 2, 3]"],
+    ["[1, 2, 3].include?(2)", "true"],
+    ["[1, 2, 3].include?(4)", "false"],
     ["[1, 2, 3].select { |n| n.even? }", "[2]"],
     ["[1, 2, 3].select { |n| n.even? }.select { |n| n.odd? }", "[]"],
-    %w[{} {}],
-    ["{ a: 1, b: 2, c: 3 }", '{"a" => 1, "b" => 2, "c" => 3}'],
-    ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
-    ["a = 1 a", "1"],
+    ["[1, 2].map(&:to_string)", "[:1, :2]"],
+    ["[1, 2].map(&:to_string)", '["1", "2"]'],
+    ["[1, 2].map(&:to_string)", '["1", "2"]'],
+    ["[1].each do end", "[1]"],
+    ["[[true]]", "[[true]]"],
+    ["[]", "[]"],
+    ["\r\n", "nothing"],
+    ["a = 0\nuntil a > 10 a += 1 end a", "11"],
+    ["a = 0\nwhile a < 10 a += 1 end a", "10"],
+    ["a = 1 3.times { a += 1 } a", "4"],
+    ["a = 1 a *= 2 a", "2"],
+    ["a = 1 a += 1 a", "2"],
     ["a = 1 a += 1 a", "2"],
     ["a = 1 a -= 1 a", "0"],
-    ["a = 1 a *= 2 a", "2"],
     ["a = 1 a /= 2 a", "0.5"],
-    ["a = 10 a %= 2 a", "0"],
-    ["a = 1 a >>= 1 a", "0"],
     ["a = 1 a <<= 1 a", "2"],
-    ["a = 1 a |= 2 a", "3"],
+    ["a = 1 a >>= 1 a", "0"],
     ["a = 1 a ^= 2 a", "3"],
-    ["a = false a ||= true a", "true"],
+    ["a = 1 a |= 2 a", "3"],
+    ["a = 1 a", "1"],
+    ["a = 1 b = 2 c = a + b c", "3"],
+    ["a = 1", "1"],
+    ["a = 10 a %= 2 a", "0"],
+    ["a = b = c = 1 a + b + c", "3"],
     ["a = false a &&= true a", "false"],
-    ["1 == 1", "true"],
-    ["1 == 1 and 2 == 2", "true"],
-    ["1 > 2", "false"],
-    ["1 < 2", "true"],
-    ["1 <= 1", "true"],
-    ["1 >= 1", "true"],
-    ["(true false)", "false"],
-    ["if true 1", "1"],
-    ["unless false 1", "1"],
-    ["if false 1", "nothing"],
-    ["unless true 1", "nothing"],
+    ["a = false a ||= true a", "true"],
+    ["a rescue :oops", ":oops"],
+    ["false ? 1 : 2", "2"],
+    ["false ? 1", ""],
+    ["false || false", "false"],
     ["if false 1 else 2", "2"],
-    ["if false 1 elsif true 2", "2"],
-    ["if false 1 elsif false 2", "nothing"],
-    ["if false 1 else if true 2", "2"],
     ["if false 1 else if false 2", "nothing"],
+    ["if false 1 else if true 2", "2"],
     ["if false 1 else unless false 2", "2"],
     ["if false 1 else unless true 2", "nothing"],
-    ["[]", "[]"],
-    ["[1, 2, 3]", "[1, 2, 3]"],
-    ["[1, 2, 3].include?(2)", "true"],
-    ["[1, 2, 3].include?(4)", "false"],
-    ["[1, 2, 3,].include?(4)", "false"],
-    ["[1, 2, 3,  \n  ].include?(4)", "false"],
-    ["[1].each do end", "[1]"],
-    ["[,].include?(4)", "false"],
-    ["[,,].include?(4)", "false"],
-    ["[[true]]", "[[true]]"],
-    ["2 * 3", "6"],
-    ["2 * 3 + 2", "8"],
-    ["2 + 2 * 3", "8"],
-    ["2 / 4", "0.5"],
-    ["4 % 3", "1"],
-    %w[!false true],
-    %w[!!true true],
-    %w[!!1 true],
-    %w[+1 1],
-    %w[+1.0 1.0],
-    %w[+true true],
-    ["not true", "false"],
+    ["if false 1 elsif false 2", "nothing"],
+    ["if false 1 elsif true 2", "2"],
+    ["if false 1", "nothing"],
+    ["if true 1", "1"],
     ["not not false", "false"],
-    %w[0 0],
-    %w[1.1 1.1],
-    %w[0x10 16],
-    %w[0o10 8],
-    %w[0b10 2],
-    %w[1e1 10],
-    %w[1.0e1 10.0],
-    %w[10e1.0 100.0],
-    ["true or false", "true"],
-    ["true and false", "false"],
+    ["not true", "false"],
     ["random = 1 random", "1"],
+    ["true && false", "false"],
+    ["true && true", "true"],
+    ["true ? 1 : 2", "1"],
+    ["true ? 1", "1"],
+    ["true and false", "false"],
+    ["true or false", "true"],
     ["true || false", "true"],
-    ["false || false", "false"],
-    ["2 ** 3", "8"],
-    ["2 ** 3 ** 2", "512"],
-    ["a rescue :oops", ":oops"],
-    ["[1, 2].map(&:to_string)", "[:1, :2]"],
-    %w['' ""],
-    %w["" ''],
-    %w[:hello :hello],
-    %w[:admin? :admin?],
-    %w[:update!.to_string :update!],
-    ["'Hello Dorian'", '"Hello Dorian"'],
+    ["unless false 1", "1"],
+    ["unless true 1", "nothing"],
+    ["until true", "nothing"],
+    ["while false", "nothing"],
+    ["{ a: 1, b: 2, c: 3 }", '{"a" => 1, "b" => 2, "c" => 3}'],
     ['"Hello Dorian"', '"Hello Dorian"'],
-    ["'Hello \\{name}'", ':Hello + " \\{name}"'],
     ['"Hello \\{name}"', '"Hello \\{" + "name}"'],
-    ["'Hello {1}'", '"Hello 1"'],
     ['"Hello {1}"', '"Hello 1"'],
-    %w[:Hello.include?(:H) true],
-    %w["Hello".downcase :hello],
-    ["true ? 1", "1"],
-    ["false ? 1", ""],
-    ["true ? 1 : 2", "1"],
-    ["false ? 1 : 2", "2"],
-    %w[-1 -1],
-    %w[--1 1],
-    %w[-1.0 -1.0],
-    %w[--1.0 1.0],
-    ["while false", "nothing"],
-    ["a = 0\nwhile a < 10 a += 1 end a", "10"],
-    ["until true", "nothing"],
-    ["a = 0\nuntil a > 10 a += 1 end a", "11"],
-    ["1 >> 1", "0"],
-    ["1 << 1", "2"],
-    ["[1, 2].map(&:to_string)", '["1", "2"]']
+    ['user = {} user.name = "Dorian" user.name', ":Dorian"],
+    ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
+    ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
@@ -191,9 +200,16 @@ RSpec.describe Code do
   end
 
   [
+    "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.from_now",
+    "Date.tomorrow",
     "Time.tomorrow",
-    "Date.tomorrow"
   ].each do |input|
     it(input) { Code.evaluate(input) }
   end

metadata

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