trust 0.6.0 → 0.6.1

data/lib/trust/controller/properties.rb

@@ -60,14 +60,15 @@ module Trust
       # returns or sets the model to be used in a controller
       # If not set, the controller_path is used
       # You can override the model to be accessed in a controller by setting the model
+      # Note that you should specify the model in plural form.
       #
       # ==== Example
       #
       #    # You have a controller which inherits from a generic controller and it has not the same name. Below
-      #    model :account # will assume that the class to be Account and instance variables to be @account/@accounts
+      #    model :accounts # will assume that the class to be Account and instance variables to be @account/@accounts
       #
       #    # name spaced models
-      #    model :"customer/account"
+      #    model :"customer/accounts"
       #
       def model(name = nil)
         @model = name.to_s if name

data/lib/trust/controller/resource.rb

@@ -126,7 +126,7 @@ module Trust
           @controller.send(:build, action) if @controller.respond_to?(:build)
         elsif properties.member_actions.include?(action)
 #          logger.debug "Trust.load: Finding parent: #{parent.inspect}, relation: #{relation.inspect}"
-          self.instance ||= relation.find(params[:id])
+          self.instance ||= relation.find(params[:id] || params["#{relation.name.underscore}_id".to_sym])
           @controller.send(:build, action) if @controller.respond_to?(:build)
         else # other outcome would be collection actions
 #          logger.debug "Trust.load: Parent is: #{parent.inspect}, collection or unknown action."

data/lib/trust/version.rb

@@ -23,5 +23,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Trust
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/dummy/log/development.log

@@ -35,3 +35,5 @@ Migrating to CreateClients (20120523144144)
    (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120523144144')
    (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120522115011')
    (1.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20120522130322')
+Connecting to database specified by database.yml
+MONGODB [DEBUG] Logging level is currently :debug which could negatively impact client-side performance. You should set your logging level no lower than :info in production.