to_api 1.2.1 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 383641504ea469fcd5c52628a77add7e9f145f8f
+  data.tar.gz: b3a3c7fea117fb69d3e49899f36eabc295d0a5c1
+SHA512:
+  metadata.gz: a4220c067c139ca7054ff74120ca389b59d615c4aa31ecc7055d2d39d2b15ee5596b5187b2b27bb00cb7c1bc0ac1b98ebc8348e34baefc63abeb7a29616d8c14
+  data.tar.gz: 1deef44cefae4a0dd6361445f245f3df32f8d75b30bbfa33a0097f4d073bdd2116676633d942ec56861fb58bd5f83a982173750172924fa0f5ef29cad07c918d

data/lib/to_api.rb

@@ -23,6 +23,15 @@ module ToApiInstanceMethods
   end
 end
 
+module ToApiMultiple
+  def to_api(*includes)
+    map{|e|
+      e.to_api_filters = to_api_filters if to_api_filters.any? && e.respond_to?(:to_api_filters)
+      e.to_api(*includes)
+    }
+  end
+end
+
 module ToApiFilter
   def add_to_api_filter(include_name, &block)
     @_to_api_filters ||= {}
@@ -106,33 +115,34 @@ if Object.const_defined? :ActiveRecord
       end
       include_hash
     end
-
   end
-
+ 
   if defined?(ActiveRecord::NamedScope)
     #Sadly, Scope isn't enumerable
     class ActiveRecord::NamedScope::Scope
       include ToApiFilter
-      def to_api(*includes)
-        map{|e|
-          e.to_api_filters = to_api_filters if to_api_filters.any? && e.respond_to?(:to_api_filters)
-          e.to_api_filters = to_api_filters if e.respond_to?(:to_api_filters)
-          e.to_api(*includes)
-        }
-      end
+      include ToApiMultiple
+    end
+  end
+
+  if defined?(ActiveRecord::Associations::CollectionProxy)
+    class ActiveRecord::Associations::CollectionProxy
+      include ToApiFilter
+      include ToApiMultiple
+    end
+  end
+
+  if defined?(ActiveRecord::Relation)
+    class ActiveRecord::Relation
+      include ToApiFilter
+      include ToApiMultiple
     end
   end
 end
 
 class Array
   include ToApiFilter
-  def to_api(*includes)
-    map{|e|
-      e.to_api_filters = to_api_filters if to_api_filters.any? && e.respond_to?(:to_api_filters)
-
-      e.to_api(*includes)
-    }
-  end
+  include ToApiMultiple
 end
 
 class Hash

data/lib/to_api/version.rb

@@ -1,3 +1,3 @@
 module ToApi
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/spec/to_api_spec.rb

@@ -9,7 +9,7 @@ class FakeRecord < ActiveRecord::Base
   if respond_to?(:named_scope)
     named_scope :scopez, :conditions => '1=1'
   else
-    scope :scopez, :conditions => '1=1'
+    scope :scopez, -> { where '1=1' }
   end
 
   attr_accessor :yarg

data/to_api.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "activerecord", ["3.2.15"]
+  s.add_development_dependency "activerecord", ["5.0.1"]
+  # s.add_development_dependency "activerecord", ["3.2.15"]
   # s.add_development_dependency "activerecord", [">= 2.3", "< 3"]
   s.add_development_dependency "rspec", "= 2.14.1"
   s.add_development_dependency "rake", ">= 0.8.7"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_api
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Shawn Anderson
@@ -10,28 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.15
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -47,49 +42,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Helper for simplifying JSON api creation.
@@ -100,8 +89,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - README.md
 - Rakefile
@@ -112,28 +101,25 @@ files:
 - to_api.gemspec
 homepage: http://github.com/atomicobject/to_api
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: to_api
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Helper for simplifying JSON api creation
-test_files:
-- spec/spec_helper.rb
-- spec/to_api_spec.rb
+test_files: []