through_hierarchy 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3bc6c2921451d1379f51c422e11ef87fb7ba934
-  data.tar.gz: 737084656d7148d237c1dee59f17290fc84a7e27
+SHA256:
+  metadata.gz: ed01a12faf0874f494e1622e5b4810c8195438a0a962032cbb49383e2d86e513
+  data.tar.gz: 11213859736477129737b3b026f4c689b37086a900a950a8bd853d4d127198a5
 SHA512:
-  metadata.gz: 36241a8007d284967306a4ce63cc6ff5de5624e3950e4c88534b9b47292a851cc6182ac2574f36333c0c5f8f74e28c0a95f123aac3b7bea2e33921caa471b463
-  data.tar.gz: 7feba64bceb116fbd151b7bc2b0562931bcc43ca96260d82cf5d056bedad1f1057e5530d47100bcedffb82ab9f233ae48ef524053a364dd78eb338609f7927ec
+  metadata.gz: 6a7ab21447264d5170415108931fed9ef426b9bdb9302c92af2e0385231b41d3690b541453061aa35b319b5d3aae8fb6b08f3216b876f598324c517cc4b000a6
+  data.tar.gz: e044a87e25e344be7979ccc38e96a98ac7ba88aaac000ac78882aec2b087ff9a395d0b24d95fcae6e3fb7ecf247d7bb884463305ba59b35288bda29ba1ca09fa

data/lib/through_hierarchy.rb

@@ -6,6 +6,7 @@ require 'through_hierarchy/associations/has_one.rb'
 require 'through_hierarchy/associations/has_many.rb'
 require 'through_hierarchy/associations/has_uniq.rb'
 require 'through_hierarchy/exceptions.rb'
+require 'through_hierarchy/rails_utils.rb'
 require 'through_hierarchy/hierarchicals/hierarchical.rb'
 require 'through_hierarchy/hierarchicals/instance.rb'
 

data/lib/through_hierarchy/hierarchicals/hierarchical.rb

@@ -60,7 +60,7 @@ module ThroughHierarchy
         Arel.sql(
           "CASE `#{@source.name}`.`#{foreign_type_name}` " +
           hierarchy_models.map.with_index do |model, ii|
-            "WHEN #{model.sanitize(model.base_class.to_s)} THEN #{ii} "
+            "WHEN #{ThroughHierarchy::RailsUtils.sanitize_sql(model.base_class.to_s)} THEN #{ii} "
           end.join +
           "END"
         )
@@ -160,4 +160,4 @@ module ThroughHierarchy
 
     end
   end
-end
+end

data/lib/through_hierarchy/rails_utils.rb

@@ -0,0 +1,17 @@
+module ThroughHierarchy
+  module RailsUtils
+    module_function
+
+    def sanitize_sql(string)
+      if rails_major_minor_version < 5.1
+        ActiveRecord::Base.sanitize(string)
+      else
+        ActiveRecord::Base.sanitize_sql_array(["?", string])
+      end
+    end
+
+    def rails_major_minor_version
+      Rails.version.split(".").first(2).join(".").to_f
+    end
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: through_hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Schwartz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-05-04 00:00:00.000000000 Z
@@ -27,11 +27,12 @@ files:
 - lib/through_hierarchy/hierarchicals/hierarchical.rb
 - lib/through_hierarchy/hierarchicals/instance.rb
 - lib/through_hierarchy/hierarchy.rb
+- lib/through_hierarchy/rails_utils.rb
 homepage: https://github.com/ozydingo/through_hierarchy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -46,9 +47,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Has Many Through Hierarchy
 test_files: []