find_as_hashes 0.4.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 80e69ce59791677832699286e87e673a6e51b11e
+  data.tar.gz: c707a4fc1f7825d27e47df7cd09d70fb7455ef19
+SHA512:
+  metadata.gz: c6f24e484e55bddcda944a9c6a4167eab36544f8d37a0681df573deff5ae56e26cfce61b042423c4cf943c8c9e2b2ecdb3be475b0f157914022cc552ce20f662
+  data.tar.gz: 4c7863791ad209c7af7ca2b456ae3e391dd18a22af612b4d15fd9fee1cd71f283787d18140484ba0981056b5c963c2cddd514316e7adbe49475b5e7de987cd74

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
 pkg/*
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,9 +1,30 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ree
+  - 2.1.2
   - ruby-head
+
+env:
+  - "RAILS_VERSION=3.1"
+  - "RAILS_VERSION=4.0"
+
+gemfile:
+  - gemfiles/rails_3.gemfile
+  - gemfiles/rails_4.gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.9.2
+      env: "RAILS_VERSION=4.0"
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_4.gemfile
+    - rvm: 2.1.2
+      env: "RAILS_VERSION=3.1"
+    - rvm: 2.1.2
+      gemfile: gemfiles/rails_3.gemfile
+  allow_failures:
+    - rvm: ruby-head
+
 notifications:
   # overriding this so that TST Media's email account doesn't get spammed
   # feel free to add yourselves if you want in on this action

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails-3" do
+  gem "rails", "3.1.0"
+end
+
+appraise "rails-4" do
+  gem "rails", "4.0.0"
+end

data/Gemfile.lock

@@ -1,40 +1,58 @@
 PATH
   remote: .
   specs:
-    find_as_hashes (0.4.0)
+    find_as_hashes (0.5.0)
       activerecord
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
+      builder (~> 3.1.0)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.5)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activeresource (4.0.0)
+      activemodel (~> 4.0)
+      activesupport (~> 4.0)
+      rails-observers (~> 0.1.1)
+    activesupport (4.0.5)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     ansi (1.4.3)
-    arel (2.2.3)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.4)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (4.0.2)
+    builder (3.1.4)
     fakeweb (1.3.0)
-    i18n (0.6.1)
-    multi_json (1.0.3)
-    rake (0.9.2)
-    shoulda (2.11.3)
-    sqlite3 (1.3.4)
-    turn (0.8.2)
-      ansi (>= 1.2.2)
-    tzinfo (0.3.35)
+    i18n (0.6.9)
+    minitest (4.7.5)
+    multi_json (1.10.1)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
+    rake (10.3.2)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.6.1)
+      activesupport (>= 3.0.0)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    turn (0.9.7)
+      ansi
+      minitest (~> 4)
+    tzinfo (0.3.39)
 
 PLATFORMS
   ruby
@@ -42,6 +60,7 @@ PLATFORMS
 DEPENDENCIES
   activeresource
   activesupport
+  appraisal
   bundler
   fakeweb
   find_as_hashes!

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2013 Sport Ngin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,4 +1,5 @@
-[![TravisCI](https://secure.travis-ci.org/tstmedia/find_as_hashes.png "TravisCI")](http://travis-ci.org/tstmedia/find_as_hashes "Travis-CI FindAsHashes")
+[![TravisCI](https://travis-ci.org/sportngin/find_as_hashes.png)](https://travis-ci.org/sportngin/find_as_hashes)
+[![Code Climate](https://codeclimate.com/github/sportngin/find_as_hashes.png)](https://codeclimate.com/github/sportngin/find_as_hashes)
 
 # ActiveRecord
 

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/find_as_hashes.gemspec

@@ -3,13 +3,14 @@ $:.push File.expand_path("../lib", __FILE__)
 require "find_as_hashes/version"
 
 Gem::Specification.new do |s|
-  s.name        = "find_as_hashes"
-  s.version     = FindAsHashes::VERSION
-  s.authors     = ["Patrick Byrne"]
-  s.email       = ["patrick.byrne@tstmedia.com"]
-  s.homepage    = "https://github.com/sportngin/find_as_hashes"
-  s.summary     = %q{Provides ActiveRecord methods to return results as attribute hashes rather than instantiated ActiveRecord objects.}
-  s.description = %q{Provides ActiveRecord methods to return results as attribute hashes rather than instantiated ActiveRecord objects. Useful when working with very large sets of results to improve performance.}
+  s.name          = "find_as_hashes"
+  s.version       = FindAsHashes::VERSION
+  s.authors       = ["Patrick Byrne"]
+  s.email         = ["patrick.byrne@tstmedia.com"]
+  s.homepage      = "https://github.com/tstmedia/find_as_hashes"
+  s.summary       = %q{Provides ActiveRecord methods to return results as attribute hashes rather than instantiated ActiveRecord objects.}
+  s.description   = %q{Provides ActiveRecord methods to return results as attribute hashes rather than instantiated ActiveRecord objects. Useful when working with very large sets of results to improve performance.}
+  s.license       = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -26,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activesupport"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "activeresource"
+  s.add_development_dependency "appraisal"
 end

data/gemfiles/rails_3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "4.0.0"
+
+gemspec :path => "../"

data/lib/active_resource/find_as_hashes.rb

@@ -21,12 +21,16 @@ module ActiveResource
         find_as_hashes(:last, *args)
       end
 
-      def instantiate_collection_with_check(collection, prefix_options = {})
+      def instantiate_collection_with_check(collection, original_params = {}, prefix_options = {})
         if @skip_instantiate
           @skip_instantiate = nil
           collection
         else
-          instantiate_collection_without_check(collection, prefix_options)
+          if ActiveResource::VERSION::MAJOR >= 4
+            instantiate_collection_without_check(collection, original_params, prefix_options)
+          else
+            instantiate_collection_without_check(collection, prefix_options)
+          end
         end
       end
       

data/lib/find_as_hashes.rb

@@ -6,7 +6,7 @@ module FindAsHashes
 
   module Relation
     def all_as_hashes
-      connection.select_all(self.joins(self.includes_values).to_sql)
+      connection.select_all(self.joins(self.includes_values).to_sql).to_a
     end
 
     def first_as_hash
@@ -16,9 +16,12 @@ module FindAsHashes
   end
 
   module Base
-    delegate :all_as_hashes, :first_as_hash, :to => :scoped
+    if ActiveRecord::VERSION::MAJOR >= 4
+      delegate :all_as_hashes, :first_as_hash, :to => :all
+    else
+      delegate :all_as_hashes, :first_as_hash, :to => :scoped
+    end
   end
-
 end
 
 ActiveRecord::Relation.send :include, FindAsHashes::Relation

data/lib/find_as_hashes/version.rb

@@ -1,3 +1,3 @@
 module FindAsHashes
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/test/active_resource_test.rb

@@ -42,7 +42,11 @@ class ActiveResourceTest < ActiveSupport::TestCase
     should "return a single hash" do
       assert_equal Hash, @hash.class
       assert_equal Resource::User, @record.class
-      assert_equal @hash["user"]["name"], User.first.name
+      if ActiveResource::VERSION::MAJOR >= 4
+        assert_equal @hash["name"], User.first.name
+      else
+        assert_equal @hash["user"]["name"], User.first.name
+      end
     end
   end
 
@@ -55,7 +59,11 @@ class ActiveResourceTest < ActiveSupport::TestCase
     should "return a single hash" do
       assert_equal Hash, @hash.class
       assert_equal Resource::User, @record.class
-      assert_equal @hash["user"]["name"], User.last.name
+      if ActiveResource::VERSION::MAJOR >= 4
+        assert_equal @hash["name"], User.last.name
+      else
+        assert_equal @hash["user"]["name"], User.last.name
+      end
     end
   end
 end

data/test/find_as_hashes_test.rb

@@ -1,12 +1,11 @@
 require File.dirname(__FILE__) + "/test_helper"
 
-class FindAsHashesTest < ActiveRecord::TestCase
+class FindAsHashesTest < ActiveSupport::TestCase
   context "#all_as_hashes" do
     context "on a relation" do
       setup do
-        relation = User.where(:active => true)
-        @records = relation.all
-        @hashes = relation.all_as_hashes
+        @records = User.where(:active => true)
+        @hashes = @records.all_as_hashes
       end
 
       should "return an array of attribute hashes" do

data/test/test_helper.rb

@@ -30,7 +30,7 @@ class Role < ActiveRecord::Base
   has_many :user
 end
 
-# Rails 3.0 has Fixtures, Rails 3.1 has ActiveRecord::Fixtures
-fixtures_class = defined?(ActiveRecord::Fixtures) ? ActiveRecord::Fixtures : Fixtures
+# Rails 3 has Fixtures, Rails 4 has ActiveRecord::FixtureSet
+fixtures_class = defined?(ActiveRecord::FixtureSet) ? ActiveRecord::FixtureSet : ActiveRecord::Fixtures
 fixtures_class.create_fixtures "test/fixtures", :roles
 fixtures_class.create_fixtures "test/fixtures", :users

metadata

@@ -1,158 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: find_as_hashes
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Patrick Byrne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2014-06-26 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: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: rake
   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: turn
   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: shoulda
   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: fakeweb
   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: activesupport
   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'
 - !ruby/object:Gem::Dependency
   name: activeresource
   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: 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'
 description: Provides ActiveRecord methods to return results as attribute hashes rather
@@ -164,13 +159,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE
 - README.markdown
 - Rakefile
 - find_as_hashes.gemspec
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.gemfile
 - lib/active_resource/find_as_hashes.rb
 - lib/find_as_hashes.rb
 - lib/find_as_hashes/version.rb
@@ -179,29 +178,29 @@ files:
 - test/fixtures/roles.yml
 - test/fixtures/users.yml
 - test/test_helper.rb
-homepage: https://github.com/sportngin/find_as_hashes
-licenses: []
+homepage: https://github.com/tstmedia/find_as_hashes
+licenses:
+- MIT
+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: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides ActiveRecord methods to return results as attribute hashes rather
   than instantiated ActiveRecord objects.
 test_files: