extjs-mvc 0.4.0.b → 0.4.0.d

data/Rakefile

@@ -5,20 +5,17 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "extjs-mvc"
-    gem.summary = %Q{A Rails-like MVC for the Ext JS javascript framework}
+    gem.summary = %Q{A Rails-like, full-stack MVC framework for the Ext JS javascript framework}
     gem.description = %Q{A full-stack, Rails-like MVC for the Ext JS javascript framework (originally known as extmvc/extmvc)}
     gem.email = "christocracy@gmail.com"
-    gem.homepage = "http://github.com/christocracy/extjs-mvc-gem"
+    gem.homepage = "http://github.com/christocracy/extjs-mvc"
     gem.authors = ["Ed Spencer and Chris Scott"]
-    gem.add_dependency "extlib"
-    gem.add_dependency "json"
-    gem.add_dependency "thor"
-    gem.add_dependency "jammit-core"
-    gem.add_dependency "hpricot"
-    
+    gem.add_dependency "xmvc"
+    gem.add_dependency "extjs"
+    gem.add_dependency "thor-cheese"
     
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.files =  FileList["[A-Z]*", "{bin,generators,lib,test,js}/**/*", 'lib/jeweler/templates/.gitignore']
+    gem.files =  FileList["[A-Z]*", "{bin,lib,test,config}/**/*"]
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.4.0.b
+0.4.0.d

data/bin/extjs-mvc

@@ -0,0 +1,19 @@
+#!/usr/local/bin/ruby
+
+# Check if an older version of extjs-mvc is installed
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift('/Users/chris/workspace/extjs/xmvc/lib')
+require 'xmvc'
+require 'xmvc/cli'
+
+require 'extjs-mvc'
+
+# Boot Xmvc CLI listener feeding it an instance of ExtJS::MVC::CLI
+begin
+  Xmvc::CLI.start(ARGV, {
+    :host => ExtJS::MVC  # <-- Supplied module must contain a CLI Thor task extension
+  })
+rescue Xmvc::Error => e
+  Xmvc.ui.error(e.message)
+  exit e.status_code
+end

data/lib/extjs-mvc.rb

@@ -1,80 +1,26 @@
-require 'fileutils'
-require 'pathname'
-require 'yaml'
-require 'json'
-require 'extlib/inflection'
-
 module ExtJS
   module MVC
-    VERSION = "0.4.0"
-    
-    ROOT = File.dirname(__FILE__)
-    
-    ##
-    # Do autoloads here
-    #
-    require 'extjs-mvc/settings'
-    
-    autoload :UI,         'extjs-mvc/ui'
-    autoload :Generator,  'extjs-mvc/generator'
-    autoload :BuilderManager, 'extjs-mvc/builder'
-    autoload :Plugin,     'extjs-mvc/plugin'
-    autoload :Stats,      'extjs-mvc/stats'
-    autoload :Update,     'extjs-mvc/update'
-    autoload :Text,       'extjs-mvc/test'
     
-    class Error < StandardError
-      def self.status_code(code = nil)
-        return @code unless code
-        @code = code
-      end
+    VERSION = "0.4.0.a"
+     
+    ROOT         = File.dirname(__FILE__)
 
-      def status_code
-        self.class.status_code
-      end
-    end
-    
-    class ArgumentError < Error; status_code(1) ; end
-    class AppNotFound   < Error; status_code(2) ; end
-    class AppAlreadyExists < Error; status_code(3) ; end
-    class FileExists < Error; status_code(4) ; end
-    class BuilderError < Error; status_code(5) ; end
+    VENDOR_NAME  = 'extjs-mvc'
 
-    
-    
-    
-    ##
-    # Add more error classes here
-    #
-    #class GemfileNotFound  < BundlerError; status_code(10) ; end
-    #class GemNotFound      < BundlerError; status_code(7)  ; end
+    VENDOR_PATH  = File.join(ROOT, "vendor")
 
+    CONFIG_PATH  = File.join(ROOT, "vendor.yml")
+    
     class << self
-      attr_writer :ui
-
-      def configure
-        @configured ||= begin
-          ##
-          # perform some config here?
-          #
-          #configure_gem_home_and_path
-          true
-        end
+       
+      def config
+        @config ||= YAML.load(File.read(CONFIG_PATH)).to_mash
       end
       
-      ##
-      # Ensure we're running within a rails app unless generating a new app ($ xmvc generate app foo)
-      #
-      def ensure_in_app
-        unless ARGV.empty? || ARGV.first == 'help' || (File.exists?('app') && File.exists?('config') && File.exists?('config/environment.json'))
-          raise ExtJS::MVC::AppNotFound.new("This command must be executed from the root of an extjs-mvc application")
-        end
+      def install(dest)
+        FileUtils.cp_r(VENDOR_PATH, File.join(dest, config["name"]))
       end
       
-      def ui
-        @ui ||= UI.new
-      end
-    end
+    end 
   end
 end
-

data/lib/{js → vendor}/lib/Booter.js

@@ -157,7 +157,8 @@ ExtMVC.lib.Booter = Ext.extend(Ext.util.Observable, {
     //   'base': {preserveOrder: false, }
     // };
     
-
+    var underscore = ExtMVC.Inflector.underscore;
+    
     Ext.each(env.config, function(file) {
       baseFiles.push(String.format("../{0}.js", file));
     }, this);
@@ -171,11 +172,11 @@ ExtMVC.lib.Booter = Ext.extend(Ext.util.Observable, {
     }, this);
     
     Ext.each(env.models, function(file) {
-      modelFiles.push(String.format("{0}/models/{1}.js", env.appDir, file));
+      modelFiles.push(String.format("{0}/models/{1}.js", env.appDir, underscore(file)));
     }, this);
     
     Ext.each(env.controllers, function(file) {
-      controllerFiles.push(String.format("{0}/controllers/{1}Controller.js", env.appDir, file));
+      controllerFiles.push(String.format("{0}/controllers/{1}_controller.js", env.appDir, underscore(file)));
     }, this);
     
     Ext.each(env.views, function(viewObj) {

data/lib/{js → vendor}/lib/Inflector.js

@@ -85,6 +85,23 @@ ExtMVC.Inflector = {
     }
   },
   
+  camelize: function(str) {
+    return (str.charAt(0).toUpperCase()+str.slice(1)).replace(/[\-_]+(\S)?/g, function(match, chr) {
+      return chr ? chr.toUpperCase() : '';
+    });
+  },
+  
+  // From http://code.google.com/p/inflection-js/source/browse/trunk/inflection.js
+  underscore: function(str) {
+    var str_path=str.split('::');
+    var upCase=new RegExp('([A-Z])','g');
+    var fb=new RegExp('^_');
+    for(var i=0;i<str_path.length;i++)
+      str_path[i]=str_path[i].replace(upCase,'_$1').replace(fb,'');
+      str=str_path.join('/').toLowerCase();
+    return str;
+  },
+  
   pluralize: function(word) {
     var unusual = ExtMVC.Inflector.uncountableOrIrregular(word);
     if (unusual) { return unusual; }

data/lib/{js/build → vendor.yml}

@@ -1,7 +1,12 @@
 # Defines the build order of Ext MVC. Comments indicated with a hash.
 # Each line denotes either a single file, or a directory glob. If a glob, all matching files are included
 # (unless they have already been defined)
+name: extjs-mvc
 
+dependencies:
+- extjs
+
+javascripts:
 - MVC.js
 - App.js
 - lib/ClassManager.js
@@ -18,4 +23,5 @@
 - view/scaffold/ScaffoldFormPanel.js
 - view/scaffold/*.js
 - testrunner/TestRunner.js
-- testrunner/*.js
+- testrunner/*.js
+stylesheets: