simple_auth 1.4.5 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b9ccc966be8f5d91ed83365e91fd161dd3855411
+  data.tar.gz: ddeab7fa3b0cf45404e19a06f1b8ac0860ae39e4
+SHA512:
+  metadata.gz: df425ff3d123c56b312517437615d925a979eb15b001061b6b304fbfcfe2e99594486365de3dff1e45cff6138f7a7543fe1cc8b9c1f837c672bf008131df5327
+  data.tar.gz: c1a2c7e841bfd56dd870fbddc96d6045df8cb6ed6eb4cf53ffd8c1ee53160159ff3ad202d7b361ab4bf4b25bd70f3fccc28bec444822d3b6cef1d9ad92c23165

data/Gemfile

@@ -1,2 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 gemspec
+
+gem "mongo_mapper", github: "jnunemaker/mongomapper"

data/Gemfile.lock

@@ -1,122 +1,122 @@
+GIT
+  remote: git://github.com/jnunemaker/mongomapper.git
+  revision: e0d7db141b2c330eb44773ef00d1b179bbdf9209
+  specs:
+    mongo_mapper (0.13.0.beta1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0)
+      mongo (~> 1.8)
+      plucky (~> 0.6.5)
+
 PATH
   remote: .
   specs:
-    simple_auth (1.4.5)
+    simple_auth (1.5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    bson (1.8.2)
-    bson_ext (1.8.2)
-      bson (~> 1.8.2)
-    builder (3.0.4)
-    diff-lcs (1.1.3)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.12)
+    bson (1.9.1)
+    bson_ext (1.9.1)
+      bson (~> 1.9.1)
+    builder (3.1.4)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    hike (1.2.3)
+    i18n (0.6.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.21)
-    mongo (1.8.2)
-      bson (~> 1.8.2)
-    mongo_mapper (0.9.2)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.3.8)
-    multi_json (1.6.0)
-    plucky (0.3.8)
-      mongo (~> 1.3)
+    mime-types (1.23)
+    minitest (4.7.5)
+    mongo (1.9.1)
+      bson (~> 1.9.1)
+    multi_json (1.7.7)
+    plucky (0.6.5)
+      mongo (~> 1.5)
     polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.2)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    sprockets (2.2.2)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     sqlite3 (1.3.7)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    thor (0.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bson_ext
-  mongo_mapper (~> 0.9.1)
-  rails
-  rspec-rails (~> 2.5)
+  mongo_mapper!
+  rails (>= 4.0.0)
+  rspec-rails
   simple_auth!
   sqlite3-ruby

data/lib/simple_auth/orm/active_record.rb

@@ -52,21 +52,16 @@ module SimpleAuth
         #   User.find_by_credential "john" # using username
         #
         def find_by_credential(credential)
-          # Build a hash that will be passed to the finder
-          options = {:conditions => [[], {}]}
+          # Collect each attribute that should be used as credential.
+          query = SimpleAuth::Config.credentials.each_with_object([]) do |attr_name, buffer|
+            buffer << "#{attr_name} = :credential"
+          end.join(" or ")
 
-          # Iterate each attribute that should be used as credential
-          # and set it to the finder conditions hash
-          SimpleAuth::Config.credentials.each do |attr_name|
-            options[:conditions][0] << "#{attr_name} = :#{attr_name}"
-            options[:conditions][1][attr_name] = credential
-          end
-
-          # Join the attributes in OR query
-          options[:conditions][0] = options[:conditions][0].join(" OR ")
+          # Set the scope.
+          scope = SimpleAuth::Config.model_class.where(query, credential: credential.to_s)
 
           # Find the record using the conditions we built
-          SimpleAuth::Config.model_class.first(options)
+          scope.first
         end
 
         # Find user by its credential. If no user is found, raise

data/lib/simple_auth/version.rb

@@ -1,8 +1,8 @@
 module SimpleAuth
   module Version
     MAJOR = 1
-    MINOR = 4
-    PATCH = 5
+    MINOR = 5
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/simple_auth.gemspec

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "simple_auth/version"
+require "./lib/simple_auth/version"
 
 Gem::Specification.new do |s|
   s.name        = "simple_auth"
@@ -17,9 +15,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rails"
+  s.add_development_dependency "rails", ">= 4.0.0"
   s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "rspec-rails", "~> 2.5"
-  s.add_development_dependency "mongo_mapper", "~> 0.9.1"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "mongo_mapper"
   s.add_development_dependency "bson_ext"
 end

data/spec/support/config/boot.rb

@@ -8,6 +8,8 @@ module SimpleAuth
   class Application < Rails::Application
     config.root = File.dirname(__FILE__) + "/.."
     config.active_support.deprecation = :log
+    config.secret_key_base = "secret"
+    config.eager_load = false
   end
 end
 

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: simple_auth
 version: !ruby/object:Gem::Version
-  version: 1.4.5
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   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'
 description: A simple authentication system for Rails apps
@@ -141,26 +130,25 @@ files:
 - templates/initializer.rb
 homepage: http://rubygems.org/gems/simple_auth
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple authentication system for Rails apps
 test_files: []