moonrope 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 477458a2ba0a81369f1b993a0be430c0af5f176c
-  data.tar.gz: 5e79acdedb3a0440bcc45096ccac42ef906d8415
+  metadata.gz: 03ef56897296df607155e3db243142135a9934bb
+  data.tar.gz: 8d9e84279e48a610c54f791782993a54620eba6d
 SHA512:
-  metadata.gz: a1749b675d587ee6913c4fca9c69fb98123c3bf64e7f2102a4136d63a9b0a2b60488f471cd356461094e26d84e679e69dc0d4740b8be5b531fdae0b4c876d6ed
-  data.tar.gz: 88895948f31a23a3db44b8d74ac9663379807d9553ded73d0e7f31afecb0b037c92f7d48b138b6da19be1f219f2a599bfa938febcdfca657feb4e64f85b1be9b
+  metadata.gz: ea2654b89ef07c235e91b3c3e39a2333af2ef29dd2751d51518e377812f807adab86fc5844a92aeb9f382370743d7f1ae5f860c1679da5bf91ee4ab9f28e4c1e
+  data.tar.gz: 7f154d360c7da6dfa8fc7b0d246a874d666e9a4587ffb9db120d9edf6abbc0035b16bd7a7acc65237c1584353c5a93657f56bf4352f3c6f62fb38e1754c1e4b7

data/lib/moonrope/dsl/structure_dsl.rb

@@ -84,7 +84,7 @@ module Moonrope
 
       def expansion(name, *args, &block)
         if block_given?
-          @structure.expansions[name] = block
+          @structure.expansions[name] = {:block => block, :conditions => @conditions}
         else
           attribute(:expansion, name, *args)
         end

data/lib/moonrope/errors.rb

@@ -22,6 +22,16 @@ module Moonrope
       end
     end
 
+    class StructuredError < RequestError
+      def status
+        "error"
+      end
+
+      def data
+        @options
+      end
+    end
+
     class AccessDenied < RequestError
       def status
         'access-denied'

data/lib/moonrope/eval_helpers.rb

@@ -7,17 +7,33 @@ module Moonrope
     # @param type [Symbol] the type of error to raise
     # @param message [String, Hash or Array] options to pass with the error (usually a message)
     #
-    def error(type, message)
+    def error(type, code_or_message, message = nil)
       case type
-      when :not_found           then raise(Moonrope::Errors::NotFound, message)
-      when :access_denied       then raise(Moonrope::Errors::AccessDenied, message)
-      when :validation_error    then raise(Moonrope::Errors::ValidationError, message)
-      when :parameter_error     then raise(Moonrope::Errors::ParameterError, message)
+      when :not_found           then raise(Moonrope::Errors::NotFound, code_or_message)
+      when :access_denied       then raise(Moonrope::Errors::AccessDenied, code_or_message)
+      when :validation_error    then raise(Moonrope::Errors::ValidationError, code_or_message)
+      when :parameter_error     then raise(Moonrope::Errors::ParameterError, code_or_message)
+      when :structured_error    then structured_error(code_or_message, message)
       else
-        raise Moonrope::Errors::RequestError, message
+        if type.is_a?(String)
+          structured_error(type, code_or_message, message.is_a?(Hash) ? message : {})
+        else
+          raise Moonrope::Errors::RequestError, code_or_message
+        end
       end
     end
 
+    #
+    # Raises a structured error.
+    #
+    # @param code [String] the code to return
+    # @param message [String] explantory text to return
+    # @param additional [Hash] additional data to return with the error
+    #
+    def structured_error(code, message, additional = {})
+      raise Moonrope::Errors::StructuredError, additional.merge(:code => code, :message => message)
+    end
+
     #
     # Return paginated information
     #

data/lib/moonrope/structure.rb

@@ -83,7 +83,8 @@ module Moonrope
         # Add the expansions
         expansions.each do |name, expansion|
           next if options[:expansions].is_a?(Array) && !options[:expansions].include?(name.to_sym)
-          DeepMerge.deep_merge!({name.to_sym => environment.instance_eval(&expansion)}, hash)
+          next unless expansion[:conditions].all? { |condition| environment.instance_eval(&condition) }
+          DeepMerge.deep_merge!({name.to_sym => environment.instance_eval(&expansion[:block])}, hash)
         end
       end
 

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json