stormpath-sdk 0.4.0 → 1.0.0.beta

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

@@ -13,14 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
-
-  module Resource
-
-    class EmailVerificationToken < InstanceResource
-    end
-
+class Stormpath::Resource::EmailVerificationToken < Stormpath::Resource::Instance
+  def token
+    href.split('/').last
   end
-
 end
-

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

@@ -13,45 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
+class Stormpath::Resource::Error < Stormpath::Resource::Base
 
-  module Resource
-
-    class Error < Resource
-
-      STATUS = "status"
-      CODE = "code"
-      MESSAGE = "message"
-      DEV_MESSAGE = "developerMessage"
-      MORE_INFO = "moreInfo"
-
-      def initialize body
-        super nil, body
-      end
-
-      def get_status
-        get_property STATUS
-      end
-
-      def get_code
-        get_property CODE
-      end
-
-      def get_message
-        get_property MESSAGE
-      end
-
-      def get_developer_message
-        get_property DEV_MESSAGE
-      end
-
-      def get_more_info
-        get_property MORE_INFO
-      end
-
-    end
+  prop_reader :status, :code, :message, :developer_message, :more_info
 
+  def initialize body
+    super body, nil
   end
-
 end
-

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

@@ -0,0 +1,28 @@
+class Stormpath::Resource::Expansion
+  attr_reader :query
+
+  def initialize *names
+    @query = {}
+    @properties = {}
+
+    names.each { |name| add_property name }
+  end
+
+  def add_property name, options = {}
+    @properties[name] = if options[:offset] || options[:limit]
+      pagination = []
+      pagination.push("offset:#{options[:offset]}") if options[:offset]
+      pagination.push("limit:#{options[:limit]}") if options[:limit]
+
+      "#{name}(#{pagination.join(',')})"
+    else
+      name
+    end
+  end
+
+  def to_query
+    if @properties.any?
+      { expand: @properties.values.join(',') }
+    end
+  end
+end

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

@@ -13,75 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
+class Stormpath::Resource::Group < Stormpath::Resource::Instance
+  include Stormpath::Resource::Status
 
-  module Resource
+  prop_accessor :name, :description
 
-    class Group < InstanceResource
+  belongs_to :tenant
+  belongs_to :directory
 
-      include Status
-
-      NAME = "name"
-      DESCRIPTION = "description"
-      STATUS = "status"
-      TENANT = "tenant"
-      DIRECTORY = "directory"
-      ACCOUNTS = "accounts"
-
-      def get_name
-        get_property NAME
-      end
-
-      def set_name name
-        set_property NAME, name
-      end
-
-      def get_description
-        get_property DESCRIPTION
-      end
-
-      def set_description description
-        set_property DESCRIPTION, description
-      end
-
-      def get_status
-        value = get_property STATUS
-
-        if !value.nil?
-          value = value.upcase
-        end
-
-        value
-      end
-
-      def set_status status
-
-        if get_status_hash.has_key? status
-          set_property STATUS, get_status_hash[status]
-        end
-
-      end
-
-      def get_tenant
-        get_resource_property TENANT, Tenant
-      end
-
-      def get_directory
-        get_resource_property DIRECTORY, Directory
-      end
-
-      def get_accounts
-        get_resource_property ACCOUNTS, AccountList
-      end
-
-      def add_account account
-
-        GroupMembership::_create account, self, data_store
-
-      end
-
-    end
+  has_many :accounts
 
+  def add_account account
+    client.group_memberships.create group: self, account: account
   end
-
 end

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

@@ -13,60 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
+class Stormpath::Resource::GroupMembership < Stormpath::Resource::Instance
 
-  module Resource
+  has_one :account
+  has_one :group
 
-    class GroupMembership < Resource
-
-      ACCOUNT = "account"
-      GROUP = "group"
-
-      def get_account
-        get_resource_property ACCOUNT, Account
-      end
-
-      def get_group
-        get_resource_property GROUP, Group
-      end
-
-      def delete
-        data_store.delete self
-      end
-
-      #
-      # THIS IS NOT PART OF THE STORMPATH PUBLIC API.  SDK end-users should not call it - it could be removed or
-      # changed at any time.  It is publicly accessible only as an implementation technique to be used by other
-      # resource classes.
-      #
-      # @param account the account to associate with the group.
-      # @param group the group which will contain the account.
-      # @param data_store the datastore used to create the membership
-      # @return the created GroupMembership instance.
-      #
-      def self._create account, group, data_store
-
-        #TODO: enable auto discovery
-        href = "/groupMemberships"
-
-        account_props = Hash.new
-        account_props.store HREF_PROP_NAME, account.get_href
-
-        group_props = Hash.new
-        group_props.store HREF_PROP_NAME, group.get_href
-
-        props = Hash.new
-        props.store ACCOUNT, account_props
-        props.store GROUP, group_props
-
-        group_membership = data_store.instantiate GroupMembership, props
-
-        data_store.create href, group_membership, GroupMembership
-
-      end
-
-    end
-
-  end
-
-end
+end

data/lib/stormpath-sdk/resource/{application_list.rb → instance.rb}

@@ -13,20 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
-
-  module Resource
-
-    class ApplicationList < CollectionResource
-
-      def get_item_type
-
-        Application
-
-      end
+class Stormpath::Resource::Instance < Stormpath::Resource::Base
+  def save
+    data_store.save self
+  end
 
+  def delete
+    unless new?
+      data_store.delete self
     end
-
   end
 end
-

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

@@ -13,30 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
+class Stormpath::Resource::PasswordResetToken < Stormpath::Resource::Base
+  prop_reader :email, :account
 
-  module Resource
-
-    class PasswordResetToken < Resource
-
-
-      EMAIL = "email"
-      ACCOUNT = "account"
-
-      def get_email
-        get_property EMAIL
-      end
-
-      def set_email email
-        set_property EMAIL, email
-      end
-
-      def get_account
-        get_resource_property ACCOUNT, Account
-      end
-
-    end
+  belongs_to :account
 
+  def token
+    href.split('/').last
   end
-
 end

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

@@ -1,34 +1,28 @@
-#
-# Copyright 2012 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 Resource
-
-    module Status
-
-      ENABLED = 'ENABLED'
-      DISABLED = 'DISABLED'
-
-      def get_status_hash
-        {ENABLED => ENABLED, DISABLED => DISABLED}
-      end
+module Stormpath::Resource::Status
 
+  ENABLED = 'ENABLED'
+  DISABLED = 'DISABLED'
+
+  def status_hash
+    {ENABLED => ENABLED, DISABLED => DISABLED}
+  end
+
+  STATUS = "status"
+
+  def status
+    value = get_property STATUS
+
+    if !value.nil?
+      value = value.upcase
     end
 
+    value
   end
 
-end
+  def status=(status)
+    if status_hash.has_key? status
+      set_property STATUS, status_hash[status]
+    end
+  end
 
+end

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

@@ -13,58 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath
+class Stormpath::Resource::Tenant < Stormpath::Resource::Instance
 
-  module Resource
+  prop_reader :name, :key
 
-    class Tenant < InstanceResource
+  has_many :applications
+  has_many :directories
 
-      NAME = "name"
-      KEY = "key"
-      APPLICATIONS = "applications"
-      DIRECTORIES = "directories"
-
-      def get_name
-        get_property NAME
-      end
-
-      def get_key
-        get_property KEY
-      end
-
-      def create_application application
-
-        href = "/applications"; #TODO: enable auto discovery
-        data_store.create href, application, Application
-
-      end
-
-      def get_applications
-
-        get_resource_property APPLICATIONS, ApplicationList
-
-      end
-
-      def get_directories
-
-        get_resource_property DIRECTORIES, DirectoryList
-
-      end
-
-      def verify_account_email token
-
-        #TODO: enable auto discovery via Tenant resource (should be just /emailVerificationTokens)
-        href = "/accounts/emailVerificationTokens/" + token
-
-        token_hash = Hash.new
-        token_hash.store HREF_PROP_NAME, href
-
-        ev_token = data_store.instantiate EmailVerificationToken, token_hash
-
-        #execute a POST (should clean this up / make it more obvious)
-        data_store.save ev_token, Account
-      end
-
-    end
-  end
-end
+end

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

@@ -14,29 +14,59 @@
 # limitations under the License.
 #
 module Stormpath
-
   module Resource
-
     module Utils
-
       include ActiveSupport::Inflector
       include Stormpath::Util::Assert
 
-      @@resources_hash = Hash.new
-
-      def to_class_from_instance resource
-
-        assert_kind_of Resource, resource, "resource argument must be instance of Stormpath::Resource::Resource"
+      def inspect
+        ''.tap do |str|
+          str << %Q[#<#{class_name_with_id} @properties={]
+          @read_lock.lock
+          begin
+            str << properties.map do |key, value|
+              if printable_property? key
+                if value.kind_of? Hash and value.has_key? Stormpath::Resource::Base::HREF_PROP_NAME
+                  value = %Q[{ "#{Stormpath::Resource::Base::HREF_PROP_NAME}" => "#{value[Stormpath::Resource::Base::HREF_PROP_NAME]}" }]
+                end
+                %Q["#{key} => #{value}"]
+              end
+            end.compact.join(',')
+          ensure
+            @read_lock.unlock
+          end
+          str << '}>'
+        end
+      end
 
-        if !@@resources_hash.has_key? resource.class.name
+      def to_s
+        "#<#{class_name_with_id}>"
+      end
 
-          @@resources_hash[resource.class.name] = constantize resource.class.name
+      def to_yaml
+        "--- !ruby/object: #{self.class.name}\n".tap do |yaml|
+          @read_lock.lock
 
+          begin
+            properties_yaml = properties.each do |key, value|
+              if printable_property? key
+                " #{key}: #{value} \n"
+              end
+            end.compact.join("\n")
+            unless properties_yaml.empty?
+              yaml << " properties\n "
+              yaml << properties_yaml
+            end
+          ensure
+            @read_lock.unlock
+          end
         end
+      end
 
-        @@resources_hash[resource.class.name]
-
+      def class_name_with_id
+        object_id_hex = '%x' % (self.object_id << 1)
+        "#{self.class.name}:0x#{object_id_hex}"
       end
     end
   end
-end
+end