ampere 1.2.1 → 1.2.2

data/.rspec

@@ -1 +1,2 @@
 --color
+--format NyanCatFormatter

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.2
+
+* Increased code coverage to everything but really bizarre edge cases.
+* Cleaned things up a little bit here and there.
+
 ## 1.2.1
 
 * Model saves and multi-attribute updates are now completely atomic, using

data/Gemfile

@@ -13,6 +13,7 @@ group :development do
   gem "cucumber", ">= 0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.4"
+  gem "nyan-cat-formatter"
   gem 'simplecov', :require => false, :group => :test
   gem "rspec"
   gem "rdoc"

data/Gemfile.lock

@@ -30,6 +30,7 @@ GEM
       rake
     json (1.7.3)
     multi_json (1.3.6)
+    nyan-cat-formatter (0.0.7)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -62,6 +63,7 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   cucumber
   jeweler (~> 1.6.4)
+  nyan-cat-formatter
   rdoc
   redis
   rspec

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/ampere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ampere"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Thom Stahl"]
-  s.date = "2012-07-12"
+  s.date = "2012-07-24"
   s.description = "An ActiveRecord/Mongoid-esque object model for the Redis key/value data store."
   s.email = "max@villainousindustri.es"
   s.extra_rdoc_files = [
@@ -138,6 +138,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<nyan-cat-formatter>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
@@ -149,6 +150,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<nyan-cat-formatter>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
@@ -161,6 +163,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<nyan-cat-formatter>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])

data/lib/ampere/keys.rb

@@ -26,11 +26,7 @@ module Ampere #:nodoc:
     private
     
     def model_name
-      if self.class == Class then
-        to_s
-      else
-        self.class.to_s
-      end
+      self.class.to_s
     end
   
   end

data/lib/ampere/model.rb

@@ -18,8 +18,8 @@ module Ampere
 
         include(Ampere::Keys)
         
-        attr_reader :id
-        attr_reader :destroyed
+        attr_reader   :id
+        attr_accessor :destroyed
         
         attr_accessor :fields
         attr_accessor :field_defaults
@@ -229,6 +229,7 @@ module Ampere
       def delete(id)
         record = find(id)
         Ampere.connection.del(key_for_find(self, id))
+        record.destroyed = true
         record
       end
     

data/lib/ampere.rb

@@ -1,7 +1,5 @@
-# require "active_support"
 require "active_record"
 require "redis"
-require "pp"
 
 # The Ampere module contains methods to connect/disconnect and gives access to
 # the Redis connection directly (though you really shouldn't need to use it).

data/spec/models/indices_spec.rb

@@ -136,9 +136,9 @@ describe "Model indices", :indices => true do
       brandi.first.employee_id_number.should == "31415929"
     end
     
-    it 'should still be able to search on just one field of a compound index' do
-      pending
-    end
+    # it 'should still be able to search on just one field of a compound index' do
+    #   pending
+    # end
   end
   
   ###

data/spec/models/model_spec.rb

@@ -2,6 +2,14 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
 
 describe "Base models", :model => true do
   context "by themselves" do
+    class Post
+      include Ampere::Model
+      
+      field :title
+      field :byline
+      field :content
+    end
+    
     before :all do
       Ampere.connect
       
@@ -9,13 +17,6 @@ describe "Base models", :model => true do
       Redis.new.flushall
       
       # Define a model class here.
-      class Post
-        include Ampere::Model
-        
-        field :title
-        field :byline
-        field :content
-      end
       
     end
     
@@ -171,26 +172,30 @@ describe "Base models", :model => true do
       post.new?.should be_false
     end
     
-    it "should be deleteable from the model class" do
-      post = Post.create :title   => "This post should be deleted",
-                         :byline  => "because it's awful",
-                         :content => "and it doesn't even make sense."
-      id = post.id
-      post.should_not be_nil
-      deleted_post = Post.delete(id)
-      deleted_post.should eq(post)
-      deleted_post.title.should eq(post.title)
-      Post.find(id).should be_nil
-    end
+    # context 'deletion' do
+      it "should be deleteable from the model class", wip:true do
+        post = Post.create :title   => "This post should be deleted",
+                           :byline  => "because it's awful",
+                           :content => "and it doesn't even make sense."
+        id = post.id
+        post.should_not be_nil
+        deleted_post = Post.delete(id)
+        deleted_post.should eq(post)
+        deleted_post.title.should eq(post.title)
+        deleted_post.should be_destroyed
+        Post.find(id).should be_nil
+      end
     
-    it "should be destroyable by itself" do
-      another_post = Post.create :title   => "This one too, probably.",
-                                 :byline  => "Just seems like one big",
-                                 :content => "non sequitor."
-      id = another_post.id
-      another_post.destroy.should eq(another_post)
-      Post.find(id).should be_nil
-    end
+      it "should be destroyable by itself" do
+        another_post = Post.create :title   => "This one too, probably.",
+                                   :byline  => "Just seems like one big",
+                                   :content => "non sequitor."
+        id = another_post.id
+        another_post.destroy.should eq(another_post)
+        another_post.should be_destroyed
+        Post.find(id).should be_nil
+      end
+    # end
     
     it "should be findable by ID" do
       post = Post.create :title   => "foo",

data/spec/models/relationships/has_many_spec.rb

@@ -57,13 +57,13 @@ describe 'has_many relationships', :has_many => true do
     @car.passengers.should include(@passenger)
   end
   
-  it 'should be able to remove items from has_many relationships' do
-    pending
-  end
+  # it 'should be able to remove items from has_many relationships' do
+  #   pending
+  # end
   
-  it 'should be able to query has_many relationships' do
-    pending
-  end
+  # it 'should be able to query has_many relationships' do
+  #   pending
+  # end
   
   ###
   

data/spec/module/ampere_spec.rb

@@ -7,16 +7,22 @@ describe 'Ampere', :ampere => true do
   end
   
   it 'should be able to connect' do
-    Ampere.connected?.should be_true
-    Ampere.disconnect
-    Ampere.connected?.should be_false
+    Ampere.should be_connected
+  end
+  
+  it 'should be able to flush' do
+    value = "%016x" % rand(2 ** 64)
+    Ampere.should be_connected
+    Ampere.connection.setex("ampere.test.flush_test", 60, value)
+    Ampere.flush
+    Ampere.connection.get("ampere.test.flush_test").should_not eq(value)
   end
   
-  # context 'Redis data store', :redis => true do
-  #   it 'should come with a __guid set' do
-  #     Redis.new['guid'].should == 0
-  #   end
-  # end
+  it 'should be able to disconnect' do
+    # NOTE: This test must always be run last
+    Ampere.disconnect
+    Ampere.should_not be_connected
+  end
   
   after :all do
     Redis.new.flushall

data/spec/module/collections_ennumerable_spec.rb

@@ -35,6 +35,18 @@ describe 'Collections are Ennumerable', :collections => true, :ennumerable => tr
     ]
   end
   
+  it 'should lazily evaluate the #[] method' do
+    presidents = President.all
+    
+    presidents[2].name.should eq('Abraham Lincoln')
+    presidents[2].name.should eq('Abraham Lincoln')
+  end
+  
+  it 'should be comparable to an array' do
+    President.all.should == President.all.to_a
+    President.all.should_not be(President.all.to_a)
+  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.

data/spec/module/collections_spec.rb

@@ -1,18 +1,18 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
 
 describe 'Collections', :collections => true do
+  class President
+    include Ampere::Model
+    
+    field :name
+    field :party
+    
+    index :party
+  end
+  
   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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampere
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: nyan-cat-formatter
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +315,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1755195159909274501
+      hash: -2731344431471118659
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: