mongery 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d8acfca1ec4e920360fd762c038d5418f2cfaf
-  data.tar.gz: 66f7ec10c8e575b4bbdfbed72a35405c2fb40a4c
+  metadata.gz: c654aa684e186267a8ad90f66b57a7c000e2529b
+  data.tar.gz: 31e9d9fab939af0b876f68782ae44950da8ecda6
 SHA512:
-  metadata.gz: 16ccca0d85eed4fe6c7f2cbdf391b26485196a9051d04be639f9a6b3dbb175e701d724c8edff4a0c972649ad5dad84cd702901a10991bee175aa6c29ed350c26
-  data.tar.gz: aa49ffa0ba15edc1a5a2efc4fc108c49845155ae7f033797e57e8ca4091da951f4062c4a7516e5582f6c20f8cf49754d2a8549781dc55c96f2fb511007e2d481
+  metadata.gz: 627d0288cfc9409bd7f00f374b2a50ec0c6acdbaaaac90e47855a0cf57b99b427e24cec0a2fd6b485131a56b3b8f507c02c221db2c2afe9552960543d46fc0fd
+  data.tar.gz: 5768a7da04168ee460e1e88cdb05a28d576d46cbd422819ffc5370a2a6569b6ba14cdd2958a8f29291e3a2c1878c9c130edf6fd998e24efdb9c96531b07c8518

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.2 (2015/01/09)
+- Support mapped_properties to map system columns on Postgres
+- Look up all values using string keys rather than symbol. Make sure you use indifferent_access, or stringify_key before passing the value hash to Mongery
+
 ## 1.0.1 (2014/12/22)
 - Force string comparison on non-typed property
 

data/lib/mongery.rb

@@ -4,29 +4,40 @@ require "arel"
 
 module Mongery
   class Builder
-    attr_reader :model, :table, :schema
+    attr_reader :model, :table, :schema, :mapped_properties
 
     def initialize(model, engine = ActiveRecord::Base, schema = nil)
       @model = model
       @table = Arel::Table.new(model, engine)
       @schema = Schema.new(schema) if schema
+      @mapped_properties = {}
+    end
+
+    def mapped_properties=(value)
+      case value
+      when Array
+        @mapped_properties = Hash[ value.map { |v| [v.to_s, v] } ]
+      else
+        @mapped_properties = value
+      end
     end
 
     def find(*args)
-      Query.new(table, schema).where(*args)
+      Query.new(table, schema, mapped_properties).where(*args)
     end
 
     def insert(*args)
-      Query.new(table, schema).insert(*args)
+      Query.new(table, schema, mapped_properties).insert(*args)
     end
   end
 
   class Query
-    attr_reader :table, :schema
+    attr_reader :table, :schema, :mapped_properties
 
-    def initialize(table, schema)
+    def initialize(table, schema, mapped_properties)
       @table = table
       @schema = schema
+      @mapped_properties = mapped_properties
       @condition = nil
     end
 
@@ -70,17 +81,26 @@ module Mongery
       self
     end
 
+    def mapped_values(args)
+      pairs = []
+      mapped_properties.each do |key, column|
+        pairs.push([table[column], args[key]]) if args.key?(key)
+      end
+      pairs
+    end
+    private :mapped_values
+
     def insert(args)
       Arel::InsertManager.new(table.engine).tap do |manager|
         manager.into(table)
-        manager.insert([[table[:id], args[:_id]], [table[:data], args.to_json]])
+        manager.insert([[table[:id], args['_id']], [table[:data], args.to_json], *mapped_values(args)])
       end
     end
 
     def update(args)
       Arel::UpdateManager.new(table.engine).tap do |manager|
         manager.table(table)
-        manager.set([[table[:data], args.to_json]])
+        manager.set([[table[:data], args.to_json], *mapped_values(args)])
         manager.where(condition) if condition
       end
     end
@@ -94,6 +114,10 @@ module Mongery
 
     private
 
+    def mapped_keys
+      mapped_properties.keys
+    end
+
     def condition
       @condition ||= translate(@where)
     end
@@ -118,6 +142,8 @@ module Mongery
         raise UnsupportedQuery, "Unsupported operator #{col}"
       when "_id"
         translate_value(table[:id], value)
+      when *mapped_keys
+        translate_value(table[mapped_properties[col.to_s]], value)
       else
         if schema
           translate_value_schema(col, sql_json_path(col), value)

data/lib/mongery/version.rb

@@ -1,3 +1,3 @@
 module Mongery
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/mongery/builder_spec.rb

@@ -103,3 +103,4 @@ describe Mongery::Builder do
     end
   end
 end
+

data/spec/mongery/mapped_properties_spec.rb

@@ -0,0 +1,34 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
+describe "#mapped_properties" do
+  let(:builder) {
+    Mongery::Builder.new(:test).tap do |builder|
+      builder.mapped_properties = [:user_id, :created_at, :updated_at]
+    end
+  }
+
+  let(:args) {
+    { '_id' => 1, 'user_id' => 2, 'created_at' => Time.now, 'foo' => "bar" }.with_indifferent_access
+  }
+
+  it 'generates INSERT' do
+    expect(builder.insert(args).to_sql).to match /VALUES \(1, '{.*?}', 2, '\d{4}-\d{2}-\d{2} .*'\)$/
+  end
+
+  it 'generates UPDATE' do
+    expect(builder.find(_id: 1).update(args).to_sql).to match /SET "data" = .*, "user_id" = 2, "created_at" = '\d{4}-.*' WHERE/;
+  end
+
+  it 'searches WHERE with symbol' do
+    expect(builder.find(:user_id => '2').to_sql).to match /WHERE "test"\."user_id" = '2'/;
+  end
+
+  it 'searches WHERE with string' do
+    expect(builder.find("user_id" => '2').to_sql).to match /WHERE "test"\."user_id" = '2'/;
+  end
+
+  it 'searches WHERE with operators' do
+    expect(builder.find("created_at" => {'$in' => ['2014-01-01', '2015-01-01']}, "foo" => "bar").to_sql)
+      .to match /WHERE "test"\."created_at" IN \('2014-01-01', '2015-01-01'\) AND data#>>'{foo}' = 'bar'/;
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongery
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tatsuhiko Miyagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -127,6 +127,7 @@ files:
 - mongery.gemspec
 - spec/mongery/builder_schema_spec.rb
 - spec/mongery/builder_spec.rb
+- spec/mongery/mapped_properties_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/miyagawa/mongery
 licenses:
@@ -148,12 +149,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Convert MongoDB query to Arel for PostgreSQL + JSON
 test_files:
 - spec/mongery/builder_schema_spec.rb
 - spec/mongery/builder_spec.rb
+- spec/mongery/mapped_properties_spec.rb
 - spec/spec_helper.rb
-has_rdoc: