moonrope 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a005ba55f00db5d481ac58a7160e591e993c39b
-  data.tar.gz: 0189df9139aa0bf21c6a991592632478a2dbd769
+  metadata.gz: b3dec6b64d723aeb2e166a548bd1b0979e6f8639
+  data.tar.gz: 1578b8fcea65a8fa2a8021cf2e8d1ddb3b5db665
 SHA512:
-  metadata.gz: f6d0eb2be42d7b122abf4abc8bfbe7575523511bef0215c669f4455e44768273cc4744fddc5da475f521307e516e684e42ddab466b20014faa0d62bdd5a978ab
-  data.tar.gz: aa90abdd05744a1fd171a53f278d4b35bc5cdcbf647bfa343933538b7e2c4223617ad511a4bfbdcc5aa3aeb0ebc7a4a4da14be26f619b90317abb6e27a649557
+  metadata.gz: e78a8573273c0bc8a0f4f892bbef61142c0b391fd01909130952c606cfd11888974569751659ba4d016763e7f143de9f199f22b6a5f01941c4fd4f4816665c5b
+  data.tar.gz: 5829ec72fbbbcce330cf9666927a270b4351a4c9bf26c2bba5edaecbb0301d3b3d7a452af049cba0a1523593a97cd29655f99f47f43936d7fabdaee5a6903cbf

data/lib/moonrope/base.rb

@@ -32,12 +32,15 @@ module Moonrope
     # @return [Proc] the default access condition
     attr_accessor :default_access
     
-    # @return [String] the directory the base was loaded from (if relevant)
-    attr_accessor :loaded_from
+    # @return [Array] the array of directories to load from  (if relevant)
+    attr_accessor :load_directories
     
     # @return [String] the moonrope environment
     attr_accessor :environment
     
+    # @return [Proc] a proc to execute before every request
+    attr_accessor :on_request
+    
     #
     # Initialize a new instance of the Moonrope::Base
     #
@@ -46,6 +49,7 @@ module Moonrope
     def initialize(&block)
       unload
       @environment = 'development'
+      @load_directories = []
       @dsl = Moonrope::DSL::BaseDSL.new(self)
       @dsl.instance_eval(&block) if block_given?
     end
@@ -64,14 +68,17 @@ module Moonrope
     #
     # Reload this whole base API from the path
     #
-    def load(directory = nil)
-      directory = self.loaded_from if directory.nil?
-      if directory
+    def load(*directories)
+      directories = self.load_directories if directories.empty?
+      if directories.size > 0
         unload
-        Dir["#{directory}/**/*.rb"].each do |filename|
-          self.dsl.instance_eval(File.read(filename), filename)
+        new_directories = []
+        directories.each do |directory|
+          if load_directory(directory)
+            new_directories << directory
+          end
         end
-        self.loaded_from = directory
+        self.load_directories = new_directories
         self
       else
         raise Moonrope::Errors::Error, "Can't reload Moonrope::Base as it wasn't required from a directory"
@@ -80,6 +87,32 @@ module Moonrope
     
     alias_method :reload, :load
     
+    #
+    # Load from a given directory
+    #
+    def load_directory(directory)
+      if File.exist?(directory)
+        Dir["#{directory}/**/*.rb"].each do |filename|
+          self.dsl.instance_eval(File.read(filename), filename)
+        end
+        true
+      else
+        false
+      end
+    end
+    
+    #
+    # Add a dirctory to the directories to load
+    #
+    def add_load_directory(directory)
+      if load_directory(directory)
+        self.load_directories << directory unless self.load_directories.include?(directory)
+        true
+      else
+        false
+      end
+    end
+    
     #
     # Return a structure of the given name
     #

data/lib/moonrope/dsl/base_dsl.rb

@@ -18,9 +18,13 @@ module Moonrope
       # @yield instance evals the block within the StructureDSL
       #
       def structure(name, &block)
-        structure = Moonrope::Structure.new(@base, name)
+        if existing = @base.structures.select { |s| s.name == name }.first
+          structure = existing
+        else
+          structure = Moonrope::Structure.new(@base, name)
+          @base.structures << structure
+        end
         structure.dsl.instance_eval(&block) if block_given?
-        @base.structures << structure
         structure
       end
     
@@ -37,9 +41,9 @@ module Moonrope
           controller = existing
         else
           controller = Moonrope::Controller.new(@base, name)
+          @base.controllers << controller
         end
         controller.dsl.instance_eval(&block) if block_given?
-        @base.controllers << controller
         controller
       end
     

data/lib/moonrope/rack_middleware.rb

@@ -15,6 +15,8 @@ module Moonrope
       @options = options
     end
     
+    attr_reader :base
+    
     #
     # Make a new request
     #
@@ -28,6 +30,13 @@ module Moonrope
           @base.load
         end
         
+        #
+        # Call the on request block if one has been defined for the base.
+        #
+        if @base.on_request.is_a?(Proc)
+          @base.on_request.call(@base, env)
+        end
+        
         #
         # Create a new request object
         #

data/lib/moonrope/railtie.rb

@@ -3,21 +3,19 @@ module Moonrope
     
     initializer 'moonrope.initialize' do |app|
       
-      # Initialize a new moonrope base from the API defined in
-      # $RAILS_ROOT/app/api directory.
-      moonrope_directory = Rails.root.join('api')
-      if File.directory?(moonrope_directory)
-        app.config.moonrope = Moonrope::Base.load(moonrope_directory)
-      else
-        $stderr.puts "Moonrope is installed but there is no API directory at ROOT/api."
-        next
-      end
-      
+      # Initialize a new moonrope base.
+      app.config.moonrope = Moonrope::Base.load(Rails.root.join('api'))
+            
       # Set the logger
       Moonrope.logger = Rails.logger
       
       # Set the environment to match the Rails environment
       app.config.moonrope.environment = Rails.env.to_s
+      
+      # Ensure all request use UTC
+      app.config.moonrope.on_request = Proc.new do |base, env|
+        Time.zone = 'UTC'
+      end
 
       # Set the request regex if one has been set
       if app.config.respond_to?(:moonrope_request_path_regex) && app.config.moonrope_request_path_regex.is_a?(Regexp)

data/lib/moonrope/structure.rb

@@ -151,7 +151,7 @@ module Moonrope
         # hash value as appropriate.
         if structure = self.base.structure(attribute.structure)
           structure_opts = attribute.structure_opts || {}
-          if value.is_a?(Array)
+          if value.respond_to?(:map)
             value.map do |v|
               structure.hash(v, structure_opts.merge(:request => environment.request))
             end

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

metadata

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