soup 1.0.5 → 1.0.6

data/Rakefile

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   
   # Change these as appropriate
   s.name              = "soup"
-  s.version           = "1.0.5"
+  s.version           = "1.0.6"
   s.summary           = "A super-simple data store"
   s.author            = "James Adam"
   s.email             = "james@lazyatom.com"

data/lib/soup.rb

@@ -8,28 +8,6 @@ class Soup
   autoload :Backends, 'soup/backends'
   autoload :Snip, 'soup/snip'
 
-  # You can access a default soup using this methods.
-
-  def self.default_instance #:nodoc:
-    @@instance ||= new
-  end
-
-  def self.[](*args)
-    default_instance[*args]
-  end
-
-  def self.<<(attributes)
-    default_instance << attributes
-  end
-
-  def self.with(*args)
-    default_instance.sieve(*args)
-  end
-
-  def self.destroy(*args)
-    default_instance.destroy(*args)
-  end
-
   # Get the soup ready!
   def initialize(backend=nil)
     @backend = backend || Soup::Backends::FileBackend.new

data/lib/soup/backends/file_backend.rb

@@ -10,26 +10,13 @@ class Soup
       end
 
       def names
-        snip_paths.map { |s| File.basename(s).split(".").first }
+        snip_paths.map { |s| snip_name_from_path(s) }
       end
 
       def load_snip(name)
-        path = snip_paths.find { |s| File.basename(s).split(".").first == name }
+        path = snip_paths.find { |s| snip_name_from_path(s) == name }
         if path
-          file = File.new(path)
-          data = file.read
-          default_attributes = {:name => name, :updated_at => file.mtime, :created_at => file.mtime}
-          if attribute_start = data.index("\n:")
-            content = data[0, attribute_start].strip
-            attributes = default_attributes.merge(YAML.load(data[attribute_start, data.length]))
-          else
-            content = data
-            attributes = default_attributes
-          end
-          attributes.update(:content => content) if content && content.length > 0
-          extension = File.extname(path).gsub(/^\./, '')
-          attributes.update(:extension => extension) if extension != "snip"
-          Snip.new(attributes, self)
+          load_snip_from_path(path, name)
         else
           nil
         end
@@ -54,8 +41,35 @@ class Soup
         end
       end
 
+      def all_snips
+        snip_paths.map do |path|
+          load_snip_from_path(path, snip_name_from_path(path))
+        end
+      end
+
       private
 
+      def snip_name_from_path(path)
+        File.basename(path).split(".").first
+      end
+
+      def load_snip_from_path(path, name)
+        file = File.new(path)
+        data = file.read
+        default_attributes = {:name => name, :updated_at => file.mtime, :created_at => file.mtime}
+        if attribute_start = data.index("\n:")
+          content = data[0, attribute_start].strip
+          attributes = default_attributes.merge(YAML.load(data[attribute_start, data.length]))
+        else
+          content = data
+          attributes = default_attributes
+        end
+        attributes.update(:content => content) if content && content.length > 0
+        extension = File.extname(path).gsub(/^\./, '')
+        attributes.update(:extension => extension) if extension != "snip"
+        Snip.new(attributes, self)
+      end
+
       def path_for(name, extension=nil)
         snip_extension = ".snip"
         snip_extension += ".#{extension}" if extension
@@ -65,12 +79,6 @@ class Soup
       def snip_paths
         Dir[File.join(@base_path, "*")].select { |s| File.file?(s) }
       end
-
-      def all_snips
-        Dir[File.join(@base_path, "*")].map do |key|
-          load_snip(File.basename(key, ".snip"))
-        end
-      end
     end
   end
 end

data/lib/soup/backends/multi_soup.rb

@@ -11,19 +11,16 @@ class Soup
 
       def method_missing(*args)
         @backends.each do |backend|
-          if result = backend.__send__(*args)
+          if result = backend.respond_to?(args.first) ? backend.__send__(*args) : nil
             return result
           end
         end
         nil
       end
 
-      private
-
       def all_snips
-        @backends.map { |b| b.send(:all_snips) }.flatten
+        @backends.map { |b| b.all_snips }.flatten
       end
-
     end
   end
 end

data/lib/soup/backends/read_only.rb

@@ -10,7 +10,7 @@ class Soup
       end
 
       def method_missing(*args)
-        @backend.__send__(*args)
+        @backend.__send__(*args) if @backend.respond_to?(args.first)
       end
     end
   end

data/lib/soup/backends/yaml_backend.rb

@@ -51,17 +51,17 @@ class Soup
         end
       end
 
-      private
-
-      def path_for(name)
-        File.join(@base_path, name + ".yml")
-      end
-
       def all_snips
         Dir[path_for("*")].map do |key|
           load_snip(File.basename(key, ".yml"))
         end
       end
+
+      private
+
+      def path_for(name)
+        File.join(@base_path, name + ".yml")
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soup
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - James Adam