valium 0.3.0 → 0.4.0

data/README.md

@@ -15,8 +15,6 @@ just the values you're interested in seeing.
 You can select a single value...
 
 ```ruby
-Post.where(:published => true)[:title]
-# - OR -
 Post.where(:published => true).value_of :title
 # => ["First Post", "Another Awesome Post", ...]
 ```
@@ -24,9 +22,7 @@ Post.where(:published => true).value_of :title
 ... or several ...
 
 ```ruby
-Employee.where(:title => 'Sr. Monkey Wrangler')[:first_name, :last_name, :hired_at]
-# - OR -
-Employee.where(:title => 'Sr. Monkey Wrangler').value_of :first_name, :last_name, :hired_at
+Employee.where(:title => 'Sr. Monkey Wrangler').values_of :first_name, :last_name, :hired_at
 # => [["Ernie", "Miller", 2009-09-21 08:00:00 -0400],
       ["Herb", "Myers", 2002-02-13 09:00:00 -0400], ...]
 ```
@@ -40,7 +36,7 @@ class Animal < ActiveRecord::Base
   serialize :extra_info
 end
 
-Animal.where(:genus => 'felis')[:species, :extra_info]
+Animal.where(:genus => 'felis').values_of :species, :extra_info
 # => [["catus", {:domestic => true}], ["lolcatus", {:can_has_cheezburger => true}], ...]
 ```
 

data/lib/valium.rb

@@ -49,7 +49,7 @@ module Valium
       end
     end
 
-    alias :[] :value_of
+    alias :values_of :value_of
 
     def valium_select_multiple(attr_names)
       columns = attr_names.map {|n| columns_hash[n]}
@@ -87,25 +87,21 @@ module Valium
 
     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
-          end
+        args.map! do |attr_name|
+          attr_name = attr_name.to_s
+          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] }
-          end
+        if loaded? && (empty? || args.all? {|a| first.attributes.has_key? a})
+          to_a.map {|record| args.map {|a| record[a]}}
         else
-          to_a[*args]
+          scoping { klass.value_of *args }
         end
       end
-
-      alias :[] :value_of
     end
 
+    alias :values_of :value_of
+
   end # Major version check
 end
 

data/lib/valium/version.rb

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

data/spec/valium/valium_spec.rb

@@ -2,56 +2,50 @@ require 'spec_helper'
 
 describe Valium do
 
-  context 'with a symbol key' do
-    subject { Person[:id] }
-    it { should have(100).ids }
-    it { should eq((1..100).to_a) }
-  end
-
-  context 'with value_of syntax' do
+  context 'with a symbol' do
     subject { Person.value_of :id }
     it { should have(100).ids }
     it { should eq((1..100).to_a) }
   end
 
-  context 'with a string key' do
-    subject { Person['id'] }
+  context 'with a string' do
+    subject { Person.value_of 'id' }
     it { should have(100).ids }
     it { should eq((1..100).to_a) }
   end
 
-  context 'with multiple keys' do
-    subject { Person[:id, :last_name] }
+  context 'with multiple values' do
+    subject { Person.values_of :id, :last_name }
     it { should have(100).elements }
     it { should eq((1..100).map {|n| [n, "Number#{n}"]})}
   end
 
   context 'with a datetime column' do
-    subject { Person[:created_at] }
+    subject { Person.value_of :created_at }
     it { should have(100).datetimes }
     it { should be_all {|d| Time === d}}
   end
 
   context 'with a serialized column' do
-    subject { Person[:extra_info] }
+    subject { Person.value_of :extra_info }
     it { should have(100).hashes }
     it { should eq 1.upto(100).map {|n| {:a_key => "Value Number #{n}"} }}
   end
 
   context 'with an alternate primary key and an :id select' do
-    subject { Widget[:id] }
+    subject { Widget.value_of :id }
     it { should have(100).ids }
-    it { should eq (1..100).to_a}
+    it { should eq((1..100).to_a)}
   end
 
   context 'with an alternate primary key and an alternate primary key select' do
-    subject { Widget[:widget_id] }
+    subject { Widget.value_of :widget_id }
     it { should have(100).ids }
-    it { should eq (1..100).to_a}
+    it { should eq((1..100).to_a)}
   end
 
   context 'with a scope' do
-    subject { Person.where(:id => [1,50,100])[:last_name] }
+    subject { Person.where(:id => [1,50,100]).value_of :last_name }
     it { should have(3).last_names }
     it { should eq ['Number1', 'Number50', 'Number100'] }
   end
@@ -63,13 +57,13 @@ describe Valium do
   end
 
   context 'with a scope, an alternate primary key, and an :id select' do
-    subject {Widget.where(:widget_id => [1,50,100])[:id] }
+    subject {Widget.where(:widget_id => [1,50,100]).value_of :id }
     it { should have(3).ids }
     it { should eq [1,50,100]}
   end
 
   context 'with a scope, an alternate primary key, and an alternate primary key select' do
-    subject { Widget.where(:widget_id => [1,50,100])[:widget_id] }
+    subject { Widget.where(:widget_id => [1,50,100]).value_of :widget_id }
     it { should have(3).widget_ids }
     it { should eq [1,50,100]}
   end
@@ -83,10 +77,10 @@ describe Valium do
 
     # We'll generate the first query when we call "subject", but won't
     # need another query
-    specify { queries_for { subject[:id] }.should have(1).query }
+    specify { queries_for { subject.value_of :id }.should have(1).query }
 
-    specify { subject[:id, :created_at, :extra_info].
-              should eq Person.where(:id => [1,50,100])[:id, :created_at, :extra_info] }
+    specify { subject.values_of(:id, :created_at, :extra_info).
+              should eq Person.where(:id => [1,50,100]).values_of(:id, :created_at, :extra_info) }
   end
 
   context 'with a loaded scope, an alternate primary key, and an :id select' do
@@ -98,10 +92,10 @@ describe Valium do
 
     # We'll generate the first query when we call "subject", but won't
     # need another query
-    specify { queries_for { subject[:id] }.should have(1).query }
+    specify { queries_for { subject.value_of :id }.should have(1).query }
 
-    specify { subject[:id, :created_at, :extra_info].
-              should eq Widget.where(:widget_id => [1,50,100])[:id, :created_at, :extra_info] }
+    specify { subject.values_of(:id, :created_at, :extra_info).
+              should eq Widget.where(:widget_id => [1,50,100]).values_of(:id, :created_at, :extra_info) }
   end
 
   context 'with a loaded scope but missing attributes' do
@@ -113,13 +107,13 @@ describe Valium do
 
     # We'll generate the first query when we call "subject", but won't
     # need another query
-    specify { queries_for { subject[:id] }.should have(1).query }
+    specify { queries_for { subject.value_of(:id) }.should have(1).query }
 
     # We'll need to run our own query for the attributes
-    specify { queries_for { subject[:first_name] }.should have(2).queries }
+    specify { queries_for { subject.value_of(:first_name) }.should have(2).queries }
 
-    specify { subject[:id, :created_at, :extra_info].
-              should eq Person.where(:id => [1,50,100])[:id, :created_at, :extra_info] }
+    specify { subject.values_of(:id, :created_at, :extra_info).
+              should eq Person.where(:id => [1,50,100]).values_of(:id, :created_at, :extra_info) }
   end
 
   context 'with a loaded scope, an alternate primary key, and missing attributes' do
@@ -131,41 +125,24 @@ describe Valium do
 
     # We'll generate the first query when we call "subject", but won't
     # need another query
-    specify { queries_for { subject[:id] }.should have(1).query }
-    specify { queries_for { subject[:widget_id] }.should have(1).query }
+    specify { queries_for { subject.value_of(:id) }.should have(1).query }
+    specify { queries_for { subject.value_of(:widget_id) }.should have(1).query }
 
     # We'll need to run our own query for the attributes
-    specify { queries_for { subject[:name] }.should have(2).queries }
+    specify { queries_for { subject.value_of :name }.should have(2).queries }
 
-    specify { subject[:id, :created_at, :extra_info].
-              should eq Widget.where(:widget_id => [1,50,100])[:id, :created_at, :extra_info] }
+    specify { subject.values_of(:id, :created_at, :extra_info).
+              should eq Widget.where(:widget_id => [1,50,100]).values_of(:id, :created_at, :extra_info) }
   end
 
   context 'with a scope and multiple keys' do
-    subject { Person.where(:id => [1,50,100])[:last_name, :id, :extra_info] }
+    subject { Person.where(:id => [1,50,100]).values_of(:last_name, :id, :extra_info) }
     it { should have(3).elements }
     it { should eq [1,50,100].map {|n| ["Number#{n}", n, {:a_key => "Value Number #{n}"}]}}
   end
 
-  context 'with a relation array index' do
-    subject { Person.where(:id => [1,50,100])[1] }
-    it { should eq Person.find(50) }
-  end
-
-  context 'with a relation array start and length' do
-    subject { Person.where(:id => 1..20)[10,3] }
-    it { should have(3).people }
-    it { should eq Person.offset(10).limit(3) }
-  end
-
-  context 'with a relation array range' do
-    subject { Person.where(:id => 1..20)[0..9] }
-    it { should have(10).people }
-    it { should eq Person.first(10) }
-  end
-
   context 'with an association' do
-    subject { Person.first.widgets[:id] }
+    subject { Person.first.widgets.value_of :id }
     it { should have(10).elements }
     it { should eq Person.first.widgets.map(&:id) }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valium
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70286893107380 !ruby/object:Gem::Requirement
+  requirement: &70207893119400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70286893107380
+  version_requirements: *70207893119400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70286893106720 !ruby/object:Gem::Requirement
+  requirement: &70207893118360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70286893106720
+  version_requirements: *70207893118360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70286893106000 !ruby/object:Gem::Requirement
+  requirement: &70207893117720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70286893106000
+  version_requirements: *70207893117720
 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  "