wallhaven 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffa413abbbc9af19d7aac34870efb2918e45ae13ea9e8a8551c352772231dd1
-  data.tar.gz: 4ea166486ff127f7938a99e2202c6e542b9af913c2192e57d88675d45281d6a8
+  metadata.gz: eb9976e5499802aebecf6cd8d7dcc4ac1d753e887f532f1a45a0f88ddd5e5323
+  data.tar.gz: 0caee8f54dd0bda864ba5e6059d3cffb8f58623fc074def59e6504248178ad8d
 SHA512:
-  metadata.gz: 74b605958fff202b7c1107af9a3ca5f18d48e290630691ac167e560570b55628596c0d5165e29d4d7c31f8b1c6ab106acb785ea1301a233ba71e9b7adff4e90c
-  data.tar.gz: be7dee81e5ad9c122e8ea4a60f958487fb54254e5c7e71b1c10ca6deed4ae03aa5bd8663fbe936de01bfc76045fce56fb87b52bc7597ba66a3d2d27a6f56f348
+  metadata.gz: 2d7bf4988081beaf43df3cfda2b2a946dbf54d5b2dc2a5972747dd351d75360950f698f978c427c64c557493115082bff9818cd730cd81a5e23da780726d1d1a
+  data.tar.gz: 16068a90ee840df863f7d13eb03416ccfc5ba9cdc91868e9d0c00067dfe4fe3ed02646afc0dd74412b34499fe369060dee78e01d753bfb1b7370abdbf01ee155

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wallhaven (0.2.1)
+    wallhaven (0.3.1)
       httparty (~> 0.17)
 
 GEM

data/README.md

@@ -4,6 +4,8 @@
 
 A simple gem to interact with Wallhaven's API.
 
+You can find the official API documentation [here](https://wallhaven.cc/help/api).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -26,14 +28,17 @@ Or install it yourself as:
 ## Usage
 
 1. Setup your API key
-    `Wallhaven::Client.new(api_key: <your_key>)`
 
-2. Make a request
+    `Wallhaven.apikey = "<your_key>"`
+
+    **Note**: You can still make requests without an apikey, but you won't be able to get NSFW results.
+
+2. Make a request to an endpoint:
     ```ruby
-    Wallhaven::Wallpaper.get(<some_id>)
-    Wallhaven::Tag.get(<some_id>)
-    Wallhaven::Search.get
-    Wallhaven::Settings.get
+    Wallhaven.wallpaper(<some_id>)
+    Wallhaven.tag(<some_id>)
+    Wallhaven.search({ filter_1: some_filter, filter_2: some_other_filter })
+    Wallhaven.settings
     ```
 
 ## Gem Development

data/lib/wallhaven.rb

@@ -1,9 +1,5 @@
 require 'wallhaven/version'
+require 'wallhaven/wallhaven'
 
 module Wallhaven
-  autoload :Client,     'wallhaven/client'
-  autoload :Search,     'wallhaven/search'
-  autoload :Settings,   'wallhaven/settings'
-  autoload :Tag,        'wallhaven/tag'
-  autoload :Wallpaper,  'wallhaven/wallpaper'
 end

data/lib/wallhaven/core_ext/hash/deep_merge.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Hash
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    merge!(other_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        this_val.deep_merge(other_val, &block)
+      elsif block_given?
+        block.call(key, this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+end

data/lib/wallhaven/version.rb

@@ -1,3 +1,3 @@
 module Wallhaven
-  VERSION = "0.3.1"
+  VERSION = "1.0.0"
 end

data/lib/wallhaven/wallhaven.rb

@@ -0,0 +1,36 @@
+require 'httparty'
+
+module Wallhaven
+  include HTTParty
+  base_uri 'https://wallhaven.cc/api/v1/'
+
+  class << self
+    attr_accessor :apikey
+  end
+
+  def self.wallpaper(id)
+    parse get("/w/#{id}", query)
+  end
+
+  def self.search(params = {})
+    parse get('/search', query(params ))
+  end
+
+  def self.tag(id)
+    parse get("/tag/#{id}", query)
+  end
+
+  def self.settings
+    parse get("/settings", query)
+  end
+
+  private
+
+  def self.parse(response)
+    response.parsed_response["data"]
+  end
+
+  def self.query(params = {})
+    { query: { apikey: apikey }.merge(params) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallhaven
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Rojo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,12 +98,9 @@ files:
 - bin/console
 - bin/setup
 - lib/wallhaven.rb
-- lib/wallhaven/client.rb
-- lib/wallhaven/search.rb
-- lib/wallhaven/settings.rb
-- lib/wallhaven/tag.rb
+- lib/wallhaven/core_ext/hash/deep_merge.rb
 - lib/wallhaven/version.rb
-- lib/wallhaven/wallpaper.rb
+- lib/wallhaven/wallhaven.rb
 - wallhaven.gemspec
 homepage: https://github.com/soyrojo/wallhaven
 licenses:

data/lib/wallhaven/client.rb

@@ -1,14 +0,0 @@
-require 'httparty'
-
-module Wallhaven
-  class Client
-    include HTTParty
-    base_uri 'https://wallhaven.cc/api/v1/'
-
-    attr_accessor :api_key
-
-    def initialize(api_key: nil)
-      @@api_key = api_key
-    end
-  end
-end

data/lib/wallhaven/search.rb

@@ -1,8 +0,0 @@
-module Wallhaven
-  class Search < Client
-
-    def self.get
-      Client.get('/search/', { query: { apikey: @@api_key }})
-    end
-  end
-end

data/lib/wallhaven/settings.rb

@@ -1,8 +0,0 @@
-module Wallhaven
-  class Settings < Client
-
-    def self.get(id)
-      Client.get('/settings/', { query: { apikey: @@api_key }})
-    end
-  end
-end

data/lib/wallhaven/tag.rb

@@ -1,8 +0,0 @@
-module Wallhaven
-  class Tag < Client
-
-    def self.get(id)
-      Client.get('/tag/' + id.to_s, { query: { apikey: @@api_key }})
-    end
-  end
-end

data/lib/wallhaven/wallpaper.rb

@@ -1,8 +0,0 @@
-module Wallhaven
-  class Wallpaper < Client
-
-    def self.get(id)
-      Client.get('/w/' + id.to_s, { query: { apikey: @@api_key }})
-    end
-  end
-end