ampere 1.1.0 → 1.1.1

data/Gemfile

@@ -3,6 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem 'activesupport'
+gem 'activemodel'
 gem 'redis'
 
 # Add dependencies to develop your gem here.
@@ -10,7 +12,7 @@ gem 'redis'
 group :development do
   gem "shoulda", ">= 0"
   gem "cucumber", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem 'simplecov', :require => false, :group => :test
   gem "rspec"

data/Gemfile.lock

@@ -1,6 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     builder (3.0.0)
     cucumber (1.1.3)
       builder (>= 2.1.2)
@@ -12,6 +18,7 @@ GEM
     gherkin (2.6.8)
       json (>= 1.4.6)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -41,7 +48,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  activemodel
+  activesupport
+  bundler (>= 1.0.0)
   cucumber
   jeweler (~> 1.6.4)
   rdoc

data/README.md

@@ -93,6 +93,25 @@ individual indices, which will always run faster than queries on unindexed field
 _**Warning:**_ If you query on an un-indexed field, the returned result set will not be
 evaluated lazily!
 
+### Validations
+
+You can now add validations to your Ampere models thanks to the magic of ActiveModel!
+
+    class Student
+      include Ampere::Model
+      
+      field :last_name
+      field :first_name
+      field :student_id_number
+      
+      index [:last_name, :first_name]
+      
+      validates_presence_of :last_name
+      validates_format_of :student_id_number, :with => /\A[0-9]{10}\Z/
+    end
+
+It's that easy!
+
 ## Contributing to ampere
  
   * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/ampere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ampere"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Thom Stahl"]
-  s.date = "2012-05-03"
+  s.date = "2012-05-12"
   s.description = "An ActiveRecord/Mongoid-esque object model for the Redis key/value data store."
   s.email = "max@villainousindustri.es"
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "spec/models/relationships/has_many_spec.rb",
     "spec/models/relationships/has_one_spec.rb",
     "spec/models/updates_spec.rb",
+    "spec/models/validations_spec.rb",
     "spec/module/ampere_spec.rb",
     "spec/module/collections_ennumerable_spec.rb",
     "spec/module/collections_spec.rb",
@@ -57,29 +58,35 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<activemodel>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<activemodel>, [">= 0"])
     s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/ampere.rb

@@ -1,3 +1,5 @@
+# require "active_support"
+require "active_record"
 require "redis"
 require "pp"
 

data/lib/ampere/model.rb

@@ -5,6 +5,8 @@ module Ampere
       base.extend(ClassMethods)
       
       base.class_eval do
+        include(::ActiveModel::Validations)
+        
         attr_reader :id
       
         attr_accessor :fields

data/spec/models/validations_spec.rb

@@ -0,0 +1,41 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper.rb")
+
+describe 'Validations', :validations => true do
+  before :all do
+    class Person
+      include Ampere::Model
+      
+      field :first_name
+      field :last_name
+      field :email
+      
+      validates_presence_of :last_name
+      validates_format_of :email, :with => /\A\w+@\w+\.com\Z/i
+    end
+    
+  end
+  
+  it 'should validate presence of items' do
+    alice = Person.new :first_name => 'Alice',
+                       :last_name  => 'Steel',
+                       :email      => 'alice@steel.com'
+    bob   = Person.new :first_name => 'Bob',
+                       :email      => 'bob@bob.com'
+    alice.should be_valid
+    alice.errors.should be_empty
+    bob.should be_invalid
+    bob.errors.should_not be_empty
+  end
+  
+  it 'should validate format of items' do
+    charlie = Person.new :first_name => 'Charlie',
+                         :last_name  => 'Steel',
+                         :email      => 'c h a r l i e @ charlie .com'
+    charlie.should_not be_valid
+  end
+  
+  # Since this is accomplished by including a module, what is being tested here
+  # is that the module got included correctly and works. For testing of all the
+  # other kinds of validations, run the tests for ActiveModel::Validations.
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ampere
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2166309900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2166309900
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &2166309360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2166309360
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2157094220 !ruby/object:Gem::Requirement
+  requirement: &2166308860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157094220
+  version_requirements: *2166308860
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2157093700 !ruby/object:Gem::Requirement
+  requirement: &2166308340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157093700
+  version_requirements: *2166308340
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2157093160 !ruby/object:Gem::Requirement
+  requirement: &2166307820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157093160
+  version_requirements: *2166307820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157092600 !ruby/object:Gem::Requirement
+  requirement: &2166307260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157092600
+  version_requirements: *2166307260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157092100 !ruby/object:Gem::Requirement
+  requirement: &2166306720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2157092100
+  version_requirements: *2166306720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157000680 !ruby/object:Gem::Requirement
+  requirement: &2166306160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157000680
+  version_requirements: *2166306160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157000140 !ruby/object:Gem::Requirement
+  requirement: &2166305600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157000140
+  version_requirements: *2166305600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2156999620 !ruby/object:Gem::Requirement
+  requirement: &2166305100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156999620
+  version_requirements: *2166305100
 description: An ActiveRecord/Mongoid-esque object model for the Redis key/value data
   store.
 email: max@villainousindustri.es
@@ -131,6 +153,7 @@ files:
 - spec/models/relationships/has_many_spec.rb
 - spec/models/relationships/has_one_spec.rb
 - spec/models/updates_spec.rb
+- spec/models/validations_spec.rb
 - spec/module/ampere_spec.rb
 - spec/module/collections_ennumerable_spec.rb
 - spec/module/collections_spec.rb
@@ -152,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3615386568657855204
+      hash: -3870431853959501764
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: