cassie 1.0.0.beta.25 → 1.0.0.beta.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada280d1a8cc943ec5c6a2fd096b7721134c6f79
-  data.tar.gz: 27c7f3ec0cd636839891747a298d1c3af13ad232
+  metadata.gz: c8c2696d4e1b2aa0bf26d50ba39d4b807084d5f6
+  data.tar.gz: f8b3d4e1d0d9e751beafe23020dfeb9801c7e3b4
 SHA512:
-  metadata.gz: 3b893a1bf8402d76a5c1c79e832dfe543afac03bbb2033d88e53c9985b1adc9aa5756ebe237926e3e2814ad256679339993b75fb48f5e847cc4a7edbbbcc418e
-  data.tar.gz: cbda596807f165500df579cf8a8d88a8210bfbcfb800024a7fe0ddfee618f406ef8bedbeb76144c865eb0ea914f9a61a90b84ed45376bbac01d54a8f8af323bc
+  metadata.gz: 3c56721404043fef6ebe7b8ec7b6c9919fa6fad2649254758aef5c00dc9e5b4589c8f006ee053b60ab2830816a61b2411e701bc5d14ce65207006a4ff04b0209
+  data.tar.gz: 35a13f31e014a3907c5922663b7b8f4727942213c8c48eade9a11e616c328964e9e82908d57b45ff3fb8aa1c849b45d162a154886d4745e3287376931b2cf1f3

data/lib/cassie/statements/statement/assignments.rb

@@ -69,7 +69,7 @@ module Cassie::Statements::Statement
         a = Assignment.new(self, *args)
         identifiers += Array(a.identifier)
         terms += Array(a.term)
-        arguments += Array(a.argument)
+        arguments << a.argument if a.argument?
       end
 
       identifiers_cql = identifiers.join(", ")

data/lib/cassie/statements/statement/relation.rb

@@ -40,9 +40,12 @@ module Cassie::Statements::Statement
       !!enabled
     end
 
+    def argument?
+      enabled? && positional?
+    end
+
     def argument
-      return nil unless enabled? && positional?
-      value
+      value if argument?
     end
 
     def positional?

data/lib/cassie/statements/statement/relations.rb

@@ -81,7 +81,7 @@ module Cassie::Statements::Statement
       relations_args.each do |args|
         r = Relation.new(self, *args)
         relation_strings += Array(r.to_cql)
-        arguments += Array(r.argument)
+        arguments << r.argument if r.argument?
       end
 
       cql = "WHERE #{relation_strings.join(' AND ')}" unless relation_strings.empty?

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.0.0.beta.25"
+  VERSION = "1.0.0.beta.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.25
+  version: 1.0.0.beta.26
 platform: ruby
 authors:
 - Evan Prothro