moonrope 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaca3dee3108ec017c94921848e0cf7bf5de4136
-  data.tar.gz: 703c784363fe0cc329931c7568c5603b1b863bef
+  metadata.gz: daba7a2efd635f91a04eb69d14fcea60738c8be6
+  data.tar.gz: 79bfec85cd725a038f2922c38e69fedb4e3a1a85
 SHA512:
-  metadata.gz: e28959e2e988a35fbb030b944dafeb086b0c973f9691cc23c2c0d23cf63fb2b3cc03b776af60c7e6022241b749ee6fb85b6f9d78fedc03c90c61bba2f4e9df53
-  data.tar.gz: e5917f0184a0113189a5291b6a91240c987dd52d9725728d57ab69e9cffaedd2f7148ce01b67a79f326c714859f3c9c1d8e2112301a6641ae1a43b46a6abefb8
+  metadata.gz: 1d3ce17c2a410105909bd97ebbac3b8ee2e362c5945805772f02fe9f5038a42241d19cb5a2f9c9cabb71c753ee3a385becdd102e7ef10d13d51899702c515531
+  data.tar.gz: e44eb7bc43ea321a06f10549dd9e4551fd5d43a3a24e928590b669e63e3ba1b805b60f9b9734707d4635c7f0cfab6f9f6436b335a9edad6eeb1e5c2b099bb50b

data/lib/moonrope/dsl/structure_dsl.rb

@@ -49,7 +49,8 @@ module Moonrope
         attribute.structure         = options[:structure]
         attribute.structure_opts    = options[:structure_opts]
         attribute.value_type        = options[:type]
-        attribute.source_attribute  = options[:source] || options[:name]
+        attribute.source_attribute  = options[:source_attribute]
+        attribute.value             = options[:value]
         attribute.groups            = @groups
         attribute.conditions        = @conditions
         @structure.attributes[type] << attribute

data/lib/moonrope/railtie.rb

@@ -39,8 +39,6 @@ module Moonrope
         end
       end
       
-      puts app.config.moonrope.helpers.inspect
-      
       # Insert the Moonrope middleware into the application's middleware
       # stack (at the bottom).
       app.middleware.use(

data/lib/moonrope/structure.rb

@@ -116,7 +116,13 @@ module Moonrope
             end
           end
           
-          value = value_for_attribute(object, environment, attribute)
+          if attribute.value.is_a?(Proc)
+            value = environment.instance_eval(&attribute.value)
+          elsif attribute.value
+            value = attribute.value
+          else
+            value = value_for_attribute(object, environment, attribute)
+          end
           
           if attribute.groups.empty?
             hash[attribute.name] = value

data/lib/moonrope/structure_attribute.rb

@@ -9,6 +9,7 @@ module Moonrope
     attr_accessor :value_type
     attr_accessor :structure
     attr_accessor :structure_opts
+    attr_accessor :value
     
     def initialize(type, name, description)
       @type = type

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

metadata

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