grosser-rpx_now 0.4.1 → 0.4.2

data/README.markdown

@@ -39,7 +39,8 @@ View
 Controller
 ----------
     # simple: use defaults
-    # user_data returns e.g. {:name=>'John Doe',:email=>'john@doe.com',:identifier=>'blug.google.com/openid/dsdfsdfs3f3'}
+    # user_data returns e.g.
+    # {:name=>'John Doe', :username => 'john', :email=>'john@doe.com', :identifier=>'blug.google.com/openid/dsdfsdfs3f3'}
     # when no user_data was found (invalid token supplied), data is empty, you may want to handle that seperatly...
     # your user model must have an identifier column
     def rpx_token
@@ -89,7 +90,8 @@ Author
 ======
 ###Contributors
  - [DBA](http://github.com/DBA)
+ - [dbalatero](http://github.com/dbalatero)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...  
+Hereby placed under public domain, do what you want, just do not hold me accountable...  

data/Rakefile

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'echoe'
+
+desc "Run all specs in spec directory"
+task :default do |t|
+  options = "--colour --format progress --loadby --reverse"
+  files = FileList['spec/**/*_spec.rb']
+  system("spec #{options} #{files}")
+end
+
+#Gemspec
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    porject_name = 'rpx_now'
+    gem.name = porject_name
+    gem.summary = "Helper to simplify RPX Now user login/creation"
+    gem.email = "grosser.michael@gmail.com"
+    gem.homepage = "http://github.com/grosser/#{porject_name}"
+    gem.authors = ["Michael Grosser"]
+    gem.add_dependency ['activesupport']
+  end
+rescue LoadError
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+task :update_gemspec => [:manifest, :build_gemspec]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
-:major: 0
 :minor: 4
+:patch: 2
+:major: 0

data/lib/rpx_now.rb

@@ -115,8 +115,9 @@ EOF
     data = {}
     data[:identifier] = user_data['identifier']
     data[:email] = user_data['verifiedEmail'] || user_data['email']
-    data[:name] = user_data['displayName'] || user_data['preferredUsername'] || data[:email].sub(/@.*/,'')
-    data[:id] = user_data['primaryKey'].to_i unless user_data['primaryKey'].to_s.empty?
+    data[:username] = user_data['preferredUsername'] || data[:email].sub(/@.*/,'')
+    data[:name] = user_data['displayName'] || data[:username]
+    data[:id] = user_data['primaryKey'] unless user_data['primaryKey'].to_s.empty?
     data
   end
 
@@ -161,4 +162,4 @@ EOF
       super.to_s
     end
   end
-end
+end

data/spec/rpx_now_spec.rb

@@ -76,12 +76,17 @@ describe RPXNow do
     
     it "parses JSON response to user data" do
       RPXNow.expects(:post).returns fake_response
-      RPXNow.user_data('','x').should == {:name=>'Michael Grosser',:email=>'grosser.michael@googlemail.com',:identifier=>"https://www.google.com/accounts/o8/id?id=AItOawmaOlyYezg_WfbgP_qjaUyHjmqZD9qNIVM"}
+      RPXNow.user_data('','x').should == {:name=>'Michael Grosser',:email=>'grosser.michael@googlemail.com',:identifier=>"https://www.google.com/accounts/o8/id?id=AItOawmaOlyYezg_WfbgP_qjaUyHjmqZD9qNIVM", :username => 'grosser.michael'}
     end
     
     it "adds a :id when primaryKey was returned" do
       RPXNow.expects(:post).returns fake_response.sub(%Q("verifiedEmail"), %Q("primaryKey":"2","verifiedEmail"))
-      RPXNow.user_data('','x')[:id].should == 2
+      RPXNow.user_data('','x')[:id].should == '2'
+    end
+
+    it "handles primaryKeys that are not numeric" do
+      RPXNow.expects(:post).returns fake_response.sub(%Q("verifiedEmail"), %Q("primaryKey":"dbalatero","verifiedEmail"))
+      RPXNow.user_data('','x')[:id].should == 'dbalatero'
     end
     
     it "hands JSON response to supplied block" do
@@ -198,4 +203,4 @@ describe RPXNow do
       RPXNow.send('to_query', {:one => " abc"}).should == "one=+abc"
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-rpx_now
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,11 +28,12 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
 files: 
-- VERSION.yml
 - README.markdown
+- Rakefile
+- VERSION.yml
 - lib/rpx_now.rb
 - spec/rpx_now_spec.rb
 - spec/spec_helper.rb
@@ -40,7 +41,6 @@ has_rdoc: true
 homepage: http://github.com/grosser/rpx_now
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -61,7 +61,8 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Helper to simplify RPX Now user login/creation
-test_files: []
-
+test_files: 
+- spec/rpx_now_spec.rb
+- spec/spec_helper.rb