Fixed some naming bugs (was born while extracting Vk gem from project)

alsemyonov · May 2, 2011 · 99841fd · 99841fd
1 parent a602267
commit 99841fd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+doc
diff --git a/Rakefile b/Rakefile
@@ -16,6 +16,7 @@ rescue LoadError
 end
 
 begin
+  require 'yard'
   require 'yard/rake/yardoc_task'
 
   desc 'Generate documentation'

diff --git a/lib/vk.rb b/lib/vk.rb
@@ -1,8 +1,12 @@
 module Vk
   extend self
 
-  autoload :DSL, 'vk/dsl'
-  autoload :Request, 'vk/request'
+  autoload :DSL,      'vk/dsl'
+  autoload :Request,  'vk/request'
+
+  class << self
+    attr_accessor :app_id, :app_secret
+  end
 
   def request
     @request ||= Request.new

diff --git a/lib/vk/dsl.rb b/lib/vk/dsl.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'vk'
 
-class VK
+module Vk
   module DSL
     # Have user installed app?
     # @param  [String] uid user’s identifier

diff --git a/lib/vk/request.rb b/lib/vk/request.rb
@@ -19,26 +19,25 @@ class Request
     PORT    = 80
 
     class << self
-      attr_accessor :app_id, :app_secret
-
       # Generates auth_key for viewer
       # @param [Fixnum, String] viewer_id viewer’s identifier
       def auth_key(viewer_id)
-        Digest::MD5.hexdigest("#{app_id}_#{viewer_id}_#{app_secret}")
+        Digest::MD5.hexdigest("#{Vk.app_id}_#{viewer_id}_#{Vk.app_secret}")
       end
 
       def authenticated?(viewer_id, auth_key)
         auth_key == self.auth_key(viewer_id)
       end
 
       def dsl!
+        require 'vk/dsl'
         include Vk::DSL
       end
     end
 
     def request(method_name, data = {})
       data.merge!(
-        api_id: VK.app_id,
+        api_id: Vk.app_id,
         format: :json,
         method: method_name,
         v:      VERSION
@@ -58,7 +57,7 @@ def method_missing(method_name, options = {})
     private
 
     def signature(data)
-      signature = data.keys.sort.inject('') { |result, key| result << "#{key}=#{data[key]}" } << VK.app_secret
+      signature = data.keys.sort.inject('') { |result, key| result << "#{key}=#{data[key]}" } << Vk.app_secret
       Digest::MD5.hexdigest(signature)
     end
   end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -4,8 +4,8 @@
 
 Bundler.require(:development)
 
-Vk::Request.app_id = 2311992
-Vk::Request.app_secret = 'secret'
+Vk.app_id = 2311992
+Vk.app_secret = 'secret'
 
 VK_AUTH_KEY = '44b0a08fcf4039bf7919132a777b23ef'
 VK_VIEWER_ID = 34160