typus 3.1.0.rc5 → 3.1.0.rc6

data/app/controllers/admin/resources_controller.rb

@@ -153,7 +153,7 @@ class Admin::ResourcesController < Admin::BaseController
       @resource = @resource.where(condition)
     end
 
-    @resource.build_joins(params).each do |join|
+    @resource.build_my_joins(params).each do |join|
       @resource = @resource.joins(join)
     end
 

data/lib/typus/orm/active_record/search.rb

@@ -91,7 +91,7 @@ module Typus
           end
         end
 
-        def build_joins(params)
+        def build_my_joins(params)
           query_params = params.dup
           query_params.reject! { |k, v| !model_relationships.keys.include?(k.to_sym) }
           query_params.compact.map { |k, v| k.to_sym }

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.1.0.rc5"
+  VERSION = "3.1.0.rc6"
 end

data/test/lib/typus/orm/active_record/search_test.rb

@@ -297,7 +297,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
   end
 
-  context "build_joins" do
+  context "build_my_joins" do
 
     setup do
       @project = Factory(:project)
@@ -306,7 +306,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
     should "return the expected joins" do
       params = { :projects => @project.id }
-      assert_equal [:projects], User.build_joins(params)
+      assert_equal [:projects], User.build_my_joins(params)
     end
 
     ##
@@ -318,7 +318,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
 
       @resource = User
       @resource.build_conditions(params).each { |c| @resource = @resource.where(c) }
-      @resource.build_joins(params).each { |j| @resource = @resource.joins(j) }
+      @resource.build_my_joins(params).each { |j| @resource = @resource.joins(j) }
 
       assert_equal [@project.user.id], @resource.map(&:id)
     end

metadata

@@ -2,7 +2,7 @@
 name: typus
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.1.0.rc5
+  version: 3.1.0.rc6
 platform: ruby
 authors: 
 - Francesc Esplugas