restly 0.0.1.beta.2 → 0.0.1.beta.3

data/lib/restly/base.rb

@@ -8,6 +8,7 @@ module Restly
     autoload :Includes
     autoload :Fields
     autoload :EmbeddedAssociations
+    autoload :PaginationOptions
 
     # Thread Local Accessor
     extend Restly::ThreadLocal
@@ -42,6 +43,9 @@ module Restly
     include Instance
     include Fields
 
+    # Pagination Options
+    include PaginationOptions
+
     # Set up the Attributes
     thread_local_accessor :current_token
     class_attribute :path, instance_writer: false, instance_reader: false

data/lib/restly/base/instance/attributes.rb

@@ -79,8 +79,7 @@ module Restly::Base::Instance::Attributes
   def write_attribute(attr, val)
     if fields.include?(attr)
       send("#{attr}_will_change!") if val != read_attribute(attr) && loaded?
-      @attributes[attr.to_sym] = val
-
+      @attributes[attr.to_sym] = convert_attr_type(val)
     else
       ActiveSupport::Notifications.instrument("missing_attribute.restly", attr: attr)
     end
@@ -90,7 +89,7 @@ module Restly::Base::Instance::Attributes
     options.reverse_merge!({ autoload: true })
 
     # Try and get the attribute if the item is not loaded
-    if initialized? && attr.to_sym != :id && @attributes[attr].nil? && !!options[:autoload] && !loaded? && exists?
+    if initialized? && attr.to_sym != :id && attribute_not_loaded?(attr) && !!options[:autoload] && !loaded? && exists?
       load!
     end
 
@@ -110,4 +109,24 @@ module Restly::Base::Instance::Attributes
     self.attributes = parsed_response(response)
   end
 
+  def attribute_loaded?(attr)
+    @attributes.has_key? attr
+  end
+
+  def attribute_not_loaded?(attr)
+    !attribute_loaded?(attr)
+  end
+
+  def convert_attr_type(val)
+    time = (val.to_time rescue nil)
+    date = (val.to_date rescue nil)
+    if time.try(:iso8601) == val
+      time
+    elsif date.try(:to_s) == val
+      date
+    else
+      val
+    end
+  end
+
 end

data/lib/restly/base/instance/persistence.rb

@@ -25,13 +25,20 @@ module Restly::Base::Instance::Persistence
   end
 
   def reload!
-    return unless initialized?
+    return unless initialized? && loaded?
     raise Restly::Error::MissingId, "Cannot reload #{resource_name}, either it hasn't been created or it is missing an ID." unless exists?
+    @loaded = true
     set_attributes_from_response connection.get(path_with_format, force: true)
+    self
+  end
+
+  def load!
+    return unless initialized? && loaded?
+    raise Restly::Error::MissingId, "Cannot load #{resource_name}, either it hasn't been created or it is missing an ID." unless exists?
     @loaded = true
+    set_attributes_from_response connection.get(path_with_format)
     self
   end
 
-  alias :load! :reload!
 
 end

data/lib/restly/base/pagination_options.rb

@@ -0,0 +1,41 @@
+module Restly::Base::PaginationOptions
+  extend ActiveSupport::Concern
+
+  Collection = Restly::Collection
+
+  included do
+    extend ClassMethods
+    class_attribute :pagination_mapping, :pagination_options, instance_writer: false
+
+    pagination per_page: 25
+
+  end
+
+  module ClassMethods
+
+    delegate :page, to: :empty_collection
+
+    def pagination(options={})
+      # Assert Main Options
+      options.assert_valid_keys :per_page, :mapping
+
+      # Reverse Merge and Assert Mappings
+      (options[:mapping] ||= {}).reverse_merge!({ current_page: :page,
+                                                  per_page: :per_page,
+                                                  total_pages: :total_pages,
+                                                  total_entries: :total_entries })
+
+      options[:mapping].assert_valid_keys :root, :current_page, :per_page, :total_pages, :total_entries
+
+      # Set the options
+      self.pagination_mapping = options.delete(:mapping)
+      self.pagination_options = options
+    end
+
+    def empty_collection
+      Collection.new(self, [])
+    end
+
+  end
+
+end

data/lib/restly/base/resource/finders.rb

@@ -1,5 +1,7 @@
 module Restly::Base::Resource::Finders
 
+  Collection = Restly::Collection
+
   def find(id, *args)
     options = args.extract_options!
 
@@ -18,7 +20,7 @@ module Restly::Base::Resource::Finders
 
   def collection_from_response(response)
     raise Restly::Error::InvalidResponse unless response.is_a? OAuth2::Response
-    Restly::Collection.new resource, nil, response: response
+    Collection.new resource, nil, response: response
   end
 
   def instance_from_response(response)

data/lib/restly/collection.rb

@@ -7,6 +7,7 @@ class Restly::Collection < Array
   include Restly::Base::Resource::BatchActions
   include Restly::Base::GenericMethods
   include ErrorHandling
+  include Pagination
 
   delegate :resource_name, :new, :client, to: :resource
 
@@ -46,14 +47,6 @@ class Restly::Collection < Array
 
   alias :collect :map
 
-  #def paginate(opts={})
-  #  @pagination_opts = opts
-  #  collection = self.dup
-  #  collection.extend(Restly::Collection::Pagination)
-  #  return page(opts[:page]) unless opts[:page] == current_page && opts[:per_page] == response_per_page
-  #  collection
-  #end
-
   def <<(instance)
     raise Restly::Error::InvalidObject, "Object is not an instance of #{resource}" unless accepts?(instance)
     super(instance)

data/lib/restly/collection/pagination.rb

@@ -1,36 +1,48 @@
 module Restly::Collection::Pagination
+  extend ActiveSupport::Concern
 
-  def page(num)
-    with_params(page: num, per_page: per_page).all.paginate(page: num, per_page: per_page)
+  included do
+    delegate :pagination_options, :pagination_mapping, to: :resource
   end
 
-  def current_page
-    pagination[:current_page] || pagination[:page]
+  def paginates?
+    !!current_page
   end
 
-  def per_page
-    @pagination_opts[:per_page] || pagination[:per_page]
+  def page(num, options={})
+    num = 1 unless (num = num.to_i) > 0
+    options.assert_valid_keys(:per_page)
+    per_page = (options[:per_page] || pagination_options[:per_page]).to_i
+    resource.with_params(page: num, per_page: per_page).all
   end
 
-  def response_per_page
-    pagination[:per_page]
-  end
+  private
 
-  def total_pages
-    pagination[:total_pages]
+  def method_missing(m, *args, &block)
+    mapping = pagination_mapping[m]
+    if pagination.has_key? mapping
+      raise ArgumentError, "doesn't accept arguments" if args.present?
+      pagination[mapping].try(:to_i)
+    else
+      super
+    end
   end
 
-  def total_entries
-    pagination[:total_entries]
+  def respond_to_missing?(m, include_private = false)
+    mapping = pagination_mapping[m]
+    pagination.has_key? mapping
   end
 
-  private
-
   def pagination
-    parsed = @response.parsed || {}
-    pagination = parsed[:pagination] || parsed
-    pagination.select!{ |k,v| /page|current_page|entries|total_entries|per_page|total_pages|total/ =~ k.to_s }
-    pagination.with_indifferent_access
+    return {} unless response.parsed.is_a? Hash
+    if (root = pagination_mapping[:root])
+      response.parsed[root.to_sym] || response.parsed[root.to_s] || {}
+    else
+      pagination_keys = pagination_mapping.values.compact.map do |key|
+        [key.to_s, key.to_sym]
+      end.flatten
+      response.parsed.slice(*pagination_keys)
+    end.with_indifferent_access
   end
 
 end

data/lib/restly/connection.rb

@@ -121,7 +121,11 @@ class Restly::Connection < OAuth2::AccessToken
 
     cache_log("Restly::CacheExpire", cache_key, :yellow) { Rails.cache.delete(cache_key) } if response.error
 
-    raise Restly::Error::ConnectionError, "#{response.status}: #{status_string(response.status)}" if response.status >= 500
+    if response.status >= 500
+      site = URI.parse(client.site)
+      formatted_path = ["#{site.scheme}://#{site.host}", "#{site.port}", path].join
+      raise Restly::Error::ConnectionError, "#{response.status}: #{status_string(response.status)}\nurl: #{formatted_path}"
+    end
 
     # Return the response
     response
@@ -130,7 +134,7 @@ class Restly::Connection < OAuth2::AccessToken
 
   def request_log(name, path, verb, color=:light_green, &block)
     site = URI.parse(client.site)
-    formatted_path = ["#{site.scheme}://#{site.host}", path].join("/")
+    formatted_path = ["#{site.scheme}://#{site.host}", ":#{site.port}", path].join
     ActiveSupport::Notifications.instrument("request.restly", url: formatted_path, method: verb, name: name, color: color, &block)
   end
 

data/lib/restly/version.rb

@@ -1,3 +1,3 @@
 module Restly
-  VERSION = "0.0.1.beta.2"
+  VERSION = "0.0.1.beta.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.2
+  version: 0.0.1.beta.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -195,6 +195,7 @@ files:
 - lib/restly/base/instance/error_handling.rb
 - lib/restly/base/instance/persistence.rb
 - lib/restly/base/instance/write_callbacks.rb
+- lib/restly/base/pagination_options.rb
 - lib/restly/base/resource.rb
 - lib/restly/base/resource/batch_actions.rb
 - lib/restly/base/resource/finders.rb