ripple 0.8.2 → 0.8.3

data/Gemfile

@@ -0,0 +1,16 @@
+source :gemcutter
+
+gem 'bundler'
+gem 'riak-client', :path => "../riak-client"
+gem 'activemodel', '~>3.0.0'
+gem 'rspec', '~>2.0.0'
+gem 'tzinfo'
+gem 'rake'
+
+if defined? JRUBY_VERSION
+  gem 'json'
+  gem 'jruby-openssl'
+else
+  gem 'yajl-ruby'
+  gem 'curb', '>0.6'
+end

data/Rakefile

@@ -8,7 +8,7 @@ gemspec = Gem::Specification.new do |gem|
   gem.summary = %Q{ripple is an object-mapper library for Riak, the distributed database by Basho.}
   gem.description = %Q{ripple is an object-mapper library for Riak, the distributed database by Basho.  It uses ActiveModel to provide an experience that integrates well with Rails 3 applications.}
   gem.version = version
-  gem.email = "seancribbs@gmail.com"
+  gem.email = "sean@basho.com"
   gem.homepage = "http://seancribbs.github.com/ripple"
   gem.authors = ["Sean Cribbs"]
   gem.add_development_dependency "rspec", "~>2.0.0"
@@ -16,22 +16,121 @@ gemspec = Gem::Specification.new do |gem|
   gem.add_dependency "activesupport", "~>3.0.0"
   gem.add_dependency "activemodel", "~>3.0.0"
 
-  files = FileList["**/*"]
-  files.exclude /\.DS_Store/
-  files.exclude /\#/
-  files.exclude /~/
-  files.exclude /\.swp/
-  files.exclude '**/._*'
-  files.exclude '**/*.orig'
-  files.exclude '**/*.rej'
-  files.exclude /^pkg/
-  files.exclude 'ripple.gemspec'
-  files.exclude 'Gemfile'
-  files.exclude 'spec/support/test_server.yml'
+  gem.files =  %W{
+      Gemfile
+      lib/rails/generators/ripple/configuration/configuration_generator.rb
+      lib/rails/generators/ripple/configuration/templates
+      lib/rails/generators/ripple/configuration/templates/ripple.yml
+      lib/rails/generators/ripple/js/js_generator.rb
+      lib/rails/generators/ripple/js/templates/js/contrib.js
+      lib/rails/generators/ripple/js/templates/js/ripple.js
+      lib/rails/generators/ripple/model/model_generator.rb
+      lib/rails/generators/ripple/model/templates
+      lib/rails/generators/ripple/model/templates/model.rb
+      lib/rails/generators/ripple/test/templates/test_server.rb
+      lib/rails/generators/ripple/test/test_generator.rb
+      lib/rails/generators/ripple_generator.rb
+      lib/ripple/associations/embedded.rb
+      lib/ripple/associations/instantiators.rb
+      lib/ripple/associations/linked.rb
+      lib/ripple/associations/many.rb
+      lib/ripple/associations/many_embedded_proxy.rb
+      lib/ripple/associations/many_linked_proxy.rb
+      lib/ripple/associations/one.rb
+      lib/ripple/associations/one_embedded_proxy.rb
+      lib/ripple/associations/one_linked_proxy.rb
+      lib/ripple/associations/proxy.rb
+      lib/ripple/associations.rb
+      lib/ripple/attribute_methods/dirty.rb
+      lib/ripple/attribute_methods/query.rb
+      lib/ripple/attribute_methods/read.rb
+      lib/ripple/attribute_methods/write.rb
+      lib/ripple/attribute_methods.rb
+      lib/ripple/callbacks.rb
+      lib/ripple/conversion.rb
+      lib/ripple/core_ext/casting.rb
+      lib/ripple/core_ext.rb
+      lib/ripple/document/bucket_access.rb
+      lib/ripple/document/finders.rb
+      lib/ripple/document/key.rb
+      lib/ripple/document/persistence.rb
+      lib/ripple/document.rb
+      lib/ripple/embedded_document/finders.rb
+      lib/ripple/embedded_document/persistence.rb
+      lib/ripple/embedded_document.rb
+      lib/ripple/i18n.rb
+      lib/ripple/inspection.rb
+      lib/ripple/locale
+      lib/ripple/locale/en.yml
+      lib/ripple/nested_attributes.rb
+      lib/ripple/properties.rb
+      lib/ripple/property_type_mismatch.rb
+      lib/ripple/railtie.rb
+      lib/ripple/timestamps.rb
+      lib/ripple/translation.rb
+      lib/ripple/validations/associated_validator.rb
+      lib/ripple/validations.rb
+      lib/ripple.rb
+      Rakefile
+      ripple.gemspec
+      spec/fixtures/config.yml
+      spec/integration/ripple/associations_spec.rb
+      spec/integration/ripple/nested_attributes_spec.rb
+      spec/integration/ripple/persistence_spec.rb
+      spec/ripple/associations/many_embedded_proxy_spec.rb
+      spec/ripple/associations/many_linked_proxy_spec.rb
+      spec/ripple/associations/one_embedded_proxy_spec.rb
+      spec/ripple/associations/one_linked_proxy_spec.rb
+      spec/ripple/associations/proxy_spec.rb
+      spec/ripple/associations_spec.rb
+      spec/ripple/attribute_methods_spec.rb
+      spec/ripple/bucket_access_spec.rb
+      spec/ripple/callbacks_spec.rb
+      spec/ripple/conversion_spec.rb
+      spec/ripple/core_ext_spec.rb
+      spec/ripple/document_spec.rb
+      spec/ripple/embedded_document/finders_spec.rb
+      spec/ripple/embedded_document/persistence_spec.rb
+      spec/ripple/embedded_document_spec.rb
+      spec/ripple/finders_spec.rb
+      spec/ripple/inspection_spec.rb
+      spec/ripple/key_spec.rb
+      spec/ripple/persistence_spec.rb
+      spec/ripple/properties_spec.rb
+      spec/ripple/ripple_spec.rb
+      spec/ripple/timestamps_spec.rb
+      spec/ripple/validations_spec.rb
+      spec/spec_helper.rb
+      spec/support/associations/proxies.rb
+      spec/support/mocks.rb
+      spec/support/models/address.rb
+      spec/support/models/box.rb
+      spec/support/models/car.rb
+      spec/support/models/cardboard_box.rb
+      spec/support/models/clock.rb
+      spec/support/models/customer.rb
+      spec/support/models/driver.rb
+      spec/support/models/email.rb
+      spec/support/models/engine.rb
+      spec/support/models/family.rb
+      spec/support/models/favorite.rb
+      spec/support/models/invoice.rb
+      spec/support/models/late_invoice.rb
+      spec/support/models/note.rb
+      spec/support/models/page.rb
+      spec/support/models/paid_invoice.rb
+      spec/support/models/passenger.rb
+      spec/support/models/seat.rb
+      spec/support/models/tasks.rb
+      spec/support/models/tree.rb
+      spec/support/models/user.rb
+      spec/support/models/wheel.rb
+      spec/support/models/widget.rb
+      spec/support/test_server.rb
+      spec/support/test_server.yml.example
+     }
 
-  gem.files = files.to_a
-
-  gem.test_files = FileList["spec/**/*.rb"].to_a
+  gem.test_files = gem.files.grep(/_spec\.rb$/)
 end
 
 # Gem packaging tasks

data/lib/rails/generators/ripple/configuration/configuration_generator.rb

@@ -0,0 +1,26 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+require 'rails/generators/ripple_generator'
+
+module Ripple
+  module Generators
+    class ConfigurationGenerator < Base
+      desc 'Generates a configuration file for Ripple.'
+
+      def create_configuration_file
+        template 'ripple.yml', 'config/ripple.yml'
+      end
+    end
+  end
+end

data/lib/rails/generators/ripple/configuration/templates/ripple.yml

@@ -0,0 +1,21 @@
+# Configure Riak connections for the Ripple library.
+development:
+  port: 8098
+  host: localhost
+
+# The test environment has additional keys for configuring the
+# Riak::TestServer for your test/spec suite:
+#
+# * bin_dir specifies the path to the "riak" script that you use to
+#           start Riak (just the directory)
+# * js_source_dir specifies where your custom Javascript functions for
+#           MapReduce should be loaded from. Usually app/mapreduce.
+test:
+  port: 9000
+  host: localhost
+  bin_dir: /usr/local/bin   # Default for Homebrew.
+  js_source_dir: <%%= Rails.root + "app/mapreduce" %>
+
+production:
+  port: 8098
+  host: localhost

data/lib/rails/generators/ripple/js/js_generator.rb

@@ -0,0 +1,26 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+require 'rails/generators/ripple_generator'
+
+module Ripple
+  module Generators
+    class JsGenerator < Base
+      desc 'Generates Javascript built-ins for use in your queries.'
+
+      def create_js_files
+        directory 'js', 'app/mapreduce'
+      end
+    end
+  end
+end

data/lib/rails/generators/ripple/js/templates/js/contrib.js

@@ -0,0 +1,80 @@
+// -------------------------------------------------------------------
+//
+//
+// This file is provided to you under the Apache License,
+// Version 2.0 (the "License"); you may not use this file
+// except in compliance with the License.  You may obtain
+// a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// -------------------------------------------------------------------
+//
+// This file contains Javascript MapReduce functions copied from the
+// "Riak Function Contrib" project.
+//
+Riak.Contrib = {
+    // Count keys in a group of results.
+    // http://contrib.basho.com/count_keys.html
+    mapCount: function(){
+        return [1];
+    },
+
+    // Generate commonly used statistics from an array of numbers.
+    // Supports count, sum, min, max, percentiles, mean, variance, and
+    // stddev.
+    // http://contrib.basho.com/stats.html
+    reduceStats: function(data) {
+        var result = {};
+
+        data.sort(function(a,b){return a-b;});
+        result.count = data.length;
+
+        // Since the data is sorted, the minimum value
+        // is at the beginning of the array, the median
+        // value is in the middle of the array, and the
+        // maximum value is at the end of the array.
+        result.min = data[0];
+        result.max = data[data.length - 1];
+
+        var ntileFunc = function(percentile){
+            if (data.length == 1) return data[0];
+            var ntileRank = ((percentile/100) * (data.length - 1)) + 1;
+            var integralRank = Math.floor(ntileRank);
+            var fractionalRank = ntileRank - integralRank;
+            var lowerValue = data[integralRank-1];
+            var upperValue = data[integralRank];
+            return (fractionalRank * (upperValue - lowerValue)) + lowerValue;
+        };
+
+        result.percentile25 = ntileFunc(25);
+        result.median = ntileFunc(50);
+        result.percentile75 = ntileFunc(75);
+        result.percentile99 = ntileFunc(99);
+
+        // Compute the mean and variance using a
+        // numerically stable algorithm.
+        var sqsum = 0;
+        result.mean = data[0];
+        result.sum = result.mean * result.count;
+        for (var i = 1;  i < data.length;  ++i) {
+            var x = data[i];
+            var delta = x - result.mean;
+            var sweep = i + 1.0;
+            result.mean += delta / sweep;
+            sqsum += delta * delta * (i / sweep);
+            result.sum += x;
+        }
+        result.variance = sqsum / result.count;
+        result.sdev = Math.sqrt(result.variance);
+
+        return result;
+    }
+};

data/lib/rails/generators/ripple/js/templates/js/ripple.js

@@ -0,0 +1,145 @@
+// Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+
+/*
+ * Namespace for Ripple's built-in MapReduce functions.
+ */
+var Ripple = {
+    /*
+     * Filter input values by simple equality test on passed "fields"
+     * argument. Returns bucket/key pairs for use in later map phases.
+     *
+     * Raw Phase Example:
+     *  {"map":{
+     *          "language":"javascript",
+     *          "name":"Ripple.filterByFields",
+     *          "arg":{"manufactured":true, "name":"widget"}
+     *          }}
+     *
+     * Ruby invocation example:
+     *   mr.map("Ripple.filterByFields",
+     *          :arg => {:manufactured => true, :name => "widget"})
+     *
+     */
+    filterByFields: function(value, keyData, fields){
+        var object = Riak.mapValuesJson(value)[0];
+        for(field in fields){
+            if(object[field] != fields[field])
+                return [];
+        }
+        return [[value.bucket, value.key]];
+    },
+    /*
+     * Filter input values by various conditions passed as the
+     * "conditions" argument. Returns bucket/key pairs for use in
+     * later map phases.
+     *
+     * Valid operators:
+     *   ==, eq      (equality)
+     *   !=, neq     (inequality)
+     *   <, lt       (less than)
+     *   =<, <=, lte (less than or equal)
+     *   >, gt       (greater than)
+     *   >=, =>, gte (greater than or equal)
+     *   ~=, match   (regular expression match)
+     *   between     (inclusive numeric range)
+     *   includes    (String or Array inclusion)
+     *
+     * Example:
+     *   {"map":{
+     *           "language":"javascript",
+     *           "name":"Ripple.filterByConditions",
+     *           "arg":{"tags":{"includes":"riak"}, "title":{"~=":"schema"}}
+     *          }}
+     *
+     * Ruby invocation example:
+     *   mr.map("Ripple.filterByConditions",
+     *          :arg => {:tags => {:includes => "riak"},
+     *                   :title => {"~=" => "schema"}})
+     */
+    filterByConditions: function(value, keyData, conditions){
+        var object = Riak.mapValuesJson(value)[0];
+        for(condition in conditions){
+            if(!Ripple.conditionMatch(condition, conditions[condition], object))
+                return [];
+        }
+        return [[value.bucket, value.key]];
+    },
+    /*
+     * Given a specific field and test, returns whether the object
+     * matches the condition specified by the test. Used internally by
+     * Ripple.filterByConditions map phases.
+     */
+    conditionMatch: function(field, test, object){
+        for(t in test){
+            switch(t){
+            case "==": case "eq":
+                if(object[field] != test[t])
+                    return false;
+                break;
+            case "!=": case "neq":
+                if(object[field] == test[t])
+                    return false;
+                break;
+            case "<":  case "lt":
+                if(object[field] >= test[t])
+                    return false;
+                break;
+            case "=<": case "<=": case "lte":
+                if(object[field] > test[t])
+                    return false;
+                break;
+            case ">":  case "gt":
+                if(object[field] <= test[t])
+                    return false;
+                break;
+            case ">=": case "=>": case "gte":
+                if(object[field] < test[t])
+                    return false;
+                break;
+            case "~=": case "match":
+                if(new RegExp(object[field],"i").test(test[t]))
+                    return false;
+                break;
+            case "between": // Inclusive on both ends
+                if(object[field] < test[t][0] || object[field] > test[t][1])
+                    return false;
+                break;
+            case "includes": // Only works with String, Array
+                if(object[field].indexOf(test[t]) == -1)
+                    return false;
+                break;
+            default:
+                ejsLog("Invalid condition for field " + field + ": " + t + " " + test[t], "ripple-error.log");
+                break;
+            }
+        }
+        return true;
+    },
+    /*
+     * Returns the mapped object without modification. Useful when
+     * preceded by map phases that do filtering or link phases.
+     */
+    mapIdentity: function(value, kd, arg){
+        return [value];
+    },
+    /*
+     * Returns the passed values without modification. Useful as an
+     * intermediary before reduce phases that require the entire
+     * result set to be present (limits).
+     */
+    reduceIdentity: function(values, arg){
+        return values;
+    }
+};

data/lib/rails/generators/ripple/model/model_generator.rb

@@ -16,7 +16,7 @@ require 'rails/generators/ripple_generator'
 
 module Ripple
   module Generators
-    class ModelGenerator < Base
+    class ModelGenerator < NamedBase
       desc 'Creates a ripple model'
       argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
       class_option :parent, :type => :string, :desc => "The parent class for the generated model"

data/lib/rails/generators/ripple/test/templates/test_server.rb

@@ -0,0 +1,42 @@
+require 'riak/test_server'
+
+module Ripple  
+  module TestServer
+    extend self
+
+    # Tweak this to change how your test server is configured
+    def test_server_config
+      {
+        :app_config => {
+          :riak_kv => { :js_source_dir => Ripple.config.delete(:js_source_dir) },
+          :riak_core => { :web_port => Ripple.config[:port] || 8098 }
+        },
+        :bin_dir => Ripple.config.delete(:bin_dir),
+        :temp_dir => Rails.root + "tmp/riak_test_server"
+      }
+    end
+
+    # Prepares the subprocess Riak node for the test suite
+    def setup
+      unless @test_server
+        begin
+          _server = @test_server = Riak::TestServer.new(test_server_config)
+          @test_server.prepare!
+          @test_server.start
+          at_exit { _server.cleanup }
+        rescue => e
+          warn "Can't run tests with Riak::TestServer. Specify the location of your Riak installation in the config/ripple.yml #{Rails.env} environment."
+          warn e.inspect
+          @test_server = nil
+        end
+      end
+    end
+
+    # Clear the data after each test run
+    def clear
+      @test_server.recycle if @test_server
+    end
+  end
+end
+
+Ripple::TestServer.setup

data/lib/rails/generators/ripple/test/test_generator.rb

@@ -0,0 +1,52 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+require 'rails/generators/ripple_generator'
+
+module Ripple
+  module Generators
+    class TestGenerator < Base
+      desc 'Generates test helpers for Ripple. Test::Unit, RSpec and Cucumber are supported.'
+      # Cucumber
+      def create_cucumber_file
+        if File.directory?(Rails.root + "features/support")
+          template 'test_server.rb', 'features/support/ripple.rb'
+          insert_into_file 'features/support/ripple.rb', "\n\nAfter do\n  Ripple::TestServer.clear\nend", :after => "Ripple::TestServer.setup"
+        end
+      end
+
+      # RSpec
+      def create_rspec_file
+        if File.file?(Rails.root + 'spec/spec_helper.rb')
+          template 'test_server.rb', 'spec/support/ripple.rb'
+          inject_into_file 'spec/spec_helper.rb', :after => /R[Ss]pec\.configure do \|config\|/ do
+            "\n  config.after(:each) do\n    Ripple::TestServer.clear\n  end\n"
+          end
+        end
+      end
+
+      # Test::Unit
+      def create_test_unit_file
+        if File.file?(Rails.root + 'test/test_helper.rb')
+          template 'test_server.rb', 'test/ripple_test_helper.rb'
+          inject_into_file "test/test_helper.rb", :before => "class ActiveSupport::TestCase" do
+            "# Setup in-memory test server for Riak\nrequire File.expand_path('../ripple_test_helper.rb', __FILE__)\n\n"
+          end
+          inject_into_class "test/test_helper.rb", ActiveSupport::TestCase do
+            "  teardown { Ripple::TestServer.clear }\n\n"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/ripple_generator.rb

@@ -14,12 +14,26 @@
 require "rails/generators/named_base"
 require "rails/generators/active_model"
 
+class RippleGenerator < ::Rails::Generators::Base
+  def create_ripple
+    invoke "ripple:configuration"
+    invoke "ripple:js"
+    invoke "ripple:test"
+  end
+end
+
 module Ripple
   # ActiveModel generators for use in a Rails project.
   module Generators
     # @private
-    class Base < ::Rails::Generators::NamedBase
+    class Base < ::Rails::Generators::Base
+      def self.source_root
+        @_ripple_source_root ||=
+        File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
+      end
+    end
 
+    class NamedBase < ::Rails::Generators::NamedBase
       def self.source_root
         @_ripple_source_root ||=
         File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)

data/lib/ripple.rb

@@ -14,6 +14,7 @@
 
 require 'riak'
 require 'active_support/all'
+require 'active_support/json'
 require 'active_model'
 require 'ripple/i18n'
 require 'ripple/core_ext'

data/lib/ripple/associations.rb

@@ -252,7 +252,7 @@ module Ripple
       when many?
         Array === value && value.all? {|d| (embeddable? && Hash === d) || klass === d }
       when one?
-        value.nil? || (embeddable? && Hash === value) || klass === value
+        value.nil? || (embeddable? && Hash === value) || value.kind_of?(klass)
       end
     end
   end

data/lib/ripple/attribute_methods.rb

@@ -32,6 +32,7 @@ module Ripple
       include Write
       include Query
       include Dirty
+      include ActiveModel::MassAssignmentSecurity
     end
 
     module ClassMethods
@@ -64,7 +65,7 @@ module Ripple
       # @param [Hash] attrs the attributes to assign
       def attributes=(attrs)
         raise ArgumentError, t('attribute_hash') unless Hash === attrs
-        attrs.each do |k,v|
+        sanitize_for_mass_assignment(attrs).each do |k,v|
           next if k.to_sym == :key
           if respond_to?("#{k}=")
             __send__("#{k}=",v)

data/lib/ripple/attribute_methods/dirty.rb

@@ -42,7 +42,7 @@ module Ripple
 
       private
       def attribute=(attr_name, value)
-        attribute_will_change!(attr_name)
+        attribute_will_change!(attr_name) if @attributes[attr_name] != value
         super
       end
     end

data/lib/ripple/core_ext/casting.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/to_json'
+require 'active_support/time_with_zone'
+
 # @private
 class Object
   def self.ripple_cast(value)
@@ -22,7 +26,7 @@ end
 # @private
 class Symbol
   def self.ripple_cast(value)
-    return nil if value.nil?
+    return nil if value.blank?
     value.respond_to?(:to_s) && value.to_s.intern or raise Ripple::PropertyTypeMismatch.new(self, value)
   end
 end
@@ -30,7 +34,7 @@ end
 # @private
 class Numeric
   def self.ripple_cast(value)
-    return nil if value.nil?
+    return nil if value.blank?
     raise Ripple::PropertyTypeMismatch.new(self,value) unless value.respond_to?(:to_i) && value.respond_to?(:to_f)
     float_value = value.to_f
     int_value = value.to_i
@@ -41,15 +45,15 @@ end
 # @private
 class Integer
   def self.ripple_cast(value)
-    return nil if value.nil?
-    value.respond_to?(:to_i) && value.to_i or raise Ripple::PropertyTypeMismatch.new(self, value)
+    return nil if value.nil? || (String === value && value.blank?)
+    !value.is_a?(Symbol) && value.respond_to?(:to_i) && value.to_i or raise Ripple::PropertyTypeMismatch.new(self, value)
   end
 end
 
 # @private
 class Float
   def self.ripple_cast(value)
-    return nil if value.nil?
+    return nil if value.nil? || (String === value && value.blank?)
     value.respond_to?(:to_f) && value.to_f or raise Ripple::PropertyTypeMismatch.new(self, value)
   end
 end
@@ -97,7 +101,7 @@ class Time
   end
 
   def self.ripple_cast(value)
-    return nil if value.nil?
+    return nil if value.blank?
     value.respond_to?(:to_time) && value.to_time or raise Ripple::PropertyTypeMismatch.new(self, value)
   end
 end
@@ -109,7 +113,7 @@ class Date
   end
 
   def self.ripple_cast(value)
-    return nil if value.nil?
+    return nil if value.blank?
     value.respond_to?(:to_date) && value.to_date or raise Ripple::PropertyTypeMismatch.new(self, value)
   end
 end
@@ -121,7 +125,17 @@ class DateTime
   end
 
   def self.ripple_cast(value)
-    return nil if value.nil?
+    return nil if value.blank?
     value.respond_to?(:to_datetime) && value.to_datetime or raise Ripple::PropertyTypeMismatch.new(self, value)
   end
 end
+
+# @private
+module ActiveSupport
+  class TimeWithZone
+    def as_json(options={})
+      self.utc.rfc822
+    end
+  end
+end
+

data/lib/ripple/document/finders.rb

@@ -26,7 +26,7 @@ module Ripple
     def initialize(keys, found)
       if keys.empty?
         super(t("document_not_found.no_key"))
-      elsif keys.one?
+      elsif keys.size == 1
         super(t("document_not_found.one_key", :key => keys.first))
       else
         missing = keys - found.compact.map(&:key)
@@ -57,7 +57,7 @@ module Ripple
         def find(*args)
           args.flatten!
           return nil if args.empty? || args.all?(&:blank?)
-          return find_one(args.first) if args.one?
+          return find_one(args.first) if args.size == 1
           args.map {|key| find_one(key) }
         end
         
@@ -118,10 +118,9 @@ module Ripple
 
         def instantiate(robject)
           klass = robject.data['_type'].constantize rescue self
-          data = {'key' => robject.key}
-          data.reverse_merge!(robject.data) rescue data
-          klass.new(data).tap do |doc|
-            doc.key = data['key']
+          klass.new.tap do |doc|
+            doc.key = robject.key
+            robject.data.except("_type").each {|k,v| doc.send("#{k}=", v) } if robject.data
             doc.instance_variable_set(:@new, false)
             doc.instance_variable_set(:@robject, robject)
           end

data/lib/ripple/document/persistence.rb

@@ -85,7 +85,7 @@ module Ripple
         def reload
           return self if new?
           robject.reload(:force => true)
-          @attributes.merge!(@robject.data)
+          @robject.data.except("_type").each { |key, value| send("#{key}=", value) }
           self
         end
 

data/lib/ripple/railtie.rb

@@ -18,7 +18,9 @@ module Ripple
   # during Rails initialization.
   class Railtie < Rails::Railtie
     initializer "ripple.configure_rails_initialization" do
-      Ripple.load_configuration Rails.root.join('config', 'ripple.yml'), [Rails.env]
+      if File.exist?(Rails.root + "config/ripple.yml")
+        Ripple.load_configuration Rails.root.join('config', 'ripple.yml'), [Rails.env]
+      end
     end
   end
 end

data/lib/ripple/timestamps.rb

@@ -23,7 +23,7 @@ module Ripple
       # Adds the :created_at and :updated_at timestamp properties to
       # the document.
       def timestamps!
-        property :created_at, Time, :default => proc { Time.now.utc }
+        property :created_at, Time, :default => proc { Time.now }
         property :updated_at, Time
         before_save :touch
       end
@@ -32,7 +32,7 @@ module Ripple
     module InstanceMethods
       # Sets the :updated_at attribute before saving the document.
       def touch
-        self.updated_at = Time.now.utc
+        self.updated_at = Time.now
       end
     end
   end

data/ripple.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ripple}
+  s.version = "0.8.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sean Cribbs"]
+  s.date = %q{2010-12-13}
+  s.description = %q{ripple is an object-mapper library for Riak, the distributed database by Basho.  It uses ActiveModel to provide an experience that integrates well with Rails 3 applications.}
+  s.email = %q{sean@basho.com}
+  s.files = ["Gemfile", "lib/rails/generators/ripple/configuration/configuration_generator.rb", "lib/rails/generators/ripple/configuration/templates/ripple.yml", "lib/rails/generators/ripple/js/js_generator.rb", "lib/rails/generators/ripple/js/templates/js/contrib.js", "lib/rails/generators/ripple/js/templates/js/ripple.js", "lib/rails/generators/ripple/model/model_generator.rb", "lib/rails/generators/ripple/model/templates/model.rb", "lib/rails/generators/ripple/test/templates/test_server.rb", "lib/rails/generators/ripple/test/test_generator.rb", "lib/rails/generators/ripple_generator.rb", "lib/ripple/associations/embedded.rb", "lib/ripple/associations/instantiators.rb", "lib/ripple/associations/linked.rb", "lib/ripple/associations/many.rb", "lib/ripple/associations/many_embedded_proxy.rb", "lib/ripple/associations/many_linked_proxy.rb", "lib/ripple/associations/one.rb", "lib/ripple/associations/one_embedded_proxy.rb", "lib/ripple/associations/one_linked_proxy.rb", "lib/ripple/associations/proxy.rb", "lib/ripple/associations.rb", "lib/ripple/attribute_methods/dirty.rb", "lib/ripple/attribute_methods/query.rb", "lib/ripple/attribute_methods/read.rb", "lib/ripple/attribute_methods/write.rb", "lib/ripple/attribute_methods.rb", "lib/ripple/callbacks.rb", "lib/ripple/conversion.rb", "lib/ripple/core_ext/casting.rb", "lib/ripple/core_ext.rb", "lib/ripple/document/bucket_access.rb", "lib/ripple/document/finders.rb", "lib/ripple/document/key.rb", "lib/ripple/document/persistence.rb", "lib/ripple/document.rb", "lib/ripple/embedded_document/finders.rb", "lib/ripple/embedded_document/persistence.rb", "lib/ripple/embedded_document.rb", "lib/ripple/i18n.rb", "lib/ripple/inspection.rb", "lib/ripple/locale/en.yml", "lib/ripple/nested_attributes.rb", "lib/ripple/properties.rb", "lib/ripple/property_type_mismatch.rb", "lib/ripple/railtie.rb", "lib/ripple/timestamps.rb", "lib/ripple/translation.rb", "lib/ripple/validations/associated_validator.rb", "lib/ripple/validations.rb", "lib/ripple.rb", "Rakefile", "ripple.gemspec", "spec/fixtures/config.yml", "spec/integration/ripple/associations_spec.rb", "spec/integration/ripple/nested_attributes_spec.rb", "spec/integration/ripple/persistence_spec.rb", "spec/ripple/associations/many_embedded_proxy_spec.rb", "spec/ripple/associations/many_linked_proxy_spec.rb", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb", "spec/spec_helper.rb", "spec/support/associations/proxies.rb", "spec/support/mocks.rb", "spec/support/models/address.rb", "spec/support/models/box.rb", "spec/support/models/car.rb", "spec/support/models/cardboard_box.rb", "spec/support/models/clock.rb", "spec/support/models/customer.rb", "spec/support/models/driver.rb", "spec/support/models/email.rb", "spec/support/models/engine.rb", "spec/support/models/family.rb", "spec/support/models/favorite.rb", "spec/support/models/invoice.rb", "spec/support/models/late_invoice.rb", "spec/support/models/note.rb", "spec/support/models/page.rb", "spec/support/models/paid_invoice.rb", "spec/support/models/passenger.rb", "spec/support/models/seat.rb", "spec/support/models/tasks.rb", "spec/support/models/tree.rb", "spec/support/models/user.rb", "spec/support/models/wheel.rb", "spec/support/models/widget.rb", "spec/support/test_server.rb", "spec/support/test_server.yml.example"]
+  s.homepage = %q{http://seancribbs.github.com/ripple}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{ripple is an object-mapper library for Riak, the distributed database by Basho.}
+  s.test_files = ["spec/integration/ripple/associations_spec.rb", "spec/integration/ripple/nested_attributes_spec.rb", "spec/integration/ripple/persistence_spec.rb", "spec/ripple/associations/many_embedded_proxy_spec.rb", "spec/ripple/associations/many_linked_proxy_spec.rb", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_runtime_dependency(%q<riak-client>, ["~> 0.8.3"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<riak-client>, ["~> 0.8.3"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<riak-client>, ["~> 0.8.3"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
+    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
+  end
+end

data/spec/ripple/associations/one_linked_proxy_spec.rb

@@ -15,7 +15,8 @@ require File.expand_path("../../../spec_helper", __FILE__)
 
 describe Ripple::Associations::OneLinkedProxy do
   require 'support/models/tasks'
-  
+  require 'support/models/family'
+
   before :each do
     @person = Person.new {|p| p.key = "riak-user" }
     @profile = Profile.new {|t| t.key = "one" }
@@ -28,7 +29,7 @@ describe Ripple::Associations::OneLinkedProxy do
   it "should be blank before the associated document is set" do
     @person.profile.should_not be_present
   end
-  
+
   it "should accept a single document" do
     lambda { @person.profile = @profile }.should_not raise_error
   end
@@ -48,8 +49,8 @@ describe Ripple::Associations::OneLinkedProxy do
     @profile.should_receive(:save).and_return(true)
     @person.profile = @profile
   end
-  
-  it "should link-walk to the associated document when accessing" do    
+
+  it "should link-walk to the associated document when accessing" do
     @person.robject.links << @profile.robject.to_link("profile")
     @person.robject.should_receive(:walk).with(Riak::WalkSpec.new(:bucket => "profiles", :tag => "profile")).and_return([[@profile.robject]])
     @person.profile.should be_present
@@ -59,13 +60,28 @@ describe Ripple::Associations::OneLinkedProxy do
     @person.robject.links.should be_empty
     @person.profile.should be_nil
   end
-  
+
   it "should replace associated document with a new one" do
     @person.profile = @profile
     @person.profile = @other_profile
     @person.profile.should == @other_profile
   end
 
+  it "replaces the associated document with the target of the proxy" do
+    @other_person = Person.new {|p| p.key = "another-riak-user" }
+    @other_person.profile = @other_profile
+
+    @person.profile = @other_person.profile
+    @person.profile.should == @other_profile
+  end
+
+  it "refuses assigning a proxy if its target is the wrong type" do
+    parent = Parent.new
+    parent.child = Child.new
+
+    lambda { @person.profile = parent.child }.should raise_error
+  end
+
   # it "should be able to build a new associated document" do
   #   @person.profile.build
   # end

data/spec/ripple/attribute_methods_spec.rb

@@ -130,6 +130,13 @@ describe Ripple::AttributeMethods do
     @widget.changes.should == {"name" => ["widget", "foobar"]}
   end
 
+  it "should report that an attribute is changed only if its value actually changes" do
+    @widget.name = "widget"
+    @widget.changed?.should be_false
+    @widget.name_changed?.should be_false
+    @widget.changes.should be_blank
+  end
+
   it "should refresh the attribute methods when adding a new property" do
     Widget.should_receive(:undefine_attribute_methods)
     Widget.property :start_date, Date
@@ -137,7 +144,7 @@ describe Ripple::AttributeMethods do
   end
 
   it "should provide a hash representation of all of the attributes" do
-    @widget.attributes.should == {"name" => "widget", "size" => nil, "manufactured" => false}
+    @widget.attributes.should == {"name" => "widget", "size" => nil, "manufactured" => false, "shipped_at" => nil}
   end
 
   it "should load attributes from mass assignment" do
@@ -177,4 +184,9 @@ describe Ripple::AttributeMethods do
     @widget = Widget.new
     lambda { @widget.attributes = nil }.should raise_error(ArgumentError)
   end
+
+  it "should protect attributes from mass assignment" do
+    @widget = Widget.new(:manufactured => true)
+    @widget.manufactured.should be_false
+  end
 end

data/spec/ripple/core_ext_spec.rb

@@ -35,6 +35,14 @@ describe DateTime do
   end
 end
 
+describe ActiveSupport::TimeWithZone do
+  it "serializes to JSON in UTC, RFC 822 format" do
+    time = Time.utc(2010,3,16,12)
+    zone = ActiveSupport::TimeZone['Alaska']
+    ActiveSupport::TimeWithZone.new(time, zone).as_json.should == "Tue, 16 Mar 2010 12:00:00 -0000"
+  end
+end
+
 describe "Boolean" do
   it "should be available to properties on documents" do
     lambda {

data/spec/ripple/finders_spec.rb

@@ -71,6 +71,11 @@ describe Ripple::Document::Finders do
       lambda { Box.find!("square") }.should_not raise_error(Ripple::DocumentNotFound)
     end
 
+    it "should raise an exception when finding an existing document that has properties we don't know about" do
+      @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"non_existent_property":"whatever"}'})
+      lambda { Box.find("square") }.should raise_error
+    end
+
     it "should return the document when calling find!" do
       @http.should_receive(:get).with(200, "/riak/", "boxes", "square", {}, {}).and_return({:code => 200, :headers => {"content-type" => ["application/json"]}, :body => '{"shape":"square"}'})
       box = Box.find!("square")

data/spec/ripple/persistence_spec.rb

@@ -54,10 +54,11 @@ describe Ripple::Document::Persistence do
   end
 
   it "should instantiate and save a new object to riak" do
-    json = @widget.attributes.merge(:size => 10, :_type => 'Widget').to_json
+    json = @widget.attributes.merge(:size => 10, :shipped_at => "Sat, 01 Jan 2000 20:15:01 -0000", :_type => 'Widget').to_json
     @http.should_receive(:post).with(201, "/riak/", "widgets", an_instance_of(Hash), json, hash_including("Content-Type" => "application/json")).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
-    @widget = Widget.create(:size => 10)
+    @widget = Widget.create(:size => 10, :shipped_at => Time.utc(2000,"jan",1,20,15,1))
     @widget.size.should == 10
+    @widget.shipped_at.should == Time.utc(2000,"jan",1,20,15,1)
     @widget.should_not be_a_new_record
   end
 
@@ -72,14 +73,15 @@ describe Ripple::Document::Persistence do
   end
 
   it "should reload a saved object" do
-    json = @widget.attributes.merge("_type" => "Widget").to_json
+    json = @widget.attributes.merge(:_type => "Widget").to_json
     @http.should_receive(:post).with(201, "/riak/", "widgets", an_instance_of(Hash), json, hash_including("Content-Type" => "application/json")).and_return(:code => 201, :headers => {'location' => ["/riak/widgets/new_widget"]})
     @widget.save
-    @http.should_receive(:get).and_return(:code => 200, :headers => {'content-type' => ["application/json"]}, :body => '{"name":"spring","size":10}')
+    @http.should_receive(:get).and_return(:code => 200, :headers => {'content-type' => ["application/json"]}, :body => '{"name":"spring","size":10,"shipped_at":"Sat, 01 Jan 2000 20:15:01 -0000","_type":"Widget"}')
     @widget.reload
     @widget.changes.should be_blank
     @widget.name.should == "spring"
     @widget.size.should == 10
+    @widget.shipped_at.should == Time.utc(2000,"jan",1,20,15,1)
   end
 
   it "should destroy a saved object" do

data/spec/ripple/properties_spec.rb

@@ -145,13 +145,18 @@ describe Ripple::Property do
         end
       end
 
-      [0.0, "0", "     000", ""].each do |v|
+      [0.0, "0", "     000"].each do |v|
         it "should cast #{v.inspect} to 0" do
           @prop.type_cast(v).should == 0
         end
       end
 
-      [true, false, [], ["something else"]].each do |v|
+      it "should not cast the blank string" do
+        @prop.type_cast("").should be_nil
+        @prop.type_cast("   ").should be_nil
+      end
+
+      [true, false, [], {}, :symbol, ["something else"]].each do |v|
         it "should raise an error casting #{v.inspect}" do
           lambda { @prop.type_cast(v) }.should raise_error(Ripple::PropertyTypeMismatch)
         end
@@ -163,7 +168,7 @@ describe Ripple::Property do
         @prop = Ripple::Property.new(:foo, Float)
       end
 
-      [0, "0", "0.0", "    0.0", ""].each do |v|
+      [0, "0", "0.0", "    0.0"].each do |v|
         it "should cast #{v.inspect} to 0.0" do
           @prop.type_cast(v).should == 0.0
         end
@@ -175,6 +180,11 @@ describe Ripple::Property do
         end
       end
 
+      it "should not cast the blank string" do
+        @prop.type_cast("").should be_nil
+        @prop.type_cast("   ").should be_nil
+      end
+
       [true, false, :symbol, [], {}].each do |v|
         it "should raise an error casting #{v.inspect}" do
           lambda { @prop.type_cast(v) }.should raise_error(Ripple::PropertyTypeMismatch)
@@ -198,6 +208,11 @@ describe Ripple::Property do
           @prop.type_cast(v).should be_kind_of(Float)
         end
       end
+
+      it "should not cast the blank string" do
+        @prop.type_cast("").should be_nil
+        @prop.type_cast("   ").should be_nil
+      end
     end
 
     describe "when type is a Time type" do
@@ -210,6 +225,13 @@ describe Ripple::Property do
           @prop.type_cast(v).should == Time.utc(2010,03,16,12)
         end
       end
+
+      it "should not cast blank types" do
+        @prop.type_cast([]).should be_nil
+        @prop.type_cast({}).should be_nil
+        @prop.type_cast("").should be_nil
+        @prop.type_cast("  ").should be_nil
+      end
     end
 
     describe "when type is a Date type" do
@@ -222,6 +244,13 @@ describe Ripple::Property do
           @prop.type_cast(v).should == Date.civil(2010,3,16)
         end
       end
+
+      it "should not cast blank types" do
+        @prop.type_cast([]).should be_nil
+        @prop.type_cast({}).should be_nil
+        @prop.type_cast("").should be_nil
+        @prop.type_cast("  ").should be_nil
+      end
     end
   end
 end

data/spec/support/models/widget.rb

@@ -17,6 +17,9 @@ class Widget
   property :size, Integer
   property :name, String, :default => "widget"
   property :manufactured, Boolean, :default => false
+  property :shipped_at, Time
+
+  attr_protected :manufactured
 end
 
 class Cog < Widget

data/spec/support/test_server.yml.example

@@ -0,0 +1,2 @@
+bin_dir: /Users/sean/Development/riak/rel/riak/bin
+temp_dir: /Users/sean/Development/ripple/.riaktest

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -04:00
+date: 2010-12-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 2
-        version: 0.8.2
+        - 3
+        version: 0.8.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -78,7 +78,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 description: ripple is an object-mapper library for Riak, the distributed database by Basho.  It uses ActiveModel to provide an experience that integrates well with Rails 3 applications.
-email: seancribbs@gmail.com
+email: sean@basho.com
 executables: []
 
 extensions: []
@@ -86,8 +86,16 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- lib/rails/generators/ripple/configuration/configuration_generator.rb
+- lib/rails/generators/ripple/configuration/templates/ripple.yml
+- lib/rails/generators/ripple/js/js_generator.rb
+- lib/rails/generators/ripple/js/templates/js/contrib.js
+- lib/rails/generators/ripple/js/templates/js/ripple.js
 - lib/rails/generators/ripple/model/model_generator.rb
 - lib/rails/generators/ripple/model/templates/model.rb
+- lib/rails/generators/ripple/test/templates/test_server.rb
+- lib/rails/generators/ripple/test/test_generator.rb
 - lib/rails/generators/ripple_generator.rb
 - lib/ripple/associations/embedded.rb
 - lib/ripple/associations/instantiators.rb
@@ -130,6 +138,7 @@ files:
 - lib/ripple/validations.rb
 - lib/ripple.rb
 - Rakefile
+- ripple.gemspec
 - spec/fixtures/config.yml
 - spec/integration/ripple/associations_spec.rb
 - spec/integration/ripple/nested_attributes_spec.rb
@@ -184,6 +193,7 @@ files:
 - spec/support/models/wheel.rb
 - spec/support/models/widget.rb
 - spec/support/test_server.rb
+- spec/support/test_server.yml.example
 has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []
@@ -243,30 +253,3 @@ test_files:
 - spec/ripple/ripple_spec.rb
 - spec/ripple/timestamps_spec.rb
 - spec/ripple/validations_spec.rb
-- spec/spec_helper.rb
-- spec/support/associations/proxies.rb
-- spec/support/mocks.rb
-- spec/support/models/address.rb
-- spec/support/models/box.rb
-- spec/support/models/car.rb
-- spec/support/models/cardboard_box.rb
-- spec/support/models/clock.rb
-- spec/support/models/customer.rb
-- spec/support/models/driver.rb
-- spec/support/models/email.rb
-- spec/support/models/engine.rb
-- spec/support/models/family.rb
-- spec/support/models/favorite.rb
-- spec/support/models/invoice.rb
-- spec/support/models/late_invoice.rb
-- spec/support/models/note.rb
-- spec/support/models/page.rb
-- spec/support/models/paid_invoice.rb
-- spec/support/models/passenger.rb
-- spec/support/models/seat.rb
-- spec/support/models/tasks.rb
-- spec/support/models/tree.rb
-- spec/support/models/user.rb
-- spec/support/models/wheel.rb
-- spec/support/models/widget.rb
-- spec/support/test_server.rb