xmvc 0.1.8 → 0.1.9

data/lib/xmvc.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'extlib'
 require 'whorm'
 require 'sprockets'
+require 'thor'
 
 module Xmvc
 
@@ -24,18 +25,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 :Helpers,        'xmvc/helpers'
   autoload :Vendor,         'xmvc/vendor'
   autoload :Helpers,        'xmvc/helpers'
   autoload :API,            'xmvc/api'
   autoload :UI,             'xmvc/ui'
   autoload :Generator,      'xmvc/generator'
-  autoload :Plugin,         'xmvc/plugin'
   autoload :Stats,          'xmvc/stats'
   autoload :Test,           'xmvc/test'
   
@@ -80,12 +75,6 @@ module Xmvc
     #
     attr_accessor :vendors
     
-    
-    ##
-    # An instance of the sprockets secretary
-    #
-    attr_accessor :secretary
-    
     attr_accessor :public_path
     
     ##
@@ -94,26 +83,40 @@ module Xmvc
         
     ##
     # @param {Symbol} type :js, :css, :image
-    # @param {String} name
+    # @param {Xmvc::Vendor} vendor
+    # @param {Symbol} type :js|:css|:sass|:haml, etc
+    # @param {Symbol} environment :development|:production
+    #
+    def public_build_paths(environment, vendor, ext)
+      vspec = vendor.config
+      @rs = []
+      vendor.config[asset_dir(ext)].each do |file|
+        @rs << build_path(environment, vspec["host"], vspec["name"], vspec["version"], ext)
+      end
+    end
+    
+    ##
+    # builds a public asset-path for a single asset-path
+    # @param {Symbol} environment
+    # @param {String} vendor name
     # @param {String} version
+    # @param {String} ext The file-extension :js, :css, :sass, etc.
     #
-    def public_build_path(type, name, version=nil, suffix=nil)      
-      File.join(public_path, asset_dir(type), build_name(type, name, version, suffix))
+    def build_path(environment, host, name, version, ext)
+      unless host.include? "http://"
+        host = (host == PUBLIC_PATH) ? "/#{host}/#{asset_dir(ext)}" : "/#{host}"
+      end
+      File.join(host, name.to_s, build_name(environment, name, version, ext))
     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))
+    
+    def build_cachefly_url(host, name, version, file)
+      File.join(host, "#{name}-#{version}", file)
     end
     
-    def build_name(type, name, version=nil, suffix=nil)
-      version   = "" if version.nil?
-      suffix    = "" if suffix.nil?
-      package   = name
-      package   += "-#{version}" unless version.empty?
-      name      += "-all"
-      name      += "-#{suffix}" unless suffix.empty?
-      File.join(package, "#{name}.#{type.to_s}")
+    def build_name(environment, name, version, ext)
+      suffix    = (environment == :development) ? "-all-debug" : "-all"
+      version   = (version.nil? or version.empty?) ? "" : "-#{version}"
+      name.to_s+version.to_s+suffix+'.'+ext.to_s
     end
     
     def asset_dir(type)
@@ -150,10 +153,6 @@ module Xmvc
       @ui ||= UI.new
     end
     
-    private
-    
-    
-    
   end
 end
 

data/test/app/public/javascripts/valid_vendor/valid_vendor-all-debug.js

@@ -0,0 +1 @@
+alert('ValidVendor');

data/test/app/test/app/vendor/ext/vendor.yml

@@ -0,0 +1,19 @@
+# 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: ext 
+
+version: 3.1.1 
+
+dependencies: 
+
+host: http://extjs.cachefly.net
+ 
+javascripts:
+- adapter/ext/ext-base.js
+- ext-all.js
+ 
+stylesheets:
+- resources/css/ext-all.css
+

data/test/app/vendor/ext/vendor.yml

@@ -0,0 +1,19 @@
+# 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: ext 
+
+version: 3.1.1 
+
+dependencies: 
+
+host: http://extjs.cachefly.net
+ 
+javascripts:
+- adapter/ext/ext-base.js
+- ext-all.js
+ 
+stylesheets:
+- resources/css/ext-all.css
+

data/test/app/vendor/valid_vendor/src/ValidVendor.js

@@ -0,0 +1 @@
+alert('ValidVendor');

data/test/app/vendor/valid_vendor/vendor.yml

@@ -0,0 +1,4 @@
+name: extjs
+
+javascripts:
+- src/*

data/test/helper.rb

@@ -4,7 +4,13 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'extjs-core'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
+
+
+require 'xmvc'
+require 'xmvc/cli'
+require 'extjs-mvc'
 
 class Test::Unit::TestCase
+  
 end

data/test/lib/invalid_vendor/invalid_vendor.rb

@@ -0,0 +1,15 @@
+module InvalidVendor
+  class API < Xmvc::Vendor
+    
+    vendor_name :invalid_vendor
+    
+    def self.source_root 
+      File.dirname(__FILE__)
+    end
+    
+    desc "install", "Install library"
+    def install
+
+    end
+  end
+end

data/test/lib/invalid_vendor/src/InvalidVendor.js

@@ -0,0 +1 @@
+alert('InvalidVendor');

data/test/lib/nameless_vendor/nameless_vendor.rb

@@ -0,0 +1,20 @@
+module NamelessVendor
+  class API < Xmvc::Vendor
+    
+    ##
+    # This test-vendor does not define the required vendor_name property
+    #vendor_name :valid_vendor
+    
+    def self.source_root 
+      File.dirname(__FILE__)
+    end
+    
+    desc "install", "Install library"
+    def install
+      
+      inside empty_directory("src") do |src|
+        copy_file("NamelessVendor.js", "NamelessVendor.js")
+      end
+    end
+  end
+end

data/test/lib/nameless_vendor/src/ValidVendor.js

@@ -0,0 +1 @@
+alert('ValidVendor');

data/test/lib/nameless_vendor/vendor.yml

@@ -0,0 +1,4 @@
+name: extjs
+
+javascripts:
+- src/*

data/test/lib/valid_vendor/src/ValidVendor.js

@@ -0,0 +1 @@
+alert('ValidVendor');

data/test/lib/valid_vendor/valid_vendor.rb

@@ -0,0 +1,18 @@
+module ValidVendor
+  class API < Xmvc::Vendor
+    
+    vendor_name :valid_vendor
+    
+    def self.source_root 
+      File.dirname(__FILE__)
+    end
+    
+    desc "install", "Install library"
+    def install
+      
+      inside empty_directory("src") do |src|
+        copy_file("ValidVendor.js", "ValidVendor.js")
+      end
+    end
+  end
+end

data/test/lib/valid_vendor/vendor.yml

@@ -0,0 +1,4 @@
+name: extjs
+
+javascripts:
+- src/*

data/test/test_app_installer.rb

@@ -0,0 +1,15 @@
+require 'helper'
+
+class TestAppInstaller < Test::Unit::TestCase
+  context "An app named foo" do
+    
+    setup {
+      
+    }
+    should "probably rename this file and start testing for real" do
+      assert true
+    end
+    
+  end
+  
+end

data/test/test_vendor_installer.rb

@@ -0,0 +1,108 @@
+require 'helper'
+
+# Include a 3 example vendors, one good, two bad.
+require 'valid_vendor/valid_vendor'
+require 'invalid_vendor/invalid_vendor'
+require 'nameless_vendor/nameless_vendor'
+
+require 'extjs'
+
+##
+# You must run this test from gem-root
+#
+FileUtils.chdir("test/app")
+
+class TestVendorInstaller < Test::Unit::TestCase
+  VENDOR_ROOT = "vendor"
+  
+  context "A valid vendor" do
+    should "install" do
+      path = "vendor/valid_vendor"
+      FileUtils.rm_rf(path) if File.exists? path
+      vendor = ValidVendor::API.install({
+        :root => "vendor"
+      })
+      assert File.exists?(File.join(VENDOR_ROOT, "valid_vendor/vendor.yml")), FileUtils.pwd
+    end
+    
+    should "load" do
+      vendor = ValidVendor::API.load({
+        :root => "vendor"
+      })
+      assert vendor.config.kind_of?(Hash) and vendor.config["name"] == ValidVendor::API.vendor_name
+    end
+    
+    should "return secretary" do
+      vendor = ValidVendor::API.load({
+        :root => "vendor"
+      })
+      secretary = vendor.invoke(:secretary)
+      assert secretary.instance_of?(Sprockets::Secretary)
+    end
+    
+    should "secretary should contain corresponding number of files as exist in valid_vendor/src/*" do
+      count = Dir["vendor/valid_vendor/src/**/*.js"].length
+      vendor = ValidVendor::API.load({
+        :root => "vendor"
+      })
+      secretary = vendor.invoke(:secretary)
+      assert secretary.preprocessor.source_files.length == count
+    end
+    
+    should "bundle assets" do
+      vendor = ValidVendor::API.load({
+        :root => "vendor"
+      })
+      vendor.invoke(:bundle)
+    end
+  end
+  
+  context "An invalid vendor with no vendor.yml defined" do
+    setup {
+      path = "test/app/vendor/invalid_vendor"
+      FileUtils.rm_rf(path) if File.exists? path
+    }
+    
+    should "Fail with SpecNotFound exception" do
+      begin
+        InvalidVendor::API.install({
+          :root => "test/app/vendor"
+        })
+      rescue StandardError => e
+        assert e.instance_of? Xmvc::Vendor::SpecNotFound
+      end
+    end
+  end  
+  
+  context "A vendor with no vendor_name defined" do
+    setup {
+      path = "test/app/vendor/nameless_vendor"
+      FileUtils.rm_rf(path) if File.exists? path      
+    }
+    
+    should "Fail with Xmvc::Vendor::Error" do
+
+      begin
+        NamelessVendor::API.install({
+          :root => "test/app/vendor"
+        })
+      rescue StandardError => e
+        assert e.instance_of? Xmvc::Vendor::Error
+      end
+    end
+  end
+  
+  context "The extjs Gem" do
+    setup {
+      path = "test/app/vendor/#{ExtJS::API.vendor_name}"
+      FileUtils.rm_r(path) if File.exists? path 
+    }
+    
+    should "install" do
+      ExtJS::API.install({
+        :root => "test/app/vendor"
+      })
+      #assert File.exists? "test/app/vendor/#{ExtJS::API.vendor_name}"
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Ed Spencer and Chris Scott
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -04:00
+date: 2010-03-19 00:00:00 -04:00
 default_executable: xmvc
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -97,6 +97,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: A full-stack, full-stack MVC framework generator geared towards generating towards the Ext JS framework.  The actual javascript framework implementation is provided by the Gem extjs-mvc.  This gem contains a series of builders and erb-templates for auto-generating javascript model, view and controller class-files.
 email: christocracy@gmail.com
 executables: 
@@ -113,17 +125,9 @@ files:
 - VERSION
 - bin/xmvc
 - lib/xmvc.rb
-- lib/xmvc/README
 - lib/xmvc/api.rb
 - lib/xmvc/builder.rb
-- lib/xmvc/builders/all_builder.rb
-- lib/xmvc/builders/app_builder.rb
-- lib/xmvc/builders/base.rb
-- lib/xmvc/builders/css_builder.rb
 - lib/xmvc/builders/docs_builder.rb
-- lib/xmvc/builders/mvc_builder.rb
-- lib/xmvc/builders/plugin_builder.rb
-- lib/xmvc/builders/vendor.rb
 - lib/xmvc/cli.rb
 - lib/xmvc/config.rb
 - lib/xmvc/generator.rb
@@ -182,7 +186,6 @@ files:
 - lib/xmvc/generators/view.rb
 - lib/xmvc/helpers.rb
 - lib/xmvc/helpers/sprockets.rb
-- lib/xmvc/plugin.rb
 - lib/xmvc/stats.rb
 - lib/xmvc/test.rb
 - lib/xmvc/testserver.ru
@@ -190,8 +193,22 @@ files:
 - lib/xmvc/update.rb
 - lib/xmvc/vendor.rb
 - lib/xmvc/vendor/plugin.rb
+- test/app/public/javascripts/valid_vendor/valid_vendor-all-debug.js
+- test/app/test/app/vendor/ext/vendor.yml
+- test/app/vendor/ext/vendor.yml
+- test/app/vendor/valid_vendor/src/ValidVendor.js
+- test/app/vendor/valid_vendor/vendor.yml
 - test/helper.rb
-- test/test_extjs-core.rb
+- test/lib/invalid_vendor/invalid_vendor.rb
+- test/lib/invalid_vendor/src/InvalidVendor.js
+- test/lib/nameless_vendor/nameless_vendor.rb
+- test/lib/nameless_vendor/src/ValidVendor.js
+- test/lib/nameless_vendor/vendor.yml
+- test/lib/valid_vendor/src/ValidVendor.js
+- test/lib/valid_vendor/valid_vendor.rb
+- test/lib/valid_vendor/vendor.yml
+- test/test_app_installer.rb
+- test/test_vendor_installer.rb
 has_rdoc: true
 homepage: http://github.com/christocracy/extjs-core
 licenses: []
@@ -224,4 +241,8 @@ specification_version: 3
 summary: A Rails-like, full-stack MVC framework generator geared towards generating towards the Ext JS framework.
 test_files: 
 - test/helper.rb
-- test/test_extjs-core.rb
+- test/lib/invalid_vendor/invalid_vendor.rb
+- test/lib/nameless_vendor/nameless_vendor.rb
+- test/lib/valid_vendor/valid_vendor.rb
+- test/test_app_installer.rb
+- test/test_vendor_installer.rb

data/lib/xmvc/README

@@ -1,20 +0,0 @@
-This directory contains a collection of Ruby scripts and classes which allow automation of common project tasks.
-You can remove this directory if you don't use any of these tasks.
-
-Usage:
-
-From within the MVC application base directory:
-
-ruby script/generate model MyModel field_1:string field_2:int field_3:boolean
-ruby script/generate view viewNamespace viewName
-ruby script/generate controller controllerName viewName1 viewName2 ...
-ruby script/generate scaffold MyModel field_1:string field_2:int field_3:boolean
-
-ruby script/plugin install git://github.com/extmvc/loadingmessage-plugin.git LoadingMessage (second arg optional)
-ruby script/plugin install MyPluginFolder (where MyPluginFolder is a folder within the vendor/plugins directory)
-ruby script/plugin uninstall MyPluginFolder
-
-ruby script/build all
-ruby script/build js
-ruby script/build css
-

data/lib/xmvc/builders/all_builder.rb

@@ -1,13 +0,0 @@
-module Xmvc
-  class AllBuilder < Builder
-    def self.instances(args = [])
-      # set defaults
-      args = ['app', 'css', 'plugin', 'mvc'] if args.empty?      
-      instances = []
-
-      #args.each {|builderName| instances.concat(ExtMVC::BuilderManager.instances_for(builderName, []))}
-  
-      return instances
-    end
-  end
-end

data/lib/xmvc/builders/app_builder.rb

@@ -1,36 +0,0 @@
-module ExtJS
-  module MVC
-    class AppBuilder < Builder
-      def self.instances(args = [])
-        [ExtMVC::AppBuilder.new]
-      end
-  
-      def file_list
-        # build to production environment
-        environment = ExtMVC.mvc_production_environment
-    
-        return ExtMVC.application_files_for(environment)
-      end
-  
-      def name
-        "Ext MVC Application"
-      end
-  
-      def message
-        "Built #{name}"
-      end
-  
-      def description
-        "Your #{name}"
-      end
-  
-      def output_filename
-        "public/application-all.js"
-      end
-  
-      def should_minify
-        true
-      end  
-    end
-  end
-end