plugins.rb in octopress-ink-1.0.0.alpha.37

- old
+ new

@@ -42,11 +42,11 @@
         end
       end
 
       def self.add_files
         add_assets(%w{images pages files fonts docs})
-        plugin('asset-pipeline').register_assets
+        plugin('octopress-asset-pipeline').register_assets
         add_stylesheets
         add_javascripts
       end
 
       def self.add_assets(assets)
@@ -57,17 +57,17 @@
 
       def self.site
         @site
       end
 
-      def self.register_plugin(plugin, name, type='plugin', local=nil)
-        new_plugin = plugin.new(name, type)
+      def self.register_plugin(plugin)
+        new_plugin = plugin.new
 
-        case type
+        case new_plugin.type
         when 'theme'
           @theme = new_plugin
         else
-          if local
+          if new_plugin.local
             @user_plugins << new_plugin
           else
             @plugins << new_plugin
           end
         end