graphiti 1.0.rc.11 → 1.0.rc.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3082ebcc3ad0db7bcfab339e6080af0a753f165
-  data.tar.gz: 496130887cdc37b7a3c9f824c4d8272a3b8efd4c
+  metadata.gz: 5741aeed3c5d6c85e7811c4bd5b16e1534c99995
+  data.tar.gz: dbaabdd369e8ce8c59b93c2ced58f749e1ae2300
 SHA512:
-  metadata.gz: 31209973f0a21e5c7bdf057996b241ed4de51583579e875508541cfb681a0011947c5482ea9b77f6c46eb574386004c54eead5adf8863b4577f7becdffcabf50
-  data.tar.gz: 5e29511ca4d7b9f775086d6b75f5b6ca69c503a6f8a1b13c4368b63bb2fe1a76eb76c5403274c30cc3fa86d16b2cfcb1b3c9cee15440595f6bf3f06d8696c428
+  metadata.gz: 452d349ea0ceda5230413c88cffd973ef6e9c2346ccc6b327644c1f176555ff8697e885a912bec5a4ba64931d35efdd1bc0590a759228341059f4708c8913b38
+  data.tar.gz: bcd0f0d5b95760c1b13b51c07556e26d3fc497d8f2c10aad2dada93e6b7a4488e4ece955a1ba0ad986dd8cf3ac7af95c0ce469a1f233029a4498b71af982d5ed

data/.travis.yml

@@ -5,16 +5,12 @@ rvm:
 - 2.5
 - 2.6
 
-script: bundle exec rake
+script: bundle exec rspec && bundle exec appraisal install && bundle exec appraisal rails-5 rspec && bundle exec appraisal rails-4 rspec
 install: bundle install --retry=3 --jobs=3
 
 before_install:
 - gem install bundler -v '< 2'
 
-gemfile:
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
-
 deploy:
   provider: rubygems
   api_key:

data/Rakefile

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   end
 end
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV['TRAVIS']
   task :default => [:spec, :appraisal]
 else
   task :default => [:spec]

data/lib/graphiti/adapters/active_record.rb

@@ -37,7 +37,7 @@ module Graphiti
       alias :filter_uuid_not_eq :filter_not_eq
 
       def filter_string_eq(scope, attribute, value, is_not: false)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         clause = column.lower.eq_any(value.map(&:downcase))
         is_not ? scope.where.not(clause) : scope.where(clause)
       end
@@ -56,7 +56,7 @@ module Graphiti
       end
 
       def filter_string_prefix(scope, attribute, value, is_not: false)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         map = value.map { |v| "#{v}%" }
         clause = column.lower.matches_any(map)
         is_not ? scope.where.not(clause) : scope.where(clause)
@@ -67,7 +67,7 @@ module Graphiti
       end
 
       def filter_string_suffix(scope, attribute, value, is_not: false)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         map = value.map { |v| "%#{v}" }
         clause = column.lower.matches_any(map)
         is_not ? scope.where.not(clause) : scope.where(clause)
@@ -78,7 +78,7 @@ module Graphiti
       end
 
       def filter_string_match(scope, attribute, value, is_not: false)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         map = value.map { |v| "%#{v.downcase}%" }
         clause = column.lower.matches_any(map)
         is_not ? scope.where.not(clause) : scope.where(clause)
@@ -89,7 +89,7 @@ module Graphiti
       end
 
       def filter_gt(scope, attribute, value)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         scope.where(column.gt_any(value))
       end
       alias :filter_integer_gt :filter_gt
@@ -99,7 +99,7 @@ module Graphiti
       alias :filter_date_gt :filter_gt
 
       def filter_gte(scope, attribute, value)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         scope.where(column.gteq_any(value))
       end
       alias :filter_integer_gte :filter_gte
@@ -109,7 +109,7 @@ module Graphiti
       alias :filter_date_gte :filter_gte
 
       def filter_lt(scope, attribute, value)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         scope.where(column.lt_any(value))
       end
       alias :filter_integer_lt :filter_lt
@@ -119,7 +119,7 @@ module Graphiti
       alias :filter_date_lt :filter_lt
 
       def filter_lte(scope, attribute, value)
-        column = scope.klass.arel_table[attribute]
+        column = column_for(scope, attribute)
         scope.where(column.lteq_any(value))
       end
       alias :filter_integer_lte :filter_lte
@@ -272,6 +272,17 @@ module Graphiti
         model_instance.destroy
         model_instance
       end
+
+      private
+
+      def column_for(scope, name)
+        table = scope.klass.arel_table
+        if other = scope.attribute_alias(name)
+          table[other]
+        else
+          table[name]
+        end
+      end
     end
   end
 end

data/lib/graphiti/resource/persistence.rb

@@ -109,7 +109,7 @@ module Graphiti
       def destroy(id)
         model_instance = self.class._find(id: id).data
         run_callbacks :destroy, :destroy, model_instance do
-          adapter.destroy(model_instance)
+          delete(model_instance)
         end
         model_instance
       end
@@ -126,6 +126,10 @@ module Graphiti
         adapter.save(model_instance)
       end
 
+      def delete(model_instance)
+        adapter.destroy(model_instance)
+      end
+
       private
 
       def run_callbacks(kind, action, *args)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.11"
+  VERSION = "1.0.rc.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.rc.11
+  version: 1.0.rc.12
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable