activerecord-raw-data 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e6a04299fc4000c230a640a07ea0ced7af74422
+  data.tar.gz: ce9f59a27f67d55662de920f5f6004f98b81b446
+SHA512:
+  metadata.gz: 4570d705996b3507aa12185ad3a5c864527e0e7a13c67750ff7efe413b5bc3348f6e728f82cb42d09f950243182eb163b42ca2cbe00c617919796dd96a6f18fd
+  data.tar.gz: f6ac74b94f05bda6f4fbf78b72dcd11ebc083b4a4fb511abe783f31054c990f5396194ffa04494cd10f6c16d717133e28ddc6d1fcea7182186f8e78cb06df569

data/lib/activerecord-raw-data.rb

@@ -1,28 +1,32 @@
-
 require 'active_record'
 require 'activerecord-raw-data/version'
+require 'activerecord-raw-data/compatibility_adapter'
 
 module ActiveRecord
   module RawData
+    mattr_accessor :adapter
+
     def self.included(klass)
       klass.extend(ClassMethods)
     end
 
+    self.adapter = ActiveRecord::RawData::CompatibilityAdapter.new(ActiveRecord::VERSION::MAJOR)
+
     module ClassMethods
       def raw_data
-        connection.select_all scoped.to_sql
+        RawData.adapter.result_to_hash(connection.select_all RawData.adapter.blank_scope(self).to_sql)
       end
 
       def raw_rows
-        connection.select_rows scoped.to_sql
+        connection.select_rows RawData.adapter.blank_scope(self).to_sql
       end
 
       def raw_values
-        connection.select_values scoped.to_sql
+        connection.select_values RawData.adapter.blank_scope(self).to_sql
       end
 
       def raw_data_by_sql(sql)
-        connection.select_all sanitize_sql(sql)
+        RawData.adapter.result_to_hash(connection.select_all sanitize_sql(sql))
       end
     end
   end

data/lib/activerecord-raw-data/compatibility_adapter.rb

@@ -0,0 +1,24 @@
+
+module ActiveRecord
+  module RawData
+    class CompatibilityAdapter
+      def initialize(version)
+        @version = version
+      end
+
+      def ar4?
+        @version == 4
+      end
+
+      def blank_scope(klass)
+        ar4? ? klass.all : klass.scoped
+      end
+
+      def result_to_hash(result)
+        return result unless ar4?
+
+        result.to_hash
+      end
+    end
+  end
+end

data/lib/activerecord-raw-data/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module RawData
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/activerecord-raw-data_spec.rb

@@ -14,9 +14,9 @@ describe ActiveRecord::RawData do
 
   it "should result raw data" do
     User.raw_data.should eq [
-      {"id"=>1, "name"=>"alice", "mail"=>"alice@example.com"},
-      {"id"=>2, "name"=>"bob", "mail"=>"bob@example.com"},
-      {"id"=>3, "name"=>"carol", "mail"=>"carol@example.com"}
+      {"id"=> alice.id, "name"=>"alice", "mail"=>"alice@example.com"},
+      {"id"=> bob.id,   "name"=>"bob", "mail"=>"bob@example.com"},
+      {"id"=> carol.id, "name"=>"carol", "mail"=>"carol@example.com"}
     ]
   end
 
@@ -30,9 +30,9 @@ describe ActiveRecord::RawData do
 
   it "should result raw rows" do
     User.raw_rows.should eq [
-      [1, "alice", "alice@example.com"],
-      [2, "bob", "bob@example.com"],
-      [3, "carol", "carol@example.com"]
+      [alice.id, "alice", "alice@example.com"],
+      [bob.id,   "bob",   "bob@example.com"],
+      [carol.id, "carol", "carol@example.com"]
     ]
   end
 
@@ -44,9 +44,8 @@ describe ActiveRecord::RawData do
     ]
   end
 
-
   it "should result raw values" do
-    User.raw_values.should eq [1, 2, 3]
+    User.raw_values.should eq [alice.id, bob.id, carol.id]
   end
 
   it "should result raw values with select" do

metadata

@@ -1,82 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-raw-data
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuichi Tateno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2191751760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2191751760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2191751240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2191751240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2191750760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2191750760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2191750280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2191750280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2191749800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2191749800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2191749320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2191749320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Get raw data from ActiveRecord
 email:
 - hotchpotch@gmail.com
@@ -84,47 +101,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - activerecord-raw-data.gemspec
 - lib/activerecord-raw-data.rb
+- lib/activerecord-raw-data/compatibility_adapter.rb
 - lib/activerecord-raw-data/version.rb
 - spec/activerecord-raw-data_spec.rb
 - spec/database.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hotchpotch/activerecord-raw-data
 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'
-      segments:
-      - 0
-      hash: -243093227698944520
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -243093227698944520
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Get raw data from ActiveRecord
 test_files:
 - spec/activerecord-raw-data_spec.rb