valium 0.2.1 → 0.3.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - rbx
+  - ruby-head

data/Gemfile

@@ -1,6 +1,8 @@
 source "http://rubygems.org"
 gemspec
 
+gem 'rake'
+
 rails = ENV['RAILS'] || 'master'
 
 case rails

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Ernie Miller
+
+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.md

@@ -1,4 +1,4 @@
-# Valium
+# Valium [![Build Status](https://secure.travis-ci.org/ernie/valium.png)](http://travis-ci.org/ernie/valium)
 
 Suffering from ActiveRecord instantiation anxiety? Try Valium. It
 saves your CPU and memory for more important things, retrieving
@@ -81,6 +81,14 @@ spent in the deserialization process than with normal attributes,
 Valium can be up to twice as fast as mapping over ActiveRecord
 objects, in my tests.
 
+## Limitations
+
+Valium will only retrieve columns from the model you are querying against.
+Joined associations may be used to limit the scope of the query, but their
+attribute values can't be selected. There's a bit of discussion on 
+[issue #2](https://github.com/ernie/valium/issues/2) about why this is, 
+if you're interested in reading more.
+
 ## Conclusion
 
 You knew everything I mentioned above, already. In fact,

data/lib/valium.rb

@@ -6,6 +6,12 @@ module Valium
 
     if ActiveRecord::VERSION::MINOR == 0 # We need to use the old deserialize code
 
+      CollectionProxy = ActiveRecord::Associations::AssociationProxy
+
+      CollectionProxy.class_eval do
+        delegate :scoping, :klass, :to => :scoped
+      end
+
       def valium_deserialize(value, klass)
         if value.is_a?(String) && value =~ /^---/
           result = YAML::load(value) rescue value
@@ -22,6 +28,8 @@ module Valium
 
     else # we're on 3.1+, yay for coder.load!
 
+      CollectionProxy = ActiveRecord::Associations::CollectionProxy
+
       def valium_deserialize(value, coder)
         coder.load(value)
       end
@@ -77,18 +85,18 @@ module Valium
       end
     end
 
-    module Relation
+    module ValueOf
       def value_of(*args)
         if args.size > 0 && args.all? {|a| String === a || Symbol === a}
           args.map! do |attr_name|
             attr_name = attr_name.to_s
-            attr_name == 'id' ? @klass.primary_key : attr_name
+            attr_name == 'id' ? klass.primary_key : attr_name
           end
 
           if loaded? && (empty? || args.all? {|a| first.attributes.has_key? a})
             to_a.map {|record| args.map {|a| record[a]}}
           else
-            scoping { @klass[*args] }
+            scoping { klass[*args] }
           end
         else
           to_a[*args]
@@ -102,4 +110,5 @@ module Valium
 end
 
 ActiveRecord::Base.extend Valium
-ActiveRecord::Relation.send :include, Valium::Relation
+ActiveRecord::Relation.send :include, Valium::ValueOf
+Valium::CollectionProxy.send :include, Valium::ValueOf

data/lib/valium/version.rb

@@ -1,3 +1,3 @@
 module Valium
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/support/schema.rb

@@ -6,10 +6,12 @@ ActiveRecord::Base.establish_connection(
 )
 
 class Person < ActiveRecord::Base
+  has_many :widgets
   serialize :extra_info
 end
 
 class Widget < ActiveRecord::Base
+  belongs_to :person
   serialize :extra_info
   set_primary_key :widget_id
 end
@@ -29,8 +31,9 @@ module Schema
         end
 
         create_table :widgets, :force => true, :primary_key => :widget_id do |t|
-          t.string   :name
-          t.text     :extra_info
+          t.belongs_to :person
+          t.string     :name
+          t.text       :extra_info
           t.timestamps
         end
       end
@@ -42,7 +45,7 @@ module Schema
     end
 
     1.upto(100) do |num|
-      Widget.create! :name => "Widget #{num}",
+      Widget.create! :person_id => num % 10, :name => "Widget #{num}",
                      :extra_info => {:a_key => "Value Number #{num}"}
     end
 

data/spec/valium/valium_spec.rb

@@ -164,4 +164,10 @@ describe Valium do
     it { should eq Person.first(10) }
   end
 
+  context 'with an association' do
+    subject { Person.first.widgets[:id] }
+    it { should have(10).elements }
+    it { should eq Person.first.widgets.map(&:id) }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valium
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70159201437300 !ruby/object:Gem::Requirement
+  requirement: &70286893107380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70159201437300
+  version_requirements: *70286893107380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70159201401980 !ruby/object:Gem::Requirement
+  requirement: &70286893106720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70159201401980
+  version_requirements: *70286893106720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70159201388400 !ruby/object:Gem::Requirement
+  requirement: &70286893106000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70159201388400
+  version_requirements: *70286893106000
 description: ! "\n    Suffering from ActiveRecord instantiation anxiety? Try Valium.
   It\n    saves your CPU and memory for more important things, retrieving\n    just
   the values you're interested in seeing.\n  "
@@ -54,7 +54,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/valium.rb
@@ -85,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: valium
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Access attribute values directly, without instantiating ActiveRecord objects.