metal_archives 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e691c4936e5453b4ae339f5844a440e3427b4277
-  data.tar.gz: 7151b7ad03f3da331456bbb840f5e6f06fcbcdcb
+  metadata.gz: 5b077092f1a7e727aee29d04339faf31468b704b
+  data.tar.gz: 00674c9f439ba8c1f8a014cd60c4da6ec5289e22
 SHA512:
-  metadata.gz: b7f1cc7c2e83a3741988341984ebdd1430f87bedf775c90c3698216af8f85ff1f9e9c779849d62e936ec792e2b39a7e60b52064f378f1342b1d3042e59feb6e2
-  data.tar.gz: ee1b4d9491e178caafd133c363d3558e3d57451e37bd845cd93e680cc8c2e65168221ae4cd458f412cc9e306995337072f66b4f8cc248ac38b5c24deb7be7877
+  metadata.gz: 9217a15df5ae47a552a8214fba23a374bb9788611103d0366078aff6e72069505bf2d43fcfc0c437624aae8bbf3f9a342bbcfa67abd512ed712473a51dc56a9b
+  data.tar.gz: 22a44ac5667e462eab891c019c98f17340e2469ffa7ff71d79e5f6dc9b6d6a5eb5482ef10fcba9f0b4a320ad9fb9795d32f7df7b4122dd463bb865192613e6b2

data/.gitignore

@@ -1,6 +1,7 @@
 Gemfile.lock
 .idea
 
+*.tar.gz
 *.gem
 *.rbc
 /.config

data/lib/metal_archives.rb

@@ -5,6 +5,7 @@ require 'openssl'
 require 'metal_archives/middleware/headers'
 require 'metal_archives/middleware/cache_check'
 require 'metal_archives/middleware/rewrite_endpoint'
+require 'metal_archives/middleware/encoding'
 
 require 'metal_archives/version'
 require 'metal_archives/configuration'

data/lib/metal_archives/http_client.rb

@@ -24,6 +24,7 @@ module MetalArchives
 
         response
       rescue Faraday::Error::ClientError => e
+        MetalArchives.config.logger.error e.response
         raise Errors::APIError, e
       end
 
@@ -43,6 +44,7 @@ module MetalArchives
           f.use       MetalArchives::Middleware::Headers
           f.use       MetalArchives::Middleware::CacheCheck
           f.use       MetalArchives::Middleware::RewriteEndpoint
+          f.use       MetalArchives::Middleware::Encoding
 
           MetalArchives.config.middleware.each { |m| f.use m } if MetalArchives.config.middleware
 

data/lib/metal_archives/middleware/encoding.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'faraday'
+
+module MetalArchives
+  module Middleware
+    ##
+    # Force UTF-8 conversion
+    #
+    class Encoding < Faraday::Response::Middleware # :nodoc:
+      def on_complete(env)
+        env.response.body.force_encoding('utf-8')
+      end
+    end
+  end
+end

data/lib/metal_archives/models/artist.rb

@@ -224,7 +224,7 @@ module MetalArchives
       #
       def find!(id)
         obj = find id
-        obj && obj.load!
+        obj.load! if obj && !obj.loaded?
 
         obj
       end
@@ -277,7 +277,7 @@ module MetalArchives
       #
       def find_by!(query)
         obj = find_by query
-        obj && obj.load!
+        obj.load! if obj && !obj.loaded?
 
         obj
       end

data/lib/metal_archives/models/band.rb

@@ -270,7 +270,7 @@ module MetalArchives
       #
       def find!(id)
         obj = find id
-        obj.load!
+        obj.load! if obj && !obj.loaded?
 
         obj
       end
@@ -342,7 +342,7 @@ module MetalArchives
       #
       def find_by!(query)
         obj = find_by query
-        obj && obj.load!
+        obj.load! if obj && !obj.loaded?
 
         obj
       end

data/lib/metal_archives/models/base_model.rb

@@ -113,13 +113,13 @@ module MetalArchives
 
         # property
         define_method(name) do
-          load! unless instance_variable_defined?("@#{name}") || name ==(:id)
+          load! unless loaded? && instance_variable_defined?("@#{name}") || name ==(:id)
           instance_variable_get("@#{name}")
         end
 
         # property?
         define_method("#{name}?") do
-          load! unless instance_variable_defined?("@#{name}") || name ==(:id)
+          load! unless loaded? && instance_variable_defined?("@#{name}") || name ==(:id)
 
           property = instance_variable_get("@#{name}")
           property.respond_to?(:empty?) ? !property.empty? : !!property
@@ -168,13 +168,13 @@ module MetalArchives
 
         # property
         define_method(name) do
-          load! unless instance_variable_defined?("@#{name}")
+          load! unless loaded? && instance_variable_defined?("@#{name}")
           instance_variable_get("@#{name}")
         end
 
         # property?
         define_method("#{name}?") do
-          load! unless instance_variable_defined?("@#{name}")
+          load! unless loaded? && instance_variable_defined?("@#{name}")
 
           property = instance_variable_get("@#{name}")
           property.respond_to?(:empty?) ? !property.empty? : !!property

data/lib/metal_archives/version.rb

@@ -4,5 +4,5 @@ module MetalArchives
   ##
   # MetalArchives API version
   #
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/publish.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/bash
+#
+# publish.sh - Publish a new gem version
+#
+
+trap _error_handler ERR
+function _error_handler() {
+	echo -ne "\e[1;31m=> Previous command exited unsuccessfully. Abort (y/n)? \e[0m"
+	read -n 1 VAR
+	echo
+
+	[[ "${VAR}" != 'n' ]] && { echo "Aborting."; exit 1; }
+}
+
+VERSION="$1"
+if [[ ! "$1" ]]; then
+	echo -ne "Previous version: `git describe --abbrev=0 --tags | sed -e 's/v//g'`. New version: "
+	read VERSION
+	echo
+fi
+
+# Release commit and tag
+git reset HEAD
+sed -s "s/VERSION = .*$/VERSION = '${VERSION}'/" -i lib/metal_archives/version.rb
+git add lib/metal_archives/version.rb
+git commit -m "Release version v${VERSION}"
+git tag "v${VERSION}"
+git push
+git push --tags
+
+# Gem
+gem build metal_archives.gemspec
+gem push "metal_archives-${VERSION}.gem"
+rm -rf html/
+rake rdoc
+tar cvjf "metal_archives-${VERSION}-doc.tar.gz" html/
+
+# Documentation
+git add --all .
+git stash
+git checkout gh-pages
+git reset --hard 'HEAD^'
+git merge master
+rm -rf html/
+rake rdoc
+git add -f html/
+git commit -m 'Add documentation'
+git push --force
+git checkout master
+git stash pop
+git reset HEAD

data/spec/models/base_model_spec.rb

@@ -78,6 +78,7 @@ RSpec.describe MetalArchives::BaseModel do
   it 'returns properties' do
     model = ModelThree.new :id => 'foo', :property_one => 'bar'
 
+    model.instance_eval { |m| @loaded = true }
     expect(model.id).to eq 'foo'
     expect(model.property_one).to eq 'bar'
   end
@@ -85,6 +86,7 @@ RSpec.describe MetalArchives::BaseModel do
   it 'sets properties' do
     model = ModelThree.new :id => 'foo', :property_one => 'bar'
 
+    model.instance_eval { |m| @loaded = true }
     model.id = 'baz'
     model.property_one = 'bat'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metal_archives
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Florian Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -213,6 +213,7 @@ files:
 - lib/metal_archives/error.rb
 - lib/metal_archives/http_client.rb
 - lib/metal_archives/middleware/cache_check.rb
+- lib/metal_archives/middleware/encoding.rb
 - lib/metal_archives/middleware/headers.rb
 - lib/metal_archives/middleware/rewrite_endpoint.rb
 - lib/metal_archives/models/artist.rb
@@ -229,6 +230,7 @@ files:
 - lib/metal_archives/utils/range.rb
 - lib/metal_archives/version.rb
 - metal_archives.gemspec
+- publish.sh
 - spec/configuration_spec.rb
 - spec/factories/artist_factory.rb
 - spec/factories/band_factory.rb