xmvc 0.1.6 → 0.1.7

data/Rakefile

@@ -11,11 +11,10 @@ begin
     gem.homepage = "http://github.com/christocracy/extjs-core"
     gem.authors = ["Ed Spencer and Chris Scott"]
     
-    gem.add_dependency "extlib", ">=0.9.14"
-    gem.add_dependency "thor", ">=0.13.4"
-    gem.add_dependency "jammit-core", ">=0.1.0"
-    gem.add_dependency "whorm", ">=0.1.0"
-    gem.add_dependency "hpricot", ">=0.8.2"
+    gem.add_dependency "extlib", ">= 0.9.14"
+    gem.add_dependency "thor", ">= 0.13.4"
+    gem.add_dependency "whorm", ">= 0.1.0"
+    gem.add_dependency "hpricot", ">= 0.8.2"
     gem.add_dependency "sprockets"
     
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/bin/xmvc

@@ -2,7 +2,6 @@
 
 # Check if an older version of extjs-mvc is installed
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift("/Users/chris/workspace/extjs/extjs-mvc/lib")
 
 require 'xmvc'
 require 'xmvc/cli'

data/lib/xmvc/cli.rb

@@ -1,8 +1,5 @@
 require 'thor'
 require 'thor/group'
-
-require 'jammit-core'
-require 'jammit-core/cli'
   
 module Xmvc
   class CLI < Thor

data/lib/xmvc/helpers/sprockets.rb

@@ -0,0 +1,118 @@
+module Xmvc
+  module Helpers
+    module Sprockets
+      class << self
+        def included(klass)
+          klass.send(:extend, ClassMethods)
+          klass.send(:include, InstanceMethods)
+        end
+      end
+    
+      module InstanceMethods
+        ##
+        # Convenience method simply delegates to ClassMethod
+        #
+        def xmvc_asset(vid, format)
+          self.class.xmvc_asset(vid, format)
+        end
+      end
+      
+      module ClassMethods
+        ##
+        # Define the available vendors with Thor task API
+        # xmvc_vendors :extjs => ExtJS::API, :"extjs-mvc" => ExtJS::MVC::API
+        #
+        def xmvc_vendors(vendors)
+          @vendors = vendors
+
+          # Add the Xmvc API
+          @vendors[:app] = Xmvc::API
+        end
+        
+        ##
+        # Defines the Sprockets root param
+        # xmvc_root File.join(MyApp::ROOT, "subfolder")
+        #
+        def xmvc_root(root)
+          @xmvc_root = root
+        end
+        
+        ##
+        # Defines teh Sprockets asset_root param where concatenation files will be created.
+        #
+        def xmvc_asset_root(asset_root)
+          @xmvc_asset_root = asset_root
+        end
+        
+        ##
+        # Request a Sprockets::Concatenation file
+        # @param {Symbol} vid Vendor-id
+        # @param {Symbol} format :js, :css, :sass, etc
+        #
+        def xmvc_asset(vid, format)
+          sec = secretary(vid.to_sym, format)
+          filename = File.join(@xmvc_root, @xmvc_asset_root, "javascripts", vid.to_s, "#{vid}-all.#{format.to_s}")
+          unless source_is_unchanged?(sec)
+            sec.concatenation.save_to(filename)
+          end
+          filename
+        end
+
+      private
+        ##
+        # Define a list of vendor-id -> Thor module
+        #
+        def vendor(vid)
+          @vendors[vid]
+        end
+        
+        ##
+        # return last modified time of Secretary concatenation
+        # @param {Sprockets::Secretary}
+        #
+        def source_last_modified(sec)
+          @last_modified ||= {}
+          @last_modified[sec.object_id]
+        end
+
+        ##
+        # cache the last-modified time of a Sprockets::Secretary concatenation
+        #
+        def record_source_last_modified (sec)
+          @last_modified ||= {}
+          @last_modified[sec.object_id] = sec.source_last_modified
+        end
+
+        ##
+        # return associated vendor's Sprockets::Secretary.
+        # @param {String} vid Vendor-ID
+        # @param {Symbol} format :js, :ccs, :sass, :images
+        #
+        def secretary(vid, format)      
+          @secretary ||= {}      
+          unless @secretary[vid]
+            begin
+              @secretary[vid] = vendor(vid).new([], {
+                :format => :js,
+                :root => (vid == :app) ? @xmvc_root : File.join(@xmvc_root, "vendor"),
+              }).invoke(:secretary, [])
+            rescue Xmvc::Error => e
+              halt e.message
+            end
+          end
+          @secretary[vid]
+        end
+
+        ##
+        # returns true if a Sprocket::Secretary's source has changed since last-modified
+        #
+        def source_is_unchanged? (sec)
+          sec.reset!
+          previous_source_last_modified = source_last_modified(sec)
+          record_source_last_modified(sec)
+          previous_source_last_modified == source_last_modified(sec)
+        end
+      end      
+    end
+  end
+end

data/lib/xmvc/helpers.rb

@@ -0,0 +1,6 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+module Xmvc
+  module Helpers
+    autoload :Sprockets,  'helpers/sprockets'
+  end
+end

data/lib/xmvc/vendor/plugin.rb

@@ -0,0 +1,11 @@
+module Xmvc
+  class Vendor
+    class Plugin < Thor
+            
+      def initialize(args, options, config)
+        puts "options: #{options}, config: #{config}"
+        say_status("Xmvc::Vendor::Plugin initialized, load teh config file")
+      end
+    end
+  end
+end

data/lib/xmvc/vendor.rb

@@ -0,0 +1,21 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+module Xmvc
+    
+  class Vendor < Thor
+    autoload :Plugin,   'vendor/plugin'
+    
+    #CONFIG_PATH = File.join(ROOT, "vendor.yml")
+    #ROOT            = File.dirname(__FILE__)
+    #class << self
+    #  def config(root)
+    #    @config ||= YAML.load(File.read(File.join(root, "vendor.yml", ))).to_mash
+    #  end
+    #end
+    
+    def initialize(args, options, config)
+      puts "options: #{options}, config: #{config}"
+      say_status("Xmvc::Vendor initialized, load teh config file")
+    end
+  end
+end

data/lib/xmvc.rb

@@ -1,5 +1,3 @@
-#$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 require 'fileutils'
 require 'pathname'
 require 'yaml'
@@ -30,11 +28,11 @@ module Xmvc
   require 'xmvc/builder'
   require 'xmvc/config'
   #require 'xmvc/api'  # <-- autoloadable ?? check with Sinatra handlers "sprockets"
-  
+  autoload :Vendor,         'xmvc/vendor'
+  autoload :Helpers,        'xmvc/helpers'
   autoload :API,            'xmvc/api'
   autoload :UI,             'xmvc/ui'
   autoload :Generator,      'xmvc/generator'
-  autoload :Environment,    'xmvc/environment'
   autoload :Plugin,         'xmvc/plugin'
   autoload :Stats,          'xmvc/stats'
   autoload :Test,           'xmvc/test'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Ed Spencer and Chris Scott
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jammit-core
+  name: whorm
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -59,24 +59,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: whorm
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hpricot
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -86,11 +72,11 @@ dependencies:
         - 2
         version: 0.8.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sprockets
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -98,11 +84,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -110,7 +96,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 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: 
@@ -140,7 +126,6 @@ files:
 - lib/xmvc/builders/vendor.rb
 - lib/xmvc/cli.rb
 - lib/xmvc/config.rb
-- lib/xmvc/environment.rb
 - lib/xmvc/generator.rb
 - lib/xmvc/generators/app.rb
 - lib/xmvc/generators/boot.rb
@@ -191,12 +176,16 @@ files:
 - lib/xmvc/generators/templates/layout.html.erb
 - lib/xmvc/generators/templates/scaffold/ScaffoldController.js
 - 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
 - lib/xmvc/ui.rb
 - lib/xmvc/update.rb
+- lib/xmvc/vendor.rb
+- lib/xmvc/vendor/plugin.rb
 - test/helper.rb
 - test/test_extjs-core.rb
 has_rdoc: true

data/lib/xmvc/environment.rb

@@ -1,92 +0,0 @@
-module Xmvc
-  module Environment
-    
-    DEFAULT_ENVIRONMENT = File.join(Xmvc::CONFIG_PATH, "environment")
-    ENVIRONMENT_PATH    = File.join(Xmvc::CONFIG_PATH, "environments")
-    
-    class FileNotFound < Xmvc::Error; status_code(10) ; end
-    
-    class << self
-      
-      ##
-      # TODO implement development/production environments
-      #
-      def load(environment)
-        @environment  = environment
-        @config       = load_environment(environment)
-        self
-      end
-      
-      def get(key)
-        config[key]
-      end
-      
-      def set(key, value)
-        config[key] = value
-        save
-      end
-      
-      ##
-      # write a newly generated controller, model or view to environment.json
-      # Unfortunately, we cannot JSON.parse the entire config/environment.json, since it contains comments
-      # and such.  Have to RegExp, pick-out the requested key, and JSON.parse the returned chunk.
-      # Is this Regexp satisfactory??  Could probably be made better.
-      #
-      def add (key, item)
-        key = key.to_s
-        config[key] = [] unless config[key] && config[key].kind_of?(Array)
-        
-        unless key == "views"
-          config[key] << item
-        else
-          if controller = config[key].find {|i| i[item[:package]]}
-            controller[item[:package]] << item[:filename]
-          else
-            config[key] << {
-              item[:package] => [
-                item[:filename]
-              ]
-            }
-          end
-        end
-        save
-      end
-      
-      def render
-        File.open("#{DEFAULT_ENVIRONMENT}.json", "w") {|file|
-          file << config.to_json
-        }
-      end
-      
-      def config
-        @config ||= load_environment(:development)
-      end
-      
-      private
-      
-      ##
-      # TODO: load and merge! specific environemnt.
-      #
-      def load_environment(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  
-        if File.exists? "#{DEFAULT_ENVIRONMENT}.yml"
-          YAML.load_file("#{DEFAULT_ENVIRONMENT}.yml") 
-        end
-      end
-      
-      def save
-        File.open("#{DEFAULT_ENVIRONMENT}.yml", "w") {|file|
-          file << config.to_yaml
-        }
-        File.open("#{DEFAULT_ENVIRONMENT}.json", "w") {|file|
-          file << config.to_json
-        }
-      end
-    end
-  end
-end
-