moonrope 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1be661422027acf61678bd7b6a73932376b53ec3
-  data.tar.gz: 3ea06c9d8c46916c81b833d6c0bd7328e7886580
+  metadata.gz: 81c19996325ee4342d9c027d043e03dc15dbf4b1
+  data.tar.gz: 6a5859ecd39d546385894fd3d114aee48b0dd166
 SHA512:
-  metadata.gz: adf31e337346e9f3013a1d89b6583ef1dc87a0fd771c21aaf4c871460e31abdc6f95c839922df56cc8eaaac91dec05b60fe15f3ad99ab0eff86cde9b171155a7
-  data.tar.gz: 3256a19d2938b43720bdf9ea95ffac7f5f86704c9acffce1977c7f16591ea0eacfbc1de49b96fa3b5a0782fba49955e52a6407c75da60efbbb71781fdb219791
+  metadata.gz: c8795f460fcbb66d4c93acd896fcb2a1e15b73650f3e824069366fdb3d8fd3a6699a3fce21f2b76c41387070d9cd52730f34b94984750880258783c6644e2ec1
+  data.tar.gz: 02fc479ae9b0c7609935605c7296eab781eaf3d8d82ced6e826f94b24fc965fca1ce5ba8f1a44926772ac79b36d4df21811b837501ab97caecc5f690b8abe4a8

data/lib/moonrope/eval_environment.rb

@@ -119,17 +119,31 @@ module Moonrope
     # @param object [Object] the object to pass through the structure
     # @param options [Hash] options to pass to the strucutre hash generator
     #
-    def structure(structure_name, object, options = {})
-      if object
-        structure = structure_for(structure_name)
-        if structure.is_a?(Moonrope::Structure)
-          structure.hash(object, options.merge(:request => @request))
-        else
-          raise Moonrope::Errors::Error, "No structure found named '#{structure_name}'"
-        end
+    def structure(structure_name_or_object, object_or_options = {}, options_if_structure_name = {})
+
+      if structure_name_or_object.is_a?(Symbol) || structure_name_or_object.is_a?(String) || structure_name_or_object.is_a?(Moonrope::Structure)
+        structure_name = structure_name_or_object
+        object = object_or_options
+        options = options_if_structure_name
+      elsif structure_name_or_object.class.name.respond_to?(:underscore)
+        structure_name = structure_name_or_object.class.name.underscore.to_sym
+        object = structure_name_or_object
+        options = object_or_options
       else
-        nil
+        raise Moonrope::Errors::Error, "Could not determine structure name"
       end
+
+      if object.nil?
+        return nil
+      end
+
+      structure = structure_for(structure_name)
+
+      unless structure.is_a?(Moonrope::Structure)
+        raise Moonrope::Errors::Error, "No structure found named '#{structure_name}'"
+      end
+
+      structure.hash(object, options.merge(:request => @request))
     end
 
     #

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Adam Cooke