google-authenticator-rails 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  # - jruby-18mode # JRuby in 1.8 mode
+  # - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec rspec spec

data/README.md

@@ -1,4 +1,6 @@
-# Google::Authenticator
+Ï# Google::Authenticator
+
+[![Build Status](https://secure.travis-ci.org/jaredonline/google-authenticator.png)](http://travis-ci.org/jaredonline/google-authenticator)
 
 Rails (ActiveRecord) integration with the Google Authenticator apps for Android and the iPhone.
 
@@ -55,26 +57,26 @@ class User
 	acts_as_google_authenticated :method => :user_name_with_label
 
 	def user_name_with_label
-	  "#{user_name}@mysweetservice.com"
+	  "#{user_name}@example.com"
 	end
 end
 
 @user = User.new(:user_name => "ted")
-@user.google_label                    # => "ted@mysweetservice.com"
+@user.google_label                    # => "ted@example.com"
 
 class User
 	acts_as_google_authenticated :method => Proc.new { |user| user.user_name_with_label.upcase }
 
 	def user_name_with_label
-	  "#{user_name}@mysweetservice.com"
+	  "#{user_name}@example.com"
 	end
 end
 
 @user = User.new(:user_name => "ted")
-@user.google_label                    # => "TED@MYSWEETSERVICE.COM"
+@user.google_label                    # => "TED@EXAMPLE.COM"
 ```
 
-You can also sepcify a column for storing the google secret.  The default is `google_secret`.
+You can also specify a column for storing the google secret.  The default is `google_secret`.
 
 Example
 

data/google-authenticator.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["jared.online@gmail.com"]
   gem.description   = %q{Add the ability to use the Google Authenticator with ActiveRecord.}
   gem.summary       = %q{Add the ability to use the Google Authenticator with ActiveRecord.}
-  gem.homepage      = "http://github.com/jaredonline/google-authenticator-rails"
+  gem.homepage      = "http://github.com/jaredonline/google-authenticator"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Google::Authenticator::Rails::VERSION
   
-  gem.add_dependency "activesupport", "~> 3.2.0"
+  gem.add_dependency "activesupport"
   gem.add_dependency "rotp"
-  gem.add_dependency "activerecord", "~> 3.2.0"
+  gem.add_dependency "activerecord"
   gem.add_dependency "google-qr"
   
   gem.add_development_dependency "rspec", "~> 2.8.0"

data/lib/google-authenticator-rails/active_record/acts_as_google_authenticated.rb

@@ -15,12 +15,14 @@ module ActiveRecord # :nodoc:
       #             it supercedes :column_name
       #   [:google_secret_column] the column the secret will be stored in, defaults
       #                           to "google_secret"
+      #   [:skip_attr_accessible] defaults to false, if set to true will no call
+      #                           attr_accessible on the google_secret_column
       def acts_as_google_authenticated(options = {})
         @google_label_column  = options[:column_name]           || :email
         @google_label_method  = options[:method]                || :default_google_label_method
         @google_secret_column = options[:google_secret_column]  || :google_secret
         
-        attr_accessible @google_secret_column
+        attr_accessible @google_secret_column unless options[:skip_attr_accessible] == true
 
         [:google_label_column, :google_label_method, :google_secret_column].each do |cattr|
           self.class.__send__(:define_method, cattr) do

data/lib/google-authenticator-rails/active_record/google_authentication.rb

@@ -9,7 +9,7 @@ module ActiveRecord # :nodoc:
     end
 
     def google_qr_uri
-      GoogleQR.new(data: ROTP::TOTP.new(google_secret_value).provisioning_uri(google_label), size: "200x200").to_s
+      GoogleQR.new(:data => ROTP::TOTP.new(google_secret_value).provisioning_uri(google_label), :size => "200x200").to_s
     end
 
     def google_label

data/lib/google-authenticator-rails/version.rb

@@ -1,7 +1,7 @@
 module Google
   module Authenticator
     module Rails
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/google_authenticator_spec.rb

@@ -43,7 +43,7 @@ describe Google::Authenticator::Rails do
     before do
       time = Time.parse("2012-08-07 11:11:00 AM +0700")
       Time.stub!(:now).and_return(time)
-      @user = User.create(email: "test@test.com", user_name: "test_user")
+      @user = User.create(:email => "test@example.com", :user_name => "test_user")
       @user.google_secret = "test"
     end
     
@@ -68,10 +68,22 @@ describe Google::Authenticator::Rails do
       @user.google_secret.should == "5qlcip7azyjuwm36"
     end
     
+    context 'skip_attr_accessible' do
+      it 'respects the :skip_attr_accessible flag' do
+        User.should_not_receive(:attr_accessible).with(:google_secret)
+        User.acts_as_google_authenticated :skip_attr_accessible => true
+      end
+
+      it 'respects the default' do
+        User.should_receive(:attr_accessible).with(:google_secret)
+        User.acts_as_google_authenticated
+      end
+    end
+
     context 'secret column' do
       before do
         Google::Authenticator::Rails.stub!(:generate_secret).and_return("test")
-        @user = CustomUser.create(email: "test@test.com", user_name: "test_user")
+        @user = CustomUser.create(:email => "test@example.com", :user_name => "test_user")
         @user.set_google_secret!
       end
 
@@ -80,7 +92,7 @@ describe Google::Authenticator::Rails do
       end
 
       it 'generates a url for a qr code' do
-        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40test.com%3Fsecret%3Dtest&chs=200x200"
+        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40example.com%3Fsecret%3Dtest&chs=200x200"
       end
     end
 
@@ -88,7 +100,7 @@ describe Google::Authenticator::Rails do
       
       it 'generates a url for a qr code' do
         @user.set_google_secret!
-        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40test.com%3Fsecret%3D5qlcip7azyjuwm36&chs=200x200"
+        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40example.com%3Fsecret%3D5qlcip7azyjuwm36&chs=200x200"
       end
       
       it 'can generate off any column' do
@@ -106,13 +118,13 @@ describe Google::Authenticator::Rails do
       it 'can generate with a method symbol' do
         @user.class.acts_as_google_authenticated :method => :email
         @user.set_google_secret!
-        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40test.com%3Fsecret%3D5qlcip7azyjuwm36&chs=200x200"
+        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40example.com%3Fsecret%3D5qlcip7azyjuwm36&chs=200x200"
       end
       
       it 'can generate with a method string' do
         @user.class.acts_as_google_authenticated :method => "email"
         @user.set_google_secret!
-        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40test.com%3Fsecret%3D5qlcip7azyjuwm36&chs=200x200"
+        @user.google_qr_uri.should == "https://chart.googleapis.com/chart?cht=qr&chl=otpauth%3A%2F%2Ftotp%2Ftest%40example.com%3Fsecret%3D5qlcip7azyjuwm36&chs=200x200"
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: google-qr
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -131,7 +132,7 @@ files:
 - lib/google-authenticator-rails/version.rb
 - spec/google_authenticator_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/jaredonline/google-authenticator-rails
+homepage: http://github.com/jaredonline/google-authenticator
 licenses: []
 post_install_message: 
 rdoc_options: []