lib/octopress-ink/assets/config.rb in octopress-ink-1.0.0.alpha.33 vs lib/octopress-ink/assets/config.rb in octopress-ink-1.0.0.alpha.34

@@ -5,34 +5,33 @@
 
         def initialize(plugin, path)
           @root = plugin.assets_path
           @plugin = plugin
           @dir = plugin.slug
-          @type = ''
+          @base = ''
           @exists = {}
           @file = path
         end
 
         def user_dir
-          File.join Plugins.site.source, Plugins.custom_dir, @dir
+          File.join Plugins.site.source, Plugins.custom_dir, dir
         end
 
         def local_plugin_path
-          File.join Plugins.site.source, @dir, @file
+          File.join Plugins.site.source, dir, file
         end
 
         def read
           config = {}
-          if @plugin.type != 'local_plugin'
-            default = plugin_path
-            if exists? default
-              config = YAML.safe_load(File.open(default))
-            end
+          default = plugin_path
+          if exists? default
+            config = YAML.safe_load(File.open(default))
           end
-          override = user_path
-          if exists? override
-            config = config.deep_merge YAML.safe_load(File.open(override))
+
+          if exists? user_path
+            config = config.deep_merge YAML.safe_load(File.open(user_path))
           end
+
           config
         end
       end
     end
   end