sinatra-backstage 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874df067c1f31e0fa5c8913f9968b5d375eeb4a3
-  data.tar.gz: f985613fd20fc61bc2ee0e01910288500b116411
+  metadata.gz: 207a05ebdc4fa45edc961167ba323bbd40e4d6ee
+  data.tar.gz: 7f963a8aaf072e820201b2b940070852c4516598
 SHA512:
-  metadata.gz: e9ee548654babda6cea1d9ba5f7849ecd03485d1c35974c997140f4b3cf89ff21b1f5ddb2d9a4e69526ff87a170f947e39301291d776efd6340920cb8cb2d828
-  data.tar.gz: f68d0ee1bb05a71d7929b7131193ef08dabb1b3b41f2aae85587b77dcd2e1050319f3d8bb191a9335240b3993fafb49a18d282d30015a1c8cca7bd07a688dd9b
+  metadata.gz: e8e6a92c8f69cfd140447ff1f0e5c3cfb6054af6c8635f66bba7534f382cd21bc14393fcb8a0b25d0b78c24d2ccea8ede931adb1d841e2638cefb3f0fcf12197
+  data.tar.gz: 52ab702b62853ed6140febac73a3aafbe2e8a0147bb0e4dc088a01d3528aa99aef7591ff5a233861f1aeef1d89bf76c5ebc82ce8b30f52905222ba32af25faf9

data/lib/sinatra/backstage/rest/rest_routes.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'dm-serializer'
 
 module Sinatra
 	module Backstage
@@ -14,15 +14,31 @@ module Sinatra
 					## Routes
 					### get list
 					get namespace do
-						@objects = rest_get_all klass, params
-						request.accept.each do |type|
-							# puts "type.to_s = #{type.to_s}"
-							case type.to_s
-							when 'text/html'
-								halt eval "#{settings.render_engine} '#{demodulize(klass).downcase}/list'"
-							when 'text/json', 'application/json'
-								halt @objects.to_a.to_json
+						## get format
+						# puts "-- REST.Routing get namespace ( params = #{params})"
+						format = params.delete('format') || 'html'
+						# puts "-- REST.Routing get namespace after format ( params = #{params})"
+						format = 'json' if request.accept.include?('text/json') || request.accept.include?('application/json')
+						## get json options
+						json_opts = params.delete('json_opts')
+						json_opts = json_opts.inject({}) do |hash_sym, (key, val)|
+							hash_sym[key.to_sym] = val.map do |el|
+								el.to_sym
 							end
+							hash_sym
+						end
+						## get objects
+						@objects = rest_get_all klass, params
+						# puts "-- REST.Routing get namespace ( @objects = #{@objects})"
+						# puts "-- REST.Routing get namespace ( @objects.to_a = #{@objects.to_a})"
+						# puts "-- REST.Routing get namespace ( @objects.to_json = #{@objects.to_json})"
+						# puts "-- REST.Routing get namespace ( @objects.to_a.to_json = #{@objects.to_a.to_json})"
+						## return
+						case format
+						when 'html'
+							halt eval "#{settings.render_engine} '#{demodulize(klass).downcase}/list'"
+						when 'json'
+							halt @objects.to_json(json_opts)
 						end
 						error 406
 					end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-backstage
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alexander Popov
@@ -9,105 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-05-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: sinatra-conditions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: dm-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: dm-validations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: dm-timestamps
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
+dependencies: []
 description: Sinatra-Backstage simplifies the use of the basic routes and models for
   Sinatra and DataMapper. Currently it includes REST and User.
 email: alex.wayfer@gmail.com