sso_client 0.0.5 → 0.0.6

data/app/models/sso_client/user.rb

@@ -1,61 +1,26 @@
 module SsoClient
-  class User
-    ATTRIBUTES = [:id, :name, :nickname, :email, :first_name, :last_name]
-    attr_accessor *ATTRIBUTES
-
-    def initialize(attributes = {})
-      self.attributes = attributes
-    end
-
-    def self.from_omniauth(omniauth)
-      User.new(omniauth['info']).tap do | user |
-        user.attributes = omniauth['extra']
-        user.id = omniauth['uid']
+  class User < ModestModel::Base
+    attributes :id, :name, :nickname, :email, :first_name, :last_name, :raw_info
+
+    class << self
+      def from_omniauth(omniauth)
+        User.new(omniauth['info']).tap do | user |
+          user.attributes = omniauth['extra']
+          user.id = omniauth['uid']
+        end
       end
-    end
 
-    def attributes
-      ATTRIBUTES.inject(HashWithIndifferentAccess.new) do |result, key|
-        result[key] = read_attribute_for_validation(key)
-        result
+      def current
+        Thread.current[:user]
       end
-    end
-
-    def attributes=(attrs)
-      attrs.each_pair {|k, v| send("#{k}=", v) if ATTRIBUTES.include? k.to_sym}
-    end
-
-    def read_attribute_for_validation(key)
-      send(key)
-    end
 
-    def self.current
-      Thread.current[:user]
-    end
-
-    def self.current_id
-      current.id if current
-    end
-
-    def self.current=(user)
-      Thread.current[:user] = user
-    end
-
-    def new_record?
-      false
-    end
-
-    def destroyed?
-      false
-    end
-
-    def self.primary_key
-      'id'
-    end
+      def current_id
+        current.id if current
+      end
 
-    def [](key)
-      self.send(key)
+      def current=(user)
+        Thread.current[:user] = user
+      end
     end
-
   end
 end

data/lib/sso_client/engine.rb

@@ -1,4 +1,5 @@
 require 'omniauth'
+require 'modest_model'
 require File.expand_path("../../../lib/omniauth/strategies/identity", __FILE__)
 
 module SsoClient

data/lib/sso_client/version.rb

@@ -1,3 +1,3 @@
 module SsoClient
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sso_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &6633720 !ruby/object:Gem::Requirement
+  requirement: &6404820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *6633720
+  version_requirements: *6404820
 - !ruby/object:Gem::Dependency
   name: configliere
-  requirement: &6632900 !ruby/object:Gem::Requirement
+  requirement: &6402900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6632900
+  version_requirements: *6402900
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &6630660 !ruby/object:Gem::Requirement
+  requirement: &6401680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *6630660
+  version_requirements: *6401680
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &6629180 !ruby/object:Gem::Requirement
+  requirement: &6400200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6629180
+  version_requirements: *6400200
+- !ruby/object:Gem::Dependency
+  name: openteam-modest_model
+  requirement: &6415020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *6415020
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &6628180 !ruby/object:Gem::Requirement
+  requirement: &6413700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6628180
+  version_requirements: *6413700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &6627180 !ruby/object:Gem::Requirement
+  requirement: &6412780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6627180
+  version_requirements: *6412780
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &6642280 !ruby/object:Gem::Requirement
+  requirement: &6411980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6642280
+  version_requirements: *6411980
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &6641040 !ruby/object:Gem::Requirement
+  requirement: &6411080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6641040
+  version_requirements: *6411080
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &6639840 !ruby/object:Gem::Requirement
+  requirement: &6410300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6639840
+  version_requirements: *6410300
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &6639080 !ruby/object:Gem::Requirement
+  requirement: &6409040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *6639080
+  version_requirements: *6409040
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &6638280 !ruby/object:Gem::Requirement
+  requirement: &6424460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6638280
+  version_requirements: *6424460
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &6637440 !ruby/object:Gem::Requirement
+  requirement: &6423420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +153,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :development
   prerelease: false
-  version_requirements: *6637440
+  version_requirements: *6423420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &6636820 !ruby/object:Gem::Requirement
+  requirement: &6422700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6636820
+  version_requirements: *6422700
 description: Client gem for connecting to SSO server (http://github.com/openteam/sso_server)
 email:
 - lda@openteam.ru
@@ -192,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2250701658001016815
+      hash: -1458722114317611209
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2250701658001016815
+      hash: -1458722114317611209
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11