baseapi 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef45b44ae0098c0c40a9e073515b5a3679ae5622
-  data.tar.gz: eed6e1caf5fce76b7bc20df167c75a1bfe46fb48
+  metadata.gz: 9458a084335b8367f4758d5e98a419d4255d9635
+  data.tar.gz: 275a2633ec64ce87a21eb077599f9f2bd5ba72b2
 SHA512:
-  metadata.gz: 4c7cb5e7a57770324319d81853e74008cb9863a82e2425ea0410c6046faece2e3b4ecc8e7b7e805160a50556dbc1a1638b0c17eff289b9a8ff07204f9480507f
-  data.tar.gz: cec57dc2393488280ad6e7bf5d7d8e7da8f513687499683150c902a5885ccadf51bbf5c714b993c54568f464ad397a681eb5eeb86584cd512ce765b01553c8cb
+  metadata.gz: c2910253e825b666b784cb6eaa017ff36e1ee75a805fad23284eb8f287bd2b4b185b66fe7db24c0cbb9138eb13ff58623ac6b6188933ed8e13360c1471a11041
+  data.tar.gz: 200cae2049be21cf6f57ce06a330d16f3ba9771438e0812a1cce4097dae0f20f18fd6c1d31142a1ffd37378972fdd408480eed4d798379d1917adc57f326a19e

data/README.md

@@ -151,6 +151,12 @@ Note that this is a multiple
 
     GET   /companies.json?users[name]=hoge
 
+Relationships can now specify multiple (v0.1.9~)
+
+Specify the User belong to a development part company
+
+    GET   /users.json?company[units][name]=development
+
 #### action show
 
 Get id 1
@@ -251,6 +257,10 @@ company belongs_to search
         end
     end
 
+If there are multiple related belongs_to
+
+    def self._belongs_to_company_units_...(models, table, hash)
+
 has_many search
 
     class Company < ActiveRecord::Base
@@ -269,6 +279,9 @@ users has_many search
         end
     end
 
+If there are multiple related has_many
+
+    def self._has_many_users_families_...(models, table, hash)
 
 ### like & match, or & and Search (v0.1.3~)
 
@@ -291,7 +304,7 @@ If the search process of the related table is to override
 relation_match, you can use the relation_like function.
 
     class User < ActiveRecord::Base
-      def self._belongs_to(models, table, hash)
+      def self._belongs_to_company(models, table, hash)
         relation_match(models, table, hash, operator:'or') # default is match OR
         # relation_like(models, table, hash, operator:'or') # LIKE OR
         # relation_like(models, table, hash, operator:'and') # LIKE AND

data/lib/baseapi/active_record/base_extension.rb

@@ -13,7 +13,6 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
       self.all
     end
 
-
     # override or create method '_where_{column}' if necessary
     # @param    ActiveRecordRelation  models
     # @param    String                column    column name
@@ -100,7 +99,6 @@ module ActiveRecordBaseExtension extend ActiveSupport::Concern
     # @param    Callable              callable
     # @option   String                operator  orかand
     def relation_call(models, table, hash, callable, operator:'or')
-      models.joins!(table.to_sym)
       hash.each do |column, value|
         if column.present? and value.present?
           relation_values = value.instance_of?(Array) ? value : [value]

data/lib/baseapi/active_record/relation_extension.rb

@@ -4,9 +4,9 @@ module ActiveRecordRelationExtension
   # @param  Hash    params
   def filtering!(params)
     models = self
-    associations = self.model.get_associations()
     params.each do |key, value|
       if key.present? and value.present?
+        # this model search
         if column_names.include?(key)
           # array change
           values = value.instance_of?(Array) ? value : [value]
@@ -14,15 +14,30 @@ module ActiveRecordRelationExtension
           # call function
           function_name = self.model.methods.include?("_where_#{key}".to_sym) ? "_where_#{key}" : '_where'
           models = self.model.send(function_name, models, key, values)
-        end
-
         # belongs_to, has_many search
-        associations.keys.each do |association|
-          if associations[association].include?(key) and value.instance_of?(ActionController::Parameters)#hash型はActionController::Parameters
-            # call function
-            function_name = self.model.methods.include?("_#{association}_#{key}".to_sym) ? "_#{association}_#{key}" : "_#{association}"
-            models = self.model.send(function_name, models, key, value)
-          end
+        else
+          relationSearch = -> (models, currentModel, key, value, joins = []) {
+            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}"
+                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
+                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)
+                end
+              end
+            end
+            return models
+          }
+          models = relationSearch.call(models, self.model, key, value)
         end
       end
     end
@@ -51,4 +66,20 @@ module ActiveRecordRelationExtension
       order!({params[:orderby] => params[:order]})
     end
   end
+
+
+  # joins as array params
+  # @param  array    param
+  def joins_array!(joins)
+    param = nil
+    joins.reverse.each_with_index do |join, index|
+      join = join.to_sym
+      if index == 0
+        param = join
+      else
+        param = {join => param}
+      end
+    end
+    joins!(param)
+  end
 end

data/lib/baseapi/version.rb

@@ -1,3 +1,3 @@
 module Baseapi
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baseapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Moriyuki Arakawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler