windsor 0.0.6 → 0.0.7

data/app/controllers/windsor_controller.rb

@@ -17,8 +17,9 @@ class WindsorController < ApplicationController
       current_page_index = params[:page].to_i - 1
       offset = @max_page_size * current_page_index  
     end
-    items = model_class.where(scope).limit(@max_page_size).offset(offset).all
-    total_items = model_class.count
+    final_scope = scope.merge(request.query_parameters)
+    items = model_class.where(final_scope).limit(@max_page_size).offset(offset).to_a
+    total_items = model_class.where(final_scope).count
 
     object = { 
       get_controller_name => items, 
@@ -152,6 +153,11 @@ class WindsorController < ApplicationController
     url_conditions.merge!(:action => "show", :id => object_hash["id"].to_s) unless object_hash["id"].nil?
     url_for(url_conditions)
   end
+
+  def get_index_link
+    url_conditions = { :controller => get_controller_name, :action => "index" }
+    url_for(url_conditions)
+  end
   
   def get_controller_name
     model_class.name.underscore.pluralize
@@ -183,13 +189,13 @@ class WindsorController < ApplicationController
   
     def request_uri
       request.base_url + request.path
-    end  
-    
+    end
+
     def page_link(page_number)
       query_parameters = request.query_parameters
       query_parameters[:page] = page_number
       return request_uri + "?" + query_parameters.to_query
-    end        
+    end
   
     # Removes extra attributes passed in. Extra attributes is defined as attributes not sent in a GET.
     def prune_extra_attributes(request_body, existing_attributes)    
@@ -205,8 +211,8 @@ class WindsorController < ApplicationController
   
     def get_resource
       @model_object = model_class.where(scope).find(params[:id])
-    end      
-  
+    end
+
     def check_implemented
       set_actions
       unless enabled_actions.include?(params[:action].to_sym)
@@ -227,7 +233,11 @@ class WindsorController < ApplicationController
     
     def prepare_representation(object)
       add_link( object, get_self_link(object), 'self' )
+      if enabled_actions.include?(:index) && !object["id"].nil?
+        add_link( object, get_index_link, 'index')
+      end
       attributes = enabled_attributes(object)
+      attributes << "links"
       object.each do |key, value|
         object.delete key unless attributes.include?(key)
       end

data/lib/windsor/version.rb

@@ -1,3 +1,3 @@
 module Windsor
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: windsor
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152306260 !ruby/object:Gem::Requirement
+  requirement: &2160243860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152306260
+  version_requirements: *2160243860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152305240 !ruby/object:Gem::Requirement
+  requirement: &2160242520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152305240
+  version_requirements: *2160242520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152304000 !ruby/object:Gem::Requirement
+  requirement: &2160241120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152304000
+  version_requirements: *2160241120
 description: Windsor is a plugin for building RESTful APIs in Rails.
 email:
 - sam@samdecesare.com