ripple 0.5.0 → 0.5.1

data/CONTRIBUTORS.textile

@@ -0,0 +1,4 @@
+These developers have contributed code to Ripple:
+
+* Sean Cribbs - sean@basho.com
+* John Lynch - john@rigelgroupllc.com

data/RELEASE_NOTES.textile

@@ -1,5 +1,16 @@
 h1. Ripple Release Notes
 
+h2. 0.5.1 Patch Release - 2010-02-22
+
+This is a minor release with fixes for Ruby 1.9, bundler/edge Rails,
+and a minor feature addition. Changes:
+
+* Qualify namespaces for Ruby 1.9.
+* Decoupled a few specs that gave the appearance of failure.
+* Added "bucket" and "key" properties on Riak::Link objects. [John Lynch]
+* Fully-qualify the @JSON@ constant, using @ActiveSupport::JSON@ instead.
+* Adjusted gem specification to accommodate edge Rails. [Preston Marshall]
+
 h2. 0.5 Initial Release - 2010-02-10
 
 This is the first release of Ripple, which would not have been possible
@@ -21,4 +32,4 @@ It includes:
 ** Validations
 ** Dirty-tracking
 ** Simple finders - all documents, by key
-** Reloading
+** Reloading

data/Rakefile

@@ -16,8 +16,8 @@ begin
     gem.add_development_dependency "rack", ">=1.0"
     gem.add_development_dependency "yard", ">=0.5.2"
     gem.add_development_dependency "curb", ">=0.6"
-    gem.add_dependency "activesupport", "3.0.0.beta"
-    gem.add_dependency "activemodel", "3.0.0.beta"
+    gem.add_dependency "activesupport", "~>3.0.0.beta"
+    gem.add_dependency "activemodel", "~>3.0.0.beta"
     gem.requirements << "`gem install curb` for better HTTP performance"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/riak/bucket.rb

@@ -46,7 +46,7 @@ module Riak
       unless response.try(:[], :headers).try(:[],'content-type').try(:first) =~ /json$/
         raise Riak::InvalidResponse.new({"content-type" => ["application/json"]}, response[:headers], t("loading_bucket", :name => name))
       end
-      payload = JSON.parse(response[:body])
+      payload = ActiveSupport::JSON.decode(response[:body])
       @keys = payload['keys'].map {|k| URI.unescape(k) }  if payload['keys']
       @props = payload['props'] if payload['props']
       self
@@ -63,7 +63,7 @@ module Riak
     def keys(options={})
       if block_given?
         @client.http.get(200, @client.prefix, name, {:props => false}, {}) do |chunk|
-          obj = JSON.parse(chunk) rescue {}
+          obj = ActiveSupport::JSON.decode(chunk) rescue {}
           yield obj['keys'].map {|k| URI.unescape(k) } if obj['keys']
         end
       elsif @keys.nil? || options[:reload]

data/lib/riak/link.rb

@@ -35,6 +35,16 @@ module Riak
       @url, @rel = url, rel
     end
 
+    # @return [String] bucket_name, if the Link url is a known Riak link ("/raw/<bucket>/<key>")
+    def bucket
+      $1 if url =~ %r{/raw/([^/]+)/?}
+    end
+    
+    # @return [String] key, if the Link url is a known Riak link ("/raw/<bucket>/<key>")
+    def key
+      $1 if url =~ %r{/raw/[^/]+/([^/]+)/?}
+    end
+
     def inspect; to_s; end
 
     def to_s
@@ -46,8 +56,7 @@ module Riak
     end
 
     def to_walk_spec
-      bucket, object = $1, $2 if @url =~ %r{/raw/([^/]+)/([^/]+)/?}
-      raise t("bucket_link_conversion") if @rel == "up" || object.nil?
+      raise t("bucket_link_conversion") if @rel == "up" || key.nil?
       WalkSpec.new(:bucket => bucket, :tag => @rel)
     end
   end

data/lib/riak/map_reduce.rb

@@ -135,7 +135,7 @@ module Riak
     def run
       response = @client.http.post(200, @client.mapred, to_json, {"Content-Type" => "application/json", "Accept" => "application/json"})
       if response.try(:[], :headers).try(:[],'content-type').include?("application/json")
-        JSON.parse(response[:body])
+        ActiveSupport::JSON.decode(response[:body])
       else
         response
       end

data/lib/ripple/document.rb

@@ -53,7 +53,7 @@ module Ripple
     included do
       extend BucketAccess
       include Persistence
-      include EmbeddedDocument
+      include Ripple::EmbeddedDocument
       include Finders
     end
   end

data/lib/ripple/document/persistence.rb

@@ -22,7 +22,7 @@ module Ripple
       autoload :Callbacks
 
       included do
-        include Callbacks
+        include Ripple::Document::Persistence::Callbacks
       end
 
       module InstanceMethods

data/lib/ripple/embedded_document.rb

@@ -23,10 +23,10 @@ module Ripple
 
     included do
       extend ActiveModel::Naming
-      extend Document::Properties
+      extend Ripple::Document::Properties
       include Persistence
-      include Document::AttributeMethods
-      include Document::Validations
+      include Ripple::Document::AttributeMethods
+      include Ripple::Document::Validations
     end
 
     module ClassMethods

data/ripple.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripple}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-22}
   s.description = %q{ripple is a rich Ruby client for Riak, Basho's distributed database.  It includes all the basics of accessing and manipulating Riak buckets and objects, and an object mapper library for building a rich domain on top of Riak.}
   s.email = %q{seancribbs@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CONTRIBUTORS.textile",
      "LICENSE",
      "README.textile",
      "RELEASE_NOTES.textile",
@@ -135,16 +136,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rack>, [">= 1.0"])
       s.add_development_dependency(%q<yard>, [">= 0.5.2"])
       s.add_development_dependency(%q<curb>, [">= 0.6"])
-      s.add_runtime_dependency(%q<activesupport>, ["= 3.0.0.beta"])
-      s.add_runtime_dependency(%q<activemodel>, ["= 3.0.0.beta"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0.beta"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0.beta"])
     else
       s.add_dependency(%q<rspec>, [">= 1.3"])
       s.add_dependency(%q<fakeweb>, [">= 1.2"])
       s.add_dependency(%q<rack>, [">= 1.0"])
       s.add_dependency(%q<yard>, [">= 0.5.2"])
       s.add_dependency(%q<curb>, [">= 0.6"])
-      s.add_dependency(%q<activesupport>, ["= 3.0.0.beta"])
-      s.add_dependency(%q<activemodel>, ["= 3.0.0.beta"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta"])
+      s.add_dependency(%q<activemodel>, ["~> 3.0.0.beta"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.3"])
@@ -152,8 +153,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, [">= 1.0"])
     s.add_dependency(%q<yard>, [">= 0.5.2"])
     s.add_dependency(%q<curb>, [">= 0.6"])
-    s.add_dependency(%q<activesupport>, ["= 3.0.0.beta"])
-    s.add_dependency(%q<activemodel>, ["= 3.0.0.beta"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0.beta"])
+    s.add_dependency(%q<activemodel>, ["~> 3.0.0.beta"])
   end
 end
 

data/spec/riak/link_spec.rb

@@ -21,13 +21,31 @@ describe Riak::Link do
       result.should be_all {|i| Riak::Link === i }
     end
 
-    it "should set the url and rel parameters properly" do
+    it "should set the bucket, key, url and rel parameters properly" do
       result = Riak::Link.parse('</raw/foo/bar>; riaktag="tag", </raw/foo>; rel="up"')
       result[0].url.should == "/raw/foo/bar"
+      result[0].bucket.should == "foo"
+      result[0].key.should == "bar"
       result[0].rel.should == "tag"
       result[1].url.should == "/raw/foo"
+      result[1].bucket.should == "foo"
+      result[1].key.should == nil
       result[1].rel.should == "up"
     end
+    
+    it "should set url properly, and set bucket and key to nil for non-Riak links" do
+      result = Riak::Link.parse('<http://www.example.com/123.html>; riaktag="tag", </raw/foo>; rel="up"')
+      result[0].url.should == "http://www.example.com/123.html"
+      result[0].bucket.should == nil
+      result[0].key.should == nil
+      result[0].rel.should == "tag"
+
+      result = Riak::Link.parse('<http://www.example.com/>; riaktag="tag", </raw/foo>; rel="up"')
+      result[0].url.should == "http://www.example.com/"
+      result[0].bucket.should == nil
+      result[0].key.should == nil
+      result[0].rel.should == "tag"
+    end
   end
 
   it "should convert to a string appropriate for use in the Link header" do

data/spec/ripple/attribute_methods_spec.rb

@@ -15,10 +15,12 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::AttributeMethods do
   before :all do
-    class Widget
-      include Ripple::Document
-      property :size, Integer
-      property :name, String, :default => "widget"
+    Object.module_eval do
+      class Widget
+        include Ripple::Document
+        property :size, Integer
+        property :name, String, :default => "widget"
+      end
     end
   end
 

data/spec/ripple/bucket_access_spec.rb

@@ -15,9 +15,11 @@ require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Ripple::Document::BucketAccess do
   before :all do
-    class Invoice; include Ripple::Document; end
-    class LateInvoice < Invoice; end
-    class PaidInvoice < Invoice; self.bucket_name = "paid"; end
+    Object.module_eval do
+      class Invoice; include Ripple::Document; end
+      class LateInvoice < Invoice; end
+      class PaidInvoice < Invoice; self.bucket_name = "paid"; end
+    end
   end
 
   it "should use the plural model name as the bucket name" do

data/spec/ripple/callbacks_spec.rb

@@ -15,12 +15,12 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Persistence::Callbacks do
   before :all do
-    class Box; include Ripple::Document; property :shape, String end
+    Object.module_eval { class Box; include Ripple::Document; property :shape, String end }
   end
 
   it "should add create, update, save, and destroy callback declarations" do
     [:save, :create, :update, :destroy].each do |event|
-      Box.private_instance_methods.should include("_run_#{event}_callbacks")
+      Box.private_instance_methods.map(&:to_s).should include("_run_#{event}_callbacks")
       [:before, :after, :around].each do |time|
         Box.should respond_to("#{time}_#{event}")
       end

data/spec/ripple/document_spec.rb

@@ -15,7 +15,7 @@ require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
 describe Ripple::Document do
   before :all do
-    class Page; include Ripple::Document; end
+    Object.module_eval { class Page; include Ripple::Document; end }
   end
 
   it "should add bucket access methods to classes when included" do

data/spec/ripple/embedded_document_spec.rb

@@ -15,7 +15,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::EmbeddedDocument do
   before :all do
-    class Address; include Ripple::EmbeddedDocument; end
+    Object.module_eval { class Address; include Ripple::EmbeddedDocument; end }
   end
 
   it "should have a model name when included" do

data/spec/ripple/finders_spec.rb

@@ -15,9 +15,11 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Finders do
   before :all do
-    class Box
-      include Ripple::Document
-      property :shape, String
+    Object.module_eval do
+      class Box
+        include Ripple::Document
+        property :shape, String
+      end
     end
   end
 
@@ -123,7 +125,7 @@ describe Ripple::Document::Finders do
 
   describe "single-bucket inheritance" do
     before :all do
-      class CardboardBox < Box; end
+      Object.module_eval { class CardboardBox < Box; end }
     end
 
     it "should instantiate as the proper type if defined in the document" do

data/spec/ripple/persistence_spec.rb

@@ -15,11 +15,13 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Persistence do
   before :all do
-    class Widget
-      include Ripple::Document
-      property :size, Integer
-      property :name, String, :default => "widget"
-    end
+    Object.module_eval {
+      class Widget
+        include Ripple::Document
+        property :size, Integer
+        property :name, String, :default => "widget"
+      end
+    }
   end
 
   before :each do
@@ -67,7 +69,10 @@ describe Ripple::Document::Persistence do
 
   describe "when storing a class using single-bucket inheritance" do
     before :all do
-      class Cog < Widget; property :name, String, :default => "cog"; end
+      Object.module_eval { class Cog < Widget; property :name, String, :default => "cog"; end }
+    end
+
+    before :each do
       @cog = Cog.new(:size => 1000)
     end
 

data/spec/ripple/properties_spec.rb

@@ -15,7 +15,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Properties do
   before :all do
-    class Email; include Ripple::Document; end
+    Object.module_eval { class Email; include Ripple::Document; end }
   end
 
   it "should make the model class have a property definition method" do
@@ -122,7 +122,11 @@ describe Ripple::Document::Property do
         @prop.type_cast("s").should == "s"
         @prop.type_cast(1).should == "1"
         @prop.type_cast(true).should == "true"
-        @prop.type_cast([]).should == ""
+        if RUBY_VERSION < "1.9"
+          @prop.type_cast([]).should == ""
+        else
+          @prop.type_cast([]).should == "[]"
+        end
       end
     end
 

data/spec/ripple/validations_spec.rb

@@ -15,7 +15,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::Document::Validations do
   before :all do
-    class Box; include Ripple::Document; property :shape, String end
+    Object.module_eval { class Box; include Ripple::Document; property :shape, String end }
   end
 
   before :each do
@@ -50,14 +50,16 @@ describe Ripple::Document::Validations do
   end
 
   it "should run validations at the correct lifecycle state" do
-    pending "@_on_validate seems not to work?!"
-    Box.property :size, Integer
-    Box.validates_inclusion_of :size, :in => 1..30, :on => :update
+    Box.property :size, Integer, :inclusion => {:in => 1..30, :on => :update }
     @box.size = 0
     @box.should be_valid
     Box.properties.delete :size
   end
-
+  
+  after :each do
+    Box.reset_callbacks(:validate)
+  end
+  
   after :all do
     Object.send(:remove_const, :Box)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ripple
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -05:00
+date: 2010-02-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.0.beta
     version: 
@@ -78,7 +78,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.0.beta
     version: 
@@ -94,6 +94,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CONTRIBUTORS.textile
 - LICENSE
 - README.textile
 - RELEASE_NOTES.textile