simple-sql 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc4e5192271e99151c59877f89671f27f3333e6
-  data.tar.gz: 986e1c338ed8c7c9571ea85797fd0f6444a8d8b3
+  metadata.gz: a83b1690cf4e3b75f7e974df31e7c8b29680e198
+  data.tar.gz: 333ca9858a0cc4eb06519d1eadee61fb875939f2
 SHA512:
-  metadata.gz: 84e6f1f3e6bad60ca3611d103a84db49069132c07f3142a88764b8fd402daea2dff9b77ac2c1d2cd72eeddf4934b1441400486eeed430744423e65be014ca866
-  data.tar.gz: 4d41a55a04b5f24cb0088fc4dd89badfdf510c7a2c06d8c64cafc3a50b3a414c8a01e66c75e245a179e527c561f5aa079f46454836cb1c5de88194ac0a7afd1c
+  metadata.gz: ce35aefb5d57370cb6fd88b1c25a5a9ebe3d767ce8bbb2e1b4433726e6968511ffa5a82859ae2b012b2f189b12761c20a266d7a21556f89303ac6f67c3ed4332
+  data.tar.gz: 812bc3709085da01e1fcd91a10f6c5c864a34f5a5fddb3edea5885ba22fcd0d5b273a8d6d300482d0a03c41ed14120c7c710aaa9e4e33a6489774d44782c3847

data/.rubocop.yml

@@ -60,3 +60,6 @@ Style/RegexpLiteral:
 
 Style/ClassVars:
   Enabled: false
+
+Style/ConditionalAssignment:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-sql (0.4.4)
+    simple-sql (0.4.5)
       pg (~> 0.20)
       pg_array_parser (~> 0)
 

data/lib/simple/sql/scope.rb

@@ -39,37 +39,56 @@ class Simple::SQL::Scope
   public
 
   # scope = Scope.new("SELECT * FROM tablename")
+  # scope = scope.where(id: 12)
   # scope = scope.where("id > ?", 12)
   #
-  # The placeholder (usually a '?') is being replaced with the numbered
-  # argument (since postgres is using $1, $2, etc.) If your SQL fragment
-  # uses '?' as part of some fixed text you must use an alternative
-  # placeholder symbol.
+  # In the second form the placeholder (usually a '?') is being replaced
+  # with the numbered argument (since postgres is using $1, $2, etc.)
+  # If your SQL fragment uses '?' as part of some fixed text you must
+  # use an alternative placeholder symbol:
+  #
+  # scope = scope.where("foo | '?' = '^'", match, placeholder: '^')
   #
-  # TODO: Add support for hash arguments, i.e.
-  # scope = scope.where(title: "foobar")
   def where(sql_fragment, arg = :__dummy__no__arg, placeholder: "?")
     duplicate.send(:where!, sql_fragment, arg, placeholder: placeholder)
   end
 
-  def where!(sql_fragment, arg = :__dummy__no__arg, placeholder: "?")
-    if arg == :__dummy__no__arg
-      if sql_fragment.is_a?(Hash)
-        sql_fragment.each do |key, value|
-          @args << value
-          @filters << "#{key} = $#{@args.length}"
-        end
-      else
-        @filters << sql_fragment
-      end
+  def where!(first_arg, arg = :__dummy__no__arg, placeholder: "?")
+    if arg != :__dummy__no__arg
+      where_sql_with_argument!(first_arg, arg, placeholder: placeholder)
+    elsif first_arg.is_a?(Hash)
+      where_hash!(first_arg)
     else
-      @args << arg
-      @filters << sql_fragment.gsub(placeholder, "$#{@args.length}")
+      where_sql!(first_arg)
     end
 
     self
   end
 
+  def where_sql!(sql_fragment)
+    @filters << sql_fragment
+  end
+
+  def where_sql_with_argument!(sql_fragment, arg, placeholder:)
+    @args << arg
+    @filters << sql_fragment.gsub(placeholder, "$#{@args.length}")
+  end
+
+  def where_hash!(hsh)
+    hsh.each do |key, value|
+      raise ArgumentError, "condition key must be a Symbol or a String" unless key.is_a?(Symbol) || key.is_a?(String)
+
+      @args << value
+
+      case value
+      when Array
+        @filters << "#{key} = ANY($#{@args.length})"
+      else
+        @filters << "#{key} = $#{@args.length}"
+      end
+    end
+  end
+
   # Set pagination
   def paginate(per:, page:)
     duplicate.send(:paginate!, per: per, page: page)

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.4.4"
+    VERSION = "0.4.5"
   end
 end

data/spec/simple/sql_scope_spec.rb

@@ -48,6 +48,22 @@ describe "Simple::SQL::Scope" do
         expect(SQL.ask(scope.where(id: user_id))).to eq(1)
       end
     end
+
+    context "with array arguments" do
+      it "matches against array arguments" do
+        expect(SQL.ask(scope.where("id" => [-333, user_id]))).to eq(1)
+        expect(SQL.ask(scope.where("id" => [-333, -1]))).to be_nil
+        expect(SQL.ask(scope.where("id" => []))).to be_nil
+      end
+    end
+
+    context "with invalid arguments" do
+      it "raises an ArgumentError" do
+        expect {
+          scope.where(1 => 3)
+        }.to raise_error(ArgumentError)
+      end
+    end
   end
 
   context "with non-argument conditions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser