risky 1.0.1 → 1.1.0

data/spec/spec_helper.rb

@@ -0,0 +1,40 @@
+require 'risky'
+
+# Choose protocol/backend for riak connection
+# Risky.riak = Riak::Client.new(:host => '127.0.0.1')
+# Risky.riak = Riak::Client.new(:host => '127.0.0.1', :http_backend => :Excon)
+Risky.riak = Riak::Client.new(:host => '127.0.0.1', :protocol => 'pbc')
+
+Riak.disable_list_keys_warnings = true
+
+def sort(ary)
+  ary.sort { |a,b| ( a && b ) ? a <=> b : ( a ? 1 : -1 ) }
+end
+
+def conflict(klass, field, values)
+  key = rand(100000).to_s
+  object = klass.new(key).save
+
+  # Create conflicting versions
+  values.each_with_index.map do |value, i|
+    klass.riak.client_id = i + 1
+    [klass[key], value]
+  end.each_with_index do |pair, i|
+    o, value = pair
+    klass.riak.client_id = i + 1
+    o[field] = value
+    o.save
+  end
+
+  ro = klass.bucket[key]
+  ro.conflict?.should be_true
+  begin
+    sort(ro.siblings.map { |s| s.data[field] }).should == sort(values)
+  rescue ArgumentError
+    ro.siblings.map { |s| s.data[field] }.to_set.should == values.to_set
+  end
+
+  # Get all conflicts
+  klass[key, {:r => :all}]
+end
+

metadata

@@ -1,67 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: risky
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &4647040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *4647040
-description: 
-email: aphyr@aphyr.com
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A lightweight Ruby ORM for Riak.
+email:
+- aphyr@aphyr.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/risky/all.rb
+- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.markdown
+- Rakefile.rb
+- lib/risky.rb
+- lib/risky/cron_list.rb
+- lib/risky/gzip.rb
+- lib/risky/indexes.rb
+- lib/risky/inflector.rb
 - lib/risky/invalid.rb
+- lib/risky/list_keys.rb
 - lib/risky/not_found.rb
+- lib/risky/paginated_collection.rb
 - lib/risky/resolver.rb
-- lib/risky/threadsafe.rb
-- lib/risky/version.rb
+- lib/risky/secondary_indexes.rb
 - lib/risky/timestamps.rb
-- lib/risky/indexes.rb
-- lib/risky/cron_list.rb
-- lib/risky.rb
-- LICENSE
-- README.markdown
+- lib/risky/version.rb
+- risky.gemspec
+- spec/risky/cron_list_spec.rb
+- spec/risky/crud_spec.rb
+- spec/risky/enumerable_spec.rb
+- spec/risky/gzip_spec.rb
+- spec/risky/indexes_spec.rb
+- spec/risky/resolver_spec.rb
+- spec/risky/secondary_indexes_spec.rb
+- spec/risky/threads_spec.rb
+- spec/risky_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/aphyr/risky
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: risky
-rubygems_version: 1.8.10
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby ORM for the Riak distributed database.
-test_files: []
+test_files:
+- spec/risky/cron_list_spec.rb
+- spec/risky/crud_spec.rb
+- spec/risky/enumerable_spec.rb
+- spec/risky/gzip_spec.rb
+- spec/risky/indexes_spec.rb
+- spec/risky/resolver_spec.rb
+- spec/risky/secondary_indexes_spec.rb
+- spec/risky/threads_spec.rb
+- spec/risky_spec.rb
+- spec/spec_helper.rb

data/lib/risky/all.rb

@@ -1,4 +0,0 @@
-require 'risky/cron_list'
-require 'risky/indexes'
-require 'risky/resolver'
-require 'risky/timestamps'

data/lib/risky/threadsafe.rb

@@ -1,42 +0,0 @@
-# Autoload is broken with threading.
-Riak::Bucket
-Riak::Client
-Riak::Link
-Riak::WalkSpec
-Riak::RObject
-
-Riak::FailedRequest
-Riak::MapReduceError
-
-Riak::Util::Escape
-Riak::Util::Headers
-Riak::Util::Multipart
-Riak::Util::Translation
-
-Riak::Client::HTTPBackend
-Riak::Client::HTTPBackend::RequestHeaders
-Riak::Client::HTTPBackend::TransportMethods
-Riak::Client::HTTPBackend::ObjectMethods
-Riak::Client::HTTPBackend::Configuration
-
-Riak::Client::NetHTTPBackend
-
-Riak::MapReduce
-Riak::MapReduce::Phase
-
-I18n::ArgumentError
-I18n::Backend
-I18n::Backend::Base
-I18n::Backend::Simple
-I18n::Config
-I18n::ExceptionHandler
-I18n::Gettext
-I18n::InvalidLocale
-I18n::InvalidLocaleData
-I18n::InvalidPluralizationData
-I18n::Locale
-I18n::MissingInterpolationArgument
-I18n::MissingTranslationData
-I18n::ReservedInterpolationKey
-I18n::Tests
-I18n::UnknownFileType