pbw 0.0.10 → 0.1.0

data/lib/generators/pbw/templates/index.erb

@@ -1,6 +1,7 @@
 <script type="text/javascript">
   $(function() {
   	window.router = new <%= router_name %>;
+  	window.<%=js_app_name%>.User = <%%=raw (current_user.to_json)%>;
     Backbone.history.start();
   });
 </script>

data/lib/generators/pbw/templates/model.coffee

@@ -1,14 +1,14 @@
 class <%= js_model_namespace %> extends Backbone.Model
-  paramRoot: '<%= singular_table_name %>'
-  urlRoot: '/pbw/<%=model_namespace.downcase%>/<%= class_name%>'
+  urlRoot: '/pbw/<%=model_namespace.downcase%>/<%= class_namespace %>'
 
   defaults:
-    name: null
-    _type: '<%= class_name%>'
+<% default_attributes.each do |attribute| -%>
+    <%= attribute[:name] %>: '<%=attribute[:default_value]%>'
+<% end -%>
 <% attributes.each do |attribute| -%>
     <%= attribute.name %>: null
 <% end -%>
 
 class <%= collection_namespace %>Collection extends Backbone.Collection
   model: <%= js_model_namespace %>
-  url: '/pbw/<%=model_namespace.downcase%>/<%= class_name%>'
+  url: '/pbw/<%=model_namespace.downcase%>/<%= class_namespace %>'

data/lib/generators/pbw/templates/pbw.coffee

@@ -8,14 +8,23 @@
 @current_user = ->
   window.<%= js_app_name %>.User
 
-# Form error handling
-@form_errors = (message, jqXHR) ->
+@is_admin = ->
+  current_user() && (current_user().role == 'superadmin' || current_user().role == 'admin')
+
+# Error handling
+@display_errors = (message, jqXHR, backlink) ->
   debug message
   debug jqXHR
-  $("#error").html('<h3>' + message + '</h3><ul>')
-  if jqXHR && jqXHR.responseText
-    _.each($.parseJSON(jqXHR.responseText), (value,key) ->
-      $("#error").append('<li>' + value + '</li>')
-    )
-  $("#error").append('</ul>')
-  $("#error").show()
+  if jqXHR && jqXHR.status == 401
+    if backlink
+      window.<%=js_app_name%>.backlink = backlink
+    window.location.hash = '/login'
+
+  _.defer =>
+    $("#error").html('<h3>' + message + '</h3><ul>')
+    if jqXHR && jqXHR.responseText
+      _.each($.parseJSON(jqXHR.responseText), (value,key) ->
+        $("#error").append('<li>' + value + '</li>')
+      )
+    $("#error").append('</ul>')
+    $("#error").show()

data/lib/generators/pbw/templates/router.coffee

@@ -5,6 +5,7 @@ class <%= router_name %> extends Backbone.Router
   routes:
     ""    : "home"
     "login" : "login"
+    "logout" : "logout"
     "signup" : "signup"
     "password_recovery" : "passwordRecovery"
     
@@ -17,6 +18,14 @@ class <%= router_name %> extends Backbone.Router
     @view = new <%= "#{js_app_name}.Views.Users.LoginView" %>
     $("#app").html(@view.render().el)
 
+  logout: ->
+    $.ajax 
+      url: '/pbw/users/sign_out.json'
+      type: 'DELETE'
+      complete: ->
+        window.<%= js_app_name %>.User = null
+        window.location.hash = "/"
+    
   signup: ->
     @view = new <%= "#{js_app_name}.Views.Users.SignupView" %>
     $("#app").html(@view.render().el)

data/lib/generators/pbw/templates/templates/edit.jst

@@ -3,14 +3,25 @@
   <input type="hidden" name="authenticity_token" value="<%%= $("meta[name='csrf-token']").attr("content") %>">
   <fieldset>
     <legend>Edit <%= singular_table_name %></legend>
+  <% default_attributes.each do |attribute| -%>
+    <% unless attribute[:name].start_with?('_') %>
     <div class="field">
-      <label for="name">Name:</label>
-      <input type="text" name="name" id="name" value="<%%= name %>" >
+      <label for="<%= attribute[:name] %>"> <%= attribute[:name].capitalize %>:</label>
+      <input type="text" name="<%= attribute[:name] %>" id="<%= attribute[:name] %>" value="<%%= <%= attribute[:name] %> %>" >
     </div>
+    <% end %>
+  <% end -%>
   <% attributes.each do |attribute| -%>
     <div class="field">
       <label for="<%= attribute.name %>"> <%= attribute.human_name %>:</label>
-      <input type="text" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>" >
+      <% case "#{attribute.type}".underscore.to_sym 
+      when :boolean %>
+      <input type="checkbox" name="<%= attribute.name %>" id="<%= attribute.name %>" data-type="<%=attribute.type%>">
+      <% when :integer %>
+      <input type="number" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>"  data-type="<%=attribute.type%>">
+      <% else %>
+      <input type="text" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>"  data-type="<%=attribute.type%>">
+      <% end %>
     </div>
 
   <% end -%>
@@ -20,4 +31,8 @@
   </fieldset>
 </form>
 
-<a href="#/<%=plural_model_name%>">Back</a>
+<%% if(is_admin()){ %>
+  <a href="#/<%=plural_model_name%>">Back</a>
+<%% }else { %>
+  <a href="#/">Back</a>
+<%% } %>

data/lib/generators/pbw/templates/templates/home.jst

@@ -1,7 +1,8 @@
 <nav>
 	<ul>
 		<%% if(current_user()) { %>
-		<li><a href="/pbw/users/sign_out" data-method="delete">Sign out</a></li>
+		<li>Hi <%%= current_user().name %></li>
+		<li><a href="#/logout">Sign out</a></li>
 		<%% } else { %>
 		<li><a href="#/signup">Sign up</a></li>
 		<li><a href="#/login">Login</a></li>

data/lib/generators/pbw/templates/templates/index.jst

@@ -1,15 +1,26 @@
+<div id="error"></div>
 <table id="<%= plural_name %>-table">
   <caption>Listing <%= plural_table_name %></caption>
-  <tr>
-  	<th>Name</th>
-<% attributes.each do |attribute| -%>
-    <th><%= attribute.human_name %></th>
-<% end -%>
-    <th></th>
-    <th></th>
-  </tr>
+  <thead>
+    <tr>
+    <% default_attributes.each do |attribute| -%>
+      <% unless attribute[:name].start_with?('_') %>
+      <th><%=attribute[:name].capitalize%></th>
+      <% end %>
+    <% end -%>
+  <% attributes.each do |attribute| -%>
+      <th><%= attribute.human_name %></th>
+  <% end -%>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody></tbody>
 </table>
 
 <br/>
-
-<a href="#/<%=plural_model_name%>/new">New <%= human_name %></a>
+<%% if(is_admin()){ %>
+  <a href="#/<%=plural_model_name%>/new">New <%= human_name %></a>
+<%% }else { %>
+  <a href="#/">Back</a>
+<%% } %>

data/lib/generators/pbw/templates/templates/model.jst

@@ -1,7 +1,20 @@
 <td><a href="#/<%=plural_model_name%>/<%%= _id %>"><%%= name %></a></td>
+<% default_attributes.each do |attribute| -%>
+<% unless attribute[:name].start_with?('_') || attribute[:name] == 'name' %>
+<td><%%= <%= attribute[:name] %> %></td>
+<% end %>
+<% end -%>
 <% attributes.each do |attribute| -%>
 <td><%%= <%= attribute.name %> %></td>
 <% end -%>
 
-<td><a href="#/<%=plural_model_name%>/<%%= _id %>/edit">Edit</td>
-<td><a href="#/<%=plural_model_name%>/<%%= _id %>/destroy" class="destroy">Delete</a></td>
+<td>
+<%% if(is_admin()){ %>
+  <a href="#/<%=plural_model_name%>/<%%= _id %>/edit">Edit</a>
+<%% } %>
+</td>
+<td>
+<%% if(is_admin()){ %>
+  <a href="#/<%=plural_model_name%>/<%%= _id %>/destroy" class="destroy">Delete</a>
+<%% } %>
+</td>

data/lib/generators/pbw/templates/templates/new.jst

@@ -3,14 +3,26 @@
    <input type="hidden" name="authenticity_token" value="<%%= $("meta[name='csrf-token']").attr("content") %>">
    <fieldset>
     <legend>New <%= singular_table_name %></legend>
+  <% default_attributes.each do |attribute| -%>
+    <% unless attribute[:name].start_with?('_') %>
     <div class="field">
-      <label for="name">Name:</label>
-      <input type="text" name="name" id="name" value="<%%= name %>" >
+      <label for="<%= attribute[:name] %>"> <%= attribute[:name].capitalize %>:</label>
+      <input type="text" name="<%= attribute[:name] %>" id="<%= attribute[:name] %>" value="<%%= <%= attribute[:name] %> %>" >
     </div>
+    <% end %>
+
+  <% end -%>
   <% attributes.each do |attribute| -%>
     <div class="field">
       <label for="<%= attribute.name %>"> <%= attribute.human_name %>:</label>
-      <input type="text" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>" >
+      <% case "#{attribute.type}".underscore.to_sym 
+      when :boolean %>
+      <input type="checkbox" name="<%= attribute.name %>" id="<%= attribute.name %>" data-type="<%=attribute.type%>">
+      <% when :integer %>
+      <input type="number" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>"  data-type="<%=attribute.type%>">
+      <% else %>
+      <input type="text" name="<%= attribute.name %>" id="<%= attribute.name %>" value="<%%= <%= attribute.name %> %>"  data-type="<%=attribute.type%>">
+      <% end %>
     </div>
 
   <% end -%>
@@ -20,4 +32,8 @@
   </fieldset>
 </form>
 
-<a href="#/<%=plural_model_name%>">Back</a>
+<%% if(is_admin()){ %>
+  <a href="#/<%=plural_model_name%>">Back</a>
+<%% }else { %>
+  <a href="#/">Back</a>
+<%% } %>

data/lib/generators/pbw/templates/templates/show.jst

@@ -1,9 +1,14 @@
+<div id="error"></div>
 <table id="<%= singular_name %>-table">
 	<tbody>
+		<% default_attributes.each do |attribute| -%>
+		<% unless attribute[:name].start_with?('_') %>
 		<tr>
-			<th>Name:</th>
-			<td><%%= name %></td>
+		  <th><%= attribute[:name] %>:</th>
+		  <td><%%= <%= attribute[:name] %> %></td>
 		</tr>
+		<% end %>
+		<% end -%>
 		<% attributes.each do |attribute| -%>
 		<tr>
 		  <th><%= attribute.human_name %>:</th>
@@ -13,4 +18,8 @@
 		
 	</tbody>
 </table>
-<a href="#/<%=plural_model_name%>">Back</a>
+<%% if(is_admin()){ %>
+  <a href="#/<%=plural_model_name%>">Back</a>
+<%% }else { %>
+  <a href="#/">Back</a>
+<%% } %>

data/lib/generators/pbw/templates/user_recovery.coffee

@@ -1,5 +1,4 @@
 class <%= js_user_model_namespace %>Recovery extends Backbone.Model
-  paramRoot: 'user'
   url: '/pbw/users/password.json'
 
   defaults:

data/lib/generators/pbw/templates/user_registration.coffee

@@ -1,5 +1,4 @@
 class <%= js_user_model_namespace %>Registration extends Backbone.Model
-  paramRoot: 'user'
   url: '/pbw/users.json'
 
   defaults:

data/lib/generators/pbw/templates/user_session.coffee

@@ -1,5 +1,4 @@
 class <%= js_user_model_namespace %>Session extends Backbone.Model
-  paramRoot: 'user'
   url: '/pbw/users/sign_in.json'
 
   defaults:

data/lib/generators/pbw/templates/views/edit_view.coffee

@@ -9,15 +9,24 @@ class <%= view_namespace %>.EditView extends Backbone.View
   constructor: (options) ->
     super(options)
     @model = options.model
-
+    
     @model.bind("change:errors", () =>
       this.render()
     )
 
     @model.bind("error", (model, xhr, options) =>
-      form_errors 'There was a problem saving <%= singular_name %>', xhr
+      display_errors 'There was a problem saving <%= singular_name %>', xhr, "/<%=plural_model_name%>/#{@model.id}/edit"
     )
 
+  initialize: ->
+    @_modelBinder = new Backbone.ModelBinder
+    @bindings = <% default_attributes.each do |attribute| -%><% unless attribute[:name].start_with?('_') %>
+      <%= attribute[:name] %> : '[name=<%= attribute[:name] %>]'
+<% end %><% end %><% attributes.each do |attribute| -%>
+      <%= attribute.name %> : '[name=<%= attribute.name %>]'
+<% end %>
+      
+
   update: (e) ->
     e.preventDefault()
     e.stopPropagation()
@@ -25,14 +34,16 @@ class <%= view_namespace %>.EditView extends Backbone.View
     @model.save(null,
       success: (<%= singular_name %>, response, options) =>
         @model = <%= singular_name %>
-        window.location.hash = "/<%=model_namespace.downcase%>/#{@model.id}"
+        window.location.hash = "/<%=plural_model_name%>/#{@model.id}"
       error: (model, xhr, options) =>
-        form_errors 'There was a problem saving <%= singular_name %>', xhr
+        display_errors 'There was a problem saving <%= singular_name %>', xhr
     )
 
   render: ->
-    @$el.html(@template(@model.toJSON() ))
-
-    this.$("form").backboneLink(@model)
-
+    @model.fetch
+      success: (model) =>
+        @$el.html(@template(model.toJSON() ))
+        @_modelBinder.bind(@model, @el, @bindings)
+      error: (model, response) ->
+        debug response
     return this

data/lib/generators/pbw/templates/views/index_view.coffee

@@ -5,16 +5,24 @@ class <%= view_namespace %>.IndexView extends Backbone.View
 
   initialize: () ->
     @options.<%= plural_model_name %>.bind('reset', @addAll)
+    @options.<%= plural_model_name %>.bind("error", (model, xhr, options) =>
+      display_errors '', xhr, "/<%=plural_model_name%>"
+      @$("#<%=plural_model_name%>-table").hide()
+    )
 
   addAll: () =>
-    @options.<%= plural_model_name %>.each(@addOne)
+    @options.<%= plural_model_name %>.fetch
+      success: (collection) =>
+        collection.each(@addOne)
+      error: (collection, response) ->
+        debug response
 
   addOne: (<%= singular_model_name %>) =>
     view = new <%= view_namespace %>.<%= singular_name.camelize %>View({model : <%= singular_model_name %>})
     @$("tbody").append(view.render().el)
 
   render: =>
-    @$el.html(@template(<%= plural_model_name %>: @options.<%= plural_model_name %>.toJSON() ))
+    @$el.html(@template())
     @addAll()
 
     return this

data/lib/generators/pbw/templates/views/login_view.coffee

@@ -9,31 +9,43 @@ class <%= user_view_namespace %>.LoginView extends Backbone.View
   constructor: (options) ->
     super(options)
     @model = new <%= js_user_model_namespace %>Session
-
+    
     @model.bind("change:errors", () =>
       this.render()
     )
 
     @model.bind("error", (model, xhr, options) =>
-      form_errors 'There was a problem logging in', xhr
+      display_errors 'There was a problem logging in', xhr
+    )
+
+    @model.bind("sync", (model, xhr, options) =>
+      window.<%=js_app_name%>.User = xhr
     )
 
+  initialize: ->
+    @_modelBinder = new Backbone.ModelBinder
+    @bindings = 
+      email: '[name=email]'
+      password: '[name=password]'
+      remember_me: '[name=remember_me]'
+
   save: (e) ->
     e.preventDefault()
     e.stopPropagation()
 
     @model.unset("errors")
 
-    @model.save(@model.attributes,
-      success: (user, response, options) =>
-        @model = user
-        window.<%= js_app_name %>.User = @model
-        window.location.hash = "/"
+    @model.save(null,
+      success: ->
+        if window.<%=js_app_name%>.backlink
+          window.location.hash = window.<%=js_app_name%>.backlink
+        else
+          window.location.hash = "/"
     )
 
   render: ->
     @$el.html(@template(@model.toJSON() ))
 
-    this.$("form").backboneLink(@model)
+    @_modelBinder.bind(@model, @el, @bindings)
 
     return this

data/lib/generators/pbw/templates/views/new_view.coffee

@@ -8,31 +8,39 @@ class <%= view_namespace %>.NewView extends Backbone.View
 
   constructor: (options) ->
     super(options)
-    @model = new @collection.model()
+    @model = options.model
 
     @model.bind("change:errors", () =>
       this.render()
     )
 
     @model.bind("error", (model, xhr, options) =>
-      form_errors 'There was a problem saving <%= singular_name %>', xhr
+      display_errors 'There was a problem saving <%= singular_name %>', xhr, "/<%=plural_model_name%>/new"
     )
 
+  initialize: ->
+    @_modelBinder = new Backbone.ModelBinder
+    @bindings = <% default_attributes.each do |attribute| -%><% unless attribute[:name].start_with?('_') %>
+      <%= attribute[:name] %> : '[name=<%= attribute[:name] %>]'
+<% end %><% end %><% attributes.each do |attribute| -%>
+      <%= attribute.name %> : '[name=<%= attribute.name %>]'
+<% end %>
+
   save: (e) ->
     e.preventDefault()
     e.stopPropagation()
 
     @model.unset("errors")
 
-    @collection.create(@model.toJSON(),
+    @model.save(null,
       success: (<%= singular_name %>, response, options) =>
         @model = <%= singular_name %>
-        window.location.hash = "/<%=model_namespace.downcase%>/#{@model.id}"
+        window.location.hash = "/<%=plural_model_name%>/#{@model.id}"
     )
 
   render: ->
     @$el.html(@template(@model.toJSON() ))
 
-    this.$("form").backboneLink(@model)
+    @_modelBinder.bind(@model, @el, @bindings)
 
     return this