ripple 0.9.5 → 1.0.0.beta

data/lib/ripple/observable.rb

@@ -1,16 +1,3 @@
-# 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 'active_support/concern'
 require 'active_model/observing'

data/lib/ripple/properties.rb

@@ -1,17 +1,3 @@
-# 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 'ripple/core_ext/casting'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/hash/indifferent_access'
@@ -61,6 +47,7 @@ module Ripple
     # @return [Object] The default value for this property if defined, or nil.
     def default
       default = options[:default]
+      default = default.dup if default.duplicable?
 
       return nil if default.nil?
       type_cast(default.respond_to?(:call) ? default.call : default)

data/lib/ripple/property_type_mismatch.rb

@@ -1,17 +1,3 @@
-# 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 'ripple/translation'
 
 module Ripple

data/lib/ripple/railtie.rb

@@ -1,23 +1,13 @@
-# 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/railtie'
 
 module Ripple
   # Railtie for automatic initialization of the Ripple framework
   # during Rails initialization.
   class Railtie < Rails::Railtie
+    rake_tasks do
+      load "ripple/railties/ripple.rake"
+    end
+
     initializer "ripple.configure_rails_initialization" do
       if File.exist?(Rails.root + "config/ripple.yml")
         Ripple.load_configuration Rails.root.join('config', 'ripple.yml'), [Rails.env]

data/lib/ripple/railties/ripple.rake

@@ -0,0 +1,86 @@
+require 'ripple/translation'
+require 'riak/cluster'
+require 'pp'
+
+namespace :riak do
+  task :cluster_created => :rails_env do
+    fail Ripple::Translator.t('cluster_not_created') unless cluster.exist?
+  end
+
+  desc "Starts the Riak cluster for the current environment"
+  task :start => :cluster_created do
+    cluster.start
+  end
+
+  desc "Stops the Riak cluster for the current environment"
+  task :stop => :cluster_created do
+    cluster.stop
+  end
+
+  desc "Creates a Riak cluster for the current environment in db/, e.g. db/development"
+  task :create => :rails_env do
+    cluster.create
+  end
+
+  desc "Destroys and recreates the cluster for the current environment."
+  task :reset => ['riak:destroy', 'riak:setup']
+
+  desc "Creates the Riak cluster and loads the seed data."
+  task :setup => ["riak:create", "db:seed"]
+
+  desc "Destroys the generated Riak cluster for the current environment."
+  task :destroy => :rails_env do
+    cluster.destroy
+  end
+
+  desc "Drops data only from the Riak cluster for the current environment."
+  task :drop => :cluster_created do
+    cluster.drop
+  end
+
+  namespace :create do
+    desc "Creates Riak clusters for all environments defined in config/ripple.yml"
+    task :all do
+      load_config.each do |env, config|
+        cluster(env.to_s, config).create
+      end
+    end
+  end
+
+  namespace :drop do
+    desc "Drops data Riak clusters for all environments defined in config/ripple.yml"
+    task :all do
+      load_config.each do |env, config|
+        c = cluster(env.to_s, config)
+        warn Ripple::Translator.t('cluster_not_created') unless c.exist?
+        c.drop
+      end
+    end
+  end
+end
+
+namespace :db do
+  task :create => "riak:create"
+  namespace(:create){ task :all => "riak:create:all" }
+  task :drop => "riak:drop"
+  namespace(:drop) { task :all => "riak:drop:all" }
+  task :setup => "riak:setup"
+  task :reset => "riak:reset"
+  task seed: ['riak:start', 'environment'] do
+    Rails.application.load_seed
+  end
+end
+
+def load_config
+  file = Rails.root + "config/ripple.yml"
+  raise Ripple::MissingConfiguration, file.to_s unless file.exist?
+  YAML.load(ERB.new(file.read).result).with_indifferent_access
+end
+
+def cluster(environment=nil, config=nil)
+  environment ||= Rails.env
+  config ||= load_config[environment]
+  root = Rails.root + "db" + environment.to_s
+  # TODO: We need to deal with multiple hosts and client ports
+  Riak::Cluster.new(config.merge(:root => root.to_s).with_indifferent_access)
+end

data/lib/ripple/serialization.rb

@@ -1,16 +1,16 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+# Copyright 2010-2011 Sean Cribbs 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
+# 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
+# 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.
+# 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 'active_support/concern'
 require 'active_model/serialization'
@@ -42,7 +42,7 @@ module Ripple
 
         hash = super(options)
 
-        hash['key'] = key if respond_to?(:key) and key.present?
+        hash['key'] = key if respond_to?(:key) && key.present? && (!options[:except] || !options[:except].map(&:to_s).include?("key"))
 
         serializable_add_includes(options) do |association, records, opts|
           hash[association.to_s] = records.is_a?(Enumerable) ? records.map {|r| r.serializable_hash(opts) } : records.serializable_hash(opts)

data/lib/ripple/test_server.rb

@@ -0,0 +1,36 @@
+require 'riak/test_server'
+require 'singleton'
+
+module Ripple
+  # Extends the {Riak::TestServer} to be aware of the Ripple
+  # configuration and adjust settings appropriately. Also simplifies
+  # its usage in the generation of test helpers.
+  class TestServer < Riak::TestServer
+    include Singleton
+
+    # Creates and starts the test server
+    def self.setup
+      instance.create
+      instance.start
+    end
+
+    # Clears data from the test server
+    def self.clear
+      instance.drop
+    end
+
+    # @private
+    def initialize(options=Ripple.config.dup)
+      options[:env] ||= {}
+      options[:env][:riak_kv] ||= {}
+      options[:env][:riak_kv][:js_source_dir] ||= Ripple.config.delete(:js_source_dir) || (Rails.root + "app/mapreduce").to_s
+      options[:env][:riak_kv][:map_cache_size] ||= 0
+      options[:env][:riak_core] ||= {}
+      options[:env][:riak_core][:http] ||= [ Tuple[Ripple.config[:host], Ripple.config[:http_port]] ]
+      options[:env][:riak_kv][:pb_port] ||= Ripple.config[:pb_port]
+      options[:env][:riak_kv][:pb_ip] ||= Ripple.config[:host]
+      options[:root] ||= (Rails.root + 'tmp/riak_test_server').to_s
+      super(options)
+    end
+  end
+end

data/lib/ripple/timestamps.rb

@@ -1,16 +1,3 @@
-# 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 'active_support/time'
 require 'active_support/concern'
 

data/lib/ripple/translation.rb

@@ -1,17 +1,3 @@
-# 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 'ripple/i18n'
 require 'riak/util/translation'
 
@@ -25,4 +11,8 @@ module Ripple
       :ripple
     end
   end
+
+  # A dummy object so translations can be accessed without module
+  # inclusion.
+  Translator = Object.new.tap {|o| o.extend Translation }
 end

data/lib/ripple/validations.rb

@@ -1,17 +1,3 @@
-# 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 'active_support/concern'
 require 'active_model/validations'
 require 'ripple/translation'
@@ -64,7 +50,7 @@ module Ripple
       end
 
       # Saves the document and raises {DocumentInvalid} exception if
-      # validations fail. 
+      # validations fail.
       def save!
         (raise Ripple::DocumentInvalid.new(self) unless save) || true
       end

data/lib/ripple/validations/associated_validator.rb

@@ -1,28 +1,37 @@
-# 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.
-#
-# Taken from ActiveRecord::Validations::AssociatedValidators
-#
 require 'active_model/validator'
 
 module Ripple
   module Validations
     class AssociatedValidator < ActiveModel::EachValidator
+      include Translation
       def validate_each(record, attribute, value)
         return if (value.is_a?(Array) ? value : [value]).collect{ |r| r.nil? || r.valid? }.all?
-        record.errors.add(attribute, :invalid, options.merge(:value => value))
+        record.errors.add(attribute, error_message_for(attribute, value))
       end
+
+      private
+
+        def error_message_for(attribute, associated_records)
+          if associated_records.respond_to?(:each_with_index)
+            record_errors = associated_records.enum_for(:each_with_index).collect do |record, index|
+              next unless record.errors.any?
+
+              t("associated_document_error_summary",
+                :doc_type => attribute.to_s.singularize,
+                :doc_id => index + 1,
+                :errors => record.errors.full_messages.to_sentence
+              )
+            end
+            record_errors.compact!
+            record_errors.flatten!
+
+            t("many_association_validation_error",
+              :association_errors => record_errors.join('; '))
+          else
+            t("one_association_validation_error",
+              :association_errors => associated_records.errors.full_messages.to_sentence)
+          end
+        end
     end
 
     module ClassMethods

data/lib/ripple/version.rb

@@ -0,0 +1,3 @@
+module Ripple
+  VERSION = "1.0.0.beta"
+end

data/ripple.gemspec

@@ -1,39 +1,28 @@
-# -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'ripple/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{ripple}
-  s.version = "0.9.5"
+Gem::Specification.new do |gem|
+  # Meta
+  gem.name = "ripple"
+  gem.version = Ripple::VERSION
+  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.email = ["sean@basho.com"]
+  gem.homepage = "http://seancribbs.github.com/ripple"
+  gem.authors = ["Sean Cribbs"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Sean Cribbs}]
-  s.date = %q{2011-06-14}
-  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 = [%q{Gemfile}, %q{lib/rails/generators/ripple/configuration/configuration_generator.rb}, %q{lib/rails/generators/ripple/configuration/templates/ripple.yml}, %q{lib/rails/generators/ripple/js/js_generator.rb}, %q{lib/rails/generators/ripple/js/templates/js/contrib.js}, %q{lib/rails/generators/ripple/js/templates/js/iso8601.js}, %q{lib/rails/generators/ripple/js/templates/js/ripple.js}, %q{lib/rails/generators/ripple/model/model_generator.rb}, %q{lib/rails/generators/ripple/model/templates/model.rb}, %q{lib/rails/generators/ripple/observer/observer_generator.rb}, %q{lib/rails/generators/ripple/observer/templates/observer.rb}, %q{lib/rails/generators/ripple/test/templates/test_server.rb}, %q{lib/rails/generators/ripple/test/test_generator.rb}, %q{lib/rails/generators/ripple_generator.rb}, %q{lib/ripple/associations/embedded.rb}, %q{lib/ripple/associations/instantiators.rb}, %q{lib/ripple/associations/linked.rb}, %q{lib/ripple/associations/many.rb}, %q{lib/ripple/associations/many_embedded_proxy.rb}, %q{lib/ripple/associations/many_linked_proxy.rb}, %q{lib/ripple/associations/one.rb}, %q{lib/ripple/associations/one_embedded_proxy.rb}, %q{lib/ripple/associations/one_linked_proxy.rb}, %q{lib/ripple/associations/proxy.rb}, %q{lib/ripple/associations.rb}, %q{lib/ripple/attribute_methods/dirty.rb}, %q{lib/ripple/attribute_methods/query.rb}, %q{lib/ripple/attribute_methods/read.rb}, %q{lib/ripple/attribute_methods/write.rb}, %q{lib/ripple/attribute_methods.rb}, %q{lib/ripple/callbacks.rb}, %q{lib/ripple/conversion.rb}, %q{lib/ripple/core_ext/casting.rb}, %q{lib/ripple/core_ext.rb}, %q{lib/ripple/document/bucket_access.rb}, %q{lib/ripple/document/finders.rb}, %q{lib/ripple/document/key.rb}, %q{lib/ripple/document/persistence.rb}, %q{lib/ripple/document.rb}, %q{lib/ripple/embedded_document/finders.rb}, %q{lib/ripple/embedded_document/persistence.rb}, %q{lib/ripple/embedded_document.rb}, %q{lib/ripple/i18n.rb}, %q{lib/ripple/inspection.rb}, %q{lib/ripple/locale/en.yml}, %q{lib/ripple/nested_attributes.rb}, %q{lib/ripple/observable.rb}, %q{lib/ripple/properties.rb}, %q{lib/ripple/property_type_mismatch.rb}, %q{lib/ripple/railtie.rb}, %q{lib/ripple/serialization.rb}, %q{lib/ripple/timestamps.rb}, %q{lib/ripple/translation.rb}, %q{lib/ripple/validations/associated_validator.rb}, %q{lib/ripple/validations.rb}, %q{lib/ripple.rb}, %q{Rakefile}, %q{ripple.gemspec}, %q{spec/fixtures/config.yml}, %q{spec/integration/ripple/associations_spec.rb}, %q{spec/integration/ripple/nested_attributes_spec.rb}, %q{spec/integration/ripple/persistence_spec.rb}, %q{spec/ripple/associations/many_embedded_proxy_spec.rb}, %q{spec/ripple/associations/many_linked_proxy_spec.rb}, %q{spec/ripple/associations/one_embedded_proxy_spec.rb}, %q{spec/ripple/associations/one_linked_proxy_spec.rb}, %q{spec/ripple/associations/proxy_spec.rb}, %q{spec/ripple/associations_spec.rb}, %q{spec/ripple/attribute_methods/dirty_spec.rb}, %q{spec/ripple/attribute_methods_spec.rb}, %q{spec/ripple/bucket_access_spec.rb}, %q{spec/ripple/callbacks_spec.rb}, %q{spec/ripple/conversion_spec.rb}, %q{spec/ripple/core_ext_spec.rb}, %q{spec/ripple/document_spec.rb}, %q{spec/ripple/embedded_document/finders_spec.rb}, %q{spec/ripple/embedded_document/persistence_spec.rb}, %q{spec/ripple/embedded_document_spec.rb}, %q{spec/ripple/finders_spec.rb}, %q{spec/ripple/inspection_spec.rb}, %q{spec/ripple/key_spec.rb}, %q{spec/ripple/observable_spec.rb}, %q{spec/ripple/persistence_spec.rb}, %q{spec/ripple/properties_spec.rb}, %q{spec/ripple/ripple_spec.rb}, %q{spec/ripple/serialization_spec.rb}, %q{spec/ripple/timestamps_spec.rb}, %q{spec/ripple/validations/associated_validator_spec.rb}, %q{spec/ripple/validations_spec.rb}, %q{spec/spec_helper.rb}, %q{spec/support/associations/proxies.rb}, %q{spec/support/associations.rb}, %q{spec/support/mocks.rb}, %q{spec/support/models/address.rb}, %q{spec/support/models/box.rb}, %q{spec/support/models/car.rb}, %q{spec/support/models/cardboard_box.rb}, %q{spec/support/models/clock.rb}, %q{spec/support/models/clock_observer.rb}, %q{spec/support/models/company.rb}, %q{spec/support/models/customer.rb}, %q{spec/support/models/driver.rb}, %q{spec/support/models/email.rb}, %q{spec/support/models/engine.rb}, %q{spec/support/models/family.rb}, %q{spec/support/models/favorite.rb}, %q{spec/support/models/invoice.rb}, %q{spec/support/models/late_invoice.rb}, %q{spec/support/models/note.rb}, %q{spec/support/models/page.rb}, %q{spec/support/models/paid_invoice.rb}, %q{spec/support/models/passenger.rb}, %q{spec/support/models/seat.rb}, %q{spec/support/models/tasks.rb}, %q{spec/support/models/tree.rb}, %q{spec/support/models/user.rb}, %q{spec/support/models/wheel.rb}, %q{spec/support/models/widget.rb}, %q{spec/support/models.rb}, %q{spec/support/test_server.rb}, %q{spec/support/test_server.yml.example}]
-  s.homepage = %q{http://seancribbs.github.com/ripple}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{ripple is an object-mapper library for Riak, the distributed database by Basho.}
-  s.test_files = [%q{spec/integration/ripple/associations_spec.rb}, %q{spec/integration/ripple/nested_attributes_spec.rb}, %q{spec/integration/ripple/persistence_spec.rb}, %q{spec/ripple/associations/many_embedded_proxy_spec.rb}, %q{spec/ripple/associations/many_linked_proxy_spec.rb}, %q{spec/ripple/associations/one_embedded_proxy_spec.rb}, %q{spec/ripple/associations/one_linked_proxy_spec.rb}, %q{spec/ripple/associations/proxy_spec.rb}, %q{spec/ripple/associations_spec.rb}, %q{spec/ripple/attribute_methods/dirty_spec.rb}, %q{spec/ripple/attribute_methods_spec.rb}, %q{spec/ripple/bucket_access_spec.rb}, %q{spec/ripple/callbacks_spec.rb}, %q{spec/ripple/conversion_spec.rb}, %q{spec/ripple/core_ext_spec.rb}, %q{spec/ripple/document_spec.rb}, %q{spec/ripple/embedded_document/finders_spec.rb}, %q{spec/ripple/embedded_document/persistence_spec.rb}, %q{spec/ripple/embedded_document_spec.rb}, %q{spec/ripple/finders_spec.rb}, %q{spec/ripple/inspection_spec.rb}, %q{spec/ripple/key_spec.rb}, %q{spec/ripple/observable_spec.rb}, %q{spec/ripple/persistence_spec.rb}, %q{spec/ripple/properties_spec.rb}, %q{spec/ripple/ripple_spec.rb}, %q{spec/ripple/serialization_spec.rb}, %q{spec/ripple/timestamps_spec.rb}, %q{spec/ripple/validations/associated_validator_spec.rb}, %q{spec/ripple/validations_spec.rb}]
+  # Deps
+  gem.add_development_dependency "rspec", "~>2.6.0"
+  gem.add_development_dependency 'rake', '~> 0.8.7'
+  gem.add_dependency "riak-client", "~>#{Ripple::VERSION}"
+  gem.add_dependency "activesupport", [">= 3.0.0", "< 3.2.0"]
+  gem.add_dependency "activemodel", [">= 3.0.0", "< 3.2.0"]
+  gem.add_dependency "tzinfo"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
-      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.5"])
-      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.4.0"])
-      s.add_dependency(%q<riak-client>, ["~> 0.9.5"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
-    s.add_dependency(%q<riak-client>, ["~> 0.9.5"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
-  end
+  # Files
+  ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten
+  gem.files         = (Dir['**/*','.gitignore'] - ignores).reject {|f| !File.file?(f) }
+  gem.test_files    = (Dir['spec/**/*','.gitignore'] - ignores).reject {|f| !File.file?(f) }
+  # gem.executables   = Dir['bin/*'].map { |f| File.basename(f) }
+  gem.require_paths = ['lib']
 end