soup 0.9.12 → 0.9.13

data/Rakefile

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

data/lib/soup/backends.rb

@@ -6,6 +6,7 @@ class Soup
   # * #save_snip(attribute_hash) - should store and return a Soup::Snip, or nil if it couldn't be saved
   # * #destroy(name) - should return true if the snip was removed, or false if otherwise
   module Backends
+    autoload :Base, 'soup/backends/base'
     autoload :YAMLBackend, 'soup/backends/yaml_backend'
     autoload :MultiSoup, 'soup/backends/multi_soup'
     autoload :ReadOnly, 'soup/backends/read_only'

data/lib/soup/backends/base.rb

@@ -0,0 +1,17 @@
+class Soup
+  module Backends
+    class Base
+      def find(conditions)
+        if conditions.keys == [:name]
+          load_snip(conditions[:name])
+        else
+          all_snips.select do |s|
+            conditions.inject(true) do |matches, (key, value)|
+              matches && (s.__send__(key) == value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/soup/backends/multi_soup.rb

@@ -1,6 +1,6 @@
 class Soup
   module Backends
-    class MultiSoup
+    class MultiSoup < Base
       def initialize(*backends)
         @backends = backends
       end
@@ -17,6 +17,13 @@ class Soup
         end
         nil
       end
+
+      private
+
+      def all_snips
+        @backends.map { |b| b.send(:all_snips) }.flatten
+      end
+
     end
   end
 end

data/lib/soup/backends/read_only.rb

@@ -1,6 +1,6 @@
 class Soup
   module Backends
-    class ReadOnly
+    class ReadOnly < Base
       def initialize(backend)
         @backend = backend
       end

data/lib/soup/backends/yaml_backend.rb

@@ -1,6 +1,6 @@
 class Soup
   module Backends
-    class YAMLBackend
+    class YAMLBackend < Base
       ATTRIBUTE_TOKEN = "--- # Soup attributes"
 
       def initialize(path="soup")
@@ -15,18 +15,6 @@ class Soup
         Dir[path_for("*")].map { |s| File.basename(s, ".yml") }
       end
 
-      def find(conditions)
-        if conditions.keys == [:name]
-          load_snip(conditions[:name])
-        else
-          all_snips.select do |s|
-            conditions.inject(true) do |matches, (key, value)|
-              matches && (s.__send__(key) == value)
-            end
-          end
-        end
-      end
-
       def load_snip(name)
         path = path_for(name)
         if File.exist?(path)

data/test/multi_soup_backend_test.rb

@@ -39,6 +39,17 @@ class MultiSoupBackendTest < Test::Unit::TestCase
       end
     end
 
+    context "when snips with a certain attribute exist in multiple backends" do
+      setup do
+        @soup_one << {:name => "snip1", :active => true}
+        @soup_two << {:name => "snip2", :active => true}
+      end
+
+      should "find matching snips from all backends" do
+        assert_equal 2, @soup[:active => true].length
+      end
+    end
+
     should "save snips" do
       @soup << {:name => "snip", :body => "bad snip"}
       @soup.destroy("snip")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 12
-  version: 0.9.12
+  - 13
+  version: 0.9.13
 platform: ruby
 authors: 
 - James Adam
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-07-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - test/multi_soup_backend_test.rb
 - test/soup_test.rb
 - test/test_helper.rb
+- lib/soup/backends/base.rb
 - lib/soup/backends/multi_soup.rb
 - lib/soup/backends/read_only.rb
 - lib/soup/backends/yaml_backend.rb