tokak_engine 0.0.5 → 0.0.6

data/Rakefile

@@ -49,3 +49,6 @@ rescue LoadError
 end
 task :rdoc => :yardoc
 task :doc => :yardoc
+
+desc "Bump gem version, release and install"
+task :push => %w(version:bump:patch release gemcutter:release install)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.6

data/app/models/user_avatar.rb

@@ -11,6 +11,7 @@ class UserAvatar < ActiveRecord::Base
     if url = pavatar.avatar_url_for(openid_identifier, :pavatar_field => :openid_identifier)
       openid_identifier.user.avatars.create(:url => url)
     end
+  rescue
   end
 
   def self.discover_from_user(user)

data/lib/tokak_engine/application.rb

@@ -1,10 +1,9 @@
 module TokakEngine
-  module Application
-    extend self
-    mattr_accessor :config
+  class Application
+    @@config = nil
 
     # Default configuration options
-    def default_config
+    def self.default_config
       @@default_config = {
         :canonical_host => 'tokak.ru',
         :domain => '.tokak.ru'
@@ -13,36 +12,37 @@ module TokakEngine
 
     # Autoload application config from application.yml
     # @return [Hash] application configuration for current environment
-    def config
-      unless @@config
-        file_name = File.join(Rails.root, 'config', 'application.yml')
-        @@config = if File.exists?(file_name)
-                     YAML.load_file(file_name).
-                       to_hash.
-                       with_indifferent_access[Rails.env]
-                    else
-                      {}
-                    end.reverse_merge!(default_config)
-      end
-      @@config
+    def self.config
+      @@config ||= load_config
+    end
+
+    def self.load_config
+      file_name = File.join(Rails.root, 'config', 'application.yml')
+      @@config = if File.exists?(file_name)
+                   YAML.load_file(file_name).
+                     to_hash.
+                     with_indifferent_access[Rails.env]
+                 else
+                   {}
+                 end.reverse_merge!(default_config)
     end
 
     # Retuns configured canonical host
-    def canonical_host
+    def self.canonical_host
       config[:canonical_host]
     end
 
     # Returns configured session domain
-    def domain
+    def self.domain
       config[:domain]
     end
 
-    def passport_url
+    def self.passport_url
       "http://passport#{domain}/"
     end
 
     # Initialize canonical host and cookies (session) domain
-    def init_engine
+    def self.init_engine
       ActionController::Base.session_options[:domain] = domain
       ActionController::Dispatcher.middleware.use 'CanonicalHost', canonical_host
     end

data/lib/tokak_engine/authentication.rb

@@ -2,16 +2,25 @@ module TokakEngine
   module Authentication
 
     def self.included(controller)
-      controller.send(:include, InstanceMethods)
       controller.extend(ClassMethods)
+      controller.send(:include, InstanceMethods)
+      controller.helper_method :current_user_session, :current_user, :logged_in?
+      controller.hide_action :current_user_session, :current_user, :logged_in?,
+        :require_user, :require_no_user,
+        :store_location, :redirect_back_or_default
     end
 
     module ClassMethods
-      def self.extended(controller)
-        controller.helper_method :current_user_session, :current_user, :logged_in?
-        controller.hide_action :current_user_session, :current_user, :logged_in?,
-          :require_user, :require_no_user,
-          :store_location, :redirect_back_or_default
+      # Shortcut for {#require_user} filter
+      # @param [Hash] options for filter
+      def require_user(options = {})
+        before_filter(:require_user, options)
+      end
+
+      # Shortcut for {#require_no_user} filter
+      # @param [Hash] options for filter
+      def require_no_user(options = {})
+        before_filter(:require_no_user, options)
       end
     end
 

data/rails/init.rb

@@ -1 +1 @@
-require 'tokak­engine'
+require 'tokak_engine'

data/tokak_engine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tokak_engine}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "app/helpers/tokak_helper.rb",
      "app/models/identifier.rb",
      "app/models/openid_identifier.rb",
-     "app/models/user.rb",
      "app/models/user_avatar.rb",
      "app/models/user_session.rb",
      "app/views/user_avatars/_user_avatar.html.haml",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tokak_engine
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -30,7 +30,6 @@ files:
 - app/helpers/tokak_helper.rb
 - app/models/identifier.rb
 - app/models/openid_identifier.rb
-- app/models/user.rb
 - app/models/user_avatar.rb
 - app/models/user_session.rb
 - app/views/user_avatars/_user_avatar.html.haml

data/app/models/user.rb

@@ -1,168 +0,0 @@
-class User < ActiveRecord::Base
-  OPENID_GENDER_MAP = {
-    'M' => 1,
-    'F' => 2
-  }
-  PERSONAL_INFORMATION = %w(first_name last_name nick_name gender was_born_on)
-  OPTIONAL_OPENID_FIELDS = %w(email fullname nickname timezone language country gender dob).map(&:to_sym)
-
-  include TokakEngine::User
-
-  with_options :dependent => :destroy do |d|
-    d.has_many :openid_identifiers
-  end
-  attr_accessor :openid_identifier
-  accepts_nested_attributes_for :openid_identifiers, :allow_destroy => true
-
-  after_create :set_openid
-  after_save :discover_avatar
-
-  acts_as_authentic do |c|
-    c.openid_optional_fields(OPTIONAL_OPENID_FIELDS)
-    c.validate :validate_openid
-    c.validates_length_of_password_field_options validates_length_of_password_field_options.merge(:if => :validate_password_with_openid?)
-    c.validates_confirmation_of_password_field_options validates_confirmation_of_password_field_options.merge(:if => :validate_password_with_openid?)
-    c.validates_length_of_password_confirmation_field_options validates_length_of_password_confirmation_field_options.merge(:if => :validate_password_with_openid?)
-  end
-
-  def self.name_field; :email end
-
-  def self.find_by_openid_identifier(identifier)
-    first(:conditions => {
-            Identifier.table_name => {
-              :openid_identifier => identifier}},
-          :joins => :openid_identifiers)
-  end
-
-  def openid_identifier=(value)
-    @openid_identifier = value.blank? ? nil : OpenIdAuthentication.normalize_identifier(value)
-    reset_persistence_token if openid_identifier_changed?
-  rescue OpenIdAuthentication::InvalidOpenId => e
-    @openid_error = e.message
-  end
-
-private
-
-  def using_openid?
-    !@openid_identifier.blank? || openid_identifiers.any?
-  end
-
-  def openid_identifier_changed?
-    !openid_identifiers.detect { |i| i.openid_identifier == @openid_identifier }
-  end
-
-  def authenticate_with_openid
-    @openid_error = nil
-
-    if !openid_complete?
-      session_class.controller.session[:openid_attributes] = attributes_to_save
-    else
-      map_saved_attributes(session_class.controller.session[:openid_attributes])
-      session_class.controller.session[:openid_attributes] = nil
-    end
-
-    options = {}
-    options[:required] = self.class.openid_required_fields
-    options[:optional] = self.class.openid_optional_fields
-    options[:return_to] = session_class.controller.url_for(:for_model => "1")
-
-    session_class.controller.send(:authenticate_with_open_id, openid_identifier, options) do |result, openid_identifier, registration|
-      if result.unsuccessful?
-        @openid_error = result.message
-      else
-        self.openid_identifier = openid_identifier
-        map_openid_registration(registration.symbolize_keys)
-      end
-
-      return true
-    end
-
-    return false
-  end
-
-  def set_openid
-    self.openid_identifiers.create(:openid_identifier => @openid_identifier) unless @openid_identifier.blank?
-  end
-
-  def map_openid_registration(registration) # :doc:
-    unless registration[:email].blank? || self.email.present?
-      self.email = registration[:email]
-    end
-
-    unless registration[:fullname].blank?
-      if respond_to?(:name)
-        self.name = registration[:fullname] if name.blank? && !registration[:fullname].blank?
-      else
-        first, last = registration[:fullname].split(/\s+/, 2)
-        self.first_name = first if first_name.blank?
-        self.last_name = last if last_name.blank?
-      end
-    end
-
-    unless registration[:gender].blank? || gender.present?
-      self.gender_id = OPENID_GENDER_MAP[registration[:gender].upcase]
-    end
-
-    unless registration[:nickname].blank? || nick_name.present?
-      self.nick_name = registration[:nickname]
-    end
-
-    unless registration[:dob].blank? || was_born_on.present?
-      self.was_born_on = Date.parse(registration[:dob])
-    end
-
-    unless registration[:country].blank? || country.present?
-      self.country = Country.find_or_create_by_code(registration[:country])
-    end
-
-    unless registration[:language].blank? || language.present?
-      self.language = Language.find_or_create_by_code(registration[:language])
-    end
-
-    unless registration[:timezone].blank? || timezone.present?
-      self.timezone = registration[:timezone]
-    end
-  end
-
-  def validate_openid
-    errors.add(:openid_identifier, "had the following error: #{@openid_error}") if @openid_error && @openid_identifier
-  end
-
-  def discover_avatar
-    if email_changed?
-      UserAvatar.discover_from_user(self)
-    end
-  end
-
-end
-
-# == Schema Info
-#
-# Table name: users
-#
-#  id                  :integer         not null, primary key
-#  avatar_id           :integer
-#  country_id          :integer
-#  gender_id           :integer
-#  language_id         :integer
-#  crypted_password    :string(255)
-#  current_login_ip    :string(255)
-#  email               :string(255)
-#  failed_login_count  :integer         not null, default(0)
-#  first_name          :string(255)
-#  last_login_ip       :string(255)
-#  last_name           :string(255)
-#  login_count         :integer         not null, default(0)
-#  nick_name           :string(255)
-#  password_salt       :string(255)
-#  perishable_token    :string(255)     not null
-#  persistence_token   :string(255)     not null
-#  postcode            :string(255)
-#  single_access_token :string(255)     not null
-#  timezone            :string(255)
-#  was_born_on         :date
-#  created_at          :datetime
-#  current_login_at    :datetime
-#  last_login_at       :datetime
-#  last_request_at     :datetime
-#  updated_at          :datetime