stormpath-sdk 1.0.0.beta.6 → 1.0.0.beta.7

data/.travis.yml

@@ -29,5 +29,7 @@ env:
 language: ruby
 rvm:
 - 1.9.3
+- 2.0.0
+- 2.1.2
 services:
   - redis-server

data/CHANGES.md

@@ -1,6 +1,16 @@
 stormpath-sdk-ruby Changelog
 ============================
 
+Version 1.0.0.beta.7
+--------------------
+
+Released on July 21, 2014
+
+- Added provider integration (Google, Facebook and Stormpath).
+- Updated tests to use RSpec3.
+- Updated tests to run in parallel in multiple versions (1.9.3, 2.0.0 and 2.1.2).
+
+
 Version 1.0.0.beta.6
 --------------------
 

data/lib/stormpath-sdk.rb

@@ -66,6 +66,21 @@ module Stormpath
     autoload :BasicAuthenticator, "stormpath-sdk/auth/basic_authenticator"
   end
 
+  module Provider
+    autoload :AccountResolver, "stormpath-sdk/provider/account_resolver"
+    autoload :AccountAccess, "stormpath-sdk/provider/account_access"
+    autoload :AccountResult, "stormpath-sdk/provider/account_result"
+    autoload :AccountRequest, "stormpath-sdk/provider/account_request"
+    autoload :Provider, 'stormpath-sdk/provider/provider'
+    autoload :ProviderData, 'stormpath-sdk/provider/provider_data'
+    autoload :FacebookProvider, 'stormpath-sdk/provider/facebook/facebook_provider'
+    autoload :FacebookProviderData, 'stormpath-sdk/provider/facebook/facebook_provider_data'
+    autoload :GoogleProvider, 'stormpath-sdk/provider/google/google_provider'
+    autoload :GoogleProviderData, 'stormpath-sdk/provider/google/google_provider_data'
+    autoload :StormpathProvider, 'stormpath-sdk/provider/stormpath/stormpath_provider'
+    autoload :StormpathProviderData, 'stormpath-sdk/provider/stormpath/stormpath_provider_data'
+  end
+
   module Http
     autoload :Utils, "stormpath-sdk/http/utils"
     autoload :Request, "stormpath-sdk/http/request"

data/lib/stormpath-sdk/data_store.rb

@@ -22,7 +22,7 @@ class Stormpath::DataStore
   DEFAULT_BASE_URL = "https://" + DEFAULT_SERVER_HOST + "/v" + DEFAULT_API_VERSION.to_s
   HREF_PROP_NAME = Stormpath::Resource::Base::HREF_PROP_NAME
 
-  CACHE_REGIONS = %w( applications directories accounts groups groupMemberships accountMemberships tenants customData )
+  CACHE_REGIONS = %w(applications directories accounts groups groupMemberships accountMemberships tenants customData provider providerData)
 
   attr_reader :client, :request_executor, :cache_manager
 
@@ -53,6 +53,9 @@ class Stormpath::DataStore
     q_href = qualify href
 
     data = execute_request('get', q_href, nil, query)
+
+    clazz = clazz.call(data) if clazz.respond_to? :call
+
     instantiate clazz, data.to_hash
   end
 
@@ -89,29 +92,36 @@ class Stormpath::DataStore
     href = resource.href
     href += "/#{property_name}" if property_name
     href = qualify(href)
-   
+
     execute_request('delete', href)
+    clear_cache_on_delete(href)
+    return nil
   end
 
   private
 
-    def needs_to_be_fully_qualified(href)
+    def needs_to_be_fully_qualified?(href)
       !href.downcase.start_with? 'http'
     end
 
     def qualify(href)
-      needs_to_be_fully_qualified(href) ? @base_url + href : href
+      needs_to_be_fully_qualified?(href) ? @base_url + href : href
     end
 
-    def execute_request(http_method, href, body=nil, query=nil)
+    def execute_request(http_method, href, resource=nil, query=nil)
       if http_method == 'get' && (cache = cache_for href)
         cached_result = cache.get href
         return cached_result if cached_result
       end
 
+      body = if resource
+               MultiJson.dump(to_hash(resource))
+             end
+
       request = Request.new(http_method, href, query, Hash.new, body)
       apply_default_request_headers request
       response = @request_executor.execute_request request
+
       result = response.body.length > 0 ? MultiJson.load(response.body) : ''
 
       if response.error?
@@ -119,11 +129,13 @@ class Stormpath::DataStore
         raise Stormpath::Error.new error
       end
 
-      if http_method == 'delete'
-        clear_cache_on_delete(href)
-        return nil
+      if resource.is_a? Stormpath::Provider::AccountAccess
+        is_new_account = response.http_status == 201
+        result = {is_new_account: is_new_account, account: result }
       end
 
+      return if http_method == 'delete'
+
       if result[HREF_PROP_NAME]
         cache_walk result
       else
@@ -206,7 +218,7 @@ class Stormpath::DataStore
 
       clear_cache_on_save(resource)
 
-      response = execute_request 'post', q_href, MultiJson.dump(to_hash(resource))
+      response = execute_request 'post', q_href, resource
 
       instantiate return_type, response.to_hash
     end
@@ -242,11 +254,11 @@ class Stormpath::DataStore
     def to_hash(resource)
       Hash.new.tap do |properties|
         resource.get_dirty_property_names.each do |name|
-          ignore_camelcasing = resource_not_custom_data(resource, name) ? false : true
+          ignore_camelcasing = resource_is_custom_data(resource, name)
           property = resource.get_property name, ignore_camelcasing: ignore_camelcasing
 
-          # Special use case is with Custom Data, it's hashes should not be simplified
-          if property.kind_of?(Hash) and resource_not_custom_data resource, name
+          # Special use cases are with Custom Data, Provider and ProviderData, their hashes should not be simplified
+          if property.kind_of?(Hash) and !resource_nested_submittable(resource, name)
             property = to_simple_reference name, property
           end
 
@@ -263,8 +275,12 @@ class Stormpath::DataStore
       {HREF_PROP_NAME => href}
     end
 
-    def resource_not_custom_data resource, name
-      resource.class != Stormpath::Resource::CustomData and name != "customData"
+    def resource_nested_submittable resource, name
+      ['provider', 'providerData'].include?(name) or resource_is_custom_data(resource, name)
+    end
+
+    def resource_is_custom_data resource, name
+      resource.is_a? Stormpath::Resource::CustomData or name == 'customData'
     end
 
 end

data/lib/stormpath-sdk/http/request.rb

@@ -24,37 +24,25 @@ module Stormpath
 
         splitted = href.split '?'
 
-        if query_string.nil?
-          @query_string = Hash.new
-        else
-          @query_string = query_string
-        end
+        @query_string = query_string || {}
 
-        if !splitted.nil? and splitted.length > 1
+        if splitted and splitted.length > 1
           @href = splitted[0]
           query_string_str = splitted[1]
-
           query_string_arr = query_string_str.split '&'
-
           query_string_arr.each do |pair|
-
             pair_arr = pair.split '='
-
             @query_string.store pair_arr[0], pair_arr[1]
-
           end
-
         else
-
           @href = href
-
         end
 
         @http_method = http_method.upcase
         @http_headers = http_headers
         @body = body
 
-        if !body.nil?
+        if body
           @http_headers.store 'Content-Length', @body.bytesize
         end
 
@@ -65,30 +53,22 @@ module Stormpath
       end
 
       def to_s_query_string canonical
-
         result = ''
 
-        if !@query_string.empty?
+        unless @query_string.empty?
           Hash[@query_string.sort].each do |key, value|
 
             enc_key = encode_url key, false, canonical
             enc_value = encode_url value, false, canonical
 
-            if !result.empty?
-              result << '&'
-            end
-
+            result << '&' unless result.empty?
             result << enc_key << '='<< enc_value
-
           end
-
         end
 
         result
       end
 
     end
-
   end
-
 end

data/lib/stormpath-sdk/http/response.rb

@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 module Stormpath
-
   module Http
-
     class Response
 
       attr_reader :http_status, :headers, :body
@@ -30,7 +28,6 @@ module Stormpath
         @headers.body_size = content_length
       end
 
-
       def client_error?
         http_status >= 400 and http_status < 500
       end
@@ -44,7 +41,5 @@ module Stormpath
       end
 
     end
-
   end
-
 end

data/lib/stormpath-sdk/provider/account_access.rb

@@ -0,0 +1,28 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Stormpath
+  module Provider
+    class AccountAccess < Stormpath::Resource::Base
+
+      PROVIDER_DATA = :provider_data
+
+      def provider_data=(provider_data)
+        set_property PROVIDER_DATA, provider_data
+      end
+
+    end
+  end
+end

data/lib/stormpath-sdk/provider/account_request.rb

@@ -0,0 +1,30 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Stormpath
+  module Provider
+    class AccountRequest
+
+      attr_accessor :provider, :token_type, :token_value
+
+      def initialize(provider, token_type, token_value) 
+        @provider = provider
+        @token_type = token_type
+        @token_value = token_value
+      end
+
+    end
+  end
+end

data/lib/stormpath-sdk/provider/account_resolver.rb

@@ -0,0 +1,43 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Stormpath
+  module Provider
+    class AccountResolver
+      include Stormpath::Util::Assert
+
+      def initialize data_store
+        @data_store = data_store
+      end
+
+      def resolve_provider_account parent_href, request
+        assert_not_nil parent_href, "parent_href argument must be specified"
+        assert_kind_of AccountRequest, request, "Only #{AccountRequest} instances are supported."
+
+        attempt = @data_store.instantiate AccountAccess
+
+        attempt.provider_data = {
+                                  request.token_type.to_s.camelize(:lower) => request.token_value,
+                                  "providerId" => request.provider
+                                }
+
+        href = parent_href + '/accounts'
+
+        @data_store.create href, attempt, Stormpath::Provider::AccountResult
+      end
+
+    end
+  end
+end

data/lib/stormpath-sdk/provider/account_result.rb

@@ -0,0 +1,27 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Stormpath
+  module Provider
+    class AccountResult < Stormpath::Resource::Base
+
+      prop_reader :is_new_account
+
+      alias_method :is_new_account?, :is_new_account
+
+      has_one :account
+    end
+  end
+end

data/lib/stormpath-sdk/provider/facebook/facebook_provider.rb

@@ -0,0 +1,18 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::FacebookProvider < Stormpath::Provider::Provider
+  prop_reader :client_id, :client_secret
+end

data/lib/stormpath-sdk/provider/facebook/facebook_provider_data.rb

@@ -0,0 +1,18 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::FacebookProviderData < Stormpath::Provider::ProviderData
+  prop_reader :access_token
+end

data/lib/stormpath-sdk/provider/google/google_provider.rb

@@ -0,0 +1,18 @@
+#
+# Copyright 2014 Stormpath, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+class Stormpath::Provider::GoogleProvider < Stormpath::Provider::Provider
+  prop_reader :client_id, :client_secret, :redirect_uri
+end