darujme_cz 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 672a894bc35b2c7afe8fd3c787e113431f5aed47bd96d53aa3e228e45378f8f8
-  data.tar.gz: 12899c6230d630f4e2842b1892284e0de2a32560bc12c069faac41ed4c2790da
+  metadata.gz: 452801c43b67be3a0d14199311717e1616b9f7b8e966119993b2f1087e6d8257
+  data.tar.gz: 4218afe511c1accfc6533cbfda5db7db086cf42e4dfde730a01f331d5141840a
 SHA512:
-  metadata.gz: 40e8351839a8dbf6005e22a2581d9013797ad6a3e85bfae43a7fe2d24577477bcba0d6353a8bca8b1a371d4f3f68893e427bd63477b6c99bcc3e3e9423b0c013
-  data.tar.gz: 860308c1dc3706f574f06740679ba26b91ea79bb8b3c80378ec3179708d4f6b69a9745b80519e23fbefad44380c59b74383a0347fcc8a33c307f80302586ae8d
+  metadata.gz: d60d4ba973a7305f54f501d754bd868085f11798f0a2252d20450f7c926b67b81613d30ec6d987fcb468a702e542808b930ad42ddd0538bd7b0dd06d2a7d1463
+  data.tar.gz: 7e0ec06313c035798722f82ad92539b2cbb7fd60a54cec1956af71f5083b3f8d821001e9d863e7d61794e4bfc0cbd1da65a6e0c14cc3901779a6efb3e041cd9a

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci
+on: [push]
+jobs:
+  # https://docs.knapsackpro.com/2021/how-to-run-ruby-on-rails-tests-on-github-actions-using-rspec
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [ 2.6, 2.7, '3.0' ]
+    runs-on: ubuntu-latest
+    env:      # Rails verifies the time zone in DB is the same as the time zone of the Rails app
+      TZ: "Europe/Prague"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: RSpec
+        run: bundle exec rspec

data/.rubocop.yml

@@ -1,8 +1,16 @@
-Rails:
-  Enabled: true
+# The behavior of RuboCop can be controlled via the .rubocop.yml
+# configuration file. It makes it possible to enable/disable
+# certain cops (checks) and to alter their behavior if they accept
+# any parameters. The file can be placed either in your home
+# directory or in some project directory.
+#
+# RuboCop will start looking for the configuration file in the directory
+# where the inspected file is and continue its way up to the root directory.
+#
+# See https://docs.rubocop.org/rubocop/configuration
 AllCops:
-  TargetRubyVersion: 2.3
-
+  NewCops: enable
+  TargetRubyVersion: 2.5
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented_relative_to_receiver
 
@@ -15,8 +23,6 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  EnforcedStyle: context_dependent
 Style/Documentation:
   Enabled: false
 Style/FrozenStringLiteralComment:
@@ -35,6 +41,3 @@ Style/SymbolArray:
   Enabled: false
 Style/EmptyMethod:
   EnforcedStyle: expanded
-Layout/IndentationConsistency:
-  EnforcedStyle: rails
-  # Enabled: false

data/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ## [Unreleased]
+## [0.4.0] - 2019-08-25
+### Security
+- rake 12.3.3+
+### Added
+- ruby3.0 support
 ## [0.3.0] - 2019-08-25
 ### Added
 - project

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/darujme_cz.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "darujme_cz/version"
 
@@ -8,12 +8,13 @@ Gem::Specification.new do |spec|
   spec.authors = ["Lukáš Pokorný"]
   spec.email = ["luk4s.pokorny@gmail.com"]
 
-  spec.summary = 'Ruby library for work with Darujme.cz API'
-  spec.description = 'Get pledges or transactions from your organization on Darujme.cz'
+  spec.summary = "Ruby library for work with Darujme.cz API"
+  spec.description = "Get pledges or transactions from your organization on Darujme.cz"
   spec.homepage = "https://github.com/luk4s/darujme_cz"
   spec.license = "GPL-3.0-or-later"
+  spec.required_ruby_version = '>= 2.5'
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the "allowed_push_host"
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
@@ -28,20 +29,19 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.test_files = Dir['spec/**/*']
+  spec.test_files = Dir["spec/**/*"]
   # spec.bindir        = "exe"
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport', '> 5.2'
-  spec.add_dependency 'money', '~> 6.13'
-  spec.add_dependency 'rest-client', '~> 2.0'
+  spec.add_dependency "activesupport", "> 5.2", "< 7"
+  spec.add_dependency "money", "~> 6.13"
+  spec.add_dependency "rest-client", "~> 2.0"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency('webmock', '~> 3.4')
+  spec.add_development_dependency "rake", ">=12.3.3"
+  spec.add_development_dependency "rspec", "~> 3.11"
+  spec.add_development_dependency "webmock", "~> 3.4"
 end

data/lib/darujme_cz/address.rb

@@ -1,13 +1,12 @@
 module DarujmeCz
   class Address
-
     # @param [Hash] attributes
     def initialize(attributes)
       @source = attributes
     end
 
     def to_s
-      "#{@source["street"]}\n#{@source["postCode"]} #{@source["city"]}\n#{@source["country"]}"
+      "#{@source['street']}\n#{@source['postCode']} #{@source['city']}\n#{@source['country']}"
     end
 
     # alias
@@ -20,6 +19,5 @@ module DarujmeCz
         @source[m]
       end
     end
-
   end
-end
+end

data/lib/darujme_cz/base.rb

@@ -1,6 +1,5 @@
 module DarujmeCz
   class Base
-
     # @abstract Define name of endpoint, which is also name of root element
     def self.endpoint
       raise NotImplementedError
@@ -8,11 +7,11 @@ module DarujmeCz
 
     # @param [Hash] params
     # @option params [Integer] organization_id (nil) ID of organization
-    def self.all(**params)
+    def self.all(params = {})
       where params
     end
 
-    def self.where(**params)
+    def self.where(params = {})
       data = connection(params).get "#{base_path(params)}/#{endpoint}-by-filter", params
       data[endpoint].map { |i| new(i) }
     end
@@ -20,9 +19,9 @@ module DarujmeCz
     def self.connection(params = {})
       credentials = params.delete(:connection) || {
         app_id: DarujmeCz.config.app_id,
-        api_key: DarujmeCz.config.app_secret
+        api_key: DarujmeCz.config.app_secret,
       }
-      Connection.new credentials
+      Connection.new(**credentials)
     end
 
     def self.base_path(params = {})
@@ -39,8 +38,6 @@ module DarujmeCz
       @source = attributes
     end
 
-    private
-
     # @param [Array<String>] list
     def self.define_attributes(list)
       list.each do |attribute|
@@ -49,6 +46,5 @@ module DarujmeCz
         end
       end
     end
-
   end
 end

data/lib/darujme_cz/connection.rb

@@ -4,7 +4,6 @@ require 'uri'
 
 module DarujmeCz
   class Connection
-
     URL = "https://www.darujme.cz/api/v1"
 
     # @param [String] app_id
@@ -16,16 +15,16 @@ module DarujmeCz
 
     # @param [String] path
     # @param [Hash] params
-    def get(path, **params)
+    def get(path, params = {})
       begin
         response = RestClient.get "#{URL}/#{path}", params: { apiId: @app_id, apiSecret: @api_key }.merge(params)
-      rescue RestClient::Exception => ex
-        handle_response_error(ex)
+      rescue RestClient::Exception => e
+        handle_response_error(e)
       end
       parse_response(response)
     end
 
-    def post(path, **data)
+    def post(path, data = {})
       # @todo
       raise NotImplementedError
     end
@@ -36,15 +35,14 @@ module DarujmeCz
     # @raise [RestClient::Exception]
     def handle_response_error(exception)
       data = parse_response(exception.response)
-      exception.message += "\n#{data["message"]}"
+      exception.message += "\n#{data['message']}"
       raise exception
     end
 
     def parse_response(response)
       JSON.parse(response.body)
-    rescue JSON::ParserError => _ex
+    rescue JSON::ParserError => _e
       {}
     end
-
   end
 end

data/lib/darujme_cz/donor.rb

@@ -1,6 +1,5 @@
 module DarujmeCz
   class Donor
-
     delegate :city, :street, :post_code, :postal_code, :country, to: :address
     # @param [Hash] attributes
     def initialize(attributes)
@@ -20,6 +19,5 @@ module DarujmeCz
         @source[m]
       end
     end
-
   end
-end
+end

data/lib/darujme_cz/pledge.rb

@@ -1,7 +1,6 @@
 module DarujmeCz
   # @see https://www.darujme.cz/doc/api/v1/index.html#endpoint-get-organization-organizationid-pledges-by-filter
   class Pledge < Base
-
     delegate :name, :address, :city, :street, :post_code, :postal_code, :country, to: :donor
 
     def self.endpoint
@@ -47,6 +46,5 @@ module DarujmeCz
     def project
       @project ||= Project.find project_id
     end
-
   end
 end

data/lib/darujme_cz/project.rb

@@ -1,7 +1,6 @@
 module DarujmeCz
   # @see https://www.darujme.cz/doc/api/v1/index.html#endpoint-get-project-projectid
   class Project < Base
-
     def self.endpoint
       "project"
     end
@@ -43,7 +42,6 @@ module DarujmeCz
         value
       end
     end
-
   end
 end
 # project_id = 1201275

data/lib/darujme_cz/transaction.rb

@@ -1,7 +1,6 @@
 module DarujmeCz
   # @see https://www.darujme.cz/doc/api/v1/index.html#endpoint-get-organization-organizationid-transactions-by-filter
   class Transaction < Base
-
     def self.endpoint
       "transactions"
     end
@@ -50,4 +49,4 @@ module DarujmeCz
       end
     end
   end
-end
+end

data/lib/darujme_cz/version.rb

@@ -1,3 +1,3 @@
 module DarujmeCz
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/models/connect_spec.rb

@@ -3,11 +3,10 @@ RSpec.describe DarujmeCz::Connection do
 
   describe ".get" do
     it "get all" do
-      stub_request(:get, "https://www.darujme.cz/api/v1/organization/22/pledges-by-filter?apiId=22&apiSecret=8d948b1").
-        to_return(status: 200, body: file_fixture("pledges.json"))
+      stub_request(:get, "https://www.darujme.cz/api/v1/organization/22/pledges-by-filter?apiId=22&apiSecret=8d948b1")
+        .to_return(status: 200, body: file_fixture("pledges.json"))
       data = subject.get "organization/22/pledges-by-filter"
       expect(data).to include "pledges"
     end
   end
-
-end
+end

data/spec/models/donor_spec.rb

@@ -29,5 +29,4 @@ RSpec.describe DarujmeCz::Donor do
   it "#postal_code" do
     expect(subject.postal_code).to eq "120 00"
   end
-
 end

data/spec/models/pledge_spec.rb

@@ -2,8 +2,8 @@ require "rest-client"
 RSpec.describe DarujmeCz::Pledge do
   describe ".all" do
     it "get all" do
-      stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/pledges-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}").
-        to_return(status: 200, body: file_fixture("pledges.json"))
+      stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/pledges-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}")
+        .to_return(status: 200, body: file_fixture("pledges.json"))
 
       pledges = described_class.all
       expect(pledges).to be_a Array
@@ -18,15 +18,15 @@ RSpec.describe DarujmeCz::Pledge do
     it "without credentials" do
       DarujmeCz.config.app_id = nil
 
-      stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/pledges-by-filter?apiId&apiSecret=#{DarujmeCz.config.app_secret}").
-        to_return(status: 400, body: darujme_cz_response_error(message: "Missing required parameter").to_json)
+      stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/pledges-by-filter?apiId&apiSecret=#{DarujmeCz.config.app_secret}")
+        .to_return(status: 400, body: darujme_cz_response_error(message: "Missing required parameter").to_json)
 
       expect { described_class.all }.to raise_exception RestClient::BadRequest, "400 Bad Request\nMissing required parameter"
     end
 
     it "pass custom organization_id" do
-      stub = stub_request(:get, "https://www.darujme.cz/api/v1/organization/33/pledges-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}").
-        to_return(status: 200, body: file_fixture("pledges.json"))
+      stub = stub_request(:get, "https://www.darujme.cz/api/v1/organization/33/pledges-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}")
+               .to_return(status: 200, body: file_fixture("pledges.json"))
 
       described_class.all(organization_id: 33)
       expect(stub).to have_been_made
@@ -35,8 +35,8 @@ RSpec.describe DarujmeCz::Pledge do
 
   describe ".where" do
     it "fromOutgoingDate" do
-      stub = stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/pledges-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}&fromOutgoingDate=#{Date.today.strftime("%Y-%m-%d")}").
-        to_return(status: 200, body: file_fixture("pledges.json"))
+      stub = stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/pledges-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}&fromOutgoingDate=#{Date.today.strftime('%Y-%m-%d')}")
+               .to_return(status: 200, body: file_fixture("pledges.json"))
       described_class.where fromOutgoingDate: Date.today
 
       expect(stub).to have_been_made
@@ -47,10 +47,9 @@ RSpec.describe DarujmeCz::Pledge do
   subject { described_class.new json["pledges"][0] }
 
   describe "attributes" do
-
     it "inspect" do
       expect(subject.project_id).to eq 4563
-      expect(subject.id).to eq 1203450
+      expect(subject.id).to eq 1_203_450
     end
   end
 
@@ -92,10 +91,9 @@ RSpec.describe DarujmeCz::Pledge do
 
   describe "#project" do
     before :each do
-      stub_request(:get, "https://www.darujme.cz/api/v1/project/4563?apiId=123&apiSecret=abcd").
-        to_return(status: 200, body: { project: JSON.parse(file_fixture("project.json").read) }.to_json)
+      stub_request(:get, "https://www.darujme.cz/api/v1/project/4563?apiId=123&apiSecret=abcd")
+        .to_return(status: 200, body: { project: JSON.parse(file_fixture("project.json").read) }.to_json)
     end
     it { expect(subject.project).to be_a DarujmeCz::Project }
   end
-
 end

data/spec/models/project_spec.rb

@@ -14,5 +14,4 @@ RSpec.describe DarujmeCz::Project do
   it_behaves_like "localized attributes", "name", "title"
   it_behaves_like "localized attributes", "content"
   it_behaves_like "localized attributes", "synopsis"
-
 end

data/spec/models/transaction_spec.rb

@@ -1,8 +1,8 @@
 RSpec.describe DarujmeCz::Transaction do
   describe ".all" do
     it "get all" do
-      stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/transactions-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}").
-        to_return(status: 200, body: file_fixture("transactions.json"))
+      stub_request(:get, "https://www.darujme.cz/api/v1/organization/#{DarujmeCz.config.organization_id}/transactions-by-filter?apiId=#{DarujmeCz.config.app_id}&apiSecret=#{DarujmeCz.config.app_secret}")
+        .to_return(status: 200, body: file_fixture("transactions.json"))
 
       pledges = described_class.all
       expect(pledges).to be_a Array
@@ -50,5 +50,4 @@ RSpec.describe DarujmeCz::Transaction do
     it { expect(subject.refund?).to eq true }
     it { expect(subject.pending?).to eq false }
   end
-
-end
+end

data/spec/spec_helper.rb

@@ -16,7 +16,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  Dir.glob(File.expand_path('../support/*.rb', __FILE__)).each do |file|
+  Dir.glob(File.expand_path('support/*.rb', __dir__)).sort.each do |file|
     require file
   end
   config.before(:each) do
@@ -24,5 +24,4 @@ RSpec.configure do |config|
     DarujmeCz.config.app_secret = "abcd"
     DarujmeCz.config.organization_id = "2"
   end
-
 end

data/spec/support/darujme.rb

@@ -4,4 +4,4 @@ end
 
 def darujme_cz_response_error(message:)
   { status: "error", responsibility: "client", message: message }
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darujme_cz
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Lukáš Pokorný
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -52,48 +58,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +107,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -157,7 +150,7 @@ metadata:
   homepage_uri: https://github.com/luk4s/darujme_cz
   source_code_uri: https://github.com/luk4s/darujme_cz
   changelog_uri: https://github.com/luk4s/darujme_cz/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,27 +158,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Ruby library for work with Darujme.cz API
 test_files:
-- spec/spec_helper.rb
-- spec/models/project_spec.rb
+- spec/darujme_cz_spec.rb
+- spec/fixtures/files/donor.json
+- spec/fixtures/files/pledges.json
+- spec/fixtures/files/project.json
+- spec/fixtures/files/transactions.json
 - spec/models/connect_spec.rb
-- spec/models/transaction_spec.rb
-- spec/models/pledge_spec.rb
 - spec/models/donor_spec.rb
+- spec/models/pledge_spec.rb
+- spec/models/project_spec.rb
+- spec/models/transaction_spec.rb
+- spec/spec_helper.rb
 - spec/support/darujme.rb
-- spec/fixtures/files/project.json
-- spec/fixtures/files/donor.json
-- spec/fixtures/files/transactions.json
-- spec/fixtures/files/pledges.json
-- spec/darujme_cz_spec.rb