paloma 0.0.8 → 1.2.0

data/Changelog.md

@@ -1,6 +1,18 @@
 Changelog
 =
 
+Version 1.2.0
+-
+* AddGenerator with multiple actions: `rails g paloma:add namespace/controller action1 action2 action3`
+
+Version 1.1.0
+-
+* Handle namespaced controllers: `rails g paloma:add namespace/controller action`
+
+Version 1.0.0
+-
+* `AddGenerator` changed from `rails g paloma:add controller/action` to `rails g paloma:add controller action`
+
 Version 0.0.8
 -
 * Bug Fix: _callback.js cannot find _local.js

data/Rakefile

@@ -9,8 +9,20 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 
-desc "Run tests"
+desc "Run all tests"
 task :test do
-  puts "Testing..."
   sh "bundle exec rake spec"
 end
+
+
+desc "Run callback tests"
+task :test_callbacks do
+  sh "rspec ./spec/callback_spec.rb"
+end
+
+
+desc "Run generator tests"
+task :test_generators do
+  sh "rspec ./spec/generator_spec.rb"
+end
+

data/TODO.md

@@ -3,7 +3,6 @@ TODO
 
 Features
 -
-* Handle namespaced controllers
 * Setup for coffescript (although I hate coffescript)
 * A way to manually trigger callbacks with parameters
 

data/app/templates/index.js

@@ -1 +1 @@
-//= require ./paloma
+//= require ./paloma.js

data/lib/paloma/action_controller_extension.rb

@@ -22,7 +22,7 @@ module Paloma
     # js_callback :params => {}
     #
     def js_callback options = {}, extras = {}
-      default_callback = "#{controller_name}/#{action_name}"
+      default_callback = "#{controller_path}/#{action_name}"
       params = {}
       
       if options.is_a? Hash
@@ -33,7 +33,7 @@ module Paloma
 
       elsif options.is_a? Symbol
         params = extras[:params] 
-        callback = "#{controller_name}/#{options}"
+        callback = "#{controller_path}/#{options}"
       
       elsif options.nil? || options.is_a?(TrueClass)
         callback = default_callback

data/lib/paloma/generators/add_generator.rb

@@ -24,46 +24,117 @@ module Paloma
     
   class AddGenerator < ::Rails::Generators::NamedBase
     source_root Paloma.templates
+    argument :actions, :type => :array, :required => false
     
     def create_callback_file
-      arg = file_path.split('/')
-      @controller_name = arg[0]
-      action_name = arg[1]
+      args = split_arguments(file_path)
       
-      controller_folder = "#{Paloma.destination}/#{@controller_name}/" 
-      callbacks_js = "#{controller_folder}/_callbacks.js"
-      local_js = "#{controller_folder}/_local.js"
-      action_js = "#{controller_folder}/#{action_name}.js"
-        
-      Dir.mkdir(controller_folder) unless Dir.exists?(controller_folder)
-      
-      generate_from_template local_js unless File.exists?(local_js)
-      generate_from_template callbacks_js unless File.exists?(callbacks_js)        
+      @namespace_name = args[0]
+      @namespace_folder = args[1]
+      @controller_name = args[2]
+      @controller_folder = args[3]
       
+      generate_folder(@namespace_folder)
+      generate_folder(@controller_folder)
+
       # Create a js file for action if there is an action argument
-      if action_name.present? && !File.exists?(action_js)
-        content = File.read("#{Paloma.templates}/action.js").gsub(
-          /controller\/action/, 
-          "#{@controller_name}/#{action_name}")
-          
-        File.open(action_js, 'w'){ |f| f.write(content) }
+      if actions.present?
+        generate_actions actions  
       end
+    end
+    
+    
+    private
+    
+    def split_arguments args
+      #split controller from actions
+      arg = args.split(' ')
       
+      #Split namespace from controller
+      namespace = arg[0].split('/')
+      namespace_name = (namespace.length > 1) ? namespace[0] : nil
+      namespace_folder = namespace_name.nil? ? nil : "#{Paloma.destination}/#{namespace_name}"
+            
+      controller_name = namespace_name.nil? ? namespace[0].split(' ')[0] : namespace[1].split(' ')[0]
+      controller_folder = namespace_folder.nil? ? 
+                            "#{Paloma.destination}/#{controller_name}" : 
+                            "#{namespace_folder}/#{controller_name}"
+       
+      # [namespace_name, namespace_folder, controller_name, controller_folder]
+      files = [namespace_name, namespace_folder, controller_name, controller_folder]
+    end
+    
+    
+    def generate_actions actions
+      actions.each do |action|
+        action_js = "#{@controller_folder}/#{action}.js"
+        if action.present? && !File.exists?(action_js)
+          controller_path = @namespace_name.nil? ? @controller_name : "#{@namespace_name}/#{@controller_name}"
+          
+          content = File.read("#{Paloma.templates}/action.js").gsub(
+            /controller\/action/, 
+            "#{controller_path}/#{action}")
+            
+          File.open(action_js, 'w'){ |f| f.write(content) }
+          
+          puts "create #{action_js}"  
+        end
+      end
+    end
+    
+    
+    def generate_folder folder
+      unless (folder.nil? || Dir.exists?(folder))
+        Dir.mkdir(folder)  
+        
+        callbacks_js = "#{folder}/_callbacks.js"
+        local_js = "#{folder}/_local.js"
+        
+        generate_from_template local_js unless File.exists?(local_js)
+        generate_from_template callbacks_js unless File.exists?(callbacks_js)
+        
+        if folder == @namespace_folder
+          content = File.read(callbacks_js).gsub('//= require_tree .', '')
+          File.open(callbacks_js, 'w'){ |f| f.write(content) }
+        end
+        
+        require_callbacks folder  
+      end
+    end
+    
+    
+    def require_callbacks folder
       # Require controller's _callbacks.js to Paloma's main index.js file.
       # Located on "#{Paloma.destination}/index.js" or by default on
       # app/assets/javascripts/paloma/index.js
-      File.open(Paloma.index_js, 'a+'){ |f| 
-        f << "\n//= require ./#{@controller_name}/_callbacks"
-      }
+      
+      if (@namespace_folder.present? && folder != @namespace_folder)
+        File.open("#{@namespace_folder}/_callbacks.js", 'a+'){ |f|
+          is_present = f.lines.grep("\n//= require ./#{@controller_name}/_callbacks.js").any?
+          f << "\n//= require ./#{@controller_name}/_callbacks.js" unless is_present
+        }
+      end
+       
+      controller = @namespace_folder.present? ? @namespace_name : @controller_name
+      
+      unless (@namespace_folder.present? && folder != @namespace_folder)
+        File.open(Paloma.index_js, 'a+'){ |f|
+          f << "\n//= require ./#{controller}/_callbacks.js"
+        }
+      end
     end
     
     
-    private
-    
     def generate_from_template destination_filename
-      filename = destination_filename.split('/').last
-      content = File.read("#{Paloma.templates}/#{filename}").gsub(/controller/, @controller_name)
+      controller = destination_filename.gsub(/[\/|\w|_]+\/paloma\//, '')
+      
+      filename = controller.split('/').last
+      controller = controller.gsub('/' + filename, '')
+      controller = controller.gsub('/', '.')
+      
+      content = File.read("#{Paloma.templates}/#{filename}").gsub(/controller/, controller)
       File.open(destination_filename, 'w'){ |f| f.write(content) }
+      puts "create #{destination_filename}"
     end 
   end
 end

data/paloma.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'paloma'
-  s.version     = '0.0.8'
+  s.version     = '1.2.0'
   s.summary     = "a sexy way to organize javascript files using Rails` asset pipeline"
   s.description = "a sexy way to organize javascript files using Rails` asset pipeline"
   s.authors     = ["Karl Paragua", "Bia Esmero"]

data/spec/callback_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-=begin
+
 feature 'Callbacks' do
   
   it 'should execute articles/new callback', :js => true do
@@ -62,5 +62,19 @@ feature 'Callbacks' do
     
     page.has_selector?('#from-articles-edit-callback').should == true
   end
+  
+  
+  it 'should execute sample_namespace/categories/index callback', :js => true do
+    1.upto(10).each { |i| Category.create :name => "Category #{i}" }
+    
+    visit sample_namespace_categories_path
+    page.has_selector?('#from-categories-index').should == true
+  end
+  
+  
+  it 'should execute sample_namespace/categories/index callback instead of new callback', :js => true do
+    visit new_sample_namespace_category_path
+    
+    page.has_selector?('#from-categories-index').should == true
+  end
 end
-=end

data/spec/generator_spec.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 
 TEMP = "#{File.dirname(__FILE__)}/tmp/"
 
+# rails g paloma:setup
 feature Paloma::SetupGenerator do
   include GeneratorSpec::TestCase
   destination TEMP
@@ -29,11 +30,11 @@ def mimic_setup
   # Mimic SetupGenerator results before running the AddGenerator
   FileUtils.cd TEMP
   FileUtils.mkpath Paloma.destination
-  File.open("#{Paloma.destination}/index.js", 'w') { |f| f.write('// test')}
+  File.open("#{Paloma.destination}/index.js", 'w') { |f| f.write('//= require ./paloma.js')}
 end
 
 
-
+# rails g paloma:add sexy_controller
 feature Paloma::AddGenerator, 'creating controller folder only' do
   include GeneratorSpec::TestCase
   destination TEMP
@@ -48,10 +49,19 @@ feature Paloma::AddGenerator, 'creating controller folder only' do
   specify do
     destination_root.should have_structure {
       directory Paloma.destination do
-        directory 'sexy_controller'
+        directory 'sexy_controller' do
+          file '_callbacks.js' do
+            contains "//= require ./_local.js"
+            contains "//= require_tree ."
+          end
+          
+          file '_local.js' do
+            contains "Paloma.sexy_controller = {"
+          end
+        end
         
         file 'index.js' do
-          contains '//= require ./sexy_controller/_callbacks'
+          contains '//= require ./sexy_controller/_callbacks.js'
         end
       end
     }
@@ -59,11 +69,94 @@ feature Paloma::AddGenerator, 'creating controller folder only' do
 end
 
 
+# rails g paloma:add namespace/new_controller_folder
+feature Paloma::AddGenerator, 'creating a namespaced controller folder' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['namespace/new_controller_folder']
+  
+  before do
+    prepare_destination
+    mimic_setup
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'namespace' do
+          directory 'new_controller_folder' do
+            file '_callbacks.js' do
+              contains '//= require ./_local.js'
+              contains '//= require_tree .'
+            end
+            
+            file '_local.js' do
+              contains 'Paloma.namespace.new_controller_folder = {'
+            end
+          end
+          file '_callbacks.js' do
+            contains "//= require ./_local.js"
+            contains "//= require ./new_controller_folder/_callbacks.js"
+          end
+          
+          file '_local.js' do
+            contains "Paloma.namespace = {"
+          end
+        end
+        file 'index.js' do
+          contains "//= require ./namespace/_callbacks.js"
+        end
+      end
+    }
+  end
+end
+
 
+# rails g paloma:add new_controller_folder new_action
+feature Paloma::AddGenerator, 'creating both controller folder and action file' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['new_controller_folder', 'new_action']
+  
+  before do
+    prepare_destination
+    mimic_setup
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'new_controller_folder' do
+          file 'new_action.js' do
+            contains "Paloma.callbacks['new_controller_folder/new_action']"
+          end
+          
+          file '_callbacks.js' do
+            contains "//= require ./_local.js"
+            contains "//= require_tree ."
+          end
+          
+          file '_local.js' do
+            contains "Paloma.new_controller_folder = {"  
+          end
+        end
+        
+        file 'index.js' do
+          contains "//= require ./new_controller_folder/_callbacks.js"
+        end        
+      end
+    }
+  end
+end
+
+
+# rails g paloma:add existing_controller_folder new_action
 feature Paloma::AddGenerator, 'creating action with existing controller folder' do
   include GeneratorSpec::TestCase
   destination TEMP
-  arguments ['existing_controller_folder/new_action']
+  arguments ['existing_controller_folder', 'new_action']
   
   before do
     prepare_destination
@@ -80,23 +173,106 @@ feature Paloma::AddGenerator, 'creating action with existing controller folder'
           file 'new_action.js' do
             contains "Paloma.callbacks['existing_controller_folder/new_action']"
           end
+        end
+      end
+    }
+  end
+end
+
+
+# rails g paloma:add namespace/new_controller_folder new_action
+feature Paloma::AddGenerator, 'creating namespaced controller folder and action file' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['namespace/new_controller_folder', 'new_action']
+  
+  before do
+    prepare_destination
+    mimic_setup    
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'namespace' do
+          directory 'new_controller_folder' do
+            file 'new_action.js' do
+              contains "Paloma.callbacks['namespace/new_controller_folder/new_action']"
+            end
+            
+            file '_local.js' do
+              contains 'Paloma.namespace.new_controller_folder = {'
+            end
+            
+            file '_callbacks.js' do
+              contains '//= require ./_local.js'
+              contains '//= require_tree .'
+            end
+          end
           
           file '_callbacks.js' do
             contains "//= require ./_local.js"
-            contains "//= require_tree ."
+            contains "//= require ./new_controller_folder/_callbacks.js"
           end
+          
+          file '_local.js' do
+            contains "Paloma.namespace = {"
+          end
+        end
+        
+        file 'index.js' do
+          contains "//= require ./namespace/_callbacks.js"
         end
       end
     }
-  end
+  end  
 end
 
 
+# rails g paloma:add existing_namespace/new_controller_folder new_action
+feature Paloma::AddGenerator, 'creating controller folder and action file under an existing namespace' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['existing_namespace/new_controller_folder', 'new_action']
+  
+  before do
+    prepare_destination
+    mimic_setup
+    Dir.mkdir "#{Paloma.destination}/existing_namespace"
+    
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'existing_namespace' do
+          directory 'new_controller_folder' do
+            file 'new_action.js' do
+              contains "Paloma.callbacks['existing_namespace/new_controller_folder/new_action']"
+            end
+            
+            file '_local.js' do
+              contains 'Paloma.existing_namespace.new_controller_folder = {'
+            end
+          end
+
+          file '_callbacks.js' do
+            contains "//= require ./new_controller_folder/_callbacks.js"
+          end
+        end    
+      end
+    }
+  end
+end
+
 
-feature Paloma::AddGenerator, 'creating both controller folder and action file' do
+# rails g paloma:add new_controller_folder first_action second_action third_action
+feature Paloma::AddGenerator, 'create controller folder and multiple action files' do
   include GeneratorSpec::TestCase
   destination TEMP
-  arguments ['new_controller_folder/new_action']
+  arguments ['new_controller_folder', 'first_action', 'second_action', 'third_action']
   
   before do
     prepare_destination
@@ -108,8 +284,139 @@ feature Paloma::AddGenerator, 'creating both controller folder and action file'
     destination_root.should have_structure {
       directory Paloma.destination do
         directory 'new_controller_folder' do
-          file 'new_action.js' do
-            contains "Paloma.callbacks['new_controller_folder/new_action']"
+          file '_local.js' do
+            contains 'Paloma.new_controller_folder = {'
+          end
+          
+          file 'first_action.js' do
+            contains "Paloma.callbacks['new_controller_folder/first_action']"
+          end
+          
+          file 'second_action.js' do
+            contains "Paloma.callbacks['new_controller_folder/second_action']"
+          end
+          
+          file 'third_action.js' do
+            contains "Paloma.callbacks['new_controller_folder/third_action']"
+          end
+        end
+        
+        file 'index.js' do
+          contains '//= require ./new_controller_folder/_callbacks.js'
+        end
+      end
+    }
+  end
+end
+
+
+# rails g paloma:add existing_controller_folder first_action second_action third_action
+feature Paloma::AddGenerator, 'create multiple actions in an existing controller folder' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['existing_controller_folder', 'first_action', 'second_action', 'third_action']
+  
+  before do
+    prepare_destination
+    mimic_setup
+    Dir.mkdir "#{Paloma.destination}/existing_controller_folder"
+    
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'existing_controller_folder' do
+          ['first', 'second', 'third'].each do |action|
+            file ("#{action}_action.js") do
+              contains "Paloma.callbacks['existing_controller_folder/#{action}_action']"
+            end
+          end
+        end
+      end
+    }
+  end
+end
+
+
+# rails g paloma:add namespace/new_controller_folder first_action second_action third_action
+feature Paloma::AddGenerator, 'create multiple actions in a new namespaced controller' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['namespace/new_controller_folder', 'first_action', 'second_action', 'third_action']
+  
+  before do
+    prepare_destination
+    mimic_setup
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'namespace' do
+          directory 'new_controller_folder' do
+            file '_local.js' do
+              contains 'Paloma.namespace.new_controller_folder'
+            end
+            
+            ['first', 'second', 'third'].each do |action|
+              file ("#{action}_action.js") do
+                contains "Paloma.callbacks['namespace/new_controller_folder/#{action}_action']"
+              end
+            end
+          end
+          file '_callbacks.js' do
+            contains '//= require ./new_controller_folder/_callbacks.js'
+          end 
+          
+          file '_local.js' do
+            contains 'Paloma.namespace'
+          end
+        end
+        file 'index.js' do
+          contains '//= require ./namespace/_callbacks.js'
+        end
+      end
+    }
+  end
+end
+
+
+# rails g paloma:add existing_namespace/new_controller_folder first_action second_action third_action
+feature Paloma::AddGenerator, 'create multiple actions in an existing namespaced controller' do
+  include GeneratorSpec::TestCase
+  destination TEMP
+  arguments ['existing_namespace/new_controller_folder', 'first_action', 'second_action', 'third_action']
+  
+  before do
+    prepare_destination
+    mimic_setup
+    Dir.mkdir "#{Paloma.destination}/existing_namespace"
+    File.open("#{Paloma.destination}/existing_namespace/_callbacks.js", 'w'){ |f| 
+      f.write('//= require ./_local.js') }
+    
+    run_generator
+  end
+  
+  specify do
+    destination_root.should have_structure {
+      directory Paloma.destination do
+        directory 'existing_namespace' do
+          directory 'new_controller_folder' do
+            ['first', 'second', 'third'].each do |action|
+              file ("#{action}_action.js") do
+                contains "Paloma.callbacks['existing_namespace/new_controller_folder/#{action}_action']"
+              end
+            end
+            
+            file '_local.js' do
+              contains 'Paloma.existing_namespace.new_controller_folder'
+            end
+          end
+          file '_callbacks.js' do
+            contains '//= require ./new_controller_folder/_callbacks.js'
           end
         end
       end

data/spec/sample_app/app/assets/javascripts/paloma/index.js

@@ -1,2 +1,3 @@
 //= require ./paloma
-//= require ./articles/callbacks
+//= require ./articles/_callbacks.js
+//= require ./sample_namespace/_callbacks.js

data/spec/sample_app/app/assets/javascripts/paloma/sample_namespace/_callbacks.js

@@ -0,0 +1 @@
+//= require ./categories/_callbacks.js

data/spec/sample_app/app/assets/javascripts/paloma/sample_namespace/categories/_callbacks.js

@@ -0,0 +1 @@
+//= require_tree .

data/spec/sample_app/app/assets/javascripts/paloma/sample_namespace/categories/index.js

@@ -0,0 +1,3 @@
+Paloma.callbacks['sample_namespace/categories/index'] = function(params){
+  $('body').append($("<div id='from-categories-index'></div>"));
+};

data/spec/sample_app/app/views/sample_namespace/categories/index.html.erb

@@ -0,0 +1,5 @@
+<% @categories.each do |category| %>
+  <div>
+    <%= category.name %>
+  </div>
+<% end %>

data/spec/sample_app/app/views/sample_namespace/categories/new.html.erb

@@ -0,0 +1,5 @@
+=form_for @category do |f|
+  =f.label :Name
+  =f.text_field :name
+  
+  =f.submit

data/spec/sample_app/controllers.rb

@@ -56,7 +56,13 @@ end
 module SampleNamespace
   class CategoriesController < ApplicationController
     def index
-      raise controller_path.inspect
+      @categories = Category.all
+    end
+    
+    
+    def new
+      @category = Category.new
+      js_callback :index
     end
   end
 end

data/spec/sample_app/init.rb

@@ -27,7 +27,10 @@ app.initialize!
 # Routes
 app.routes.draw do
   resources :articles, :controller => 'Articles'
-  resources :categories, :module => 'SampleNamespace'
+  
+  namespace :sample_namespace do
+    resources :categories
+  end
 end
 
 require "#{Paloma.root}/spec/sample_app/models"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paloma
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -184,7 +184,7 @@ files:
 - spec/callback_spec.rb
 - spec/generator_spec.rb
 - spec/sample_app/app/assets/javascripts/application.js
-- spec/sample_app/app/assets/javascripts/paloma/articles/callbacks.js
+- spec/sample_app/app/assets/javascripts/paloma/articles/_callbacks.js
 - spec/sample_app/app/assets/javascripts/paloma/articles/create.js
 - spec/sample_app/app/assets/javascripts/paloma/articles/edit.js
 - spec/sample_app/app/assets/javascripts/paloma/articles/index.js
@@ -193,10 +193,15 @@ files:
 - spec/sample_app/app/assets/javascripts/paloma/articles/update.js
 - spec/sample_app/app/assets/javascripts/paloma/index.js
 - spec/sample_app/app/assets/javascripts/paloma/paloma.js
+- spec/sample_app/app/assets/javascripts/paloma/sample_namespace/_callbacks.js
+- spec/sample_app/app/assets/javascripts/paloma/sample_namespace/categories/_callbacks.js
+- spec/sample_app/app/assets/javascripts/paloma/sample_namespace/categories/index.js
 - spec/sample_app/app/views/articles/index.html.erb
 - spec/sample_app/app/views/articles/new.html.erb
 - spec/sample_app/app/views/articles/show.html.erb
 - spec/sample_app/app/views/layouts/application.html.erb
+- spec/sample_app/app/views/sample_namespace/categories/index.html.erb
+- spec/sample_app/app/views/sample_namespace/categories/new.html.erb
 - spec/sample_app/controllers.rb
 - spec/sample_app/init.rb
 - spec/sample_app/models.rb