mongery 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2ea2dd29e75e89c48aae9e0aa1614a8896625e
-  data.tar.gz: eeb65b09d38eb4ace06422f046caa6657324ec6e
+  metadata.gz: 1124d4cc8a8887a26daf6cd0167b395692eb2b80
+  data.tar.gz: e0cc0961e38626e40cc26f079471e0e0c52186c2
 SHA512:
-  metadata.gz: a2f38853f1ffd8fe79824dc01efa935dfd4e253399e9f8324b403a93c6a0fa446bf2e0133f93cf0d7f04dd4fa74bf5338301401dfdb1906d4e2aa57cb84716f1
-  data.tar.gz: e56c8c81a04e7c55bc6e21dcdb5343719e760e43e3843f51e73f555a9e8be921ce351cd599c8b818dd32a12668fea3fa05e93f70a88bf9ea7e31c6c67bae3b33
+  metadata.gz: e4de70968015998d26f1bd15e15e8e08c24a67356ae1ba3351f1be7ca6baed823a8c7688bab266b3fddb7dd9a31cbdfbb5540b1e81d06235bea504ab5e294409
+  data.tar.gz: 8861688d905bb127308cde48cd9797903d00620f500c15d89413527a20fce2bca18262af44761ee237611eb4923576f0c7dbf0abc33a414c8b21a096cf13454b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.0.5 (2014/11/10)
+- Use JSON path expression for nested data to avoid errors like "cannot extract element from a scalar"
+
 ## 0.0.4 (2014/10/23)
 - Support insert(), update() and delete() for more compatibilities
 

data/README.md

@@ -24,8 +24,6 @@ CREATE TABLE objects (
 
 Currently Mongery assumes the `id` values are stored as `_id` key duplicated in the json data as well. This can be customized in the future updates.
 
-### Selects
-
 ```ruby
 builder = Mongery::Builder.new(:objects)
 
@@ -34,12 +32,6 @@ builder.find({ _id: 'abcd' }).limit(1).to_sql
 
 builder.find({ age: {"$gte" => 21 } }).sort({ name: -1 }).to_sql
 # => SELECT data FROM objects WHERE (data->>'age')::integer >= 21 ORDER BY data->>'name' DESC
-```
-
-### Inserts, Updates and Deletes
-
-```ruby
-builder = Mongery::Builder.new(:objects)
 
 builder.insert({ _id: 'foobar' }).to_sql
 # => INSERT INTO "objects" ("id", "data") VALUES ('foobar', '{"_id":"foobar"}')
@@ -49,6 +41,7 @@ builder.find({ age: {"$gte" => 21 } }).update({ name: "John" }).to_sql
 
 builder.find({ age: {"$eq" => 55 } }).delete.to_sql
 # => DELETE FROM "objects" WHERE (data->>'age')::integer = 21
+```
 
 ## See Also
 

data/lib/mongery/version.rb

@@ -1,3 +1,3 @@
 module Mongery
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/mongery.rb

@@ -2,8 +2,6 @@ require "mongery/version"
 require "arel"
 
 module Mongery
-  # Translate Mongo query to Arel AST
-
   class Builder
     attr_reader :model, :table
 
@@ -192,13 +190,16 @@ module Mongery
     end
 
     def sql_json_path(col)
-      path = "data"
-      parts = col.to_s.split('.')
-      parts.each_with_index do |part, index|
-        sep = index == parts.size - 1 ? "->>" : "->"
-        path += sep + quote(part)
+      paths = col.to_s.split('.')
+      if paths.size > 1
+        Arel.sql("data#>>#{json_pathize(paths)}")
+      else
+        Arel.sql("data->>#{quote(paths.first)}")
       end
-      Arel.sql(path)
+    end
+
+    def json_pathize(paths)
+      quote("{#{paths.join(',')}}")
     end
 
     def quote(str)

data/spec/mongery/builder_spec.rb

@@ -41,7 +41,9 @@ describe Mongery::Builder do
     [ { bool: true }, { },
       /WHERE data->>'bool' = 'true'$/ ],
     [ { 'email.address' => 'john@example.com' }, { },
-      /WHERE data->'email'->>'address' = 'john@example.com'$/ ],
+      /WHERE data#>>'{email,address}' = 'john@example.com'$/ ],
+    [ { "x'y.z" => 'john' }, { },
+      /WHERE data#>>'{x''y,z}' = 'john'$/ ],
     [ { type: "food", "$or" => [{name: "miso"}, {name: "tofu"}]}, { },
       /WHERE data->>'type' = 'food' AND \(data->>'name' = 'miso' OR data->>'name' = 'tofu'\)$/ ],
     [ { "$or" => [{ _id: "foo" }, { _id: "bar" }] }, { },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongery
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel