baseapi 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 936fbd26520a71667904014ba7483ad45e8147bf
-  data.tar.gz: 715371435bdfdc327b13eeecd1fd6749c15318fd
+  metadata.gz: f3e73410c8406195ecee9cafea68fb5e51af7002
+  data.tar.gz: f42abb494021317b75fcc3fdb59f56665eb93a0c
 SHA512:
-  metadata.gz: f369bec23293e8f0714047795914389a42e70179d51030f6e19d6c24a8f6467cf165da8c618a228ef002919ca783a7c9ca65a2fa316e5c6c3610f40511823b46
-  data.tar.gz: 602e8694c2d6a6a2cc0bff313e5d643dffe87bc79b6c662381900fb31a413a50e049fcd1371e25635f7100d127317f99253d1fbc7a561e843d65f9f96e88b529
+  metadata.gz: 94f9e21eec63f75e68802a9e7b881ece8925d639c58068289a98e327c4b174061f9e5c3e4e0deaae158163fca87dc66914ac421f758c7ccc36b2ab1e5941c23a
+  data.tar.gz: f279474c03b69be2619384c31cda734dd836a9e5171acbdf34f443d3c2e2c5f17638d9adede9265e6006e5ecb9f52b4510f71292a7c7612642c3d2639e7780c5

data/README.md

@@ -157,15 +157,15 @@ Specify the User belong to a development part company
 
     GET   /users.json?company[units][name]=development
 
-Specify it more 20~ (v0.1.11~)
+Specify it more 20~ (v0.1.12~)
 
     GET   /users.json?age=>=20
 
-Specify it less ~20 (v0.1.11~)
+Specify it less ~20 (v0.1.12~)
 
     GET   /users.json?age=<=20
 
-Specify between 2015/09/01 ~ 2015/09/31 (v0.1.11~)
+Specify between 2015/09/01 ~ 2015/09/31 (v0.1.12~)
 
     GET   /users.json?created_at[]=>=20150901&created_at[]=<=20150931
 
@@ -281,7 +281,7 @@ company belongs_to search
         end
     end
 
-If there are multiple related belongs_to
+If there are multiple related belongs_to (v0.1.12~)
 
     def self._belongs_to_company_units_...(models, table, hash)
 
@@ -303,7 +303,7 @@ users has_many search
         end
     end
 
-If there are multiple related has_many
+If there are multiple related has_many (v0.1.12~)
 
     def self._has_many_users_families_...(models, table, hash)
 

data/lib/baseapi/active_record/relation_extension.rb

@@ -16,22 +16,24 @@ module ActiveRecordRelationExtension
           models = self.model.send(function_name, models, key, values)
         # belongs_to, has_many search
         else
-          relationSearch = -> (models, currentModel, key, value, joins = []) {
+          relationSearch = -> (models, currentModel, key, value, prifix = '', joins = []) {
+            joins.push key
             associations = currentModel.get_associations()
             associations.keys.each do |association|
               if currentModel.column_names.include?(key)
                 # call function
-                function_name = self.model.methods.include?("_#{association}_#{joins.join('_')}".to_sym) ? "_#{association}_#{joins.join('_')}" : "_#{association}"
+                function_name = self.model.methods.include?("_#{prifix}_#{joins.join('_')}".to_sym) ? "_#{prifix}_#{joins.join('_')}" : "_#{prifix}"
                 table_name = currentModel.name.underscore
                 hash = {key => value}
                 return self.model.send(function_name, models, table_name, hash)
               elsif associations[association].include?(key)
-                joins.push key
+                # prifix = first association
+                prifix = association if prifix == ''
                 models.joins_array!(joins)
                 currentModel = key.camelize.singularize.constantize
                 value.each do |k, v|
                   # this fnuction collback
-                  models = relationSearch.call(models, currentModel, k, v, joins)
+                  models = relationSearch.call(models, currentModel, k, v, prifix, joins)
                 end
               end
             end

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baseapi
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Moriyuki Arakawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler