restpack-resource 0.1.4 → 0.1.5

data/lib/restpack-resource/resource/pageable.rb

@@ -4,7 +4,6 @@ module RestPack
   module Resource
     module Pageable      
       def paged_resource(options = {})
-        p "paged_resource options: #{options}"
         options.reverse_merge!(
           :scope => self.all,
           :page => 1,
@@ -23,7 +22,6 @@ module RestPack
       protected
       
       def get_paged_resource(options)
-        p "options: #{options}"
         paged_models = get_paged_models(options)        
 
         paged_resource = {

data/lib/restpack-resource/service.rb

@@ -4,22 +4,20 @@ module RestPack
   module Service
   
     def paged_resource(klass, params, options = {})
-      p "paged_resource: params: #{params}"
-      options[:page] ||= params[:page].to_i if params[:page]
-      options[:includes] ||= extract_includes_from_params(params) unless params[:includes].nil?
-      options[:sort_by] ||= params[:sort_by].to_sym if params[:sort_by]
-      options[:sort_direction] ||= params[:sort_direction].to_sym if params[:sort_direction]
+      options[:page] ||= params['page'].to_i if params['page']
+      options[:includes] ||= extract_includes_from_params(params) unless params['includes'].nil?
+      options[:sort_by] ||= params['sort_by'].to_sym if params['sort_by']
+      options[:sort_direction] ||= params['sort_direction'].to_sym if params['sort_direction']
       
       filters = extract_filters_from_params(klass, params)
-      p "paged_resource: filters: #{filters}"
       options[:filters] ||= filters unless filters.empty?
       
       klass.paged_resource(options)
     end
     
     def single_resource(klass, params, options = {})      
-      options[:id] ||= params[:id] if params[:id]
-      options[:includes] ||= extract_includes_from_params(params) unless params[:includes].nil?
+      options[:id] ||= params['id'] if params['id']
+      options[:includes] ||= extract_includes_from_params(params) unless params['includes'].nil?
       
       klass.single_resource(options)
     end
@@ -27,12 +25,12 @@ module RestPack
     private
   
     def extract_filters_from_params(klass, params)
-      extracted = params.extract!(*klass.resource_filterable_by)
+      extracted = params.with_indifferent_access.extract!(*klass.resource_filterable_by)
       extracted.delete_if { |k, v| v.nil? }
     end
     
     def extract_includes_from_params(params)
-      params[:includes].split(',').map {|i| i.to_sym }
+      params['includes'].split(',').map {|i| i.to_sym }
     end
     
   end

data/lib/restpack-resource/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Resource
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/spec/service_spec.rb

@@ -12,52 +12,52 @@ describe RestPack::Service do
     context "with params" do
       it "extracts the page number" do
         Artist.should_receive(:paged_resource).with({ :page => 66 })
-        service.paged_resource(Artist, { :page => '66' })
+        service.paged_resource(Artist, { 'page' => '66' })
       end
       
       it "gives options[:page] precidence" do
         Artist.should_receive(:paged_resource).with({ :page => 2 })
-        service.paged_resource(Artist, { :page => '66' }, { :page => 2 })
+        service.paged_resource(Artist, { 'page' => '66' }, { :page => 2 })
       end
       
       it "extracts the includes" do
         Artist.should_receive(:paged_resource).with({ :includes => [:songs, :manager] })
-        service.paged_resource(Artist, { :includes => 'songs,manager' })
+        service.paged_resource(Artist, { 'includes' => 'songs,manager' })
       end
       
       it "gives options[:includes] precidence" do
          Artist.should_receive(:paged_resource).with({ :includes => [:specified] })
-          service.paged_resource(Artist, { :includes => 'songs,manager' }, { :includes => [:specified] })
+          service.paged_resource(Artist, { 'includes' => 'songs,manager' }, { :includes => [:specified] })
       end
       
       it "extracts the sort_by" do
         Artist.should_receive(:paged_resource).with({ :sort_by => :id })
-        service.paged_resource(Artist, { :sort_by => 'id' })
+        service.paged_resource(Artist, { 'sort_by' => 'id' })
       end
       
       it "gives options[:sort_by] precidence" do
         Artist.should_receive(:paged_resource).with({ :sort_by => :name })
-        service.paged_resource(Artist, { :sort_by => 'id' }, { :sort_by => :name })
+        service.paged_resource(Artist, { 'sort_by' => 'id' }, { :sort_by => :name })
       end
       
       it "extracts the sort_direction" do
         Artist.should_receive(:paged_resource).with({ :sort_direction => :ascending })
-        service.paged_resource(Artist, { :sort_direction => 'ascending' })
+        service.paged_resource(Artist, { 'sort_direction' => 'ascending' })
       end
       
       it "gives options[:sort_direction] precidence" do
         Artist.should_receive(:paged_resource).with({ :sort_direction => :descending })
-        service.paged_resource(Artist, { :sort_direction => 'ascending' }, { :sort_direction => :descending })
+        service.paged_resource(Artist, { 'sort_direction' => 'ascending' }, { :sort_direction => :descending })
       end
       
       it "extracts the filters" do
-        Artist.should_receive(:paged_resource).with({ :filters => { :id => '148258', :name => 'Radiohead' } })
-        service.paged_resource(Artist, { :id => '148258', :name => 'Radiohead', :something => 'Else' })
+        Artist.should_receive(:paged_resource).with({ :filters => { :id => '142857', :name => 'Radiohead' } })
+        service.paged_resource(Artist, { 'id' => '142857', 'name' => 'Radiohead', 'something' => 'Else' })
       end
       
       it "gives options[:filters] precidence" do
         Artist.should_receive(:paged_resource).with({ :filters => { :id => '999' } })
-        service.paged_resource(Artist, { :id => '148258', :name => 'Radiohead', :something => 'Else' }, { :filters => { :id => '999' }})
+        service.paged_resource(Artist, { 'id' => '148258', 'name' => 'Radiohead', 'something' => 'Else' }, { :filters => { :id => '999' }})
       end
     end
     
@@ -71,12 +71,12 @@ describe RestPack::Service do
       context "with params" do
         it "extracts the includes" do
           Artist.should_receive(:single_resource).with({ :includes => [:songs, :manager] })
-          service.single_resource(Artist, { :includes => 'songs,manager' })
+          service.single_resource(Artist, { 'includes' => 'songs,manager' })
         end
 
         it "gives options[:includes] precidence" do
            Artist.should_receive(:single_resource).with({ :includes => [:specified] })
-            service.single_resource(Artist, { :includes => 'songs,manager' }, { :includes => [:specified] })
+            service.single_resource(Artist, { 'includes' => 'songs,manager' }, { :includes => [:specified] })
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors: