stormpath-sdk 1.0.0.beta.4 → 1.0.0.beta.5

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

@@ -14,25 +14,18 @@
 # limitations under the License.
 #
 module Stormpath
-
   module Http
-
     class HttpClientRequestExecutor
-
       include Stormpath::Http::Authc
       include Stormpath::Util::Assert
 
-      REDIRECTS_LIMIT = 10
-
       def initialize(api_key, options = {})
         @signer = Sauthc1Signer.new
         @api_key = api_key
         @http_client = HTTPClient.new options[:proxy]
-        @redirects_limit = REDIRECTS_LIMIT
       end
 
-      def execute_request(request)
-
+      def execute_request(request, redirects_limit = 10)
         assert_not_nil request, "Request argument cannot be null."
 
         @redirect_response = nil
@@ -47,56 +40,31 @@ module Stormpath
 
         method = @http_client.method(request.http_method.downcase)
 
-        if request.body.nil?
-
-          response = method.call domain, nil, request.http_headers
+        response = method.call domain, request.body, request.http_headers
 
-        else
-
-          response = method.call domain, request.body, request.http_headers
-
-        end
-
-        if response.redirect? and @redirects_limit > 0
+        if response.redirect? and redirects_limit > 0
           request.href = response.http_header['location'][0]
-          @redirects_limit -= 1
-          @redirect_response = execute_request request
+          redirects_limit -= 1
+          @redirect_response = execute_request request, redirects_limit
           return @redirect_response
         end
 
-        if @redirect_response
-          @redirects_limit = REDIRECTS_LIMIT
-          @redirect_response
-        else
-          Response.new response.http_header.status_code,
+        Response.new response.http_header.status_code,
                        response.http_header.body_type,
                        response.content,
                        response.http_header.body_size
-        end
-
       end
 
       private
 
-      def add_query_string href, query_string
-
-        query_string.each do |key, value|
-
-          if href.include? '?'
-
-            href << '&' << key.to_s << '=' << value.to_s
-
-          else
-            href << '?' << key.to_s << '=' << value.to_s
+        def add_query_string href, query_string
+          query_string.each do |key, value|
+            prefix = if href.include? '?' then '&' else '?' end
+            href << prefix << key.to_s << '=' << value.to_s
           end
-
         end
 
-      end
-
     end
-
   end
-
 end
 

data/lib/stormpath-sdk/resource/account.rb

@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class  Stormpath::Resource::Account < Stormpath::Resource::Instance
-  include Stormpath::Resource::Status
+class Stormpath::Resource::Account < Stormpath::Resource::Instance
+  include Stormpath::Resource::AccountStatus
+  include Stormpath::Resource::CustomDataStorage
 
   prop_accessor :username, :email, :given_name, :middle_name, :surname
   prop_writer :password
@@ -22,13 +23,22 @@ class  Stormpath::Resource::Account < Stormpath::Resource::Instance
   prop_non_printable :password
 
   belongs_to :directory
+  belongs_to :tenant
+
   has_one :email_verification_token
 
   has_many :groups
   has_many :group_memberships
 
+  has_one :custom_data
+
   def add_group group
     client.group_memberships.create group: group, account: self
   end
-  
+
+  def remove_group group
+    group_membership = group_memberships.find {|group_membership| group_membership.group.href == group.href }
+    group_membership.delete if group_membership
+  end
+
 end

data/lib/stormpath-sdk/resource/account_membership.rb

@@ -0,0 +1,16 @@
+#
+# 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.
+#
+Stormpath::Resource::AccountMembership = Stormpath::Resource::GroupMembership

data/lib/stormpath-sdk/resource/account_status.rb

@@ -0,0 +1,26 @@
+#
+# 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::Resource::AccountStatus
+  include Stormpath::Resource::Status
+
+  UNVERIFIED = 'UNVERIFIED'
+  LOCKED = 'LOCKED'
+
+  def status_hash
+    super.merge UNVERIFIED => UNVERIFIED, LOCKED => LOCKED
+  end
+
+end

data/lib/stormpath-sdk/resource/account_store_mapping.rb

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 class Stormpath::Resource::AccountStoreMapping < Stormpath::Resource::Instance
-  include Stormpath::Resource::Status
 
   prop_accessor :list_index, :is_default_account_store, :is_default_group_store
 
@@ -24,9 +23,12 @@ class Stormpath::Resource::AccountStoreMapping < Stormpath::Resource::Instance
 
   alias_method :default_account_store, :is_default_account_store
   alias_method :default_account_store?, :is_default_account_store
+
+  alias_method :default_account_store=, :is_default_account_store=
+
   alias_method :default_group_store, :is_default_group_store
   alias_method :default_group_store?, :is_default_group_store
-  alias_method :default_account_store=, :is_default_account_store=
+
   alias_method :default_group_store=, :is_default_group_store=
 
 end

data/lib/stormpath-sdk/resource/application.rb

@@ -21,10 +21,12 @@ class Stormpath::Resource::Application < Stormpath::Resource::Instance
   prop_accessor :name, :description
 
   belongs_to :tenant
-  has_many :accounts, can: [:create]
+
+  has_many :accounts, can: [:get, :create]
   has_many :password_reset_tokens, can: [:get, :create]
   has_many :account_store_mappings, can: [:get, :create]
-
+  has_many :groups, can: [:get, :create]
+  
   has_one :default_account_store_mapping, class_name: :accountStoreMapping
   has_one :default_group_store_mapping, class_name: :accountStoreMapping
 

data/lib/stormpath-sdk/resource/associations.rb

@@ -24,7 +24,6 @@ module Stormpath
           options[:class_name] ||= name
           resource_class = "Stormpath::Resource::#{options[:class_name].to_s.camelize}".constantize
           property_name = name.to_s.camelize :lower
-
           define_method(name) do
             get_resource_property property_name, resource_class
           end
@@ -90,9 +89,14 @@ module Stormpath
               href = get_href_from_hash value
             end
             
-            if href
-              data_store.instantiate clazz, value
+            if instance_variable_get("@_#{key.underscore}").nil?
+              if href
+                instance_variable_set("@_#{key.underscore}", data_store.instantiate(clazz, value))
+              else
+                instance_variable_set("@_#{key.underscore}", clazz.new(value))
+              end
             end
+            instance_variable_get("@_#{key.underscore}")
           end
 
           def get_resource_href_property(key)

data/lib/stormpath-sdk/resource/base.rb

@@ -18,26 +18,22 @@ class Stormpath::Resource::Base
   include Stormpath::Resource::Associations
 
   HREF_PROP_NAME = "href"
-
+  DEFAULT_SERVER_HOST = Stormpath::DataStore::DEFAULT_SERVER_HOST
   attr_reader :client, :properties
 
   class << self
     def prop_reader(*args)
       args.each do |name|
-        property_name = name.to_s.camelize :lower
-
         define_method(name) do
-          get_property property_name
+          get_property name
         end
       end
     end
 
     def prop_writer(*args)
       args.each do |name|
-        property_name = name.to_s.camelize :lower
-
         define_method("#{name.to_s}=") do |value|
-          set_property property_name, value
+          set_property name, value
         end
       end
     end
@@ -79,6 +75,7 @@ class Stormpath::Resource::Base
     @write_lock = Mutex.new
     @properties = Hash.new
     @dirty_properties = Hash.new
+    @deleted_properties = Array.new
     set_properties properties
   end
 
@@ -106,6 +103,16 @@ class Stormpath::Resource::Base
     end
   end
 
+  def get_dirty_property_names
+    @read_lock.lock
+
+    begin
+      @dirty_properties.keys
+    ensure
+      @read_lock.unlock
+    end
+  end
+
   def set_properties properties
     @write_lock.lock
 
@@ -114,9 +121,9 @@ class Stormpath::Resource::Base
       @dirty_properties.clear
       @dirty = false
 
-      unless properties.nil?
+      if properties
         @properties = deep_sanitize properties
-
+        @dirty_properties = @properties if new?
         # Don't consider this resource materialized if it is only a reference.  A reference is any object that
         # has only one 'href' property.
         href_only = (@properties.size == 1 and @properties.has_key? HREF_PROP_NAME)
@@ -133,7 +140,7 @@ class Stormpath::Resource::Base
   def get_property name
     property_name = name.to_s.camelize :lower
 
-    if !HREF_PROP_NAME.eql? property_name
+    if HREF_PROP_NAME != property_name
       #not the href/id, must be a property that requires materialization:
       unless new? or materialized?
 
@@ -155,7 +162,7 @@ class Stormpath::Resource::Base
       end
     end
 
-    read_property name
+    read_property property_name
   end
 
   def set_property name, value
@@ -214,7 +221,7 @@ class Stormpath::Resource::Base
   private
 
   def get_href_from_hash(props)
-    if !props.nil? and props.is_a? Hash
+    if props and props.is_a? Hash
       props[HREF_PROP_NAME]
     end
   end
@@ -233,10 +240,8 @@ class Stormpath::Resource::Base
     {}.tap do |sanitized_properties|
       properties.map do |key, value|
         property_name = key.to_s.camelize :lower
-
         sanitized_properties[property_name] =
-          if (value.kind_of? Hash) or
-            (value.kind_of? Stormpath::Resource::Base)
+          if value.kind_of? Hash or value.kind_of? Stormpath::Resource::Base
             deep_sanitize value
           else
             value
@@ -253,4 +258,5 @@ class Stormpath::Resource::Base
       sanitize hash_or_resource
     end
   end
+
 end

data/lib/stormpath-sdk/resource/custom_data.rb

@@ -0,0 +1,86 @@
+#
+# Copyright 2013 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::Resource::CustomData < Stormpath::Resource::Instance
+  include Stormpath::Resource::CustomDataHashMethods
+
+  def [](property_name)
+    get_property property_name
+  end
+
+  def []=(property_name, property_value)
+    set_property property_name, property_value
+  end
+  
+  def save
+    if has_removed_properties?
+      delete_removed_properties
+    end
+    if has_new_properties?
+      super
+    end
+  end
+
+  def delete(name = nil)
+    super() if name.nil?
+
+    @write_lock.lock
+    property_name = name.to_s
+    begin
+      @properties.delete(property_name)
+      @dirty_properties.delete(property_name)
+      @deleted_properties << property_name
+      @dirty = true
+    ensure
+      @write_lock.unlock
+    end
+  end
+
+  private
+
+    def sanitize(properties)
+      {}.tap do |sanitized_properties|
+        properties.map do |key, value|
+          property_name = key.to_s.camelize :lower
+          sanitized_properties[property_name] = value
+        end
+      end
+    end
+
+    def has_removed_properties?
+      @read_lock.lock
+      begin
+        !@deleted_properties.empty?
+      ensure
+        @read_lock.unlock
+      end
+    end
+
+    def has_new_properties?
+      @read_lock.lock
+      begin
+        !@dirty_properties.empty?
+      ensure
+        @read_lock.unlock
+      end
+    end
+
+    def delete_removed_properties
+      @deleted_properties.each do |deleted_property_name|
+        data_store.delete self, deleted_property_name
+      end
+    end
+
+end

data/lib/stormpath-sdk/resource/custom_data_hash_methods.rb

@@ -0,0 +1,33 @@
+module Stormpath::Resource::CustomDataHashMethods
+  extend ActiveSupport::Concern
+
+  included do
+    def has_key?(key)
+      materialize unless materialized?
+      properties.has_key? key.to_s.camelize(:lower)
+    end
+
+    alias_method :include?, :has_key?
+
+    def has_value?(value)
+      materialize unless materialized?
+      properties.has_value? value
+    end
+
+    def store(key, value)
+      materialize unless  materialized?
+      self[key] = value
+    end
+
+    def keys
+      materialize unless materialized?
+      properties.keys.map {|key| key.to_s.underscore}
+    end
+
+    def values
+      materialize unless materialized?
+      properties.values
+    end
+  end
+
+end