oa-webmoney 0.0.3 → 0.1.0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/CHANGES

@@ -0,0 +1,3 @@
+0.1.0
+  * Refactored to respect omniauth 1.0.1
+  * options syntax changed

data/Gemfile

@@ -1,14 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'https://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-
-group :development do
-  gem "rspec", "~> 2.5.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem 'webmoney', '~> 0.0.10'
-end
+# Specify your gem's dependencies in oa-webmoney.gemspec
+gemspec

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,6 @@
-Copyright (c) 2011 Anton
+Copyright (c) 2011 Anton Orel
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -26,9 +26,14 @@ and add code below to created migration:
 
 devise.rb
 
-    config.omniauth :webmoney, :credentials => { :site_holder_wmid => 'your_site_wmid',
-                        :app_rids => { 'localhost'   => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
-                                       'example.com' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx' }}, :mode => Rails.env)
+    config.omniauth :webmoney,
+      :credentials => {
+        :site_holder_wmid => 'your_site_wmid',
+        :app_rids => {
+          'localhost'   => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+          'example.com' => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx' }},
+      :env => Rails.env,
+      :wm_instance => Rails.webmoney #optional, if you have already used webmoney gem instance in your app
 
 user.rb
 
@@ -36,10 +41,10 @@ user.rb
 
     def self.find_for_webmoney_oauth(access_token, signed_in_resource=nil)
       data = access_token['extra']
-      if user = User.find_by_wmid(data[:WmLogin_WMID])
+      if user = User.find_by_wmid(data['WmLogin_WMID'])
         user
       else # Create an user with a stub password.
-        User.create!(:email => "#{data[:WmLogin_WMID]}@wmkeeper.com", :password => Devise.friendly_token[0,20])
+        User.create!(:email => "#{data['WmLogin_WMID']}@wmkeeper.com", :password => Devise.friendly_token[0,20])
       end
     end
 

data/Rakefile

@@ -1,45 +1,2 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "oa-webmoney"
-  gem.homepage = "http://github.com/skyeagle/oa-webmoney"
-  gem.license = "MIT"
-  gem.summary = %Q{Webmoney}
-  gem.description = %Q{Webmoney}
-  gem.email = "eagle.anton@gmail.com"
-  gem.authors = ["Anton"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_runtime_dependency 'webmoney', '~> 0.0.10'
-  gem.add_development_dependency 'rspec', '> 2.5.02.5.0'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "oa-webmoney #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/lib/oa-webmoney.rb

@@ -1,6 +1,7 @@
+require 'oa-webmoney/version'
+
 module OmniAuth
   module Strategies
-    # tell OmniAuth to load our strategy
     autoload :Webmoney, 'oa-webmoney/webmoney'
   end
 end

data/lib/oa-webmoney/version.rb

@@ -0,0 +1,5 @@
+module OmniAuth
+  module Webmoney
+    VERSION = "0.1.0"
+  end
+end

data/lib/oa-webmoney/webmoney.rb

@@ -1,5 +1,6 @@
 require 'omniauth/core'
 require 'webmoney'
+
 module OmniAuth
   module Strategies
     class Webmoney
@@ -44,22 +45,16 @@ module OmniAuth
 
         :canceled             => "Authorization was canceled by user"
       }
-      attr_reader :credentials, :mode, :wm_instance
 
-      def initialize(app, opts = {})
-        @credentials = opts[:credentials]
-        @mode = opts[:mode]
-        @wm_instance = if defined?(Rails)
-                         Rails.webmoney
-                       else
-                         WmLib.new(:wmid => @credentials[:site_holder_wmid])
-                       end
-        super(app, :webmoney, opts)
-      end
+      option :credentials
+      option :env, :production
+      option :wm_instance
+      option :fields, [:WmLogin_Ticket, :WmLogin_UrlID, :WmLogin_Expire, :WmLogin_AuthType,
+                       :WmLogin_LastAccess, :WmLogin_Created, :WmLogin_WMID, :WmLogin_UserAddress]
 
       def request_phase
         r = Rack::Response.new
-        r.redirect "https://login.wmtransfer.com/GateKeeper.aspx?RID=#{credentials[:app_rids][request.host]}"
+        r.redirect "https://login.wmtransfer.com/GateKeeper.aspx?RID=#{options[:credentials][:app_rids][request.host]}"
         r.finish
       end
 
@@ -68,27 +63,19 @@ module OmniAuth
           return fail!(:canceled, ERROR_MESSAGES[:canceled])
         end
 
-        @wminfo =
-          { :WmLogin_Ticket      => request.params["WmLogin_Ticket"],
-            :WmLogin_UrlID       => request.params["WmLogin_UrlID"],
-            :WmLogin_Expire      => request.params["WmLogin_Expires"],
-            :WmLogin_AuthType    => request.params["WmLogin_AuthType"],
-            :WmLogin_LastAccess  => request.params["WmLogin_LastAccess"],
-            :WmLogin_Created     => request.params["WmLogin_Created"],
-            :WmLogin_WMID        => request.params["WmLogin_WMID"],
-            :WmLogin_UserAddress => request.params["WmLogin_UserAddress"] }
-
         # work around for local development
-        ip_to_check = %w(development test).include?(mode) ? @wminfo[:WmLogin_UserAddress] : request.ip
+        ip_to_check = [:development, :test].include?(options[:env].to_sym) ? extra[:WmLogin_UserAddress] : request.ip
+
+        check_req_params = extra.merge({:remote_ip => ip_to_check})
 
-        check_req_params = @wminfo.merge({:remote_ip => ip_to_check})
+        options[:wm_instance] ||= WmLib.new(:wmid => options[:credentials][:site_holder_wmid])
 
         begin
-          response = wm_instance.request(:login, check_req_params)[:retval]
+          response = options[:wm_instance].request(:login, check_req_params)[:retval]
         rescue Errno::ECONNRESET, Errno::ECONNREFUSED, Timeout::Error => e
           response = -2
         rescue ::Webmoney::ResultError => e
-          response = wm_instance.error
+          response = options[:wm_instance].error
         end
 
         status = case response
@@ -116,10 +103,15 @@ module OmniAuth
         super
       end
 
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super(), {
-          'uid' => @wminfo[:WmLogin_WMID],
-          'extra' => @wminfo})
+      def uid
+        extra[:WmLogin_WMID]
+      end
+
+      def extra
+        options.fields.inject({}) do |hash, field|
+          hash[field] = request.params[field.to_s]
+          hash
+        end
       end
     end
   end

data/oa-webmoney.gemspec

@@ -1,72 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/oa-webmoney/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{oa-webmoney}
-  s.version = "0.0.3"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Anton Orel"]
+  gem.email         = ["eagle.anton@gmail.com"]
+  gem.description   = %q{OmniAuth Webmoney Strategy}
+  gem.summary       = %q{OmniAuth Webmoney Strategy}
+  gem.homepage      = %q{http://github.com/skyeagle/oa-webmoney}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Anton"]
-  s.date = %q{2011-03-01}
-  s.description = %q{Webmoney}
-  s.email = %q{eagle.anton@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/oa-webmoney.rb",
-    "lib/oa-webmoney/webmoney.rb",
-    "oa-webmoney.gemspec",
-    "spec/oa-webmoney_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/skyeagle/oa-webmoney}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Webmoney}
-  s.test_files = [
-    "spec/oa-webmoney_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "oa-webmoney"
+  gem.require_paths = ["lib"]
+  gem.version       = OmniAuth::Webmoney::VERSION
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<webmoney>, ["~> 0.0.10"])
-      s.add_runtime_dependency(%q<webmoney>, ["~> 0.0.10"])
-      s.add_development_dependency(%q<rspec>, ["> 2.5.02.5.0"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<webmoney>, ["~> 0.0.10"])
-      s.add_dependency(%q<webmoney>, ["~> 0.0.10"])
-      s.add_dependency(%q<rspec>, ["> 2.5.02.5.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<webmoney>, ["~> 0.0.10"])
-    s.add_dependency(%q<webmoney>, ["~> 0.0.10"])
-    s.add_dependency(%q<rspec>, ["> 2.5.02.5.0"])
-  end
+  gem.add_runtime_dependency 'webmoney', ['~> 0.0.12']
+  gem.add_development_dependency 'bundler', ["~> 1.1.rc.2"]
 end
-

metadata

@@ -1,170 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oa-webmoney
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
-- Anton
+authors:
+- Anton Orel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-01 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+date: 2011-12-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: webmoney
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &21749840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 10
-        version: 0.0.10
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: webmoney
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 10
-        version: 0.0.10
+      - !ruby/object:Gem::Version
+        version: 0.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *21749840
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &21749320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 2
-        - 5
-        - 0
-        version: 2.5.02.5.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.rc.2
   type: :development
   prerelease: false
-  version_requirements: *id006
-description: Webmoney
-email: eagle.anton@gmail.com
+  version_requirements: *21749320
+description: OmniAuth Webmoney Strategy
+email:
+- eagle.anton@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.md
-files: 
-- .document
-- .rspec
+extra_rdoc_files: []
+files:
+- .gitignore
+- CHANGES
 - Gemfile
-- Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/oa-webmoney.rb
+- lib/oa-webmoney/version.rb
 - lib/oa-webmoney/webmoney.rb
 - oa-webmoney.gemspec
-- spec/oa-webmoney_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/skyeagle/oa-webmoney
-licenses: 
-- MIT
+licenses: []
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -329519907
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Webmoney
-test_files: 
-- spec/oa-webmoney_spec.rb
-- spec/spec_helper.rb
+summary: OmniAuth Webmoney Strategy
+test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/Gemfile.lock

@@ -1,30 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    nokogiri (1.4.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    webmoney (0.0.10)
-      nokogiri
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rspec (~> 2.5.0)
-  webmoney (~> 0.0.10)

data/VERSION

@@ -1 +0,0 @@
-0.0.3

data/spec/oa-webmoney_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "OaWebmoney" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'oa-webmoney'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end