marfa 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0759f81941c873aa1735687444f031c919ea122
-  data.tar.gz: 5a395cc867d247b1524bc8447b168296fdb8065a
+  metadata.gz: 90641f7d5612ca1b78d65e6d47bc7b39367edcd6
+  data.tar.gz: 3df9aa6915e89d571bf023bda9513937466cb237
 SHA512:
-  metadata.gz: 8f396b685edab492541f969c49cc10e83ae1e9a5685c1c7addee2cd87a311f0c8aa16c9594b3bc44c89e5c36c68bb8d87284c8209bc18a940c397c20c68f1196
-  data.tar.gz: a00519de9f1b9ed6c32c04e3e61391585a6b2c22ed75306750e702d058abc18adef2205cc7850ad3e4df1058e67f35fc0b04a453109d7dbe2d88b00dda2db14c
+  metadata.gz: 46f66bb98fea88ffa2696d45774c72838e379c1394930973811aff8d85eca262093f25991c2e38a6bc827ed2729fa069e16bb157496a3dfd77af0544eddaa57e
+  data.tar.gz: de4e0267dcaa010208da1957bc3c3a3d6be95b27115c678470329371122276a87f7ee522f58ebe7c2670b60961651482836cf45865297c80a3d04c516a85afc1

data/lib/marfa/models/api_model.rb

@@ -37,7 +37,8 @@ module Marfa
       def self.get_raw_data(params)
         result = {}
         path = params[:path]
-        cache_key = "data_#{path}#{params[:query]}".scan(/\w+/).join('_')
+        cache_key = "data_#{path}#{params[:query]}".scan(/[a-zA-Zа-яА-Я0-9]+/).join('_')
+        cache_key = params[:cache_key] unless params[:cache_key].nil?
 
         begin
           if Marfa.cache.exist?(cache_key)
@@ -62,7 +63,8 @@ module Marfa
       def self.get_raw_data_with_pagination(params)
         result = {}
         path = params[:path]
-        cache_key = "data_with_pagination_#{path}#{params[:query]}".scan(/\w+/).join('_')
+        cache_key = "data_with_pagination_#{path}#{params[:query]}".scan(/[a-zA-Zа-яА-Я0-9]+/).join('_')
+        cache_key = params[:cache_key] unless params[:cache_key].nil?
 
         begin
           if Marfa.cache.exist?(cache_key)
@@ -79,16 +81,6 @@ module Marfa
             _log_exception(exception, path, params)
           end
         end
-        # begin
-        #   response = RestClient.get("#{Marfa.config.api_server}#{path}", { params: params[:query], headers: {} })
-        #   result[:data] = JSON.parse(response.body, symbolize_names: true)
-        #   result[:data_count] = response.headers[:x_count].to_i unless response.headers[:x_count].nil?
-        #   result[:data_pages] = response.headers[:x_pages].to_i unless response.headers[:x_pages].nil?
-        # rescue => exception
-        #   if [:development, :test].include? Marfa.config.environment
-        #     _log_exception(exception, path, params)
-        #   end
-        # end
 
         result
       end

data/lib/marfa/version.rb

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

data/marfa.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'marfa'
-  s.version     = '0.5.0'
+  s.version     = '0.5.1'
   s.required_ruby_version = '>= 2.3.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.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Max Krechetov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml