lib/xmvc/vendor.rb in xmvc-0.1.10 vs lib/xmvc/vendor.rb in xmvc-0.1.11

- old
+ new

@@ -38,19 +38,19 @@ ## # get / set the vendor name # def vendor_name(name=nil) - @name ||= name + @name ||= name.to_s end ## # Install a vendor # @return {Xmvc::Vendor} # def install(options) - unless vendor_name + if vendor_name.empty? raise Vendor::Error.new("Vendors must specify a name using the class-method vendor_name") end prepare_vendor(options) do |vendor| vendor.say_status("install", vendor.class.to_s) @@ -125,11 +125,11 @@ end def prepare_vendor(options) vendor = new([], options) vendor.inside(File.expand_path(options[:root])) do - vendor.inside vendor_name.to_s do |root| + vendor.inside vendor_name do |root| vendor.destination_root = root yield vendor if block_given? configure(vendor) end end @@ -173,10 +173,10 @@ end desc "bundle", "Bundle a vendor's assets" def bundle(sec = secretary(:js)) # ugly hack for root in order to satisfy both Sprockts helper and CLI. - root = (self.class.vendor_name == :app) ? Xmvc::PUBLIC_PATH : "../#{Xmvc::PUBLIC_PATH}" + root = (self.class.vendor_name == "app") ? Xmvc::PUBLIC_PATH : "../#{Xmvc::PUBLIC_PATH}" self.class.bundle_js(self, sec, root) unless config['host'].include?('http://') self.class.bundle_css(self) unless config['host'].include?('http://') end end \ No newline at end of file