eyeballs 0.3.3.1 → 0.3.4

data/README.md

@@ -134,6 +134,17 @@ You can also add your own validations, again, similar to how Rails does things:
       post.errors   # => [{
                     #     message: 'title should be present'}]
     })     # yep, there's a save method too!
+    
+When you want to find things:
+
+    Post.find({
+      loading: function(){
+        console.log("I'm loading...")
+      },
+      success: function(post){
+        console.log("here I am")
+      }
+    })
 
 And if you want to add your own methods:
 

data/Rakefile

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

data/app.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'sinatra'
+set :static, true
+set :public, Proc.new { File.expand_path('.') }
+
+

data/lib/eyeballs/controller_generator.rb

@@ -12,7 +12,7 @@ module Eyeballs
     end
   
     def greeting
-      $stdout.puts "Creating new eyeballs.js controller #{name.pluraize}Controller"
+      $stdout.puts "Creating new eyeballs.js controller #{name.pluralize}Controller"
     end
   
     def build_the_model

data/lib/eyeballs/model_generator.rb

@@ -4,7 +4,6 @@ module Eyeballs
     include Eyeballs::AppDetector
 
     desc "Creates a new eyeballs.js model"
-  
     argument :name
   
     def self.source_root

data/spec/controller_generator_spec.rb

@@ -6,7 +6,8 @@ describe Eyeballs::ControllerGenerator do
     create_test_root
     run_command("eyeballs generate controller Paul")
   end
-  let(:controller_file) { file('app', 'controllers', 'paul_controller.js') }
+  
+  let(:controller_file) { file('app/controllers/paul_controller.js') }
   
   it "should create my controller" do
     controller_file.should exist

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'eyeballs'
 require 'fileutils'
 require 'ruby-debug'
+require 'pathname'
 Debugger.settings[:autoeval] = true
 
 def create_test_root
@@ -16,27 +17,27 @@ def run_command(cmd)
 end
 
 def file(*parts)
-  FileChecker.new([test_root] + parts)
+  Pathname.new([test_root, *parts].join('/'))
 end
 
 def test_root
   File.join(File.dirname(File.expand_path(__FILE__)), 'test_root')
 end
 
-class FileChecker
-  def initialize(parts)
-    @file = File.join(parts)
-  end
-
-  def exist?
-    File.exists?(@file)
-  end
-  
-  def read
-    File.read(@file)
-  end
-  
-  def to_s
-    @file
-  end
-end
+# class FileChecker
+#   def initialize(parts)
+#     @file = File.join(parts)
+#   end
+# 
+#   def exist?
+#     File.exists?(@file)
+#   end
+#   
+#   def read
+#     File.read(@file)
+#   end
+#   
+#   def to_s
+#     @file
+#   end
+# end

data/src/o_O.js

@@ -190,16 +190,22 @@ o_O.model = {
       find: function(id, callback){
         if(this.adapter)
         {
+          run_callback(callback, 'loading', this)
           var model = this;
           return this.adapter.find(this, id, function(returned_object){
-            if(typeof callback === 'function')
+            found_object = model.initialize(returned_object);
+            if(!found_object['new_record'])
             {
-              found_object = model.initialize(returned_object);
-              if(!found_object['new_record'])
-              {
-                found_object['new_record'] = false;
-              }
-              callback(found_object);
+              found_object['new_record'] = false;
+            }
+            if(found_object.id)
+            {
+              console.log(found_object)
+              run_callback(callback, 'success', found_object);
+            }
+            else
+            {
+              run_callback(callback, 'failure', found_object);
             }
           });
         }

data/templates/scaffold_controller.js

@@ -4,7 +4,7 @@ o_O('<%= name.capitalize.pluralize -%>Controller', {
       for(var id in <%= name.downcase.pluralize %>)
       {
         var <%= name.downcase %> = <%= name.downcase.pluralize %>[id];
-        o_O.render('<%= name.downcase.pluralize %>/_<%= name.downcase %>', <%= name.downcase %>, {append: 'div#<%= name.pluralize %>'})
+        o_O.render('<%= name.downcase.pluralize %>/_<%= name.downcase %>', <%= name.downcase %>, {append: 'div#<%= name.downcase.pluralize %>'})
       }
     });
   },

data/templates/scaffold_index.html

@@ -24,7 +24,7 @@
       <input type="submit" name="commit" value="Save">
     </form>
     
-    <div id="<%= name.pluralize %>">
+    <div id="<%= name.downcase.pluralize %>">
       
     </div>
   </body>

data/test/unit/test_model_with_callbacks.html

@@ -11,6 +11,8 @@
 
   <script>  
 
+  o_O.model.adapter = o_O.dom;
+
   o_O('Review', function(that){
     that.validates_presence_of('title');
     that.validates_presence_of('content');
@@ -31,6 +33,21 @@
     
     module("Models");
     
+    asyncTest('find() an existent object',2, function(){
+      Review.find('thing', {
+        loading: function(){
+          ok('this should be called')
+        },
+        success: function(){
+          ok('this should be called');
+          start();
+        },
+        failure: function(){
+          ok(false, 'this should not be called');
+        }
+      })
+    });
+
     asyncTest('a valid, successful model', 2, function(){
       var myReview = Review.initialize({title: "Biscuit", content: "Some Content"});
       myReview.save({
@@ -76,21 +93,21 @@
           });
         })
 
-        asyncTest('updating an invalid review', 1, function(){
-              var myReview = Review.initialize();
-              myReview.update_attributes({}, {
-                success: function(){
-                  ok(false, 'should not call the success callback');
-                },
-                invalid: function(){
-                  ok(true, 'should call the invalid callback');
-                  start();
-                },
-                loading: function(){
-                  ok(false, 'should not call the loading callback');
-                }
-              });
-            })
+  asyncTest('updating an invalid review', 1, function(){
+        var myReview = Review.initialize();
+        myReview.update_attributes({}, {
+          success: function(){
+            ok(false, 'should not call the success callback');
+          },
+          invalid: function(){
+            ok(true, 'should call the invalid callback');
+            start();
+          },
+          loading: function(){
+            ok(false, 'should not call the loading callback');
+          }
+        });
+      })
 
       test('destroying a review', 2, function(){
         var myReview = Review.initialize();
@@ -114,5 +131,7 @@
   <h2 id="qunit-userAgent"></h2>
   <ol id="qunit-tests"></ol>
   </div>
+  
+  <div data-id="thing"></div>
 </body>
 </html>

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eyeballs
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  - 1
-  version: 0.3.3.1
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Paul Campbell
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-06-17 00:00:00 -07:00
 default_executable: eyeballs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +58,12 @@ files:
 - CHANGELOG
 - README.md
 - Rakefile
+- app.rb
 - bin/eyeballs
 - config.ru
 - dist/jquery-1.4.2.min.js
 - dist/jquery.livequery.js
 - dist/mustache.js
-- eyeballs.gemspec
 - eyeballs.js.gemspec
 - lib/eyeballs.rb
 - lib/eyeballs/app_detector.rb
@@ -86,6 +85,7 @@ files:
 - templates/scaffold_edit.html.mustache
 - templates/scaffold_index.html
 - templates/scaffold_partial.html.mustache
+- test/index.html
 - test/unit/qunit.css
 - test/unit/qunit.js
 - test/unit/test_controller.html

data/eyeballs.gemspec

@@ -1,92 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{eyeballs}
-  s.version = "0.3.3.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Paul Campbell"]
-  s.date = %q{2010-06-10}
-  s.default_executable = %q{eyeballs}
-  s.email = %q{paul@rslw.com}
-  s.executables = ["eyeballs"]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "CHANGELOG",
-     "README.md",
-     "Rakefile",
-     "bin/eyeballs",
-     "config.ru",
-     "dist/jquery-1.4.2.min.js",
-     "dist/jquery.livequery.js",
-     "dist/mustache.js",
-     "eyeballs.gemspec",
-     "eyeballs.js.gemspec",
-     "lib/eyeballs.rb",
-     "lib/eyeballs/app_detector.rb",
-     "lib/eyeballs/app_generator.rb",
-     "lib/eyeballs/cli.rb",
-     "lib/eyeballs/controller_generator.rb",
-     "lib/eyeballs/model_generator.rb",
-     "lib/eyeballs/scaffold_generator.rb",
-     "src/jquery.o_O.couchdb.js",
-     "src/jquery.o_O.dom.js",
-     "src/jquery.o_O.js",
-     "src/jquery.o_O.rails.js",
-     "src/o_O.js",
-     "src/o_O.localstorage.js",
-     "templates/app_root/index.html",
-     "templates/controller.js",
-     "templates/model.js",
-     "templates/scaffold_controller.js",
-     "templates/scaffold_edit.html.mustache",
-     "templates/scaffold_index.html",
-     "templates/scaffold_partial.html.mustache",
-     "test/unit/qunit.css",
-     "test/unit/qunit.js",
-     "test/unit/test_controller.html",
-     "test/unit/test_dom.html",
-     "test/unit/test_dom_with_callbacks.html",
-     "test/unit/test_form.html",
-     "test/unit/test_localstorage.html",
-     "test/unit/test_model.html",
-     "test/unit/test_model_with_callbacks.html",
-     "test/unit/test_rails.html"
-  ]
-  s.has_rdoc = false
-  s.homepage = %q{http://www.github.com/paulca/eyeballs.js}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A lightweight javascript MVC framework.}
-  s.test_files = [
-    "spec/app_generator_spec.rb",
-     "spec/controller_generator_spec.rb",
-     "spec/model_generator_spec.rb",
-     "spec/rack_app_detector_spec.rb",
-     "spec/scaffold_generator_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-    else
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-  end
-end
-