rico 0.3.0 → 0.4.0

data/README.md

@@ -61,7 +61,7 @@ end
 
 ```ruby
 a = Rico::Array.new "bucket", "key"
-a.add 3, 1, 1, 4, 2
+a.add [3, 1, 1, 4, 2]
 a.members   # => [3, 1, 1, 4, 2]
 a.length    # => 5
 ```
@@ -70,7 +70,7 @@ a.length    # => 5
 
 ```ruby
 l = Rico::List.new "bucket", "key"
-l.add 3, 1, 1, 4, 2
+l.add [3, 1, 1, 4, 2]
 l.members   # => [1, 1, 2, 3, 4]
 l.length    # => 5
 ```
@@ -79,7 +79,7 @@ l.length    # => 5
 
 ```ruby
 s = Rico::Set.new "bucket", "key"
-s.add 3, 1, 1, 4, 2
+s.add [3, 1, 1, 4, 2]
 s.members   # => [3, 1, 4, 2]
 s.length    # => 4
 ```
@@ -88,7 +88,7 @@ s.length    # => 4
 
 ```ruby
 s = Rico::SortedSet.new "bucket", "key"
-s.add 3, 1, 1, 4, 2
+s.add [3, 1, 1, 4, 2]
 s.members   # => [1, 2, 3, 4]
 s.length    # => 4
 ```
@@ -143,7 +143,7 @@ v.exists?   # => true
 ```ruby
 s = Rico::Set.new "bucket", "key"
 s.content_type = "application/x-gzip"
-s.add 1, 2, 3
+s.add [1,2,3]
 s.get       # => [1, 2, 3]
 s.raw_data  # => "\u001F\x8B\b\u0000G...."
 ```

data/lib/rico/array.rb

@@ -32,5 +32,23 @@ module Rico
       obj.data = { "_values" => result, "_deletes" => deletions }
       obj
     end
+
+    protected
+
+    def build_map_add(items)
+      { "_type" => type_key, "_values" => compute_add(items) }
+    end
+
+    def build_map_remove(items)
+      { "_type" => type_key, "_values" => compute_remove(items), "_deletes" => items }
+    end
+
+    def compute_add(items)
+      members + Array(items)
+    end
+
+    def compute_remove(items)
+      members - Array(items)
+    end
   end
 end

data/lib/rico/collection.rb

@@ -11,7 +11,7 @@ module Rico
     # items - items to be added to the array
     #
     # Returns the result of the store operation
-    def add(*items)
+    def add(items)
       mutate build_map_add(items)
     end
 
@@ -20,7 +20,7 @@ module Rico
     # items - items to be removed from the array
     #
     # Returns the result of the store operation
-    def remove(*items)
+    def remove(items)
       mutate build_map_remove(items)
     end
 
@@ -32,23 +32,5 @@ module Rico
     def member?(item)
       members.include? item
     end
-
-    protected
-
-    def build_map_add(items)
-      { "_type" => type_key, "_values" => compute_add(items) }
-    end
-
-    def build_map_remove(items)
-      { "_type" => type_key, "_values" => compute_remove(items), "_deletes" => items }
-    end
-
-    def compute_add(items)
-      members + items
-    end
-
-    def compute_remove(items)
-      members - items
-    end
   end
 end

data/lib/rico/map.rb

@@ -29,15 +29,17 @@ module Rico
 
     protected
 
+    def build_map_add(items)
+      { "_type" => type_key, "_values" => compute_add(items) }
+    end
+
     def build_map_remove(items)
       keys = extract_keys(items)
       { "_type" => type_key, "_values" => compute_remove(items), "_deletes" => keys }
     end
 
     def compute_add(items)
-      Array(items).inject(members) do |res, h|
-        res.merge(h)
-      end
+      members.merge(items)
     end
 
     def compute_remove(items)

data/lib/rico/version.rb

@@ -1,3 +1,3 @@
 module Rico
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/array_spec.rb

@@ -6,91 +6,91 @@ describe Rico::Array do
   end
 
   describe "#add" do
-    it "writes values to an array" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_writes_values"
-      a.add(1, 2, 3)
-      b = Rico::Array.new RiakHelpers.bucket, "add_writes_values"
-      b.members.should eql [1, 2, 3]
+    it "writes a single value to an array" do
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_single_value"
+      a.add 5
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_single_value"
+      b.members.should eql [5]
     end
 
-    it "retains a single value as an array" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_flattens_values"
-      a.add([1, 2, 3])
-      b = Rico::Array.new RiakHelpers.bucket, "add_flattens_values"
-      b.members.should eql [[1, 2, 3]]
+    it "writes values to an array" do
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_writes_values"
+      a.add [1, 2, 3]
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_writes_values"
+      b.members.should eql [1, 2, 3]
     end
 
     it "allows duplicate values" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_allows_duplicates"
-      a.add(1, 2, 3)
-      a.add(2, 3, 4)
-      b = Rico::Array.new RiakHelpers.bucket, "add_allows_duplicates"
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_allows_duplicates"
+      a.add [1, 2, 3]
+      a.add [2, 3, 4]
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_allows_duplicates"
       b.members.should eql [1, 2, 3, 2, 3, 4]
     end
 
     it "retains order of addition" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_retains_order"
-      a.add(5, 3, 1, 6, 7)
-      b = Rico::Array.new RiakHelpers.bucket, "add_retains_order"
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_retains_order"
+      a.add [5, 3, 1, 6, 7]
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_retains_order"
       b.members.should eql [5, 3, 1, 6, 7]
     end
 
     it "works with strings" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_works_with_strings"
-      a.add("john", "joe", "jason")
-      a.add("brian", "bob")
-      b = Rico::Array.new RiakHelpers.bucket, "add_works_with_strings"
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_strings"
+      a.add ["john", "joe", "jason"]
+      a.add ["brian", "bob"]
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_strings"
       b.members.should eql ["john", "joe", "jason", "brian", "bob"]
     end
 
     it "works with arrays" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_works_with_arrays"
-      a.add([1,2,3], [4,5,6], [7,8,9])
-      a.add(["a", "b", 37.2])
-      b = Rico::Array.new RiakHelpers.bucket, "add_works_with_arrays"
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_arrays"
+      a.add [[1,2,3], [4,5,6], [7,8,9]]
+      a.add [["a", "b", 37.2]]
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_arrays"
       b.members.should eql [[1,2,3], [4,5,6], [7,8,9], ["a", "b", 37.2]]
     end
 
     it "works with hashmaps" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_works_with_hashmaps"
-      a.add({a: 1, b: 2}, {charlie: 6})
-      a.add({"usd" => 37.2, "eur" => 31.6})
-      b = Rico::Array.new RiakHelpers.bucket, "add_works_with_hashmaps"
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_hashmaps"
+      a.add [{a: 1, b: 2}, {charlie: 6}]
+      a.add [{"usd" => 37.2, "eur" => 31.6}]
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_hashmaps"
       b.members.should eql [{"a" => 1, "b" => 2}, {"charlie" => 6}, {"usd" => 37.2, "eur" => 31.6}]
     end
 
     it "works with mixed types" do
-      a = Rico::Array.new RiakHelpers.bucket, "add_works_with_mixed_types"
-      a.add({"usd" => 123.41, "cad" => 61.89})
-      a.add("Bears", "Beets", "Battlestar Galactica")
-      a.add(3.14159)
-      a.add(71)
-      b = Rico::Array.new RiakHelpers.bucket, "add_works_with_mixed_types"
+      a = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_mixed_types"
+      a.add [{"usd" => 123.41, "cad" => 61.89}]
+      a.add ["Bears", "Beets", "Battlestar Galactica"]
+      a.add 3.14159
+      a.add 71
+      b = Rico::Array.new RiakHelpers.bucket, "array_add_works_with_mixed_types"
       b.members.should eql [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71]
     end
   end
 
   describe "#remove" do
     it "removes existing values" do
-      a = Rico::Array.new RiakHelpers.bucket, "remove_removes"
-      a.add({"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", :slumdog, "Battlestar Galactica", 3.14159, 71)
-      b = Rico::Array.new RiakHelpers.bucket, "remove_removes"
-      b.remove(3.14159, "Beets")
-      b.remove("slumdog")
-      c = Rico::Array.new RiakHelpers.bucket, "remove_removes"
+      a = Rico::Array.new RiakHelpers.bucket, "array_remove_removes"
+      a.add [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", :slumdog, "Battlestar Galactica", 3.14159, 71]
+      b = Rico::Array.new RiakHelpers.bucket, "array_remove_removes"
+      b.remove [3.14159, "Beets"]
+      b.remove ["slumdog"]
+      c = Rico::Array.new RiakHelpers.bucket, "array_remove_removes"
       c.members.should eql [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Battlestar Galactica", 71]
     end
 
     it "does not throw on removal on non-key" do
       lambda do
-        Rico::Array.new(RiakHelpers.bucket, "remove_nonkey").remove("bill")
+        Rico::Array.new(RiakHelpers.bucket, "array_remove_nonkey").remove("bill")
       end.should_not raise_error
     end
 
     it "does not throw on removal on non-value" do
       lambda do
-        a = Rico::Array.new RiakHelpers.bucket, "remove_nonvalue"
-        a.add 37, 68, 54
+        a = Rico::Array.new RiakHelpers.bucket, "array_remove_nonvalue"
+        a.add [37, 68, 54]
         a.remove "josh"
       end.should_not raise_error
     end
@@ -98,44 +98,44 @@ describe Rico::Array do
 
   describe "#members" do
     it "returns a list of members" do
-      a = Rico::Array.new RiakHelpers.bucket, "members_lists"
-      a.add({"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71)
-      b = Rico::Array.new RiakHelpers.bucket, "members_lists"
+      a = Rico::Array.new RiakHelpers.bucket, "array_members_lists"
+      a.add [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71]
+      b = Rico::Array.new RiakHelpers.bucket, "array_members_lists"
       b.members.should eql [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71]
     end
   end
 
   describe "#member?" do
     it "returns a true if a member" do
-      a = Rico::Array.new RiakHelpers.bucket, "members_lists"
-      a.add({"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71)
-      b = Rico::Array.new RiakHelpers.bucket, "members_lists"
+      a = Rico::Array.new RiakHelpers.bucket, "array_members_lists"
+      a.add [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71]
+      b = Rico::Array.new RiakHelpers.bucket, "array_members_lists"
       b.member?({"usd" => 123.41, "cad" => 61.89}).should eql true
     end
 
     it "returns a true if not a member" do
-      a = Rico::Array.new RiakHelpers.bucket, "members_lists"
-      a.add({"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71)
-      b = Rico::Array.new RiakHelpers.bucket, "members_lists"
+      a = Rico::Array.new RiakHelpers.bucket, "array_members_lists"
+      a.add [{"usd" => 123.41, "cad" => 61.89}, "Bears", "Beets", "Battlestar Galactica", 3.14159, 71]
+      b = Rico::Array.new RiakHelpers.bucket, "array_members_lists"
       b.member?({"usd" => 123.42, "cad" => 61.89}).should eql false
     end
   end
 
   describe "#length" do
     it "returns zero for an empty list" do
-      a = Rico::Array.new RiakHelpers.bucket, "length_empty"
+      a = Rico::Array.new RiakHelpers.bucket, "array_length_empty"
       a.length.should eql 0
     end
 
     it "returns the number of entries" do
-      a = Rico::Array.new RiakHelpers.bucket, "length_6"
-      a.add(1, 2, 3, 4, 5, 6)
+      a = Rico::Array.new RiakHelpers.bucket, "array_length_6"
+      a.add [1, 2, 3, 4, 5, 6]
       a.length.should eql 6
     end
 
     it "is aliased to #count" do
-      a = Rico::Array.new RiakHelpers.bucket, "length_alias"
-      a.add(1, 2, 3, 4, 5, 6)
+      a = Rico::Array.new RiakHelpers.bucket, "array_length_alias"
+      a.add [1, 2, 3, 4, 5, 6]
       a.count.should eql 6
     end
   end
@@ -164,8 +164,8 @@ describe Rico::Array do
   end
 
   it "is enumerable" do
-    a = Rico::Array.new RiakHelpers.bucket, "enumerable"
-    a.add(3, 1, 4, 1, 5, 9)
+    a = Rico::Array.new RiakHelpers.bucket, "array_enumerable"
+    a.add [3, 1, 4, 1, 5, 9]
     a.to_a.should eql [3, 1, 4, 1, 5, 9]
     a.each { }.length.should eql 6
     a.map {|x| x + 1 }.should eql [4, 2, 5, 2, 6, 10]

data/spec/list_spec.rb

@@ -8,20 +8,20 @@ describe Rico::List do
   describe "#add" do
     it "adds values and sorts them in instance" do
       a = Rico::List.new RiakHelpers.bucket, "list_add_1"
-      a.add(3, 2, 1)
+      a.add [3, 2, 1]
       a.members.should eql [1, 2, 3]
     end
 
     it "adds values and sorts them on read" do
       a = Rico::List.new RiakHelpers.bucket, "list_add_2"
-      a.add(3, 2, 1)
+      a.add [3, 2, 1]
       b = Rico::List.new RiakHelpers.bucket, "list_add_2"
       b.members.should eql [1, 2, 3]
     end
 
     it "allows duplicates of the same value" do
       a = Rico::List.new RiakHelpers.bucket, "list_add_duplicate"
-      a.add(3, 6, 4, 1, 7, 9, 1, 1, 3, 3)
+      a.add [3, 6, 4, 1, 7, 9, 1, 1, 3, 3]
       b = Rico::List.new RiakHelpers.bucket, "list_add_duplicate"
       b.members.should eql [1, 1, 1, 3, 3, 3, 4, 6, 7, 9]
     end
@@ -30,9 +30,9 @@ describe Rico::List do
   describe "#remove" do
     it "removes all occurence of the item" do
       a = Rico::List.new RiakHelpers.bucket, "list_remove_all_duplicates"
-      a.add(1, 1, 1, 2, 2, 2)
+      a.add [1, 1, 1, 2, 2, 2]
       b = Rico::List.new RiakHelpers.bucket, "list_remove_all_duplicates"
-      b.remove(1, 2)
+      b.remove [1, 2]
       c = Rico::List.new RiakHelpers.bucket, "list_remove_all_duplicates"
       c.members.should eql []
     end

data/spec/map_spec.rb

@@ -13,13 +13,6 @@ describe Rico::Map do
       b.members.should eql({"a" => 1, "b" => 2, "c" => 3, "d" => 4, "e" => 5})
     end
 
-    it "writes multiple hashes to the map" do
-      a = Rico::Map.new RiakHelpers.bucket, "map_add_multiple_hashes"
-      a.add({"a" => 1, "b" => 2, "c" => 3}, {"d" => 4, "e" => 5})
-      b = Rico::Map.new RiakHelpers.bucket, "map_add_multiple_hashes"
-      b.members.should eql({"a" => 1, "b" => 2, "c" => 3, "d" => 4, "e" => 5})
-    end
-
     it "supports multiple multiple writes to the map" do
       a = Rico::Map.new RiakHelpers.bucket, "map_add_multiple_writes"
       a.add({"a" => 1, "b" => 2, "c" => 3})
@@ -27,6 +20,14 @@ describe Rico::Map do
       b = Rico::Map.new RiakHelpers.bucket, "map_add_multiple_writes"
       b.members.should eql({"a" => 1, "b" => 2, "c" => 3, "d" => 4, "e" => 5})
     end
+
+    it "merges in the right order with implicit deduping" do
+      a = Rico::Map.new RiakHelpers.bucket, "map_add_order_dedupe"
+      a.add({"a" => 1, "b" => 2, "c" => 3})
+      a.add({"b" => "B", "c" => "C"})
+      b = Rico::Map.new RiakHelpers.bucket, "map_add_order_dedupe"
+      b.members.should eql({"a" => 1, "b" => "B", "c" => "C"})
+    end
   end
 
   describe "#remove" do
@@ -43,7 +44,7 @@ describe Rico::Map do
       a = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_string"
       a.add({"a" => 1, "b" => 2, "c" => 3})
       b = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_string"
-      b.remove("a", "c")
+      b.remove(["a", "c"])
       c = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_string"
       c.members.should eql({"b" => 2})
     end
@@ -52,7 +53,7 @@ describe Rico::Map do
       a = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_symbol"
       a.add({"a" => 1, "b" => 2, "c" => 3})
       b = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_symbol"
-      b.remove(:a, :c)
+      b.remove([:a, :c])
       c = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_symbol"
       c.members.should eql({"b" => 2})
     end
@@ -61,7 +62,7 @@ describe Rico::Map do
       a = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_integer"
       a.add({1 => 1, 2 => 2, 3 => 3})
       b = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_integer"
-      b.remove(1, 3)
+      b.remove([1, 3])
       c = Rico::Map.new RiakHelpers.bucket, "map_remove_multiple_keys_integer"
       c.members.should eql({"2" => 2})
     end
@@ -70,9 +71,17 @@ describe Rico::Map do
       a = Rico::Map.new RiakHelpers.bucket, "map_remove_single_key_tuple"
       a.add({"a" => 1, "b" => 2, "c" => 3})
       b = Rico::Map.new RiakHelpers.bucket, "map_remove_single_key_tuple"
-      b.remove({"a" => 1})
+      b.remove({"a" => 1, "b" => 2})
       c = Rico::Map.new RiakHelpers.bucket, "map_remove_single_key_tuple"
-      c.members.should eql({"b" => 2, "c" => 3})
+      c.members.should eql({"c" => 3})
+    end
+
+    it "merges in the right order with implicit deduping" do
+      a = Rico::Map.new RiakHelpers.bucket, "map_remove_order_dedupe"
+      a.add({"a" => 1, "b" => 2, "c" => 3, "d" => 4})
+      a.remove({"b" => 2, "c" => 3, "c" => 3, "c" => 3})
+      b = Rico::Map.new RiakHelpers.bucket, "map_remove_order_dedupe"
+      b.members.should eql({"a" => 1, "d" => 4})
     end
   end
 

data/spec/set_spec.rb

@@ -8,13 +8,13 @@ describe Rico::Set do
   describe "#add" do
     it "dedupes and retains order in instance" do
       a = Rico::Set.new RiakHelpers.bucket, "set_add_1"
-      a.add(3, 4, 6, 8, 1, 2, 3, 4, 7)
+      a.add [3, 4, 6, 8, 1, 2, 3, 4, 7]
       a.members.should eql [3, 4, 6, 8, 1, 2, 7]
     end
 
     it "dedupes and sort is retained on read" do
       a = Rico::Set.new RiakHelpers.bucket, "set_add_2"
-      a.add(3, 4, 6, 8, 1, 2, 3, 4, 7)
+      a.add [3, 4, 6, 8, 1, 2, 3, 4, 7]
       b = Rico::Set.new RiakHelpers.bucket, "set_add_2"
       b.members.should eql [3, 4, 6, 8, 1, 2, 7]
     end

data/spec/sorted_set_spec.rb

@@ -8,13 +8,13 @@ describe Rico::SortedSet do
   describe "#add" do
     it "dedupes and sorts in instance" do
       a = Rico::SortedSet.new RiakHelpers.bucket, "sorted_set_add_1"
-      a.add(3, 2, 2, 1, 1)
+      a.add [3, 2, 2, 1, 1]
       a.members.should eql [1, 2, 3]
     end
 
     it "dedupes and sort is retained on read" do
       a = Rico::SortedSet.new RiakHelpers.bucket, "sorted_set_add_2"
-      a.add(3, 3, 2, 2, 1)
+      a.add [3, 3, 2, 2, 1]
       b = Rico::SortedSet.new RiakHelpers.bucket, "sorted_set_add_2"
       b.members.should eql [1, 2, 3]
     end

data/spec/spec_helper.rb

@@ -16,10 +16,6 @@ module RiakHelpers
     b.keys.each do |k|
       b.delete k
     end
-
-    a = Rico::Array.new bucket, "visual_array"
-    a.add 1,2,3,4,5,6
-    a.remove 6
   end
 
   def self.build_conflicted_robject(key, values)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rico
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors: