social 0.0.2 → 0.0.3

data/config/social.yml

@@ -0,0 +1,27 @@
+ok:
+  development: 
+    # production
+    api_server: 'http://api.odnoklassniki.ru/'
+    application_key: ''
+    secret_key: ''
+  staging: # staging
+    api_server: 'http://api.odnoklassniki.ru/'
+    application_key: ''
+    secret_key: ''
+  production: # production
+    api_server: 'http://api.odnoklassniki.ru/'
+    application_key: ''
+    secret_key: ''
+vk:
+  production:
+    key: ""
+    app_id: 1
+  staging:
+    key: ""
+    app_id: 1
+  vk_staging:
+    key: ""
+    app_id: 1
+  development:
+    key: ""
+    app_id: 1

data/lib/social/config.rb

@@ -1,52 +1,51 @@
 module Social
-  module Config
+  class Config
 
-    @@network_name = nil
+    #@@network_name = nil
 
-    def self.included(network)
-      network.send(:include, InstanceMethods)
-      @@network_name = network.name.split('::').last.downcase 
-    end
-
-    module InstanceMethods
-
-      def network_name
-        @@network_name
-      end
+    #def self.included(network)
+    #  require 'pry'
+    #  binding.pry
+    #  network.send(:include, InstanceMethods)
+    #  @@network_name = network.name.split('::').last.downcase 
+    #end
 
-      def network
-        @network
-      end
-      
-      def config
-        @config_data ||= load_config_file
-      end
+    def initialize(network_name)
+      @network_name = network_name
+    end
 
-      def config_file_path=(new_path)
-        @config_file_path = new_path
-        @config           = load_config_file if @config_data
-      end
+    def network_name
+      @network_name
+    end
+    
+    def config
+      @config_data ||= load_config_file
+    end
 
-      def config_root=(new_root)
-        @config_root = new_root
-      end
+    def config_file_path=(new_path)
+      @config_file_path = new_path
+      @config           = load_config_file if @config_data
+    end
 
-      def config_root
-        @config_root ||= File.join(Rails.root, 'config') if defined?(Rails)
-        @config_root ||= ENV['SOCIAL_CONFIG_ROOT']
-        @config_root ||= File.join('.', 'config')
-      end
+    def config_root=(new_root)
+      @config_root = new_root
+    end
 
-      def config_file_path
-        @config_file_path ||= ENV['SOCIAL_CONFIG_PATH']
-        @config_file_path ||= File.joint(self.config_root, 'social.yml')
-      end
+    def config_root
+      @config_root ||= File.join(Rails.root, 'config') if defined?(Rails)
+      @config_root ||= ENV['SOCIAL_CONFIG_ROOT']
+      @config_root ||= File.join('.', 'config')
+    end
 
-      def load_config_file
-        YAML.load_file(config_file_path).with_indifferent_access
-      end
+    def config_file_path
+      @config_file_path ||= ENV['SOCIAL_CONFIG_PATH']
+      @config_file_path ||= File.join(self.config_root, 'social.yml')
+    end
 
+    def load_config_file
+      YAML.load_file(config_file_path).with_indifferent_access
     end
 
+
   end
 end

data/lib/social/config/ok.rb

@@ -1,11 +1,14 @@
 module Social
-  module Config
+  class Config
     module Ok
-      include Social::Config
-      
       def config
-        env = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
-        super['ok'][]
+        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]
+        end
+
+        @config
       end
     end
   end

data/lib/social/config/vk.rb

@@ -1,13 +1,18 @@
 module Social
-  module Config
+  class Config
     module Vk
-      include Social::Config
       
       def config
-        env = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development'
-        super['vk'][env.to_s]
+        
+        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]
+        end
 
+        @config
       end
+
     end
   end
 end

data/lib/social/version.rb

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

data/social.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack', '~> 1.4.1'
   s.add_development_dependency 'rack-test', '~> 0.6.1'
   s.add_development_dependency "rr", "~> 1.0"
+  s.add_development_dependency "pry", "~> 0.9.8.4"
   s.add_development_dependency 'activesupport', "~> 3.1.3"
   s.add_development_dependency 'i18n', '~> 0.6.0'
 end

data/spec/lib/social_spec.rb

@@ -4,9 +4,24 @@ describe Social do
 
   it "support ok" do
     Social::Network(:ok).user.should_not be_nil
+    Social::Network(:ok).rate.should_not be_nil
   end
 
   it "support vk" do
     Social::Network(:vk).user.should_not be_nil
+    Social::Network(:vk).rate.should_not be_nil
+  end
+
+  it "must load config to vk" do
+  	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
+    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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000Z
+date: 2012-03-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &70103475836660 !ruby/object:Gem::Requirement
+  requirement: &70327502176360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70103475836660
+  version_requirements: *70327502176360
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &70103475835920 !ruby/object:Gem::Requirement
+  requirement: &70327502175840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70103475835920
+  version_requirements: *70327502175840
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70103475835060 !ruby/object:Gem::Requirement
+  requirement: &70327502175380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *70103475835060
+  version_requirements: *70327502175380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70103475834420 !ruby/object:Gem::Requirement
+  requirement: &70327502174920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70103475834420
+  version_requirements: *70327502174920
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70103475833760 !ruby/object:Gem::Requirement
+  requirement: &70327502174420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,21 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70103475833760
+  version_requirements: *70327502174420
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &70327502173960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.8.4
+  type: :development
+  prerelease: false
+  version_requirements: *70327502173960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70103475833200 !ruby/object:Gem::Requirement
+  requirement: &70327502173480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *70103475833200
+  version_requirements: *70327502173480
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70103475832600 !ruby/object:Gem::Requirement
+  requirement: &70327502173020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70103475832600
+  version_requirements: *70327502173020
 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."
@@ -103,6 +114,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- config/social.yml
 - lib/social.rb
 - lib/social/auth.rb
 - lib/social/auth/controller.rb