discourse_api 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03839d5965051fc89e305bbfab286efdc3b0692e
-  data.tar.gz: e6794d1f02adddab8a2429c2e3c1eb95ab98f37a
+  metadata.gz: f8d1504d9f6215e61f1b9038809f8663eaa566b8
+  data.tar.gz: b4ed50ba139c359d2a33b96a26b9c851431abb9c
 SHA512:
-  metadata.gz: 14e05fdda3649ccb71c7cc350f4e056237f5803af5450adb6fc4b1cf5d108967509a6713bb277c3e2b681957f2af7e4b21dc25df7506b3774a2220427ddeb61c
-  data.tar.gz: 9b5a76da916d2b54a1d6d489ca044396db57c2f12a68492a4cc8d39455af7450f27b1b55d645ce909115f8b071a002beabe8996d2308f43d43b6ec04f2bac554
+  metadata.gz: 414204490efeb376d200c2fce194d031d383af3da1f59825d3268359c480264d7f36468a9c2f1476fec3eaa41e1fa87f925661430bea225503cb7062136166f6
+  data.tar.gz: ce5ca8d555c8d0a8f4250c8597870ae64c8e4604bfa3c00322dce468214c0e6dea87e3ed59d8802c230607ef961e10872f679f56e4195e59b52539484890b1ce

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/). 
 
+## [0.6.2] - 2015-12-02
+### Fixed
+- `API::Params` will not work correctly when both optional and defaults are
+  specified
+
 ## [0.6.1] - 2015-11-28
 ### Fixed
 - typo in topic_posts method

data/lib/discourse_api/api/params.rb

@@ -38,18 +38,12 @@ module DiscourseApi
           raise ArgumentError.new("#{k} is required but not specified") unless h[k]
         end
 
-        h =
-          if @optional.length == 0
-            @args.dup
-          else
-            @optional.each do |k|
-              h[k] = @args[k] if @args.include?(k)
-            end
-            h
-          end
+        @optional.each do |k|
+          h[k] = @args[k] if @args.include?(k)
+        end
 
         @defaults.each do |k,v|
-          h[k] = v unless h.key?(k)
+          @args.key?(k) ? h[k] = @args[k] : h[k] = v
         end
 
         h

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/discourse_api/api/params_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe DiscourseApi::API::Params do
   def params_for(h)
-    DiscourseApi::API::Params.new(h).required(:r1).optional(:o1, :o2)
+    DiscourseApi::API::Params.new(h).required(:r1).optional(:o1, :o2).default(d1: "default")
   end
 
   it "should raise on missing required params" do
@@ -17,4 +17,16 @@ describe DiscourseApi::API::Params do
     expect(params_for({r1: "test", o2: nil}).to_h).to include(:o2)
   end
 
+  it "should include default params when defined but not provided" do
+    expect(params_for({r1: "test"}).to_h).to include(d1: "default")
+  end
+
+  it "should include default params when defined and provided" do
+    expect(params_for({r1: "test", d1: "override"}).to_h).to include(d1: "override")
+  end
+
+  it "should include optional and default params when defined and provided" do
+    expect(params_for({r1: "test", o1: "optional", d1: "override"}).to_h).to include(o1: "optional", d1: "override")
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_api
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday