rack-googlemarketplace 0.0.1.pre → 0.0.1.pre1

data/lib/rack/googlemarketplace.rb

@@ -11,7 +11,6 @@ module Rack
       # Set default values
       @domain_param ||= "domain"
       @session_key  ||= "user_id"
-      @return_to    ||= "/"
 
       yield self if block_given?
     end
@@ -27,27 +26,32 @@ module Rack
       session = env["rack.session"]
       @domain = request[domain_param]
 
-      if env["PATH_INFO"] == "/login" and @domain
-        status = 401
-        headers["WWW-Authenticate"] = Rack::OpenID.build_header(
-          :identifier => identifier,
-          :return_to  => "/?#{query({@domain_param => @domain})}",
-          :required   => ax_required,
-          :method     => "post"
-        )
-      elsif resp = env["rack.openid.response"] and @domain
-        if resp.status == :success
-          user = {}
-          user[:email]      = ax_response ax_schema("contact/email")
-          user[:first_name] = ax_response ax_schema("namePerson/first")
-          user[:last_name]  = ax_response ax_schema("namePerson/last")
+      if @domain
+        if resp = env["rack.openid.response"]
+          if resp.status == :success
+            marketplace = {}
+            user = {}
+            user[:email]      = ax_response ax_schema("contact/email")
+            user[:first_name] = ax_response ax_schema("namePerson/first")
+            user[:last_name]  = ax_response ax_schema("namePerson/last")
+            marketplace[:user]            = user
+            marketplace[:domain]          = @domain
+            marketplace[:openid_response] = resp
+          else
+            status = 302
+            headers["Location"] = "/page/support"
+          end
 
-          env["rack.googlemarketplace.openid_response"] = resp
-          env["rack.googlemarketplace.user"] = user
-          env["rack.googlemarketplace.domain"] = @domain
+          env["rack.googlemarketplace"] = marketplace
+        else
+          status = 401
+          headers["WWW-Authenticate"] = Rack::OpenID.build_header(
+            :identifier => identifier,
+            :return_to  => "/?#{query({@domain_param => @domain})}",
+            :required   => ax_required,
+            :method     => "post"
+          )
         end
-        status = 302
-        headers["Location"] = @return_to
       end
 
       [ status, headers, response ]

data/rack-googlemarketplace.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rack-googlemarketplace"
-  s.version     = "0.0.1.pre"
+  s.version     = "0.0.1.pre1"
   s.authors     = ["Erlend Finvåg"]
   s.email       = ["erlend.finvag@gmail.com"]
   s.homepage    = "http://github.com/erlend/rack-googlemarketplace"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib/rack"]
+  s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", "~> 2.8"

data/spec/googlemarketplace_spec.rb

@@ -23,8 +23,8 @@ describe "rack-google-marketplace" do
   end
 
   # Initialize and authenticate
-  describe "GET", "/login" do
-    before { get "/login?domain_name=wepack.no" }
+  describe "GET", "/" do
+    before { get "/?domain_name=wepack.no" }
     subject { last_response }
 
     its(:status) { should eq(401) }
@@ -46,10 +46,6 @@ describe "rack-google-marketplace" do
         subject["method"].should eq("post")
       end
 
-      pending "should have the correct realm" do
-        subject["realm"].should eq("https://localhost:9000")
-      end
-
       it "should have the correct return_to" do
         subject["return_to"].should eq("/?domain_name=wepack.no")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-googlemarketplace
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70162351295720 !ruby/object:Gem::Requirement
+  requirement: &70204148056280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70162351295720
+  version_requirements: *70204148056280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70162351295220 !ruby/object:Gem::Requirement
+  requirement: &70204148055740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70162351295220
+  version_requirements: *70204148055740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70162351294760 !ruby/object:Gem::Requirement
+  requirement: &70204148055140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70162351294760
+  version_requirements: *70204148055140
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70162351294300 !ruby/object:Gem::Requirement
+  requirement: &70204148054540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70162351294300
+  version_requirements: *70204148054540
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70162351293920 !ruby/object:Gem::Requirement
+  requirement: &70204148054020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70162351293920
+  version_requirements: *70204148054020
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70162351293380 !ruby/object:Gem::Requirement
+  requirement: &70204148053200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70162351293380
+  version_requirements: *70204148053200
 - !ruby/object:Gem::Dependency
   name: rack-openid
-  requirement: &70162351292880 !ruby/object:Gem::Requirement
+  requirement: &70204148049620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70162351292880
+  version_requirements: *70204148049620
 - !ruby/object:Gem::Dependency
   name: ruby-openid-apps-discovery
-  requirement: &70162351292420 !ruby/object:Gem::Requirement
+  requirement: &70204148049160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,7 +98,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70162351292420
+  version_requirements: *70204148049160
 description: Write a gem description
 email:
 - erlend.finvag@gmail.com
@@ -121,7 +121,7 @@ licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib/rack
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4323997729412537861
+      hash: 3213135176645639812
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: