social 0.0.3 → 0.0.4

data/lib/social/config.rb

@@ -1,17 +1,9 @@
 module Social
   class Config
 
-    #@@network_name = nil
-
-    #def self.included(network)
-    #  require 'pry'
-    #  binding.pry
-    #  network.send(:include, InstanceMethods)
-    #  @@network_name = network.name.split('::').last.downcase 
-    #end
-
     def initialize(network_name)
       @network_name = network_name
+      @config_file_data = {}
     end
 
     def network_name
@@ -19,7 +11,7 @@ module Social
     end
     
     def config
-      @config_data ||= load_config_file
+      @config_data ||= load_config_file[@network_name]
     end
 
     def config_file_path=(new_path)
@@ -43,7 +35,7 @@ module Social
     end
 
     def load_config_file
-      YAML.load_file(config_file_path).with_indifferent_access
+      @config_file_data[config_file_path] ||= YAML.load_file(config_file_path).with_indifferent_access
     end
 
 

data/lib/social/config/ok.rb

@@ -1,15 +1,24 @@
 module Social
   class Config
     module Ok
+
       def config
+        
         unless @config
           @env = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
-          @config_ins = Social::Config.new('ok')
-          @config = @config_ins.config['ok'][@env]
+          @config_ins = Social::Config.new(:ok)
+          @config = @config_ins.config[@env]
         end
 
         @config
       end
+
+      def safe_config(auth_params = {})
+        auth_params.merge \
+          :api_server       => Social::Network(:ok).config[:api_server],
+          :application_key  => Social::Network(:ok).config[:application_key],
+          :logged_user_id   => auth_params['uid']
+      end
     end
   end
 end

data/lib/social/config/vk.rb

@@ -6,13 +6,19 @@ module Social
         
         unless @config
           @env = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
-          @config_ins = Social::Config.new('vk')
-          @config = @config_ins.config['vk'][@env]
+          @config_ins = Social::Config.new(:vk)
+          @config = @config_ins.config[@env]
         end
 
         @config
       end
 
+      def safe_config(auth_params = {})
+        auth_params.merge \
+          :app_id         => Social::Network(:vk).config['app_id'],
+          :logged_user_id => auth_params['uid']
+      end
+
     end
   end
 end

data/lib/social/version.rb

@@ -1,3 +1,3 @@
 module Social
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/social_spec.rb

@@ -13,15 +13,25 @@ describe Social do
   end
 
   it "must load config to vk" do
-  	Social::Network(:vk).config.should_not be_nil
+    Social::Network(:vk).config.should_not be_nil
     Social::Network(:vk).config['key'].should_not be_nil
     Social::Network(:vk).config['app_id'].should_not be_nil
   end
 
-  it "must load config to vk" do
+  it "must load config to ok" do
     Social::Network(:ok).config.should_not be_nil
     Social::Network(:ok).config['api_server'].should_not be_nil
     Social::Network(:ok).config['application_key'].should_not be_nil
     Social::Network(:ok).config['secret_key'].should_not be_nil
   end
+
+  it "valid safe config data for vk" do
+    avalible_keys = [ :app_id , :logged_user_id ]
+    Social::Network(:vk).safe_config.keys.should =~ avalible_keys
+  end
+
+  it "valid safe config data for ok" do
+    avalible_keys = [ :api_server , :application_key, :logged_user_id ]
+    Social::Network(:ok).safe_config.keys.should =~ avalible_keys
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70327502176360 !ruby/object:Gem::Requirement
+  requirement: &70292337319380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70327502176360
+  version_requirements: *70292337319380
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70327502175840 !ruby/object:Gem::Requirement
+  requirement: &70292337318880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70327502175840
+  version_requirements: *70292337318880
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70327502175380 !ruby/object:Gem::Requirement
+  requirement: &70292337318420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *70327502175380
+  version_requirements: *70292337318420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70327502174920 !ruby/object:Gem::Requirement
+  requirement: &70292337317960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70327502174920
+  version_requirements: *70292337317960
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70327502174420 !ruby/object:Gem::Requirement
+  requirement: &70292337317500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70327502174420
+  version_requirements: *70292337317500
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70327502173960 !ruby/object:Gem::Requirement
+  requirement: &70292337316980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.8.4
   type: :development
   prerelease: false
-  version_requirements: *70327502173960
+  version_requirements: *70292337316980
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70327502173480 !ruby/object:Gem::Requirement
+  requirement: &70292337316460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *70327502173480
+  version_requirements: *70292337316460
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70327502173020 !ruby/object:Gem::Requirement
+  requirement: &70292337310040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70327502173020
+  version_requirements: *70292337310040
 description: ! "This is social networks api wrapper and authorization tools for social
   applications. \n    Now it is a compilation of code from various projects in production.
   Without tests. =( NOT RECOMMENDED USE IN PRODUCTION."