stormpath-sdk 1.6.0 → 1.7.0

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

@@ -1,5 +1,5 @@
 #
-# Copyright 2012 Stormpath, Inc.
+# Copyright 2016 Stormpath, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,14 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class Stormpath::Resource::Challenge < Stormpath::Resource::Instance
-  prop_accessor :message
-  prop_reader :status, :created_at, :modified_at
+module Stormpath
+  module Resource
+    class Challenge < Stormpath::Resource::Instance
+      prop_accessor :message
+      prop_reader :status, :created_at, :modified_at
 
-  belongs_to :factor
-  belongs_to :account
+      belongs_to :factor
+      belongs_to :account
 
-  def validate(code)
-    data_store.execute_raw_request href, { code: code }, Stormpath::Resource::Challenge
+      def validate(code)
+        data_store.execute_raw_request(href, { code: code }, Stormpath::Resource::Challenge)
+      end
+    end
   end
 end

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

@@ -13,101 +13,102 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-class Stormpath::Resource::Collection
-  include Enumerable
-
-  attr_reader :href, :client, :item_class, :collection_href, :criteria
-
-  def initialize(href, item_class, client, options={})
-    @client = client
-    @href = href
-    @item_class = item_class
-    @collection_href = options[:collection_href] || @href
-    @criteria ||= {}
-  end
-
-  def data_store
-    client.data_store
-  end
+module Stormpath
+  module Resource
+    class Collection
+      include Enumerable
+
+      attr_reader :href, :client, :item_class, :collection_href, :criteria
+
+      def initialize(href, item_class, client, options = {})
+        @client = client
+        @href = href
+        @item_class = item_class
+        @collection_href = options[:collection_href] || @href
+        @criteria ||= {}
+      end
 
-  def search query
-    query_hash = if query.is_a? String
-      { q: query }
-    elsif query.is_a? Hash
-      query
-    end
+      def data_store
+        client.data_store
+      end
 
-    criteria.merge! query_hash
-    self
-  end
+      def search(query)
+        query_hash = if query.is_a? String
+                       { q: query }
+                     elsif query.is_a? Hash
+                       query
+                     end
 
-  def offset offset
-    criteria.merge! offset: offset
-    self
-  end
+        criteria.merge! query_hash
+        self
+      end
 
-  def limit limit
-    criteria.merge! limit: limit
-    self
-  end
+      def offset(offset)
+        criteria[:offset] = offset
+        self
+      end
 
-  def order statement
-    criteria.merge! order_by: statement
-    self
-  end
+      def limit(limit)
+        criteria[:limit] = limit
+        self
+      end
 
-  def each(&block)
-    PaginatedIterator.iterate(collection_href, client, item_class, @criteria, &block)
-  end
+      def order(statement)
+        criteria[:order_by] = statement
+        self
+      end
 
-  def current_page
-    page = CollectionPage.new(collection_href, client, criteria)
-    page.item_type = item_class
-    page
-  end
+      def each(&block)
+        PaginatedIterator.iterate(collection_href, client, item_class, @criteria, &block)
+      end
 
-  private
+      def current_page
+        page = CollectionPage.new(collection_href, client, criteria)
+        page.item_type = item_class
+        page
+      end
 
-    module PaginatedIterator
+      private
 
-      def self.iterate(collection_href, client, item_class, criteria, &block)
-        page = CollectionPage.new collection_href, client, criteria
-        page.item_type = item_class
+      module PaginatedIterator
+        def self.iterate(collection_href, client, item_class, criteria, &block)
+          page = CollectionPage.new(collection_href, client, criteria)
+          page.item_type = item_class
 
-        unless page.items.count.zero?
-          page.items.each(&block)
-          criteria[:offset] = page.offset + page.limit
-          iterate(collection_href, client, item_class, criteria, &block)
+          unless page.items.count.zero?
+            page.items.each(&block)
+            criteria[:offset] = page.offset + page.limit
+            iterate(collection_href, client, item_class, criteria, &block)
+          end
         end
       end
-    end
 
-    class CollectionPage < Stormpath::Resource::Base
-      ITEMS = 'items'
+      class CollectionPage < Stormpath::Resource::Base
+        ITEMS = 'items'.freeze
 
-      prop_accessor :offset, :limit, :size
+        prop_accessor :offset, :limit, :size
 
-      attr_accessor :item_type
+        attr_accessor :item_type
 
-      def items
-        to_resource_array get_property(ITEMS)
-      end
+        def items
+          to_resource_array(get_property(ITEMS))
+        end
 
-      def to_resource properties
-        data_store.instantiate item_type, properties
-      end
+        def to_resource(properties)
+          data_store.instantiate(item_type, properties)
+        end
 
-      def to_resource_array vals
-        Array.new.tap do |items|
-          if vals.is_a? Array
-            vals.each do |val|
-              resource = to_resource val
-              items << resource
+        def to_resource_array(vals)
+          [].tap do |items|
+            if vals.is_a? Array
+              vals.each do |val|
+                resource = to_resource val
+                items << resource
+              end
             end
           end
         end
-      end
-
-    end#class Stormpath::Resource::Collection::CollectionPage
-
-end#Stormpath::Resource::Collection
+      end # class Stormpath::Resource::Collection::CollectionPage
+    end # Stormpath::Resource::Collection
+  end
+end

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

@@ -13,82 +13,81 @@
 # 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
+module Stormpath
+  module Resource
+    class CustomData < Stormpath::Resource::Instance
+      include Stormpath::Resource::CustomDataHashMethods
 
-  prop_reader :created_at, :modified_at
+      prop_reader :created_at, :modified_at
 
-  def [](property_name)
-    get_property property_name, ignore_camelcasing: true
-  end
+      def [](property_name)
+        get_property property_name, ignore_camelcasing: true
+      end
 
-  def []=(property_name, property_value)
-    set_property property_name, property_value, ignore_camelcasing: true
-  end
+      def []=(property_name, property_value)
+        set_property property_name, property_value, ignore_camelcasing: true
+      end
 
-  def save
-    if has_removed_properties?
-      delete_removed_properties
-    end
-    if has_new_properties?
-      super
-    end
-  end
+      def save
+        delete_removed_properties if has_removed_properties?
+        super if has_new_properties?
+      end
 
-  def delete(name = nil)
-    if name.nil?
-      @properties = { HREF_PROP_NAME => @properties[HREF_PROP_NAME] }
-      @dirty_properties.clear
-      @deleted_properties.clear
-      return super()
-    end
+      def delete(name = nil)
+        if name.nil?
+          @properties = { HREF_PROP_NAME => @properties[HREF_PROP_NAME] }
+          @dirty_properties.clear
+          @deleted_properties.clear
+          return super()
+        end
 
-    @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
+        @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
+      private
 
-    def sanitize(properties)
-      {}.tap do |sanitized_properties|
-        properties.map do |key, value|
-          property_name = key.to_s
-          sanitized_properties[property_name] = value
+      def sanitize(properties)
+        {}.tap do |sanitized_properties|
+          properties.map do |key, value|
+            property_name = key.to_s
+            sanitized_properties[property_name] = value
+          end
         end
       end
-    end
 
-    def has_removed_properties?
-      @read_lock.lock
-      begin
-        !@deleted_properties.empty?
-      ensure
-        @read_lock.unlock
+      def has_removed_properties?
+        @read_lock.lock
+        begin
+          !@deleted_properties.empty?
+        ensure
+          @read_lock.unlock
+        end
       end
-    end
 
-    def has_new_properties?
-      @read_lock.lock
-      begin
-        !@dirty_properties.empty?
-      ensure
-        @read_lock.unlock
+      def has_new_properties?
+        @read_lock.lock
+        begin
+          !@dirty_properties.empty?
+        ensure
+          @read_lock.unlock
+        end
       end
-    end
 
-    def delete_removed_properties
-      @deleted_properties.delete_if do |deleted_property_name|
-        data_store.delete self, deleted_property_name
-        true
+      def delete_removed_properties
+        @deleted_properties.delete_if do |deleted_property_name|
+          data_store.delete(self, deleted_property_name)
+          true
+        end
       end
     end
-
+  end
 end

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

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

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

@@ -13,27 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-module Stormpath::Resource::CustomDataStorage
-  extend ActiveSupport::Concern
+module Stormpath
+  module Resource
+    module CustomDataStorage
+      extend ActiveSupport::Concern
 
-  CUSTOM_DATA = "custom_data"
+      CUSTOM_DATA = 'custom_data'.freeze
 
-  included do
+      included do
+        def save
+          apply_custom_data_updates_if_necessary
+          super
+        end
 
-    def save
-      apply_custom_data_updates_if_necessary
-      super
-    end
+        def apply_custom_data_updates_if_necessary
+          if custom_data.send(:has_removed_properties?)
+            custom_data.send(:delete_removed_properties)
+          end
 
-    def apply_custom_data_updates_if_necessary
-      if custom_data.send :has_removed_properties?
-        custom_data.send :delete_removed_properties
-      end
-      if custom_data.send :has_new_properties?
-        self.set_property CUSTOM_DATA, custom_data.dirty_properties
+          if custom_data.send(:has_new_properties?)
+            set_property(CUSTOM_DATA, custom_data.dirty_properties)
+          end
+        end
       end
     end
-
   end
-
 end