choco 0.1.1 → 0.1.2

data/HISTORY

@@ -1,3 +1,6 @@
+== 0.1.2 [08-27-10]
+* Add fixtures generate (mock ajax requests)
+
 == 0.1.1 [07-27-10]
 
 * Clean generated HTML (indentation)

data/README.rdoc

@@ -50,8 +50,8 @@ Once you've chosen the location where your application will reside, don't forget
 You can find the line to edit in your application_controller (app/controllers).
 
 Example for Rails :
-
-  this.use(Sammy.SmartRenderer, '/javascripts/my_project/app/views/');
+  
+  this.project_path = '/javascripts/my_project';
 
 == Jim
 
@@ -206,6 +206,10 @@ The Choco application will then be launched when all the responses have been rec
 To create, remove & update posts, you have to create your REST controller on the server side.
 Have a look at the sample demo for an example (http://github.com/ahe/choco_demo).
 
+You can also use fixtures instead. Fixtures are located in the /fixtures folder, they use the jquery.mockjax plugin to mock Ajax requests and return the JSON you defined in your fixtures.
+
+Use the choco generate fixture command to easily create your fixtures (e.g : $ choco generate fixture post, will mock requests sent to the /posts URL).
+
 = Generators
 
 The following code generators are available :
@@ -214,6 +218,7 @@ The following code generators are available :
 * $ choco generate model <model_name>
 * $ choco generate scaffold <name> [field1 field2 ...]
 * $ choco generate scaffold <name> <url>
+* $ choco generate fixture <name>
 * $ choco generate layout <layout_name>
 * $ choco generate plugin <plugin_name>
 

data/choco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{choco}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Heukmes"]
-  s.date = %q{2010-07-27}
+  s.date = %q{2010-07-28}
   s.default_executable = %q{choco}
   s.description = %q{Choco brings the MVC to the client side! It allows you to easily develop maintainable Rich Internet Applications using Javascript.}
   s.email = %q{anthony.heukmes@skynet.be}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "lib/choco/dependency_manager.rb",
      "lib/choco/generators/app_generator.rb",
      "lib/choco/generators/controller_generator.rb",
+     "lib/choco/generators/fixture_generator.rb",
      "lib/choco/generators/layout_generator.rb",
      "lib/choco/generators/model_generator.rb",
      "lib/choco/generators/plugin_generator.rb",
@@ -44,6 +45,8 @@ Gem::Specification.new do |s|
      "lib/choco/generators/templates/controllers/application_controller.js",
      "lib/choco/generators/templates/controllers/base_controller.js",
      "lib/choco/generators/templates/controllers/rest_controller.js",
+     "lib/choco/generators/templates/fixtures/base.js",
+     "lib/choco/generators/templates/fixtures/model/array.js",
      "lib/choco/generators/templates/help/commands",
      "lib/choco/generators/templates/help/generators",
      "lib/choco/generators/templates/helpers/application_helper.js",

data/lib/choco.rb

@@ -3,13 +3,14 @@ require 'thor/group'
 require 'active_support/inflector'
 
 module Choco
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   
   autoload :DependencyManager, 'choco/dependency_manager'
   autoload :CLI, 'choco/cli'  
   autoload :AppGenerator, 'choco/generators/app_generator'
   autoload :ControllerGenerator, 'choco/generators/controller_generator'
   autoload :LayoutGenerator, 'choco/generators/layout_generator'
+  autoload :FixtureGenerator, 'choco/generators/fixture_generator'  
   autoload :ModelGenerator, 'choco/generators/model_generator'
   autoload :PluginGenerator, 'choco/generators/plugin_generator'
   autoload :ScaffoldGenerator, 'choco/generators/scaffold_generator'          

data/lib/choco/dependency_manager.rb

@@ -16,6 +16,8 @@ module Choco
         type = 'Helper'
       elsif filename.include?('models/')
         type = 'Model'
+      elsif filename.include?('fixtures/')
+        type = 'Fixture'        
       else
         type = 'Libs'
       end

data/lib/choco/generators/app_generator.rb

@@ -40,6 +40,10 @@ module Choco
       empty_directory "#{name}/stylesheets"
       template('templates/application.css', "#{name}/stylesheets/application.css")
     end
+
+    def create_fixtures_folder
+      empty_directory "#{name}/fixtures"
+    end
     
     def create_spec_folder
       empty_directory "#{name}/spec"

data/lib/choco/generators/fixture_generator.rb

@@ -0,0 +1,23 @@
+module Choco
+  class FixtureGenerator < Thor::Group
+    include Thor::Actions
+    
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+    
+    desc 'Generates Ajax fixtures (mocks)'
+    argument :name, :required => true    
+    
+    def create_mock_file
+      @name = name.underscore.pluralize
+      template('templates/fixtures/base.js', "fixtures/#{@name}.js")
+    end
+    
+    def create_json_folder
+      empty_directory "fixtures/#{@name}"
+      template('templates/fixtures/model/array.js', "fixtures/#{@name}/#{@name}.json")
+    end
+    
+  end
+end

data/lib/choco/generators/templates/Jimfile

@@ -10,10 +10,12 @@ sammy.smart_renderer
 js-model 0.8.3
 underscore
 mustache
+jquery.mockjax
 choco.utils
 choco.plugins.models.load
 
 // Libs # Don't remove this line!
+lib/application
 
 // Helpers # Don't remove this line!
 app/helpers/application_helper
@@ -21,4 +23,6 @@ app/helpers/application_helper
 // Models # Don't remove this line!
 
 // Controllers # Don't remove this line!
-app/controllers/application_controller
+app/controllers/application_controller
+
+// Fixtures # Don't remove this line!

data/lib/choco/generators/templates/Rakefile

@@ -14,6 +14,7 @@ namespace :choco do
   	  system 'jim install http://github.com/ahe/choco.libs/raw/master/choco.utils.js'  	  
   	  system 'jim install http://github.com/ahe/choco.libs/raw/master/plugins/models/choco.plugins.models.load.js'
   	  system 'jim install http://github.com/ahe/choco.libs/raw/master/plugins/sammy/choco.plugins.sammy.smart_renderer.js'
+  	  system 'jim install http://github.com/appendto/jquery-mockjax/raw/master/jquery.mockjax.js'
       system 'jim bundle lib/bundled.js'
   	end
   end

data/lib/choco/generators/templates/controllers/application_controller.js

@@ -2,11 +2,13 @@ var app = $.sammy(function() {
 	
 	this.element_selector = '#choco';
 	this.template_engine = 'template';
+	this.project_path = '/<%= name %>';
+	this.fixtures = true;
 	
 	// Configure your Sammy JS plugins
 	this.use(Sammy.Template);
 	this.use(Sammy.NestedParams);
-	this.use(Sammy.SmartRenderer, '/<%= name %>/app/views/');
+	this.use(Sammy.SmartRenderer, this.project_path + '/app/views/');
 	
 	// Event fired by the render() method
 	this.bind('template_loaded', function(e, data) {

data/lib/choco/generators/templates/fixtures/base.js

@@ -0,0 +1,20 @@
+if(app.fixtures) {
+	var model = '{ "id": 1, "title": "Hello Choco!" }';
+	
+	$.mockjax({
+	  url: '/<%= @name %>/*',
+	  responseText: model
+	});
+	
+	$.mockjax({
+	  url: '/<%= @name %>',
+		type: 'POST',
+	  responseText: model
+	});
+	
+	$.mockjax({
+	  url: '/<%= @name %>',
+		type: 'GET',
+	  proxy: app.project_path + '/fixtures/<%= @name %>/<%= @name %>.json'
+	});
+}

data/lib/choco/generators/templates/fixtures/model/array.js

@@ -0,0 +1,4 @@
+[
+	{ "id": 1, "title": "Hello Choco!" },
+	{ "id": 2, "title": "Hello Sammy!" }
+]

data/lib/choco/generators/templates/help/commands

@@ -7,6 +7,6 @@ The choco script responds to the following commands and options :
   Your Jimfile will also be maintained by this command.
   
 generate <generator_name> <resource_name> [options]
-  Available generators are : controller, model, scaffold, layout, plugin
+  Available generators are : controller, model, scaffold, fixture, layout, plugin
   Run '$ choco generate', for more information.
 

data/lib/choco/generators/templates/help/generators

@@ -23,6 +23,15 @@ scaffold <url>
   The fields will be determined from the JSON returned by your URL
   e.g : http://localhost:3000/posts.json
   
+fixture
+  $ choco generate fixture <resource_name>
+
+  It will create fixture & JSON files.
+  resource_name will be pluralized.
+  
+  $ choco generate fixture post
+  Will mock requests sent to /posts
+  
 layout
   $ choco generate layout <layout_name>
 

data/spec/dependency_manager_spec.rb

@@ -68,6 +68,16 @@ describe Choco::DependencyManager do
       
     end
     
+    describe "when it's a fixture" do
+      
+      it "should add an entry in the Jimfile (models section)" do
+        in_file('Jimfile', 'fixtures/posts').should == 0
+        Choco::DependencyManager.add_dependency('fixtures/posts.js')
+        in_file('Jimfile', 'fixtures/posts', "// Fixtures # Don't remove this line!").should == 1
+      end
+      
+    end
+    
     describe "when it's a lib" do
       
       it "should add an entry in the Jimfile (libs section)" do

data/spec/generators_spec.rb

@@ -42,6 +42,10 @@ describe "Generators" do
       File.exist?(@project_path + '/stylesheets/application.css').should be_true      
     end
     
+    it "should generate the fixtures folder" do
+      File.exist?(@project_path + '/fixtures').should be_true
+    end    
+    
     it "should generate the spec folder" do
       File.exist?(@project_path + '/spec').should be_true
     end
@@ -64,7 +68,7 @@ describe "Generators" do
       
         it "should set the views path to the project views folder" do
           file = get_file_as_string(@project_path + '/app/controllers/application_controller.js')
-          file.include?("this.use(Sammy.SmartRenderer, '/spec/tmp/test_project/app/views/');").should be_true
+          file.include?("this.project_path = '/spec/tmp/test_project';").should be_true
         end
       end
       
@@ -188,6 +192,30 @@ describe "Generators" do
       
     end
     
+    describe Choco::FixtureGenerator do
+      it "should generate a fixture file" do
+        Choco::FixtureGenerator.start 'posts'
+        File.exist?('fixtures/posts.js').should be_true
+      end
+      
+      it "should generate a fixture folder" do
+        Choco::FixtureGenerator.start 'posts'
+        File.exist?('fixtures/posts').should be_true
+        File.exist?('fixtures/posts/posts.json').should be_true
+      end
+      
+      describe "templates" do
+        
+        it "the URL should have a correct format" do
+          Choco::FixtureGenerator.start 'post'
+          file = get_file_as_string('fixtures/posts.js')
+          file.include?("url: '/posts',").should be_true
+        end
+        
+      end
+      
+    end
+    
     describe Choco::PluginGenerator do
       it "should generate a plugin file" do
         Choco::PluginGenerator.start 'live'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Anthony Heukmes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: choco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,6 +102,7 @@ files:
 - lib/choco/dependency_manager.rb
 - lib/choco/generators/app_generator.rb
 - lib/choco/generators/controller_generator.rb
+- lib/choco/generators/fixture_generator.rb
 - lib/choco/generators/layout_generator.rb
 - lib/choco/generators/model_generator.rb
 - lib/choco/generators/plugin_generator.rb
@@ -114,6 +115,8 @@ files:
 - lib/choco/generators/templates/controllers/application_controller.js
 - lib/choco/generators/templates/controllers/base_controller.js
 - lib/choco/generators/templates/controllers/rest_controller.js
+- lib/choco/generators/templates/fixtures/base.js
+- lib/choco/generators/templates/fixtures/model/array.js
 - lib/choco/generators/templates/help/commands
 - lib/choco/generators/templates/help/generators
 - lib/choco/generators/templates/helpers/application_helper.js