shapeable 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c95227cc1ac36a8fbaa29cd421a90984740fa49
-  data.tar.gz: ebe50c0055ffa8595085b8f3114e9ac7808a49d1
+  metadata.gz: 4ed1e8139b673601f51a5a4a95830670945710d4
+  data.tar.gz: 013a597aba452cc63d267909298c84e7ee027449
 SHA512:
-  metadata.gz: 873f0e823c9cea191193691a3aa6004a1085b5a306b3cc3425ded7de174e8a3647a90817bd4a9c1ba35e2ab80001a2b0bf03f86d5c7ce1f377c886e068b8afb2
-  data.tar.gz: b465a882b86f93fecf29f1e58e7d98af65ff59d47ceb4f867ef5c94ff0c326eaf2890dd04e3a806084ae655567df2461ffffda71060b9a482991a7c7428f9f36
+  metadata.gz: 7e3babc9c59f8fb1ee8a8e9a6825d83ff29f6afc93ef9ef546a526170e2cd728cd33d3b3bd52ce4136294eb62701486d9fad02ba5330e9bda3f19be8c3ba5b54
+  data.tar.gz: 4990746ce0a05398bf8ab340147fc1158fee3a92c5215d85bcfb1f659a6ed452e646f89235f1bf55617d732bd3f58b1771c3f61b0cc8a36777f829ae9ddab661

data/lib/shapeable.rb

@@ -7,19 +7,18 @@ module Shapeable
     normalize_shapeable_options(opts)
     acts_as_shapeable_opts = opts || {}
 
-    define_method(:shape) do |opts|
+    define_method(:shape) do |opts={}|
       opts = acts_as_shapeable_opts.merge(opts)
       default_shape = opts[:default_shape]
       default_version = opts[:default_version]
       path = opts[:path]
-      raise ArgumentError, "specify a default shape" unless default_shape
-      raise ArgumentError, "specify a default version" unless default_version
-      raise ArgumentError, "specify a path" unless path
+      raise ArgumentError, "Specify a path" unless path
       resource = path.name.split('::').last.constantize
       if request.accept
         version_str = request.accept[/version\s?=\s?(\d+)/, 1]
         version = version_str.nil? ? default_version : version_str.to_i
         shape = request.accept[/shape\s?=\s?(\w+)/, 1] || default_shape
+        raise UnresolvedShapeError, "Unable to resolve shape. Try specifying a default version and shape" unless version && shape
         begin
           serializer = path.const_get("V#{version}").const_get("#{resource}#{shape.camelize}Serializer")
         rescue NameError
@@ -39,6 +38,7 @@ module Shapeable
   end
 
   class InvalidShapeError < NameError; end
+  class UnresolvedShapeError < Exception; end
 
 end
 

data/lib/shapeable/version.rb

@@ -1,3 +1,3 @@
 module Shapeable
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shapeable
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Shawn O'Mara