prooflink_connect 0.0.21 → 0.0.22

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+Gemfile.lock

data/.travis.yml

@@ -11,6 +11,8 @@ notifications:
   recipients:
     - markmulder@gmail.com
     - stephan@ka.ag
+    - jermaine@holder.nl
+    - chiel.wester@holder.nl
 
 branches:
   only:

data/lib/prooflink_connect/version.rb

@@ -1,3 +1,3 @@
 module ProoflinkConnect
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/lib/prooflink_connect.rb

@@ -20,8 +20,10 @@ module ProoflinkConnect
   def self.embedded(options = {}, config = ProoflinkConnect.config)
     # needed because you didn't have to use px explicitly in the old situation
     [:width, :height].each do |dimension|
-      if options[dimension] && !options[dimension].to_s.include?("%")
-        options[dimension] << "px"
+      next if options[dimension].nil?
+      value = options[dimension].to_s
+      if !value.match(/[%|px]/)
+        options[dimension] = value << "px"
       end
     end
 

data/prooflink_connect.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.name        = "prooflink_connect"
   s.version     = ProoflinkConnect::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Chiel Wester", "Jermaine Oosterling"]
-  s.email       = ["chiel.wester@holder.nl", "jermaine.oosterling@prooflink.com"]
+  s.authors     = ["Chiel Wester", "Jermaine Oosterling", "Stephan Kaag", "Mark Mulder"]
+  s.email       = ["chiel.wester@holder.nl", "jermaine.oosterling@prooflink.com", "stephan@ka.ag", "markmulder@gmail.com"]
   s.homepage    = "https://github.com/prooflink/prooflink_connect"
   s.summary     = "Make a connection to the prooflink connect api"
   s.description = "Make a connection to the prooflink connect api for single sign on authentication"

data/spec/prooflink_connect/activity_spec.rb

@@ -7,14 +7,12 @@ describe ProoflinkConnect::Activity do
 
   before do
     stub_request(:post, "https://example.prooflink.com/api/v2/activities").
-      with(:headers => {'Accept'=>'*/*', 'Authorization'=>'OAuth 4321', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
-      to_return do |request|
-        if request.body.empty?
-          {:body => {:status => "ERROR", :message => "no activity specified"}.to_json}
-        else
-          {:body => {:status => "SUCCESS", :message => "activity succesfully created"}.to_json}
-        end
-      end
+      with(:body => {"activity"=>{"activity_type"=>{"name"=>"My name", "value"=>"1", "identifier"=>"my_identifier"}, "user"=>{"identity_provider"=>"prooflink", "email"=>"jon@doe.com"}}}, :headers => {'Accept'=>'*/*', 'Authorization'=>'OAuth 4321', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(:status => 200, :body => {"status"=>"SUCCESS", "message"=>"activity succesfully created"}.to_json, :headers => {})
+
+    stub_request(:post, "https://example.prooflink.com/api/v2/activities").
+      with(:body => "", :headers => {'Accept'=>'*/*', 'Authorization'=>'OAuth 4321', 'Content-Type'=>'application/x-www-form-urlencoded'}).
+      to_return(:status => 406, :body => {"status"=>"ERROR", "message"=>"no activity specified"}.to_json, :headers => {})
   end
 
   it "should log activity as expected" do
@@ -22,6 +20,10 @@ describe ProoflinkConnect::Activity do
               :user => {:email => "jon@doe.com", :identity_provider => 'prooflink'}}
 
     ProoflinkConnect::Activity.log(params).should eq({"status"=>"SUCCESS", "message"=>"activity succesfully created"})
+
+  end
+
+  it "should not log activity when no params are passed" do
     ProoflinkConnect::Activity.log({}).should eq({"status"=>"ERROR", "message"=>"no activity specified"})
   end
 end

data/spec/prooflink_connect/invite_spec.rb

@@ -7,9 +7,10 @@ describe ProoflinkConnect::Invite do
 
   it "creates a Prooflink invite" do
     attributes = {:email => 'newuser@prooflink.com'}
+    expected_parameters = {"locale"=>["nl"], "api_key"=>["1234"], "invite[email]"=>["newuser@prooflink.com"]}
 
     stub_request(:post, "https://example.prooflink.com/invites").
-      with(:body => "invite[email]=newuser%40prooflink.com&api_key=1234&locale=nl").
+      with{|request| expected_parameters == CGI.parse(request.body)}.
       to_return(:status => 200, :body => {
         "entry" => {
           "name" => {},

data/spec/prooflink_connect_spec.rb

@@ -6,24 +6,48 @@ describe ProoflinkConnect do
     ProoflinkConnect.embedded.should == result
   end
 
-  it "allows pixels or percentage for width" do
-    result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 100%; height: 250px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
-    ProoflinkConnect.embedded({:width => "100%"}).should == result
-  end
+  context "width" do
+    it "allows integer" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 100px; height: 250px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:width => 100}).should == result
+    end
 
-  it "adds px to width if not given" do
-    result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 100px; height: 250px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
-    ProoflinkConnect.embedded({:width => "100"}).should == result
-  end
+    it "allows pixels" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 100%; height: 250px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:width => "100%"}).should == result
+    end
 
-  it "allows pixels or percentage for height" do
-    result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 520px; height: 100%; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
-    ProoflinkConnect.embedded({:height => "100%"}).should == result
+    it "allows percentage" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 100%; height: 250px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:width => "100%"}).should == result
+    end
+
+    it "adds px if not given" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 100px; height: 250px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:width => "100"}).should == result
+    end
   end
 
-  it "adds px to height if not given" do
-    result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 520px; height: 100px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
-    ProoflinkConnect.embedded({:height => "100"}).should == result
+  context "height" do
+    it "allows integer" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 520px; height: 100px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:height => 100}).should == result
+    end
+
+    it "allows pixels" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 520px; height: 300px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:height => "300px"}).should == result
+    end
+
+    it "allows percentage" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 520px; height: 100%; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:height => "100%"}).should == result
+    end
+
+    it "adds px if not given" do
+      result = "<iframe src='https://example.prooflink.com/authentications/embedded?token_url=https://example.com/auth/callbacks&use_popups=1' style='width: 520px; height: 100px; border: 0; display: block;' frameborder='0' allowTransparency='true'></iframe>"
+      ProoflinkConnect.embedded({:height => "100"}).should == result
+    end
   end
 
   it "sets split screen option" do

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: prooflink_connect
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Chiel Wester
 - Jermaine Oosterling
+- Stephan Kaag
+- Mark Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-07-30 00:00:00 Z
+date: 2012-09-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -122,6 +124,8 @@ description: Make a connection to the prooflink connect api for single sign on a
 email: 
 - chiel.wester@holder.nl
 - jermaine.oosterling@prooflink.com
+- stephan@ka.ag
+- markmulder@gmail.com
 executables: []
 
 extensions: []
@@ -133,7 +137,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - lib/prooflink_connect.rb
@@ -185,9 +188,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prooflink_connect
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Make a connection to the prooflink connect api
 test_files: []
 
+has_rdoc: 

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    prooflink_connect (0.0.20)
-      activesupport
-      httparty
-      json
-      oauth2
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.7)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.2.8)
-    crack (0.3.1)
-    diff-lcs (1.1.3)
-    faraday (0.8.1)
-      multipart-post (~> 1.1)
-    httparty (0.8.3)
-      multi_json (~> 1.0)
-      multi_xml
-    httpauth (0.1)
-    i18n (0.6.0)
-    json (1.7.4)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
-    multi_json (1.3.6)
-    multi_xml (0.5.1)
-    multipart-post (1.1.5)
-    oauth2 (0.8.0)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      rack (~> 1.2)
-    rack (1.4.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    webmock (1.8.8)
-      addressable (~> 2.2.8)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.0)
-  prooflink_connect!
-  rspec
-  webmock