eyeballs 0.5.2 → 0.5.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+Sun Aug 1
+- - - - -
+- Bring the scaffold generator up to date
+
 Tue Jul 27
 - - - - - -
 - Event Delegation bug causing the default bit not to return false

data/README.md

@@ -257,17 +257,17 @@ Tasty!
 
 To bind events to these controller actions, use the data-bind attribute:
 
-    <a href="/posts/new" data-controller="posts#new">Click me!</a>
+    <a href="/posts/new" data-bind="posts#new">Click me!</a>
 
 This binds all clicks on this element to the new action on the PostsController. By default, if you add these attributes to a form, the action is bound to the submit event; to all other elements it binds to a click.
 
 It also returns false, canceling out the default behavior. If you want the default behavior, prefix with `+`  to "add" the action to the propagation chain:
 
-    <a href="/posts/new" data-controller="+posts#new">Click me!</a>
+    <a href="/posts/new" data-bind="+posts#new">Click me!</a>
     
 You can also bind to custom events:
 
-    <a href="/posts/new" data-controller="+mouseover:posts#new">Hover over me!</a>
+    <a href="/posts/new" data-bind="+mouseover:posts#new">Hover over me!</a>
     
 You can bind multiple events and actions to a single element:
 

data/Rakefile

@@ -27,7 +27,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "eyeballs"
-    s.version = "0.5.2"
+    s.version = "0.5.3"
     s.author = "Paul Campbell"
     s.email = "paul@rslw.com"
     s.homepage = "http://www.github.com/paulca/eyeballs.js"

data/eyeballs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eyeballs}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Campbell"]
-  s.date = %q{2010-07-27}
+  s.date = %q{2010-08-01}
   s.default_executable = %q{eyeballs}
   s.email = %q{paul@rslw.com}
   s.executables = ["eyeballs"]

data/lib/eyeballs/app_detector.rb

@@ -20,6 +20,18 @@ module Eyeballs
       end
     end
     
+    def public_path
+      @public_path ||= if rack_app?
+        'public'
+      else
+        '.'
+      end
+    end
+    
+    def prefix
+      '/public/' if rack_app?
+    end
+    
     def rack_app?
       File.exists?('public')
     end

data/lib/eyeballs/scaffold_generator.rb

@@ -29,9 +29,9 @@ module Eyeballs
     end
     
     def build_the_views
-      template "templates/scaffold_index.html", "#{app_path}/#{name.downcase.pluralize}.html"
+      template "templates/scaffold_index.html", "#{public_path}/#{name.downcase.pluralize}.html"
       template "templates/scaffold_partial.html.mustache", "#{app_path}/app/views/#{name.downcase.pluralize}/_#{name.downcase}.html.mustache"
-      template "#{app_path}/templates/scaffold_edit.html.mustache", "app/views/#{name.downcase.pluralize}/edit.html.mustache"
+      template "templates/scaffold_edit.html.mustache", "#{app_path}/app/views/#{name.downcase.pluralize}/edit.html.mustache"
     end
   
     def farewell

data/templates/app_root/config/initializer.js

@@ -1,4 +1,8 @@
 // This is a very handy place to put any initial logic
 // For example, choosing your adapter
+<% if rack_app? %>
 o_O.model.adapter = o_O.rest;
-o_O.config.authenticity_token = $('meta[name=csrf-token]').attr('content')
+o_O.config.authenticity_token = $('meta[name=csrf-token]').attr('content')
+<% else %>
+o_O.model.adapter = o_O.localstorage;
+<% end %>

data/templates/scaffold_edit.html.mustache

@@ -1,5 +1,5 @@
 <div class="edit-<%= name.downcase %>">
-  <form data-id="{{id}}" data-controller="<%= name.downcase.pluralize %>" data-action="update">
+  <form data-id="{{id}}" data-bind="<%= name.downcase.pluralize %>#update">
     <%- attributes.each do |attribute| %>
       <label for="<%= name.downcase %>-<%= attribute.name %>"><%= attribute.name.titlecase %></label><br />
       <%- if attribute.type == 'text' %>
@@ -8,6 +8,8 @@
         <input type="text" name="<%= attribute.name %>" value="{{<%= attribute.name %>}}" data-attribute="<%= attribute.name %>"><br />
       <%- end -%>
     <%- end -%>
-    <input type="submit" name="commit" value="Save"> or <a href="#" data-controller="<%= name.downcase.pluralize %>" data-action="cancel_edit">Cancel</a>
+    <input type="submit" name="commit" value="Save">
+    or
+    <a href="#" data-controller="<%= name.downcase.pluralize %>#cancel_edit">Cancel</a>
   </form>
 </div>

data/templates/scaffold_index.html

@@ -28,17 +28,19 @@
       
     </div>
   </body>
-  <script src="vendor/jquery/jquery-1.4.2.min.js"></script>
-  <script src="vendor/jquery/jquery.livequery.js"></script>
-  <script src="vendor/mustache/mustache.js"></script>
-  <script src="vendor/eyeballs/o_O.js"></script>
-  <script src="vendor/eyeballs/jquery.o_O.js"></script>
-  <script src="vendor/eyeballs/o_O.localstorage.js"></script>
-  <script type="text/javascript" charset="utf-8">
-    o_O.model.adapter = o_O.localstorage;
-  </script>
-  <script src="app/models/<%= name.downcase %>.js"></script>
-  <script src="app/controllers/<%= name.downcase.pluralize %>_controller.js"></script>
+  <script src="<%= prefix %>vendor/jquery/jquery-1.4.2.min.js"></script>
+  <script src="<%= prefix %>vendor/mustache/mustache.0.2.3.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/o_O.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/modules/o_O.model.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/modules/o_O.validations.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/drivers/jquery/modules/o_O.controller.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/drivers/jquery/modules/o_O.routes.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/drivers/jquery/modules/o_O.support.js"></script>
+  <script src="<%= prefix %>vendor/eyeballs/adapters/o_O.localstorage.js"></script>
+  <script src="<%= prefix %>config/initializer.js"></script>
+  <script src="<%= prefix %>config/routes.js"></script>
+  <script src="<%= prefix %>app/models/<%= name.downcase %>.js"></script>
+  <script src="<%= prefix %>app/controllers/<%= name.downcase.pluralize %>_controller.js"></script>
   <script type="text/javascript" charset="utf-8">
     $(function(){
       <%= name.capitalize.pluralize %>Controller.index();

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Paul Campbell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +01:00
+date: 2010-08-01 00:00:00 +01:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency