graphql-active_record 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10caa39790c95eaa28ada47d7f82ca23552c22dc
-  data.tar.gz: bd0c481b90ea4d88c6e033775a86c42924896b66
+  metadata.gz: 5a44cf0f25abe8f851f4a3801183c97f8b03c0cd
+  data.tar.gz: 17f9a15ed51efc2b299419cbbbbf8a6f0c96c58f
 SHA512:
-  metadata.gz: c6ec6a31f0cc12597eb16481f8e211c17ad0997ae06c8a2b38f5e3caaa082ab4118b5a263172930f6ab0a20a78ec59623b3356abb5987c11f19561c6b8053b60
-  data.tar.gz: 92f9b98456949e083d1eaefc4a2e780185c981ecb8a3ab7487068971de3483de31fb12467ff6ca44cd50cc724760b02fadabf44426bc453ba0b9b66aabe56cb3
+  metadata.gz: 50ec563ed10c4ddbbae8b98326cbf6617f101705423ce70113839b1dfcdaf6d188b8a2b1db9b4afe21d13b41d6261e84e594e1aae1bacec07bb7caf65beea1b4
+  data.tar.gz: 09260d87f51cce3ec84fec7e39d5b6f4bce1e40ad20e62869e57cadfb6160060df4a11c00a43446828bb969fbfd12c59e5e1336b37f8f55bc74576df99a9208c

data/.gitignore

@@ -9,3 +9,7 @@
 /tmp/
 
 *.gem
+
+gemfiles/*.lock
+
+.byebug_history

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,4 +1,13 @@
+---
 language: ruby
+cache: bundler
 rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6
+  - "2.2.4"
+script: 'bundle exec rake'
+
+gemfile:
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.gemfile

data/Appraisals

@@ -0,0 +1,19 @@
+appraise 'rails_3.2' do
+  gem 'activerecord', '~> 3.2.21'
+end
+
+appraise 'rails_4.0' do
+  gem 'activerecord', '~> 4.0.13'
+end
+
+appraise 'rails_4.1' do
+  gem 'activerecord', '~> 4.1.10'
+end
+
+appraise 'rails_4.2' do
+  gem 'activerecord', '~> 4.2.4'
+end
+
+appraise 'rails_5' do
+  gem 'activerecord', '~> 5.0.0.beta2'
+end

data/Guardfile

@@ -0,0 +1,11 @@
+guard :bundler do
+  watch('Gemfile')
+  # Uncomment next line if your Gemfile contains the `gemspec' command.
+  watch(/^.+\.gemspec/)
+end
+
+guard :rspec, cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -1,4 +1,6 @@
-# GraphQL::ActiveRecordExtensions
+# GraphQL::ActiveRecordExtensions 
+
+[![Build Status](https://travis-ci.org/brettjurgens/graphql-active-record.svg?branch=master)](https://travis-ci.org/brettjurgens/graphql-active-record)
 
 Active Record includes for GraphQL
 

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.2.21"
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.0.13"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.1.10"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.4"
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0.beta2"
+
+gemspec :path => "../"

data/graphql-active-record.gemspec

@@ -21,7 +21,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "graphql", "~> 0.8"
   spec.add_runtime_dependency "activerecord"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "codeclimate-test-reporter", '~>0.4'
+  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "guard", "~> 2.12"
+  spec.add_development_dependency "guard-bundler", "~> 2.1"
+  spec.add_development_dependency "guard-rspec", "~> 4.6.4"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency "sqlite3"
 end

data/lib/graphql/active_record_extensions/field.rb

@@ -12,7 +12,7 @@ module GraphQL
         self.type = type
         self.description = "Find a #{model.name} by ID"
         self.arguments = {
-          id: GraphQL::Argument.define do
+          'id' => GraphQL::Argument.define do
             type !GraphQL::ID_TYPE
             description "Id for record"
           end
@@ -32,7 +32,8 @@ module GraphQL
       def resolve(object, arguments, ctx)
         includes = map_includes(@model, ctx.ast_node.selections, ctx)
 
-        model_with_includes = @model.includes(*includes)
+        model_with_includes = include_in_model(@model, includes)
+
         if @use_uuid
           model_with_includes.find_by_uuid(arguments['id'])
         else
@@ -44,6 +45,11 @@ module GraphQL
       end
 
       private
+
+      def include_in_model(model, includes)
+        includes.present? ? model.includes(*includes) : model
+      end
+
       ##
       # generates an array for use in AR::QueryMethods.includes
       # allows for nested includes as well
@@ -60,8 +66,8 @@ module GraphQL
           table_name, node = handle_fragments(selection, ctx)
 
           if node.present? && node.selections.present?
-            singular = table_name.singularize.to_sym
-            plural   = table_name.pluralize.to_sym
+            singular = table_name.singularize
+            plural   = table_name.pluralize
 
             # make sure that the next model is an ActiveRecord model
             next_model = singular.to_s.classify.safe_constantize
@@ -72,11 +78,11 @@ module GraphQL
 
             nested = map_includes(next_model, node.selections, ctx)
 
-            final_type =  if model.reflections[singular].present?
+            final_type =  if (model.reflections[singular] || model.reflections[singular.to_sym]).present?
                             # this is for has_one relationships
                             singular
 
-                          elsif model.reflections[plural].present?
+                          elsif (model.reflections[plural] || model.reflections[plural.to_sym]).present?
                             # this is for has_many relationships
                             plural
 

data/lib/graphql/active_record_extensions/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module ActiveRecordExtensions
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-active_record
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brett Jurgens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -39,35 +39,133 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,13 +186,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
+- Appraisals
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.gemfile
 - graphql-active-record.gemspec
 - lib/graphql/active_record_extension.rb
 - lib/graphql/active_record_extensions/field.rb