marfa 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862d25196c6c383de5233b33b119ffa32fccee35
-  data.tar.gz: 80654b3ddd051ec3912e81b0cebd2d90b6910005
+  metadata.gz: 077740413761a2332ab3064d01571c536a9debcc
+  data.tar.gz: 8a76c2df9d05d1e7f94f977cc95ae94f52c890cc
 SHA512:
-  metadata.gz: 02f586bb240842d4be8c39eb4c9d5990f22bec4942513bf466fccb00a3a7abd7d56e4438e8b7601df2ad42141f26852ae4101958bf9661851e966a22c94c2997
-  data.tar.gz: cf2ae9b244b64b4d11a19e14c3ab141ae0180fc45b64fde37ebc7c5520690c7a921273e2e1a36c57c3fb321c1f1554350c2e96e35a18c7cf5fe5e804b20e62a8
+  metadata.gz: 8798bc436b7e58f5a781f94dab28dd7610345a0b5cef10e2d964309f1fd4962341f6abbd755050f75c10a9bb2bb326697b506186989c5c5b05e645e3db96a7fb
+  data.tar.gz: 0c7674862463f5e124ed654178d05d452bd781692b44b42cc694c6989573fedf5bebee39323dd042b7a00c05005eb7b051a0bdd0a243e00c95cdd0c30ea1d371

data/lib/marfa/controllers/base_controller.rb

@@ -4,6 +4,7 @@ require 'device_detector'
 require 'marfa/helpers/controller'
 require 'marfa/helpers/http/vary'
 require 'marfa/css_version'
+require 'marfa/exceptions'
 
 # Extending Marfa
 module Marfa
@@ -11,6 +12,8 @@ module Marfa
   module Controllers
     # base controller
     class BaseController < Sinatra::Base
+      include Marfa::Exceptions
+
       before do
         if Marfa.config.device_detector[:enabled]
           client = DeviceDetector.new(request.user_agent)

data/lib/marfa/exceptions.rb

@@ -0,0 +1,15 @@
+# Extending Marfa
+module Marfa
+  # Marfa Exceptions
+  module Exceptions
+    # Pages range error
+    class PagesRangeError < StandardError
+      attr_reader :redirect_page_to
+
+      def initialize(msg = 'Page is out of range', redirect_page_to = 1)
+        @redirect_page_to = redirect_page_to
+        super(msg)
+      end
+    end
+  end
+end

data/lib/marfa/models/api_model.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'json'
 require 'marfa/configuration'
+require 'marfa/exceptions'
 
 module Marfa
   # Extend Models
@@ -11,6 +12,7 @@ module Marfa
       class ModelError < StandardError; end
 
       include Marfa::Helpers::HTTP
+      include Marfa::Exceptions
 
       @aliases = {}
 
@@ -69,6 +71,8 @@ module Marfa
       # @return [Hash]
       def self.get_raw_data_with_pagination(params)
         params[:query] = params[:query].delete_if { |_, v| v.nil? } unless params[:query].nil?
+        params[:query][:page] = 1 if params[:query][:page].blank?
+
         path = params[:path]
         cache_key = params[:cache_key]
 
@@ -83,7 +87,14 @@ module Marfa
           Marfa.cache.set(cache_key, result.to_json, params[:cache_time] || Marfa.config.cache[:expiration_time])
 
           return result
+        # Avoid range errors
+        rescue RestClient::RangeNotSatisfiable
+          params[:query][:page] = 1
+
+          # try to get x_pages
+          res = _get_request_result_with_headers(params)
 
+          raise PagesRangeError.new('Page is out of range', res[:data_pages])
         rescue => exception
           if [:development, :test].include? Marfa.config.environment
             _log_exception(exception, path, params)

data/lib/marfa/version.rb

@@ -1,7 +1,7 @@
 # Version constant
 module Marfa
   # The version constant for the current version of Marfa
-  VERSION = '0.10.0'.freeze unless defined?(Marfa::VERSION)
+  VERSION = '0.10.1'.freeze unless defined?(Marfa::VERSION)
 
   # The current Marfa version.
   # @return [String] The version number

data/lib/marfa.rb

@@ -2,6 +2,7 @@ require 'sinatra/base'
 require 'marfa/configuration'
 require 'marfa/cache'
 require 'marfa/version'
+require 'marfa/exceptions'
 require 'marfa/helpers/http/rest'
 require 'marfa/helpers/controller'
 require 'marfa/helpers/http/vary'

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.10.0'
+  s.version     = '0.10.1'
   s.required_ruby_version = '>= 2.5.0'
   s.platform    = Gem::Platform::RUBY
   s.date        = Time.now.strftime('%Y-%m-%d')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marfa
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -253,6 +253,7 @@ files:
 - lib/marfa/controllers/base_controller.rb
 - lib/marfa/controllers/css_controller.rb
 - lib/marfa/css_version.rb
+- lib/marfa/exceptions.rb
 - lib/marfa/file_templates.rb
 - lib/marfa/helpers/classes/array.rb
 - lib/marfa/helpers/classes/false_class.rb