moonrope 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daba7a2efd635f91a04eb69d14fcea60738c8be6
-  data.tar.gz: 79bfec85cd725a038f2922c38e69fedb4e3a1a85
+  metadata.gz: 7ca039ed24cf2290a693a3114f6c814394126950
+  data.tar.gz: c3b20c6c65d8fedc44bb81e2416ee8a80ab7dd49
 SHA512:
-  metadata.gz: 1d3ce17c2a410105909bd97ebbac3b8ee2e362c5945805772f02fe9f5038a42241d19cb5a2f9c9cabb71c753ee3a385becdd102e7ef10d13d51899702c515531
-  data.tar.gz: e44eb7bc43ea321a06f10549dd9e4551fd5d43a3a24e928590b669e63e3ba1b805b60f9b9734707d4635c7f0cfab6f9f6436b335a9edad6eeb1e5c2b099bb50b
+  metadata.gz: d9498a71459b3944f2054b5636ba09f7f7c3c0436697dbccb822849c8af7b3e65c977594bd2731d2b151c5596cfa189de440b993888379033e6383b303bf6828
+  data.tar.gz: 6371c78a68ff96cd6f376e20d05832fb97f6659e28e47b48258fe1e92fe27e46808a7165e3785c63716427d1d1f4cb7ba34353eb1347cd67de3fa22ffc63bfbd

data/lib/moonrope.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'logger'
-require 'deep_merge'
+require 'deep_merge/core'
 
 require 'moonrope/action'
 require 'moonrope/action_result'

data/lib/moonrope/action.rb

@@ -147,7 +147,7 @@ module Moonrope
         eval_environment = EvalEnvironment.new(@controller.base, request)
       end
       
-      access_condition = self.access || @controller.base.default_access
+      access_condition = self.access || @controller.access || @controller.base.default_access
       
       if eval_environment.auth
         # If there's no authentication object, access is permitted otherwise

data/lib/moonrope/controller.rb

@@ -1,7 +1,7 @@
 module Moonrope
   class Controller
     
-    attr_accessor :name, :actions, :befores
+    attr_accessor :name, :actions, :access, :befores
     attr_reader :base, :dsl
     
     #
@@ -15,6 +15,7 @@ module Moonrope
       @base = base
       @name = name
       @actions = {}
+      @access = nil
       @befores = []
       @dsl = Moonrope::DSL::ControllerDSL.new(self)
       @dsl.instance_eval(&block) if block_given?

data/lib/moonrope/dsl/base_dsl.rb

@@ -57,8 +57,8 @@ module Moonrope
       #
       # @yield stores the block as the access check
       #
-      def default_access(&block)
-        @base.default_access = block
+      def default_access(value = nil, &block)
+        @base.default_access = block_given? ? block : value
       end
       
       #

data/lib/moonrope/dsl/controller_dsl.rb

@@ -43,6 +43,14 @@ module Moonrope
         before_action
       end
       
+      #
+      # Defines the access required for controller methods which do not
+      # define their own access.
+      #
+      def access(value = nil, &block)
+        @controller.access = block_given? ? block : value
+      end
+      
       #
       # Defines a new helper for this controller.
       #

data/lib/moonrope/dsl/structure_dsl.rb

@@ -51,6 +51,7 @@ module Moonrope
         attribute.value_type        = options[:type]
         attribute.source_attribute  = options[:source_attribute]
         attribute.value             = options[:value]
+        attribute.example           = options[:eg] || options[:example]
         attribute.groups            = @groups
         attribute.conditions        = @conditions
         @structure.attributes[type] << attribute

data/lib/moonrope/structure.rb

@@ -52,22 +52,22 @@ module Moonrope
       hash = Hash.new
       
       # Add the 'basic' structured fields
-      hash.deep_merge! hash_for_attributes(@attributes[:basic], object, environment)
+      DeepMerge.deep_merge! hash_for_attributes(@attributes[:basic], object, environment), hash
       
       # Always get a basic hash to work from
       if self.basic.is_a?(Proc)
-        hash.deep_merge! environment.instance_eval(&self.basic)
+        DeepMerge.deep_merge! environment.instance_eval(&self.basic), hash
       end
       
       # Enhance with the full hash if requested
       if options[:full]
         
         # Add the 'full' structured fields
-        hash.deep_merge! hash_for_attributes(@attributes[:full], object, environment)
+        DeepMerge.deep_merge! hash_for_attributes(@attributes[:full], object, environment), hash
         
         if self.full.is_a?(Proc)
           full_hash = environment.instance_eval(&self.full)
-          hash.deep_merge! full_hash
+          DeepMerge.deep_merge! full_hash,hash
         end
       end
       
@@ -76,14 +76,14 @@ module Moonrope
         
         # Add structured expansions
         @attributes[:expansion].each do |attribute|
-          next if options[:expansions].is_a?(Array) && !options[:expansions].include?(name.to_sym)
-          hash.deep_merge!(hash_for_attributes([attribute], object, environment))
+          next if options[:expansions].is_a?(Array) && !options[:expansions].include?(attribute.name.to_sym)
+          DeepMerge.deep_merge! hash_for_attributes([attribute], object, environment), hash
         end
         
         # Add the expansions
         expansions.each do |name, expansion|
           next if options[:expansions].is_a?(Array) && !options[:expansions].include?(name.to_sym)
-          hash.deep_merge!(name.to_sym => environment.instance_eval(&expansion))
+          DeepMerge.deep_merge!({name.to_sym => environment.instance_eval(&expansion)}, hash)
         end
       end
       
@@ -146,7 +146,7 @@ module Moonrope
     #
     def value_for_attribute(object, environment,  attribute)
       value = object.send(attribute.source_attribute)
-      if attribute.structure
+      if value && attribute.structure
         # If a structure is required, lookup the desired structure and set the
         # hash value as appropriate.
         if structure = self.base.structure(attribute.structure)

data/lib/moonrope/structure_attribute.rb

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

data/lib/moonrope/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json