ampere 1.0.0 → 1.1.0

data/README.md

@@ -2,10 +2,7 @@
 
 Ampere is an ActiveRecord-style ORM for the Redis key/value data store. 
 
-This is under active development right now and not very far along. Stay
-tuned for further developments.
-
-## A note about version 1.0 (IMPORTANT!!!)
+## A note about Ampere version >1.0 (IMPORTANT!!!)
 
 For the 1.0 release I changed Ampere's API so that instead of subclassing
 `Ampere::Model` to use Ampere's methods, you include it as a mixin. This
@@ -60,6 +57,9 @@ be slower if one of the keys you are searching by isn't indexed).
 
     post = Post.where(:title => "BREAKING: Kitties Are Awesome").first
 
+Ampere query results implement the `Enumerable` module, so all the Enumerable methods 
+you know and love are there. 
+
 ### Indexes
 
 Indexes work similar to Mongoid. They are non-unique by default.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/ampere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ampere"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Thom Stahl"]
-  s.date = "2012-04-20"
+  s.date = "2012-05-03"
   s.description = "An ActiveRecord/Mongoid-esque object model for the Redis key/value data store."
   s.email = "max@villainousindustri.es"
   s.extra_rdoc_files = [
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "spec/models/relationships/has_one_spec.rb",
     "spec/models/updates_spec.rb",
     "spec/module/ampere_spec.rb",
+    "spec/module/collections_ennumerable_spec.rb",
     "spec/module/collections_spec.rb",
     "spec/spec_helper.rb",
     "test/helper.rb",
@@ -49,7 +50,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mstahl/ampere"
   s.licenses = ["EPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.15"
   s.summary = "A pure Ruby ORM for Redis."
 
   if s.respond_to? :specification_version then

data/lib/ampere/collection.rb

@@ -4,6 +4,8 @@ module Ampere
   # Collections are search results from queries. They can be used like arrays,
   # but you cannot add anything to them. 
   class Collection
+    include Enumerable
+    
     attr_reader :raw_array
     attr_reader :model
     
@@ -14,6 +16,17 @@ module Ampere
       @model = model_class
     end
     
+    def each
+      @raw_array.each_with_index do |x, i|
+        if x.is_a?(Ampere::Model) then
+          yield(x)
+        else
+          raw_array[i] = @model.find(x)
+          yield(raw_array[i])
+        end
+      end
+    end
+    
     # Index into the search results. Lazily loads models when they're accessed.
     def [](idx)
       if @raw_array[idx].is_a?(Ampere::Model) then
@@ -24,46 +37,16 @@ module Ampere
       end
     end
     
-    # Delegates to internal array.
-    def count
-      @raw_array.count
-    end
-    
     # Delegates to internal array.
     def empty?
       @raw_array.empty?
     end
-    
-    # Returns first item or first n elements.
-    def first(n = 0)
-      if n == 0 then
-        self[0]
-      else
-        (0..(n - 1)).map{|i| self[i]}
-      end
-    end
-    
+
     # Returns the last item.
     def last
       self[-1]
     end
     
-    # Delegates to internal array.
-    def length
-      @raw_array.count
-    end
-    
-    # Finds all the un-found items and returns an applicatively-evaluated array.
-    def to_a
-      @raw_array.map do |m|
-        if m.is_a?(Ampere::Model) then
-          m
-        else
-          @model.find(m)
-        end
-      end
-    end
-    
     # Class methods ###########################################################
     
     

data/lib/ampere/model.rb

@@ -149,11 +149,10 @@ module Ampere
     end
     
     ### Class methods
-    
     module ClassMethods
       # Returns an array of all the records that have been stored.
       def all
-        Ampere.connection.keys("#{to_s.downcase}.*").map{|m| find m}
+        Ampere::Collection.new(self, Ampere.connection.keys("#{to_s.downcase}.*"))
       end
     
       # Declares a belongs_to relationship to another model.

data/spec/module/collections_ennumerable_spec.rb

@@ -0,0 +1,70 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+
+describe 'Collections are Ennumerable', :collections => true, :ennumerable => true do
+  before :all do
+    Redis.new.flushall
+    Ampere.connect
+    
+    class President
+      include Ampere::Model
+      
+      field :name
+      field :party
+      
+      index :party
+    end
+
+    President.create :name  => "Millard Fillmore"      , :party => "Whig"
+    President.create :name  => "Ulysses S. Grant"      , :party => "Republican"
+    President.create :name  => "Abraham Lincoln"       , :party => "Republican"
+    President.create :name  => "Franklin D. Roosevelt" , :party => "Democratic"
+    President.create :name  => "John F. Kennedy"       , :party => "Democratic"
+    President.create :name  => "Jimmy Carter"          , :party => "Democratic"
+  end
+  
+  it 'should implement the #each method correctly' do
+    presidents = []
+    President.all.each {|p| presidents << p.name}
+    presidents.should == [
+      "Millard Fillmore"     ,
+      "Ulysses S. Grant"     ,
+      "Abraham Lincoln"      ,
+      "Franklin D. Roosevelt",
+      "John F. Kennedy"      ,
+      "Jimmy Carter"         
+    ]
+  end
+  
+  # These are just a handful of methods to ensure that the Enumerable module is
+  # being included correctly. They can safely be factored out since the #each 
+  # one above should cover Enumerable if it's being included correctly.
+  it 'should implement the #all? method correctly' do
+    President.all.all? {|p| p.party != 'Green'}.should be_true
+    President.all.all? {|p| p.party == 'Democratic'}.should be_false
+  end
+
+  it 'should implement the #any? method correctly' do
+    President.all.any? {|p| p.party == 'Whig'}.should be_true
+    President.all.any? {|p| p.party == 'Green'}.should be_false
+  end
+  
+  it 'should implement the #map method correctly' do
+    President.all.map(&:party).should == %w{Whig Republican Republican Democratic Democratic Democratic}
+  end
+
+  it 'should implement the #inject method correctly' do
+    party_counts = President.all.inject({}) do |h, p|
+      h[p.party.downcase.to_sym] ||= 0
+      h[p.party.downcase.to_sym] += 1
+      h
+    end
+    party_counts.should == {
+      whig: 1,
+      republican: 2,
+      democratic: 3
+    }
+  end
+
+  
+end
+

data/spec/module/collections_spec.rb

@@ -23,13 +23,21 @@ describe 'Collections', :collections => true do
   end
   
   ###
+
+  it 'should be returned by President.all' do
+    democrats = President.all
+    democrats.class.should == Ampere::Collection
+    democrats.model.should == President
+    democrats.raw_array.length.should == 6
+    democrats.count.should == 6
+  end
   
   it 'should be returned by where() queries' do
     democrats = President.where(:party => "Democratic")
     democrats.class.should == Ampere::Collection
     democrats.model.should == President
     democrats.raw_array.length.should == 3
-    democrats.length.should == 3
+    democrats.count.should == 3
   end
   
   it 'should be accessible via [] like an Array' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampere
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70280166250520 !ruby/object:Gem::Requirement
+  requirement: &2157094220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280166250520
+  version_requirements: *2157094220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70280166249600 !ruby/object:Gem::Requirement
+  requirement: &2157093700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280166249600
+  version_requirements: *2157093700
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70280166263980 !ruby/object:Gem::Requirement
+  requirement: &2157093160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280166263980
+  version_requirements: *2157093160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70280166262680 !ruby/object:Gem::Requirement
+  requirement: &2157092600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70280166262680
+  version_requirements: *2157092600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70280166261440 !ruby/object:Gem::Requirement
+  requirement: &2157092100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70280166261440
+  version_requirements: *2157092100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70280166260320 !ruby/object:Gem::Requirement
+  requirement: &2157000680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280166260320
+  version_requirements: *2157000680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280166259660 !ruby/object:Gem::Requirement
+  requirement: &2157000140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280166259660
+  version_requirements: *2157000140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70280166257860 !ruby/object:Gem::Requirement
+  requirement: &2156999620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280166257860
+  version_requirements: *2156999620
 description: An ActiveRecord/Mongoid-esque object model for the Redis key/value data
   store.
 email: max@villainousindustri.es
@@ -132,6 +132,7 @@ files:
 - spec/models/relationships/has_one_spec.rb
 - spec/models/updates_spec.rb
 - spec/module/ampere_spec.rb
+- spec/module/collections_ennumerable_spec.rb
 - spec/module/collections_spec.rb
 - spec/spec_helper.rb
 - test/helper.rb
@@ -151,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 719359362580818516
+      hash: 3615386568657855204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A pure Ruby ORM for Redis.