xmvc 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/xmvc/api.rb

@@ -15,11 +15,6 @@ module Xmvc
       Xmvc::Stats.dispatch
     end
     
-    desc "config", "Return configuration"
-    def config
-      Xmvc::Config
-    end
-    
     desc "secretary", "Return Sprockets::Secretary for app javascripts"
     def secretary
       say_status "Xmvc::API", "secretary #{config[:root]}, #{FileUtils.pwd}"

data/lib/xmvc/builder.rb

@@ -16,13 +16,13 @@ module Xmvc
     end
     
     desc "setup", "Initialize config file"
-    def setup
-      Xmvc.ui.warn("Builder setup")
-      
+    def setup      
       Xmvc.secretary = Sprockets::Secretary.new({})
       Xmvc.public_path = File.expand_path("public")
-      host = Vendor.new([], {})
-      host.invoke("app", [Xmvc.environment])
+      host = Vendor.new([], {
+        :environment => Xmvc.environment
+      })
+      host.invoke("app")
     end
     
   private

data/lib/xmvc/builders/vendor.rb

@@ -10,10 +10,6 @@ module Xmvc
       desc "app", "Build application-host's assets"
       def app(environment)
         pkgs = []
-        each_vendor do |vendor|
-          builder = Vendor.new([], {})
-          builder.invoke("build", [vendor, pkgs])
-        end
         
         Xmvc.secretary.reset!({
           :source_files => Xmvc::Config[:javascripts]

data/lib/xmvc/cli.rb

@@ -55,12 +55,13 @@ module Xmvc
       Xmvc.host = host
       options.delete(:shell)
       
-      Xmvc::Config.setup(options)
+      # New Vendors replaces host above
+      Xmvc.vendors = options.delete(:vendors)
       
+      Xmvc::Config.setup(options)    
       Xmvc.config = Xmvc::Config
-      
       Xmvc.environment = Xmvc::Config[:environment]
-            
+      
       super
     end
   

data/lib/xmvc/config.rb

@@ -133,20 +133,18 @@ module Xmvc
       # TODO: load and merge! specific environemnt.
       #
       def load(environment)
-        # When generating a new app, there is no environment yet
-        #
-        #unless File.exists?("#{DEFAULT_ENVIRONMENT}.yml")
-        #  raise FileNotFound.new("Failed to load environment #{DEFAULT_ENVIRONMENT}.yml")
-        #end
-        config = {}  
+        config = {}
+        if File.exists?("vendor.yml")
+          config.merge!(YAML.load_file("vendor.yml"))
+          #raise Xmvc::Error.new("Xmvc::Config failed to find #{File.expand_path('.')}/vendor.yml")
+        end
         if File.exists? "config/environment.yml"
-          config = YAML.load_file("config/environment.yml")
+          config.merge!(YAML.load_file("config/environment.yml"))
         end
         if File.exists? "config/environments/#{environment}.yml"
           config.merge!(YAML.load_file("config/environments/#{environment}.yml"))
         end
         config
-        
       end
       
       def save

data/lib/xmvc/generator.rb

@@ -24,14 +24,6 @@ module Xmvc
           options = options.dup
           
           App.start(params, options)
-          Xmvc::Config.setup
-          #FXmvc.public_path = File.expand_path("./public")
-          
-          builder = Xmvc::Builder.new([], {})    
-          packages = builder.invoke(:setup, [])      
-          
-          boot = Boot.new([], {})  
-          boot.invoke(:generate, [packages])
           
         when "model"
           model = Model.new([], options.dup)

data/lib/xmvc/generators/app.rb

@@ -17,11 +17,15 @@ module Xmvc
         FileUtils.chdir(name)
       end
       
+      def vendor_spec
+        copy_file("vendor.yml", "vendor.yml")
+      end
+      
       def create_app
         empty_directory("app")
         inside("app", {}) do
           #copy_file("App.js", "#{destination_root}/App.js")
-          directory("models", "models")
+          empty_directory("models")
           directory("views", "views")
           directory("controllers", "controllers")
         end
@@ -32,16 +36,16 @@ module Xmvc
       end
       
       def create_lib
-        directory("lib", "lib")
+        empty_directory("lib")
       end
       
       def create_public
         empty_directory("public")
         inside("public", {}) do
           copy_file("index.html", "index.html")
-          directory("images", "images")
+          empty_directory("images")
+          empty_directory("javascripts")
           directory("stylesheets", "stylesheets")
-          directory("javascripts", "javascripts")
         end
 
       end
@@ -49,22 +53,28 @@ module Xmvc
       def create_spec
         directory("spec", "spec", :recursive => false)
         inside("spec", {}) do
-          directory("models", "models")
-          directory("controllers", "controllers")
+          empty_directory("models")
+          empty_directory("controllers")
         end
       end
       
       def create_vendor
         directory("vendor", "vendor")
-        inside("vendor", {}) do 
+        inside("vendor", {}) do |pwd|
           empty_directory("plugins")
-        end
-      end
-      
-      def install_host
-        inside("vendor", {}) do |dir|
-          host = Xmvc.host::API.new([], {})
-          host.invoke(:install, [dir])
+          
+          #host = Xmvc.host::API.new([], {})
+          #host.invoke(:install, [dir])
+          
+          Xmvc.vendors.each do |vendor|
+            say_status("install", vendor)
+            api = vendor::API.new([], {
+              :root => pwd,
+              :format => :js,
+              :asset_root => "public"
+            })
+            api.invoke(:install)
+          end    
         end
       end
       
@@ -73,6 +83,36 @@ module Xmvc
           # install vendor/plugins here
         end
       end
+      
+      def environment
+        Xmvc::Config.setup
+      end
+              
+      def boot
+        ##
+        # We want to get rid of Xmvc::Builder in favour of each vendor providing its own secretary
+        #
+        @vendors = []
+        asset_root = File.join(self.destination_root, "public")
+        inside "vendor" do |dir|
+          Xmvc.vendors.each do |vendor|
+            @vendors << vendor::API.new([], {
+              :root => dir,
+              :format => :js,
+              :asset_root => asset_root
+            })
+          end
+        end
+          
+        boot = Xmvc::Generator::Boot.new([], {
+          :root => self.destination_root,
+          :vendors => @vendors
+        })
+        Xmvc.ui.warn("Disabled default bundling")  
+        #boot.invoke(:default)
+        
+        boot.invoke(:sprockets)
+      end
     end
   end
 end

data/lib/xmvc/generators/boot.rb

@@ -9,8 +9,13 @@ module Xmvc
         File.join(Xmvc::TEMPLATE_PATH)
       end
       
-      desc "generate", "Generate the config/boot.js file"
-      def generate(packages)
+      desc "default", "Generate the default index.html with config/boot.js"
+      def default
+        puts "Boot default is disabled"
+        return false
+        
+        #builder = Xmvc::Builder.new([], {})    
+        #packages = builder.invoke(:setup, [])
         
         host = Xmvc.host.config["name"]
         @development = []
@@ -47,6 +52,37 @@ module Xmvc
         template("boot.js", "config/boot.js")
       end
       
+      desc "sprockets", "Generate a sprockets compatible index page"
+      def sprockets        
+        @javascripts = []
+        @stylesheets = []
+        options[:vendors].each do |vendor|
+          config = vendor.invoke(:config)
+          if config["host"] # <-- Host as in http://extjs.cachefly.net/...
+            config["javascripts"].each do |script|
+              @javascripts << File.join(config["host"], script)
+            end
+            config["stylesheets"].each do |url|
+              @stylesheets << File.join(config["host"], url)
+            end
+          else
+            @javascripts << File.join("/sprockets", "#{config['name']}.js")
+            if config["stylesheets"]  # <-- We wanna' use Sass!
+              config["stylesheets"].each do |url|
+                @stylesheets << File.join("/public", "stylesheets", config["name"], url)
+              end
+            end
+          end  
+        end
+        
+        # Finallly, add the xmvc assets (ie: controllers, models, views, plugins, etc)
+        @javascripts << File.join("/sprockets", "app.js")
+        
+        # Application sass / css??
+        
+        template("index.html.sprockets", "public/index.html.sprockets")
+      end
+      
       private
       
       def url_for_path(path)

data/lib/xmvc/generators/environment.rb

@@ -0,0 +1,9 @@
+module Xmvc
+  module Builder
+    class Environment < Thor
+      
+    end
+  end
+end
+      
+    

data/lib/xmvc/generators/templates/app/public/config/environment.yml

@@ -33,7 +33,8 @@ config:
 # All stylesheets to be loaded. These are all taken to be relative to the public/stylesheets directory, 
 # and the .css is automatically appended
 #
-stylesheets: []
+stylesheets:
+- extjs-mvc-all.css
 
 # Overrides to include. These files should be located in the config/overrides directory
 overrides: []

data/lib/xmvc/generators/templates/app/public/vendor.yml

@@ -0,0 +1,72 @@
+# General settings used by ruby scripts
+
+namespace: MyApp
+
+##
+# Directory paths
+# Original from extmvc, used with javascript asset-manager in config/boot.js
+#
+pluginsDIr: /vendor/plugins
+libsDir: /lib
+configDir: /config
+overridesDir: /config/overrides
+appDir: /app
+vendor:
+- extjs-mvc
+mvcFilename: extjs-mvc-all-min
+
+
+# Use config/application for general framework configuration
+config:
+- application
+- routes
+
+##
+# Begin standard xmvc vendor-spec
+#
+name: app
+
+javascripts:
+- config/application.js
+- config/routes.js
+- vendor/plugins/*/**.js
+- overrides/*.js
+- app/models/*.js
+- app/controllers/*.js
+- app/views/*/**.js
+
+##
+# All stylesheets to be loaded. These are all taken to be relative to the public/stylesheets directory, 
+# and the .css is automatically appended
+#
+stylesheets: []
+
+# Overrides to include. These files should be located in the config/overrides directory
+overrides: []
+
+# Plugins to include. Each will load vendor/plugins/SomePlugin/SomePlugin-all.js
+plugins: []
+
+# All of the models in this application, found in the app/models folder
+models: []
+
+# All of the controllers in this application, found in the app/controllers folder
+controllers:
+- application
+- home
+
+# All of the views in this application, as an object with the subfolder inside app/views as the key, 
+# and an array of filenames as the value. e.g.: 
+#   views: 
+#     index: 
+#     - index
+#     - edit
+#     - new
+#     - view 
+# will load /app/views/index/index.js and app/views/index/my_view.js
+views:
+- layout:
+  - menu
+- home:
+  - index
+

data/lib/xmvc/generators/templates/index.html.sprockets

@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
+		<% @stylesheets.each do |url| %>
+			<link href="<%= url %>" rel="stylesheet" type="text/css" />
+		<% end %>
+		
+		<% @javascripts.each do |url| %>
+			<script type="text/javascript" src="<%= url %>"></script>
+		<% end %>
+
+    <title>Ext MVC Application</title>
+  </head>
+  
+	<body>
+    <div id="loading-mask"></div>
+    <div id="loading">
+      <div class="loading-indicator">
+        Loading...
+      </div>
+    </div>	
+  </body>
+</html>

data/lib/xmvc.rb

@@ -4,10 +4,6 @@ require 'yaml'
 require 'json'
 require 'extlib'
 require 'whorm'
-
-require 'jammit-core'
-require 'jammit-core/cli'
-
 require 'sprockets'
 
 module Xmvc
@@ -27,6 +23,12 @@ module Xmvc
   #
   require 'xmvc/builder'
   require 'xmvc/config'
+  
+  ##
+  # load sprockets helper immediately so we can mix in right away
+  require 'xmvc/helpers/sprockets'
+  include Xmvc::Helpers::Sprockets
+  
   #require 'xmvc/api'  # <-- autoloadable ?? check with Sinatra handlers "sprockets"
   autoload :Vendor,         'xmvc/vendor'
   autoload :Helpers,        'xmvc/helpers'
@@ -56,12 +58,6 @@ module Xmvc
   class NoFramework < Error; status_code(6) ; end
   class HostError < Error; status_code(10) ; end
   class VendorFileNotFound < Error; status_code(11) ; end
-  
-  ##
-  # Add more error classes here
-  #
-  #class GemfileNotFound  < BundlerError; status_code(10) ; end
-  #class GemNotFound      < BundlerError; status_code(7)  ; end
 
   class << self
     ##
@@ -75,8 +71,16 @@ module Xmvc
     
     ##
     # An instance of supplied framework plugin, eg ExtJS::MVC::CLI
+    # deprecate
     #
     attr_accessor :host
+    
+    ##
+    # [Thor]
+    #
+    attr_accessor :vendors
+    
+    
     ##
     # An instance of the sprockets secretary
     #
@@ -84,6 +88,8 @@ module Xmvc
     
     attr_accessor :public_path
     
+    ##
+    # Xmvc::
     attr_writer :config
         
     ##
@@ -94,7 +100,8 @@ module Xmvc
     def public_build_path(type, name, version=nil, suffix=nil)      
       File.join(public_path, asset_dir(type), build_name(type, name, version, suffix))
     end
-    
+
+    # TODO Get rid of following obsolete
     def public_build_url(type, name, version=nil, suffix=nil)
       File.join("/#{PUBLIC_PATH}", asset_dir(type), build_name(type, name, version, suffix))
     end
@@ -117,6 +124,8 @@ module Xmvc
         "stylesheets"
       when :images
         "images"
+      when :sass
+        "sass"
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Ed Spencer and Chris Scott
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -04:00
+date: 2010-03-16 00:00:00 -04:00
 default_executable: xmvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,7 @@ files:
 - lib/xmvc/generators/app.rb
 - lib/xmvc/generators/boot.rb
 - lib/xmvc/generators/controller.rb
+- lib/xmvc/generators/environment.rb
 - lib/xmvc/generators/layout.rb
 - lib/xmvc/generators/model.rb
 - lib/xmvc/generators/scaffold.rb
@@ -153,6 +154,7 @@ files:
 - lib/xmvc/generators/templates/app/public/public/stylesheets/extjs-mvc-all.css
 - lib/xmvc/generators/templates/app/public/spec/SpecHelper.js
 - lib/xmvc/generators/templates/app/public/spec/index.html
+- lib/xmvc/generators/templates/app/public/vendor.yml
 - lib/xmvc/generators/templates/app/public/vendor/screw-unit/EXAMPLE.html
 - lib/xmvc/generators/templates/app/public/vendor/screw-unit/LICENSE
 - lib/xmvc/generators/templates/app/public/vendor/screw-unit/README.markdown
@@ -173,6 +175,8 @@ files:
 - lib/xmvc/generators/templates/app/public/vendor/screw-unit/spec/suite.html
 - lib/xmvc/generators/templates/app/public/vendor/screw-unit/vendor.yml
 - lib/xmvc/generators/templates/boot.js
+- lib/xmvc/generators/templates/index.html
+- lib/xmvc/generators/templates/index.html.sprockets
 - lib/xmvc/generators/templates/layout.html.erb
 - lib/xmvc/generators/templates/scaffold/ScaffoldController.js
 - lib/xmvc/generators/view.rb