fantasticstay_api 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdecfb00c6c09a2e935ade7f958df01b634928f4c6bb46baa6d6e0992c01ffaa
-  data.tar.gz: ac032f6927c1b9769224c88008b10c6442c00b0e685b343081e96fd7b651c1f1
+  metadata.gz: 34e6c99e07ab528a63116a7bdfcd764a6cd74047f805ef2121c02f82b7266584
+  data.tar.gz: 4a2af7516ae2ae8385cf20acb58b282d72d9d52e8024df49f3f3db91fffc32c2
 SHA512:
-  metadata.gz: 75c5256ada0d0a1f1b3098ce474820fa6e67a5ca5d997fbab9682be27e745903ea2879dc97797bd940c3f5601c926fe672f053b6adb4b00e8e07bc8657287973
-  data.tar.gz: 47658f8667df190a20bcb052a6bb2de69fc3b0ad90fb69c08777a6f47e2fa1e906bb5431ef349cb81a2ebf57d856bb6b523ef5d7bb916eff74030b2fd2d4d4b0
+  metadata.gz: 8be0b2d3027bdf240d35414d4800dfaaf13de5e2c06348dac2c7fbbf38670f362829b29ff898b4cd1c82ee34d17034c9b6ed686ebdaad735f5eabb235487da80
+  data.tar.gz: dced4169e85772446ba7441ea95da1d32f96f8e76d37aaa1a87b1c4aa72193c78a8d0f64334086505a3869050e48a8fc7f0ad85795ff08697d22747bb6e1156a

data/Dockerfile

@@ -2,7 +2,11 @@ FROM ruby:3.0
 
 WORKDIR /usr/src/app
 
-COPY . .
+COPY Gemfile .
+COPY Gemfile.lock .
+COPY fantasticstay_api.gemspec .
+COPY lib/fantasticstay_api/version.rb lib/fantasticstay_api/version.rb
 
 RUN bundle install
 
+COPY . .

data/README.md

@@ -1,5 +1,7 @@
 # FantasticstayApi
 
+![main workflow](https://github.com/dlage/fantasticstay_api_gem/actions/workflows/main.yml/badge.svg)
+
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/fantasticstay_api`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem

data/Rakefile

@@ -3,7 +3,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
 
 require 'rubocop/rake_task'
 

data/fantasticstay_api.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
 
-  spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/dlage/fantasticstay_api_gem'
@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency 'api_cache', '~> 0.3.0'
   spec.add_dependency 'faraday', '~> 1.3.0'
   spec.add_dependency 'oj', '~> 3.11'
-  spec.add_dependency 'api_cache', '~> 0.3.0'
 
   # spec.add_dependency 'dry-configurable', '~> 0.12.1'
 

data/lib/fantasticstay_api/api.rb

@@ -14,7 +14,7 @@ module FantasticstayApi
     include Constants
     include HttpStatusCodes
 
-    attr_reader(*FantasticstayApi.configuration.property_names, :token, :endpoint)
+    attr_reader(*FantasticstayApi.configuration.property_names)
 
     attr_accessor :current_options
 
@@ -28,7 +28,6 @@ module FantasticstayApi
       end
     end
 
-    API_ENDPOINT = 'https://api.fsapp.io'
     HTTP_STATUS_MAPPING = {
       HTTP_BAD_REQUEST_CODE => BadRequestError,
       HTTP_UNAUTHORIZED_CODE => UnauthorizedError,
@@ -48,8 +47,6 @@ module FantasticstayApi
       FantasticstayApi.configuration.property_names.each do |key|
         send("#{key}=", opts[key])
       end
-      @api_token = opts[:token] || ENV['FANTASTICSTAY_API_TOKEN']
-      @api_endpoint = opts[:endpoint] || ENV['FANTASTICSTAY_API_ENDPOINT'] || API_ENDPOINT
 
       yield_or_eval(&block) if block_given?
     end
@@ -69,18 +66,22 @@ module FantasticstayApi
       # provide your own logger
       logger = Logger.new $stderr
       logger.level = Logger::DEBUG
-      @client ||= Faraday.new(@api_endpoint) do |client|
+      @client ||= Faraday.new(@endpoint) do |client|
         client.request :url_encoded
         client.adapter Faraday.default_adapter
         client.headers['Content-Type'] = 'application/json'
-        client.headers['x-api-key'] = @api_token
+        client.headers['x-api-key'] = @token
+        client.headers['User-Agent'] = @user_agent
         client.response :logger, logger
       end
     end
 
     def request(http_method:, endpoint:, params: {}, cache_ttl: 3600)
-      response = APICache.get(Digest::SHA256.bubblebabble(@api_token) + http_method.to_s + endpoint + params.to_s, cache: cache_ttl) do
-         client.public_send(http_method, endpoint, params)
+      response = APICache.get(
+        Digest::SHA256.bubblebabble(@token) + http_method.to_s + endpoint + params.to_s,
+        cache: cache_ttl
+      ) do
+        client.public_send(http_method, endpoint, params)
       end
       parsed_response = Oj.load(response.body)
 
@@ -108,7 +109,7 @@ module FantasticstayApi
       # :nodoc:
       case method_name.to_s
       when /^(.*)\?$/
-        !!send(Regexp.last_match(1).to_s)
+        !send(Regexp.last_match(1).to_s).nil?
       when /^clear_(.*)$/
         send("#{Regexp.last_match(1)}=", nil)
       else

data/lib/fantasticstay_api/client.rb

@@ -26,10 +26,7 @@ module FantasticstayApi
         http_method: :get,
         endpoint: 'calendar',
         params: {
-          listing_id: listing_id,
-          start_date: start_date,
-          end_date: end_date,
-          filters: filters.to_json
+          listing_id: listing_id, start_date: start_date, end_date: end_date, filters: filters.to_json
         }.merge(global_params)
       )
       process_response(response)
@@ -45,16 +42,14 @@ module FantasticstayApi
     end
 
     # FantasticstayApi::Client.new.reservations(38859)
-    def reservations(listing_id, filters = [], sort = nil, global_params = {})
+    def reservations(listing_id, filters = [], sort = { order: 'checkIn', direction: 'desc' }, global_params = {})
       response = request(
         http_method: :get,
         endpoint: 'reservations',
         params: {
-          listing_id: listing_id,
-          filters: filters.to_json,
-          sort: sort
+          listing_id: listing_id, filters: filters.to_json, sort: sort[:order], direction: sort[:direction]
         }.merge!(global_params),
-        cache_ttl: 3600*24
+        cache_ttl: 3600 * 24
       )
       process_response(response)
     end
@@ -73,7 +68,7 @@ module FantasticstayApi
         http_method: :get,
         endpoint: "guests/#{guest_id}",
         params: global_params,
-        cache_ttl: 3600*24
+        cache_ttl: 3600 * 24
       )
       process_response(response)
     end
@@ -94,13 +89,9 @@ module FantasticstayApi
       case result
       when Hash
         result.transform_keys!(&:to_sym)
-        result.values.each do |r|
-          process_response(r)
-        end
+        result.each_value { |r| process_response(r) }
       when Array
-        result.each do |r|
-          process_response(r)
-        end
+        result.each { |r| process_response(r) }
       end
       result
     end

data/lib/fantasticstay_api/configuration.rb

@@ -6,19 +6,25 @@ require_relative 'version'
 module FantasticstayApi
   # Stores the configuration
   class Configuration < API::Config
+    API_ENDPOINT = 'https://api.fsapp.io'
+    API_TOKEN = 'TESTING'
+
     property :follow_redirects, default: true
 
     # The api endpoint used to connect to FantasticstayApi if none is set
-    property  :endpoint, default: 'https://api.fsapp.io/'
+    property :endpoint, default: ENV['FANTASTICSTAY_API_ENDPOINT'] || API_ENDPOINT
+
+    # The token included in request header 'x-api-key'
+    property :token, default: ENV['FANTASTICSTAY_API_TOKEN'] || API_TOKEN
 
     # The value sent in the http header for 'User-Agent' if none is set
-    property  :user_agent, default: "FantasticstayApi API Ruby Gem #{FantasticstayApi::VERSION}"
+    property :user_agent, default: "FantasticstayApi API Ruby Gem #{FantasticstayApi::VERSION}"
 
     # By default uses the Faraday connection options if none is set
-    property  :connection_options, default: {}
+    property :connection_options, default: {}
 
     # By default display 30 resources
-    property :per_page, default: 20
+    property :per_page, default: 10
 
     # Add Faraday::RackBuilder to overwrite middleware
     property :stack

data/lib/fantasticstay_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FantasticstayApi
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/fantasticstay_api.rb

@@ -4,8 +4,8 @@ require 'faraday'
 require 'oj'
 require_relative 'fantasticstay_api/version'
 
+# Base module for Fantasticstay API
 module FantasticstayApi
-  # Base module for Fantasticstay API
   class Error < StandardError; end
 
   LIBNAME = 'fantasticstay_api'

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: fantasticstay_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Dinis
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: api_cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: api_cache
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '3.11'
 description: A gem that implements functions from the FS API available for its users.
 email:
 - dinis@lage.pw
@@ -94,7 +94,7 @@ metadata:
   homepage_uri: https://github.com/dlage/fantasticstay_api_gem
   source_code_uri: https://github.com/dlage/fantasticstay_api_gem
   changelog_uri: https://github.com/dlage/fantasticstay_api_gem/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.2.33
+signing_key: 
 specification_version: 4
 summary: FantasticStay API Wrapper.
 test_files: []