moonrope 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c07e3a6cf5bed85f04b415aba7c0a93eaac01c
-  data.tar.gz: 54224342f109ced1f812419c23453d63538b3af3
+  metadata.gz: ef945cc15907ff80fe15bc8d5e8cd01c439183e7
+  data.tar.gz: 29682cb87255200fb7c52dbec08c0e7b18ce6292
 SHA512:
-  metadata.gz: 6d10f3add6366036c7ed1355d9b03ad53629019a16bbb3689b0e70b0cc01e9740bcee698dcd0fc26a386609676bbff9e7852a4a4da5a81c89d26a0099e56bd96
-  data.tar.gz: 38d91c152c7208dcda97cf6e3ddb5ee95a5146c3790c4739b43da8513e45cfddd1951620379d7597a6eb1898716a0bcb74167f358043f3e463de4c7dbe4696a1
+  metadata.gz: 16c45bb324804dc8180a2e71940a952d50cb1c68464df6d619d1bef1b3beb63aa1557647f70a4c5b0294f0f7ba733ac7cf1ec9648e6e37ee1fabe517967c5a57
+  data.tar.gz: c7b40e7fe75f15ca75894c2df47a3db6d6a6dcc3c672c0d084e9a95711a5ea09c7ee9165d14e5946cad1093a7514448ce1920b536f5d15cd17cc0f507819f0f1

data/lib/moonrope/dsl/base_dsl.rb

@@ -21,6 +21,7 @@ module Moonrope
         structure = Moonrope::Structure.new(@base, name)
         structure.dsl.instance_eval(&block) if block_given?
         @base.structures << structure
+        structure
       end
     
       #
@@ -39,6 +40,7 @@ module Moonrope
         end
         controller.dsl.instance_eval(&block) if block_given?
         @base.controllers << controller
+        controller
       end
     
       #
@@ -66,7 +68,9 @@ module Moonrope
       # @yield stores the block to execute for the helper
       #
       def helper(name, &block)
-        @base.helpers << Moonrope::Helper.new(name, nil, &block)
+        helper_instance = Moonrope::Helper.new(name, nil, &block)
+        @base.helpers << helper_instance
+        helper_instance
       end
       
     end

data/lib/moonrope/eval_environment.rb

@@ -115,27 +115,45 @@ module Moonrope
     # object and return a hash or nil if the structure doesn't 
     # exist.
     #
-    # @param structure [Moonrope::Structure or Symbol] the structure to be used
+    # @param structure_name [Moonrope::Structure or Symbol] the structure to be used
     # @param object [Object] the object to pass through the structure
     # @param options [Hash] options to pass to the strucutre hash generator
     #
-    def structure(structure, object, options = {})
+    def structure(structure_name, object, options = {})
       if object
-        structure = case structure
-        when Symbol, String       then @base.structure(structure.to_sym)
-        when Moonrope::Structure  then structure
-        else
-          raise Moonrope::Errors::Error, "Invalid structure '#{structure}'"
-        end
-        if structure
+        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}'"
+          raise Moonrope::Errors::Error, "No structure found named '#{structure_name}'"
         end
       else
         nil
       end
     end
     
+    #
+    # Return a Moonrope::Structure object for the provided name
+    #
+    # @param structure_name [Symbol or String] the structure to return
+    #
+    def structure_for(structure_name)
+      structure = case structure_name
+      when Symbol, String       then @base.structure(structure_name.to_sym)
+      when Moonrope::Structure  then structure_name
+      else
+        false
+      end
+    end
+    
+    #
+    # Return whether or not a given structure name is valid?
+    #
+    # @param structure_name [Symbol or String] the structure to return
+    #
+    def has_structure_for?(structure_name)
+      self.structure_for(structure_name).is_a?(Moonrope::Structure)
+    end
+    
   end
 end

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json