rocket_pants 1.5.4 → 1.5.5

data/lib/rocket_pants.rb

@@ -4,7 +4,6 @@ require 'action_dispatch/routing'
 require 'action_controller'
 
 require 'moneta'
-require 'moneta/memory'
 
 module RocketPants
   require 'rocket_pants/error'
@@ -46,12 +45,20 @@ module RocketPants
 
   mattr_writer :cache
 
+  begin
+    require 'moneta/memory'
+    MONETA_LEGACY = true
+  rescue LoadError => e
+    require 'moneta'
+    MONETA_LEGACY = false
+  end
+
   class << self
     alias caching_enabled? caching_enabled
     alias header_metadata? header_metadata
 
     def cache
-      @@cache ||= Moneta::Memory.new
+      @@cache ||= (MONETA_LEGACY ? Moneta::Memory : Moneta::Adapters::Memory).new
     end
 
     def env

data/lib/rocket_pants/controller/versioning.rb

@@ -1,28 +1,28 @@
 module RocketPants
   module Versioning
-    
+
     extend ActiveSupport::Concern
-    
+
     included do
       class_attribute :_version_range
     end
-    
+
     module ClassMethods
-      
+
       def version(version)
         version = version..version if version.is_a?(Integer)
         self._version_range = version
         before_filter :verify_api_version
       end
-      
+
     end
-    
+
     protected
-    
+
     def version
       if !instance_variable_defined?(:@version)
         @version = begin
-          version = params[:version]
+          version = extract_version_string_with_prefix params[:version], request.symbolized_path_parameters[:rp_prefix]
           version.presence && Integer(version)
         rescue ArgumentError
           nil
@@ -30,10 +30,25 @@ module RocketPants
       end
       @version
     end
-    
+
     def verify_api_version
       error! :invalid_version unless version.present? && _version_range.include?(version)
     end
-      
+
+    def extract_version_string_with_prefix(version, prefix)
+      if version && prefix.is_a?(Hash)
+        # We need to strip the text from the prefix.
+        prefix_regexp = /^#{prefix[:text]}/
+        version = version.to_s
+        if prefix[:required] && version !~ prefix_regexp
+          raise ArgumentError, "You required the route version prefix #{prefix[:text]}, but not was given."
+        end
+        version.gsub prefix_regexp, ''
+      else
+        # Otherwise, return it intact.
+        version
+      end
+    end
+
   end
 end

data/lib/rocket_pants/routing.rb

@@ -7,20 +7,37 @@ module RocketPants
     # @option options [Array<Integer>, Integer] :version the single version to support
     # @raise [ArgumentError] raised when the version isn't provided.
     def rocket_pants(options = {}, &blk)
-      versions = (Array(options.delete(:versions)) + Array(options.delete(:version))).flatten.map(&:to_s)
-      versions.each do |version|
-        raise ArgumentError, "Got invalid version: '#{version}'" unless version =~ /\A\d+\Z/
+      versions = extract_rocket_pants_versions options
+
+      defaults = {:format => 'json'}
+
+      if (optional_prefix = options.delete(:allow_prefix))
+        versions.map! { |v| "#{optional_prefix}?#{v}" }
+        defaults[:rp_prefix] = {:text => optional_prefix.to_s, :required => false}
+      elsif (required_prefix = options.delete(:require_prefix))
+        versions.map! { |v| "#{required_prefix}#{v}" }
+        defaults[:rp_prefix] = {:text => required_prefix.to_s, :required => true}
       end
       versions_regexp = /(#{versions.uniq.join("|")})/
       raise ArgumentError, 'please provide atleast one version' if versions.empty?
       options = options.deep_merge({
         :constraints => {:version => versions_regexp},
         :path        => ':version',
-        :defaults    => {:format => 'json'}
+        :defaults    => defaults
       })
       scope options, &blk
     end
     alias api rocket_pants
 
+    private
+
+    def extract_rocket_pants_versions(options)
+      versions = (Array(options.delete(:versions)) + Array(options.delete(:version))).flatten.map(&:to_s)
+      versions.each do |version|
+        raise ArgumentError, "Got invalid version: '#{version}'" unless version =~ /\A\d+\Z/
+      end
+      versions
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_pants
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,232 +9,232 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: railties
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: will_paginate
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: hashie
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: api_smith
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: moneta
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rspec-rails
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.4'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rr
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: webmock
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: activerecord
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
+  name: sqlite3
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: reversible_data
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: kaminari
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Rocket Pants adds JSON API love to Rails and ActionController, making
   it simpler to build API-oriented controllers.
 email:
@@ -275,20 +275,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1041762551203045726
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24