flexible_api_server 0.0.13 → 0.1.0

data/lib/flexible_api_server.rb

@@ -13,11 +13,18 @@ class ActiveRecord::Base
   end
 end
 
+
+
 module FlexibleApiServer
 
   class App < Sinatra::Base
-
+    # to allow periods in parameters without it being a MIME type, respondto tries to replace all periods, so we intercept before
+    before do 
+      request.path_info = request.path_info.sub(/\.(?=([.*\)]))/, '\period')
+    end
+    
     register Sinatra::RespondTo
+  
     mime_type :jsonp, 'application/javascript'
     mime_type :js, 'application/json'
     mime_type :xml, 'application/xml'
@@ -203,14 +210,19 @@ module FlexibleApiServer
 
     DEFAULT_LIMIT = 50
 
+    # override this method to allow backspace (%5C) escaping commas, parentheses, and backspaces in params
     def add_scopes(query, scope_param)
       scopes = []
       scopes.concat scope_param.split ':' unless scope_param.nil?
       scopes.concat params[:scopes] if params[:scopes].is_a?(Array)
       scopes.each do |scope|
-        # TODO remove this ugliness
-        method, arg_string = scope.split '('
-        if !arg_string.nil? && args = arg_string.chop.split(',').map(&:strip)
+        method, arg_string = scope.split(/(?<=[^\\])\(/)
+        if !arg_string.nil?
+          arg_string = arg_string.chop.gsub(/\\\\/, "\\backspace").gsub(/\\period/, '.')
+          # split on non-escaped commas
+          args = arg_string.split(/(?<=[^\\]),/).map(&:strip)
+          # map escaped characters to normal values
+          args = args.map {|arg| arg.gsub(/\\,/, ',')}.map {|arg| arg.gsub(/\\\(/, '(')}.map {|arg| arg.gsub(/\\backspace/, '\\')}
           query = query.send method.to_sym, *args
         else
           query = query.send method.to_sym

data/lib/flexible_api_server/version.rb

@@ -1,5 +1,5 @@
 module FlexibleApiServer
 
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 
 end

metadata

@@ -1,146 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flexible_api_server
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.13
 platform: ruby
-authors: 
+authors:
 - John Crepezzi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70236559424220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559424220
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70236559423520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559423520
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70236559422400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: flexible_api
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559422400
+- !ruby/object:Gem::Dependency
+  name: flexible_api
+  requirement: &70236559421440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559421440
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70236559420920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559420920
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70236559409220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559409220
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70236559407680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sinatra-respond_to
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70236559407680
+- !ruby/object:Gem::Dependency
+  name: sinatra-respond_to
+  requirement: &70236559406900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70236559406900
 description: Server for exposing Flexible APIs
 email: john.crepezzi@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/flexible_api_server/version.rb
 - lib/flexible_api_server.rb
 - views/doc_index.html.erb
 - spec/spec_helper.rb
-has_rdoc: false
 homepage: http://github.com/seejohnrun/flexible_api_server
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: flexible_api_server
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Server for exposing Flexible APIs created by FlexibleAPI
-test_files: 
+test_files:
 - spec/spec_helper.rb