authlogic_vkontakte 0.1.0 → 0.1.1

data/Manifest

@@ -2,10 +2,12 @@ README.rdoc
 Rakefile
 authlogic_vkontakte.gemspec
 init.rb
-js/vkontakte.js
 lib/profile_loader.rb
 lib/settings.rb
 lib/tasks/vkontakte.rake
 lib/vkontakte_authentication.rb
 lib/vkontakte_helper.rb
+resources/vkontakte.js
+resources/xd_receiver.html
+vkontakte.yml
 Manifest

data/README.rdoc

@@ -1,6 +1,6 @@
 Bind vkontakte authentication to your authlogic project.
 == Install
-    gem install authlogic_vkontakte
+    script/plugin install authlogic_vkontakte
 
 == Setup
 Run rake task to init resources (javascripts and other)

data/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 require "rake"
 require "echoe"
 
-Echoe.new("authlogic_vkontakte", "0.1.0") do |p|
+Echoe.new("authlogic_vkontakte", "0.1.1") do |p|
   p.description= "Bind vkontakte authentication to your authlogic project"
   p.url= "http://github.com/GarPit/authlogic_vkontakte"
   p.author= "Igor Petrov"

data/authlogic_vkontakte.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_vkontakte}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Petrov"]
-  s.date = %q{2010-10-15}
+  s.date = %q{2010-11-17}
   s.description = %q{Bind vkontakte authentication to your authlogic project}
   s.email = %q{garik.piton@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/profile_loader.rb", "lib/settings.rb", "lib/tasks/vkontakte.rake", "lib/vkontakte_authentication.rb", "lib/vkontakte_helper.rb"]
-  s.files = ["README.rdoc", "Rakefile", "authlogic_vkontakte.gemspec", "init.rb", "js/vkontakte.js", "lib/profile_loader.rb", "lib/settings.rb", "lib/tasks/vkontakte.rake", "lib/vkontakte_authentication.rb", "lib/vkontakte_helper.rb", "Manifest"]
+  s.files = ["README.rdoc", "Rakefile", "authlogic_vkontakte.gemspec", "init.rb", "lib/profile_loader.rb", "lib/settings.rb", "lib/tasks/vkontakte.rake", "lib/vkontakte_authentication.rb", "lib/vkontakte_helper.rb", "resources/vkontakte.js", "resources/xd_receiver.html", "vkontakte.yml", "Manifest"]
   s.homepage = %q{http://github.com/GarPit/authlogic_vkontakte}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Authlogic_vkontakte", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/tasks/vkontakte.rake

@@ -1,6 +1,6 @@
 namespace :vkontakte do
     desc "Init resources for plugin"
-    task :init => [:yml, :javascripts]
+    task :init => [:yml, :resources]
 
     desc "Copy vkontakte.yml to current rails application"
     task :yml do
@@ -11,12 +11,14 @@ namespace :vkontakte do
       puts "vkontakte.yml copied successfully!"
     end 
 
-    desc "Copy javascript to current rails application"
-    task :javascripts do
-      puts "Copying javascript files..."
+    desc "Copy resources to current rails application"
+    task :resources do
+      puts "Copying resources files..."
       project_dir = RAILS_ROOT + '/public/javascripts/'
-      scripts = Dir[File.join(File.dirname(__FILE__), '..', '..', '/js/', '*.js')]     
+      scripts = Dir[File.join(File.dirname(__FILE__), '..', '..', '/resources/', '*.js')]     
+      htmls = Dir[File.join(File.dirname(__FILE__), '..', '..', '/resources/', '*.html')]
       FileUtils.cp(scripts, project_dir)
+      FileUtils.cp(htmls, RAILS_ROOT + '/public/')
       puts "Files copied successfully!"
     end  
 end

data/lib/vkontakte_authentication.rb

@@ -1,94 +1,94 @@
-require "profile_loader"
-require "settings"
-require "md5"
-
-module VkontakteAuthentication
-
-  class NotInitializedError < StandardError;
-  end
-
-  module ClassMethods
-    include Settings    
-
-    def find_by_vk_id_method(value = nil)
-      rw_config(:find_by_vk_id_method, value, "find_by_vk_id")
-    end
-    alias_method :find_by_vk_id_method=, :find_by_vk_id_method
-
-    def vk_id_field(value = nil)
-      rw_config(:vk_id_field, value, :vk_id)
-    end
-    alias_method :vk_id_field=, :vk_id_field
-
-    def vkontakte_authentication
-      raise(NotInitializedError, "create and initialize vkontakte.yml") unless profile_loader.vkontakte_yml_defined? && vk_app_id && vk_app_password
-    end
-    
-  end
-
-  module InstanceMethods
-
-    private
-
-    def credentials=(value)
-      super
-      cookies = value.is_a?(Array) ? value.first : value
-      if cookies.is_a?(ActionController::CookieJar) && cookies[vk_app_cookie]
-        @vk_cookies = CGI::parse(cookies[vk_app_cookie])        
-      end
-    end
-
-    def authenticating_with_vkontakte?
-      @vk_cookies
-    end
-
-    def validate_by_vk_cookie
-      result = "expire=%smid=%ssecret=%ssid=%s%s" % [@vk_cookies['expire'], @vk_cookies['mid'], @vk_cookies['secret'], @vk_cookies['sid'], self.class.vk_app_password]
-      if MD5.md5(result).to_s == @vk_cookies['sig'].to_s
-        raise(NotInitializedError, "you must define vk_id column in your User model") unless record_class.respond_to? find_by_vk_id_method
-        mid_cookie = @vk_cookies['mid'].first
-        possible_record = search_for_record(find_by_vk_id_method, mid_cookie)
-        if possible_record.nil?
-          possible_record = record_class.new(vk_id_field => mid_cookie)
-          possible_record.send :persistence_token=, Authlogic::Random.hex_token if possible_record.respond_to? :persistence_token=
-          possible_record.send :save, false
-        end
-        self.attempted_record = possible_record
-      end
-    end
-
-    def vk_app_cookie
-      self.class.vk_app_cookie
-    end
-
-    def find_by_vk_id_method
-      self.class.find_by_vk_id_method      
-    end
-
-    def vk_id_field
-      self.class.vk_id_field
-    end
-
-    def record_class
-      self.class.klass
-    end
-
-    def destroy_vkontakte_cookies
-      controller.cookies.delete vk_app_cookie
-    end
-  end
-
-
-end
-
-ActiveRecord::Base.class_eval do
-  extend VkontakteAuthentication::ClassMethods
-  attr_accessible vk_id_field
-end
-
-Authlogic::Session::Base.class_eval do
-  include VkontakteAuthentication::InstanceMethods
-  extend VkontakteAuthentication::ClassMethods
-  after_destroy :destroy_vkontakte_cookies
-  validate :validate_by_vk_cookie, :if => :authenticating_with_vkontakte?
-end
+require "profile_loader"
+require "settings"
+require "md5"
+
+module VkontakteAuthentication
+
+  class NotInitializedError < StandardError;
+  end
+
+  module ClassMethods
+    include Settings    
+
+    def find_by_vk_id_method(value = nil)
+      rw_config(:find_by_vk_id_method, value, "find_by_vk_id")
+    end
+    alias_method :find_by_vk_id_method=, :find_by_vk_id_method
+
+    def vk_id_field(value = nil)
+      rw_config(:vk_id_field, value, :vk_id)
+    end
+    alias_method :vk_id_field=, :vk_id_field
+
+    def vkontakte_authentication
+      raise(NotInitializedError, "create and initialize vkontakte.yml") unless profile_loader.vkontakte_yml_defined? && vk_app_id && vk_app_password
+    end
+    
+  end
+
+  module InstanceMethods
+
+    private
+
+    def credentials=(value)
+      super
+      cookies = value.is_a?(Array) ? value.first : value
+      if cookies && cookies[vk_app_cookie]
+        @vk_cookies = CGI::parse(cookies[vk_app_cookie])        
+      end
+    end
+
+    def authenticating_with_vkontakte?
+      @vk_cookies
+    end
+
+    def validate_by_vk_cookie
+      result = "expire=%smid=%ssecret=%ssid=%s%s" % [@vk_cookies['expire'], @vk_cookies['mid'], @vk_cookies['secret'], @vk_cookies['sid'], self.class.vk_app_password]
+      if MD5.md5(result).to_s == @vk_cookies['sig'].to_s
+        raise(NotInitializedError, "you must define vk_id column in your User model") unless record_class.respond_to? find_by_vk_id_method
+        mid_cookie = @vk_cookies['mid'].first
+        possible_record = search_for_record(find_by_vk_id_method, mid_cookie)
+        if possible_record.nil?
+          possible_record = record_class.new
+          possible_record.send "#{vk_id_field}=", mid_cookie
+          possible_record.send :persistence_token=, Authlogic::Random.hex_token if possible_record.respond_to? :persistence_token=
+          possible_record.send :save, false
+        end
+        self.attempted_record = possible_record
+      end
+    end
+
+    def vk_app_cookie
+      self.class.vk_app_cookie
+    end
+
+    def find_by_vk_id_method
+      self.class.find_by_vk_id_method      
+    end
+
+    def vk_id_field
+      self.class.vk_id_field
+    end
+
+    def record_class
+      self.class.klass
+    end
+
+    def destroy_vkontakte_cookies
+      controller.cookies.delete vk_app_cookie
+    end
+  end
+
+
+end
+
+ActiveRecord::Base.class_eval do
+  extend VkontakteAuthentication::ClassMethods
+end
+
+Authlogic::Session::Base.class_eval do
+  include VkontakteAuthentication::InstanceMethods
+  extend VkontakteAuthentication::ClassMethods
+  after_destroy :destroy_vkontakte_cookies
+  validate :validate_by_vk_cookie, :if => :authenticating_with_vkontakte?
+end

data/resources/xd_receiver.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Open API XD Receiver</title>
+  </head>
+  <body>
+    <script src="http://vkontakte.ru/js/api/xd_receiver.js" type="text/javascript"></script>
+  </body>
+</html>

data/vkontakte.yml

@@ -0,0 +1,2 @@
+vk_app_id: <YOUR_APP_ID>
+vk_app_password: <YOUR_PASSWORD>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_vkontakte
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Igor Petrov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +04:00
+date: 2010-11-17 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -37,12 +37,14 @@ files:
 - Rakefile
 - authlogic_vkontakte.gemspec
 - init.rb
-- js/vkontakte.js
 - lib/profile_loader.rb
 - lib/settings.rb
 - lib/tasks/vkontakte.rake
 - lib/vkontakte_authentication.rb
 - lib/vkontakte_helper.rb
+- resources/vkontakte.js
+- resources/xd_receiver.html
+- vkontakte.yml
 - Manifest
 has_rdoc: true
 homepage: http://github.com/GarPit/authlogic_vkontakte