xmvc 0.1.10 → 0.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/xmvc/vendor.rb +4 -4
- metadata +2 -2
    
        data/VERSION
    CHANGED
    
    | @@ -1 +1 @@ | |
| 1 | 
            -
            0.1. | 
| 1 | 
            +
            0.1.11
         | 
    
        data/lib/xmvc/vendor.rb
    CHANGED
    
    | @@ -40,7 +40,7 @@ module Xmvc | |
| 40 40 | 
             
                  # get / set the vendor name
         | 
| 41 41 | 
             
                  #
         | 
| 42 42 | 
             
                  def vendor_name(name=nil)
         | 
| 43 | 
            -
                    @name ||= name
         | 
| 43 | 
            +
                    @name ||= name.to_s
         | 
| 44 44 | 
             
                  end
         | 
| 45 45 |  | 
| 46 46 | 
             
                  ##
         | 
| @@ -48,7 +48,7 @@ module Xmvc | |
| 48 48 | 
             
                  # @return {Xmvc::Vendor}
         | 
| 49 49 | 
             
                  #
         | 
| 50 50 | 
             
                  def install(options)
         | 
| 51 | 
            -
                     | 
| 51 | 
            +
                    if vendor_name.empty?
         | 
| 52 52 | 
             
                      raise Vendor::Error.new("Vendors must specify a name using the class-method vendor_name")
         | 
| 53 53 | 
             
                    end
         | 
| 54 54 |  | 
| @@ -127,7 +127,7 @@ module Xmvc | |
| 127 127 | 
             
                  def prepare_vendor(options)
         | 
| 128 128 | 
             
                    vendor = new([], options)
         | 
| 129 129 | 
             
                    vendor.inside(File.expand_path(options[:root])) do
         | 
| 130 | 
            -
                      vendor.inside vendor_name | 
| 130 | 
            +
                      vendor.inside vendor_name do |root|
         | 
| 131 131 | 
             
                        vendor.destination_root = root
         | 
| 132 132 | 
             
                        yield vendor if block_given?
         | 
| 133 133 | 
             
                        configure(vendor)
         | 
| @@ -175,7 +175,7 @@ module Xmvc | |
| 175 175 | 
             
                desc "bundle", "Bundle a vendor's assets"
         | 
| 176 176 | 
             
                def bundle(sec = secretary(:js))
         | 
| 177 177 | 
             
                  # ugly hack for root in order to satisfy both Sprockts helper and CLI.
         | 
| 178 | 
            -
                  root = (self.class.vendor_name ==  | 
| 178 | 
            +
                  root = (self.class.vendor_name == "app") ? Xmvc::PUBLIC_PATH : "../#{Xmvc::PUBLIC_PATH}"
         | 
| 179 179 |  | 
| 180 180 | 
             
                  self.class.bundle_js(self, sec, root) unless config['host'].include?('http://')
         | 
| 181 181 | 
             
                  self.class.bundle_css(self) unless config['host'].include?('http://')
         |