moonrope 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cbbacd319f472da01acaa7be887855096facf6
-  data.tar.gz: e198ad723b9e7431a29a93cd6527f2ab65927ee9
+  metadata.gz: a9692810430240c41d7a72ae72a4c9db1134359e
+  data.tar.gz: f87635e0c45475aab9be1f764af4661f736bd3a3
 SHA512:
-  metadata.gz: 97c16159042f72c46ab081f889bf6db8fae3e7b06ef6909a814fdafd945dd13ad5d3ac3672ac89500a38694b1819d512f7360e0ad1274072399043427842af1a
-  data.tar.gz: a0c2475a80583da947f65e9f25f11970e8214d4e2671a4305d30f7b5cbceae51eabf6122e310049d38cb68e9851d843efc6c7c9336cf6d2b95ebb8a3b21b09e4
+  metadata.gz: 3d2a7fdb9279de606ea73fcb20dc6fe18bf6e2e13eb5016ee0bf6f513f3391fdc10d345eacab8b90474c249261e883af8312ea80c9004666fd092414f35f0586
+  data.tar.gz: 37b832788c055a6fc24361d9f7acae8957eed70fb392210500cfcd25f6232c97e7b259d6c2e3ea0f4776448bb5bb43ce57be4cb69a8af6bd8759cfbc86079031

data/lib/moonrope/base.rb

@@ -52,7 +52,7 @@ module Moonrope
     def unload
       @structures = []
       @controllers = []
-      @helpers = []
+      @helpers = @helpers.is_a?(Array) ? @helpers.select { |h| h.options[:unloadable] == false } : []
       @authenticator = nil
       @default_access = nil
     end
@@ -70,7 +70,7 @@ module Moonrope
         self.loaded_from = directory
         self
       else
-        raise Moonrope::Error, "Can't reload Moonrope::Base as it wasn't required from a directory"
+        raise Moonrope::Errors::Error, "Can't reload Moonrope::Base as it wasn't required from a directory"
       end
     end
     

data/lib/moonrope/dsl/base_dsl.rb

@@ -67,8 +67,12 @@ module Moonrope
       # @param name [Symbol] the name of the helper
       # @yield stores the block to execute for the helper
       #
-      def helper(name, &block)
-        helper_instance = Moonrope::Helper.new(name, nil, &block)
+      def helper(name, options = {}, &block)
+        if @base.helper(name, nil)
+          raise Moonrope::Errors::HelperAlreadyDefined, "Helper has already been defined with name `#{name}`"
+        end
+
+        helper_instance = Moonrope::Helper.new(name, nil, options, &block)
         @base.helpers << helper_instance
         helper_instance
       end

data/lib/moonrope/dsl/controller_dsl.rb

@@ -49,8 +49,12 @@ module Moonrope
       # @param name [Symbol] the name of the helper
       # @yield stores the block to execute for the helper
       #
-      def helper(name, &block)
-        @controller.base.helpers << Moonrope::Helper.new(name, @controller, &block)
+      def helper(name, options = {}, &block)
+        if @controller.base.helper(name, @controller)
+          raise Moonrope::Errors::HelperAlreadyDefined, "Helper has already been defined with name `#{name}`"
+        end
+        
+        @controller.base.helpers << Moonrope::Helper.new(name, @controller, options, &block)
       end
     end
   end

data/lib/moonrope/errors.rb

@@ -4,6 +4,8 @@ module Moonrope
     class Error < StandardError
     end
     
+    class HelperAlreadyDefined < Error; end
+    
     class RequestError < Error
       attr_reader :options
       

data/lib/moonrope/helper.rb

@@ -10,6 +10,8 @@ module Moonrope
     # @return [Proc] the proc to execute
     attr_reader :block
     
+    # @return [Hash] options for this helper
+    attr_reader :options
     
     #
     # Initialize a new helper
@@ -18,9 +20,10 @@ module Moonrope
     # @param controller [Moonrope::Controller] the controller the helper belongs to
     # @yield stores the block for use later
     #
-    def initialize(name, controller, &block)
+    def initialize(name, controller, options = {}, &block)
       @name = name
       @controller = controller
+      @options = options
       @block = block
     end
     

data/lib/moonrope/railtie.rb

@@ -27,8 +27,20 @@ module Moonrope
           result.status = 'not-found'
           result.data = {:message => exception.message}
         end
+        
+        # Add a helper for auto setting parameters
+        app.config.moonrope.dsl.instance_eval do
+          helper :auto_set_params_for, :unloadable => false do |object|
+            current_action = object.new_record? ? :create_only : :update_only
+            request.action.params.select { |k,v| v[:set] == true || v[:set] == current_action }.keys.each do |param|
+              object.send("#{param}=", params[param])  if params.has?(param)
+            end
+          end
+        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/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An API server DSL.