google_authentication 0.1.1 → 0.1.2

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 0.1.2, released 2011-07-07
+
+* Added presence and uniqueness validators to `:email` and `:omniauth_uid` fields in `acts_as_google_user` models
+
 ## 0.1.1, released 2011-07-04
 
 * Changed define_routes? implementation, old implementation is buggy

data/Gemfile

@@ -9,20 +9,20 @@ gem 'devise', '>= 1.2.0'
 group :development do
   gem "sqlite3"
   gem "rspec-rails"
+  gem "shoulda-matchers"
+  gem "generator_spec"
   gem "guard-rspec"
   gem "capybara", ">= 0.4.0"
   gem "yard"
   gem "cucumber", "~> 0.10"
+  gem "aruba"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.2"
-  gem "rcov", ">= 0"
+end
+
+group :test do
   if RUBY_PLATFORM.downcase.include?("darwin") # I'm on Mac
     gem "rb-fsevent"
     gem "growl"
   end
 end
-
-group :test do
-  gem "aruba"
-  gem "generator_spec"
-end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/google_authentication.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google_authentication}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabio Napoleoni"]
-  s.date = %q{2011-07-04}
+  s.date = %q{2011-07-07}
   s.description = %q{Authenticate users through Google in your app using devise and omniauth}
   s.email = %q{f.napoleoni@gmail.com}
   s.extra_rdoc_files = [
@@ -111,30 +111,30 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<devise>, [">= 1.2.0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
+      s.add_development_dependency(%q<generator_spec>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.10"])
+      s.add_development_dependency(%q<aruba>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
-      s.add_development_dependency(%q<growl>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<omniauth>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 1.2.0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<shoulda-matchers>, [">= 0"])
+      s.add_dependency(%q<generator_spec>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<cucumber>, ["~> 0.10"])
+      s.add_dependency(%q<aruba>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rb-fsevent>, [">= 0"])
-      s.add_dependency(%q<growl>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
@@ -142,15 +142,15 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<devise>, [">= 1.2.0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<shoulda-matchers>, [">= 0"])
+    s.add_dependency(%q<generator_spec>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<cucumber>, ["~> 0.10"])
+    s.add_dependency(%q<aruba>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rb-fsevent>, [">= 0"])
-    s.add_dependency(%q<growl>, [">= 0"])
   end
 end
 

data/lib/google_authentication/acts_as_google_user.rb

@@ -39,7 +39,10 @@ module GoogleAuthentication
         # include devise modules
         devise *(ActsAsGoogleUser.devise_modules_to_include)
         # Setup accessible (or protected) attributes for your model
-        attr_accessible :email
+        attr_accessible :email, :omniauth_uid
+        # Setup validation for model
+        validates_presence_of :email, :omniauth_uid
+        validates_uniqueness_of :email, :omniauth_uid
       end
 
       module ClassMethods # :nodoc:

data/spec/models/acts_as_google_user_spec.rb

@@ -26,6 +26,16 @@ describe GoogleAuthentication::ActsAsGoogleUser do
 
   describe DefaultUser do
 
+    include Shoulda::Matchers::ActiveRecord
+
+    before(:all) do
+      DefaultUser.find_or_create_by_email "user@example.org" do |user|
+        user.omniauth_uid = "some-cool-omniauth-uid"
+        user.first_name = "John"
+        user.last_name = "Doe"
+      end
+    end
+
     subject { DefaultUser.new }
 
     it_should_behave_like "All Users"
@@ -37,6 +47,12 @@ describe GoogleAuthentication::ActsAsGoogleUser do
     it "should have only omniauthable module" do
       subject.class.devise_modules.should eql [:omniauthable]
     end
+
+    # shoulda specs for google_user model
+    it { should validate_presence_of :email }
+    it { should validate_presence_of :omniauth_uid }
+    it { should validate_uniqueness_of :email }
+    it { should validate_uniqueness_of :omniauth_uid }
   end
 
   describe "Users with different devise modules" do

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
 require "generator_spec/test_case"
+require "shoulda-matchers"
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true

metadata

@@ -2,7 +2,7 @@
 name: google_authentication
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Fabio Napoleoni
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 +02:00
+date: 2011-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: shoulda-matchers
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,18 +80,18 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: generator_spec
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: guard-rspec
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,40 +102,40 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: capybara
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.10"
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: yard
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: cucumber
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.2
+        version: "0.10"
   type: :development
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: aruba
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -146,24 +146,24 @@ dependencies:
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: rb-fsevent
+  name: bundler
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: growl
+  name: jeweler
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: *id014
@@ -269,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2474828222469363557
+      hash: 2937787373273199637
       segments: 
       - 0
       version: "0"