riagent 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27288ed232ba0816f1d3801edbb0d254f9afddf3
-  data.tar.gz: 734ec9dcfb6fc9816660d911e0cfd93a348b3e0a
+  metadata.gz: 5d1d7a96d9c29d8889bf4a5dcf4203e8356a7f67
+  data.tar.gz: bec969e749fe0625dc02521c851cf8c5ecbc738d
 SHA512:
-  metadata.gz: dcc0206d55b66b3db10d0ed0fd1131232fd5979bbf61a60d177850198d30a20a8d6b3a658d7c72790bf054cf470e6aeb6d2b57c34d7abbb2d31d1d66fc56ce8e
-  data.tar.gz: e834529f89a4755b803b926055565e1345f8a57c4529973e5e7acef529825e321138662ec65c1f3e64ddc4d76d8c02fd42757e744016d78a771a984037fe8fd8
+  metadata.gz: cd088e4272e939b1a01d9ddc5dfcf656f739c31c22af2af59257e427a62886edd7bdb11fdedeb8758f3275a7a8ff1abd7d6f80fe939af193ab3a3d3135b52912
+  data.tar.gz: 3c051e911034f36d1b546644f6321dbcb05155cb1204ce3e85abb2384953b2247ac34e6e8eb5114714b8afd3d5647c4261d0d9ffb1867a8b986e040f0cf86fe5

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    riagent (0.0.2)
+    riagent (0.0.3)
       activemodel (~> 4.0)
       activesupport (~> 4.0)
-      riagent-document
-      riak-client (~> 2.0.0.rc1)
-      riak_json
+      riagent-document (= 0.0.1)
+      riak-client (~> 2.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.9)
-      activesupport (= 4.0.9)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activesupport (4.0.9)
+    activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -24,44 +23,33 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    beefcake (1.0.0.pre2)
+    beefcake (1.1.0)
     builder (3.1.4)
+    cert_validator (0.0.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    equalizer (0.0.9)
-    i18n (0.6.11)
-    ice_nine (0.11.0)
+    equalizer (0.0.11)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
     innertube (1.0.2)
-    json (1.8.1)
-    mime-types (2.3)
     minitest (4.7.0)
     minitest-spec-context (0.0.3)
-    multi_json (1.10.1)
-    netrc (0.7.7)
-    r509 (0.10.0)
-    r509-cert-validator (0.0.4)
-      r509 (~> 0.10.0)
+    multi_json (1.11.2)
     rake (10.3.2)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     riagent-document (0.0.1)
       activesupport (~> 4.0)
       virtus
-    riak-client (2.0.0.rc1)
-      beefcake (>= 1.0.0.pre1)
+    riak-client (2.2.1)
+      beefcake (~> 1.1)
+      cert_validator (~> 0.0.1)
       i18n (>= 0.4.0)
       innertube (~> 1.0.2)
       multi_json (~> 1.0)
-      r509-cert-validator (~> 0.0.4)
-    riak_json (0.0.4)
-      json
-      rest-client
-    thread_safe (0.3.4)
-    tzinfo (0.3.41)
-    virtus (1.0.3)
+    thread_safe (0.3.5)
+    tzinfo (0.3.44)
+    virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)

data/README.md

@@ -5,16 +5,11 @@ Object Document Mapper for [Riak](http://basho.com/products/riak-kv/)
 Sinatra.
 
 ## Requirements
- - Ruby 1.9+
+ - Ruby 2+
  - [Riak](http://basho.com/products/riak-kv/) version 2.0 or later
- - [RiakJson](https://github.com/basho-labs/riak_json_ruby_client) Ruby Client
-    gem installed locally
- - [riagent-document](https://github.com/dmitrizagidulin/riagent-document) gem
-    installed locally
 
 ## Motivation
 *a.k.a. Why not just use a plain
-[riak_json client](https://github.com/basho-labs/riak_json_ruby_client) or a
 [riak-ruby-client](https://github.com/basho/riak-ruby-client)?*
 
 A Riak client just answers the question "How do I store stuff in Riak?".
@@ -30,7 +25,7 @@ a developer must answer further questions:
 
 Riagent attempts to provide answers to those questions, to encode recommended
 best-practice Riak query patterns, and in general to aid rapid application
-development by working with Riak's strenghts while respecting its limitations.
+development by working with Riak's strengths while respecting its limitations.
 It is intended as a spiritual successor to
 [Ripple](https://github.com/basho-labs/ripple).
 
@@ -69,16 +64,16 @@ Search/Solr integration?
 Riagent provides a set of high-level notations and functionality that allows
 developers create collections and associations on Riak, either via plain K/V
 operations when possible, or via advanced mechanisms such as
-Solr/[RiakJson](https://github.com/basho-labs/riak_json) queries when necessary.
+Solr queries when necessary.
 
 ```ruby
 class User
   include Riagent::ActiveDocument
 
-  collection_type :riak_json  # Persist to a RiakJson::Collection
+  collection_type :riak_kv
 
-  attribute :username, String, search_index: { as: :text }
-  attribute :email, String, search_index: { as: :string }
+  attribute :username, String
+  attribute :email, String
   attribute :language, String, default: 'en'
 
   # Associations
@@ -104,8 +99,6 @@ Riagent and ActiveDocuments are integrated into the usual Rails workflow.
  - Provides ```before_save``` / ```after_save``` type Callback functionality
  - Provides a custom Query capability (to Riak/Solr), for searches, range
     queries, aggregations and more
- - Derives RiakJson/Solr search schemas from annotated document attributes (see
-    Schemas below)
 
 ## Usage
 ### Adding Riagent to a Rails App
@@ -182,70 +175,6 @@ ActiveDocument currently supports ```before_*``` and ```after_*``` [callbacks](h
 for the following events:
 ```[:create, :update, :save, :destroy]```
 
-### Search and Querying
-See the Querying sections of [RJ Ruby Client](https://github.com/basho-labs/riak_json_ruby_client#querying-riakjson---find_one-and-find)
-and [RiakJson itself](https://github.com/basho-labs/riak_json/blob/master/docs/query.md)
-```ruby
-# All matching instances
-us_users = User.where({ country: 'USA' })   # => array of US user instances
-# One instance (the first)
-user = User.find_one({ username: 'HieronymusBosch' })
-```
-
-## Search Schema Definition
-RiakJson uses Solr/Yokozuna to provide indexing and search capability for its
-collections. If you do not specify a collection schema explicitly, RiakJson
-creates one when you insert the first document to that collection (it [infers
-the
-schema](https://github.com/basho-labs/riak_json/blob/master/docs/architecture.md#inferred-schemas)
-based on the basic data types of the field values in the JSON). However, if you
-do not want to use this default schema behavior (for example, because RJ tries
-to index all of the fields), you can define and set a collection schema
-yourself, using RJ Ruby Client's [schema
-administration](https://github.com/basho-labs/riak_json_ruby_client#schema-administration)
-API.
-
-To make the process of schema definition even easier for developers,
-ActiveDocument provides the ```search_index``` attribute option. This annotation
-allows you to specify which document fields you want added to your search
-schema, as well as the Solr field type that will be used to index it.
-
-For example, the following model:
-```ruby
-class User
-  include Riagent::ActiveDocument
-
-  attribute :username, String, required: true, search_index: { :as => :text }
-  attribute :email, String, search_index: { :as => :string }
-  attribute :country, String, default: 'USA'
-end
-```
-will enable you to construct the following schema:
-```ruby
-User.schema   # =>
-#   [{
-#     :name => "username",
-#     :type => "text",
-#     :require => true
-#    }, {
-#     :name => "email",
-#     :type => "string",
-#     :require => false
-#    }
-# ]
-#   # Note that 'country' is not included in this schema, and so will not be indexed.
-```
-
-### Schema Administration
-Note that if you use the ```search_index``` attribute annotations above, you
-will have to explicitly notify RiakJson of your intent to save the schema. You
-will have to call the ```set_schema()``` collection method before you start
-inserting documents (for example, in a ```db:setup``` Rake task).
-
-```ruby
-User.collection.set_schema(User.schema)
-```
-
 ## Testing the Riagent gem
 First, set up the Riak config file for (and make sure it's pointing to a running
 Riak instance)

data/lib/rails/generators/riagent/install/templates/riak.yml

@@ -1,4 +1,4 @@
-# Configure Riak and RiakJson connections for the client, by environment
+# Configure Riak connections for the client, by environment
 development:
   http_port: 8098
   pb_port: 8097   # Protocol Buffer port

data/lib/riagent/active_document.rb

@@ -25,7 +25,6 @@ require 'riagent/document'
 require 'riagent/conversion'
 require 'riagent/persistence'
 require 'riagent/associations'
-require 'riagent/search_schema'
 
 module Riagent
   module ActiveDocument
@@ -45,7 +44,7 @@ module Riagent
     
     module ClassMethods
       # Returns string representation for the collection name
-      # Used to determine the RiakJson::Collection name, or the Riak Bucket name
+      # Used to determine the Riak Bucket name
       # Uses ActiveModel::Naming functionality to derive the name
       def collection_name
         self.model_name.plural

data/lib/riagent/associations.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -37,7 +37,7 @@ module Riagent
       end
       
       # Create a has_many association where the collection will be loaded
-      # via RiakJson Solr queries.
+      # via Solr queries.
       def has_many_using_solr(name, target_class, query_type, options)
         target_getter_method = "#{name}".to_sym
         

data/lib/riagent/configuration.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -20,6 +20,7 @@
 
 require "active_support/concern"
 require "riak"
+require "erb"
 
 module Riagent
   module Configuration
@@ -47,12 +48,6 @@ module Riagent
       env_config
     end
 
-    # @param [Hash] env_config Configuration hash for a given environment
-    def init_riak_json_client(env_config)
-      client = RiakJson::Client.new(env_config['host'], env_config['http_port'])
-      self.riak_json_client = client
-    end
-
     # @param [Hash] env_config Configuration hash for a given environment
     def init_riak_client(env_config)
 #      client = Riak::Client.new host: env_config['host'], pb_port: env_config['pb_port'], protocol: 'pbc'
@@ -67,7 +62,6 @@ module Riagent
     # @param [Symbol] environment
     def init_clients(environment=:development)
       env_config = self.config_for(environment)
-      self.init_riak_json_client(env_config)
       self.init_riak_client(env_config)
     end
     
@@ -91,20 +85,5 @@ module Riagent
     def riak_client=(value)
       Thread.current[:riak_client] = value
     end
-    
-    # @return [RiakJson::Client] The RiakJson client for the current thread.
-    def riak_json_client
-      unless Thread.current[:riak_json_client]
-        # Re-initialize client
-        self.init_riak_json_client(self.config_for(Rails.env))
-      end
-      Thread.current[:riak_json_client]
-    end
-    
-    # Sets the RiakJson client for the current thread.
-    # @param [RiakJson::Client] value the client
-    def riak_json_client=(value)
-      Thread.current[:riak_json_client] = value
-    end
   end
 end

data/lib/riagent/conversion.rb

@@ -44,7 +44,7 @@ module Riagent
       @persisted = true
     end
     
-    # Has this document been saved to RiakJson?
+    # Has this document been saved to Riak?
     # Required by ActiveModel::Conversion API
     # @return [Boolean]
     def persisted?

data/lib/riagent/persistence/persistence_strategy.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin
+## Copyright (c) "2014-2015" Dmitri Zagidulin
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -18,8 +18,6 @@
 ##
 ## -------------------------------------------------------------------
 
-require "riak_json"
-
 module Riagent
   module Persistence
     # Riagent document persistence strategy

data/lib/riagent/persistence/riak_dt_set_strategy.rb

@@ -64,7 +64,7 @@ module Riagent
       
       # Insert a document into the collection.
       # Also inserts the document's key into the key list set.
-      # @param [RiakJson::ActiveDocument] document Document to be inserted
+      # @param [Riagent::ActiveDocument] document Document to be inserted
       # @return [String] Document key
       def insert(document)
         doc_key = super

data/lib/riagent/persistence/riak_kv_strategy.rb

@@ -74,7 +74,7 @@ module Riagent
         active_doc_instance
       end
       
-      # @param [RiakJson::ActiveDocument] document Document to be inserted
+      # @param [Riagent::ActiveDocument] document Document to be inserted
       # @return [String] Document key
       def insert(document)
         if document.key.present?
@@ -98,13 +98,13 @@ module Riagent
       end
       
       # Deletes the riak object that stores the document
-      # @param [RiakJson::ActiveDocument] document Document to be deleted
+      # @param [Riagent::ActiveDocument] document Document to be deleted
       def remove(document)
         self.new_riak_object(document.key).delete
         document.source_object = nil
       end
       
-      # @param [RiakJson::ActiveDocument] document Document to be updated
+      # @param [Riagent::ActiveDocument] document Document to be updated
       # @return [Integer] Document key
       def update(document)
         self.insert(document)

data/lib/riagent/persistence.rb

@@ -21,20 +21,18 @@
 require "active_support/concern"
 require "riagent/persistence/persistence_strategy"
 require "riagent/persistence/riak_dt_set_strategy"
-require "riagent/persistence/riak_json_strategy"
 require "riagent/persistence/riak_no_index_strategy"
 
 module Riagent
-  # Provides a common persistence API for RiakJson Documents.
+  # Provides a common persistence API for Riagent Documents.
   # Most persistence calls are delegated to the Collection class instance,
   # which are implemented in persistence/*_strategy.rb modules.
   module Persistence
     extend ActiveSupport::Concern
     
-    COLLECTION_TYPES = [:riak_json, :riak_kv]
+    COLLECTION_TYPES = [:riak_kv]
     
     # Key Listing strategies for +:riak_kv+ collections 
-    # (the :riak_json collection type uses an implied solr query strategy)
     VALID_KEY_LISTS = [:streaming_list_keys, :riak_dt_set]
     
     included do
@@ -113,7 +111,8 @@ module Riagent
       # <code>
       # class SomeModel
       #   include Riagent::ActiveDocument
-      #   collection_type :riak_json  # persist to a RiakJson::Collection
+      #   collection_type :riak_kv,   # Persist to a Riak::Bucket 
+      #                   list_keys_using: :riak_dt_set  #keep track of keys in a Set CRDT data type
       # end
       # </code>
       def collection_type(coll_type, options={})
@@ -122,8 +121,6 @@ module Riagent
         end
         @collection_type = coll_type
         case @collection_type
-        when :riak_json
-          self.persistence = Riagent::Persistence::RiakJsonStrategy.new(self)
         when :riak_kv
           self.persistence = Riagent::Persistence::RiakKVStrategy.new(self)
           if options.has_key? :list_keys_using

data/lib/riagent/railtie.rb

@@ -19,7 +19,6 @@
 ## -------------------------------------------------------------------
 
 require 'rails/railtie'
-require 'riak_json'
 
 module Riagent
   # Railtie for Rails integration and initialization

data/lib/riagent/version.rb

@@ -19,5 +19,5 @@
 ## -------------------------------------------------------------------
 
 module Riagent
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/riagent.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -38,9 +38,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "riak_json"
-  spec.add_runtime_dependency "riak-client", "~> 2.0.0.rc1"
-  spec.add_runtime_dependency "riagent-document"
+  spec.add_runtime_dependency "riak-client", "~> 2.2"
+  spec.add_runtime_dependency "riagent-document", "0.0.1"
   spec.add_runtime_dependency "activemodel", "~> 4.0"
   spec.add_runtime_dependency "activesupport", "~> 4.0"
 

data/test/config/riak.yml.example

@@ -1,7 +1,7 @@
 # Sample riak.yml config file for running integration tests
 # Be sure to 'cp riak.yml.example riak.yml' before testing
 
-# Configure Riak and RiakJson connections for the client, by environment
+# Configure Riak connections for the client, by environment
 development:
   http_port: 8098
   pb_port: 8087   # Protocol Buffer port

data/test/examples/models/address_book.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -26,7 +26,7 @@ require_relative 'contact'
 class AddressBook
   include Riagent::ActiveDocument
 
-  collection_type :riak_json  # Persist to a RiakJson::Collection
+  collection_type :riak_kv
   
   attribute :contacts, Set[Contact]
 end

data/test/examples/models/blog_post.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -21,11 +21,11 @@
 class BlogPost
   include Riagent::ActiveDocument
   
-  collection_type :riak_json  # Persist to a RiakJson::Collection
+  collection_type :riak_kv
   
   # Explicit attributes
   # key is an implied attribute, present in all ActiveDocument instances
-  attribute :title, String, search_index: { as: :text }
-  attribute :description, String, search_index: { as: :text }
-  attribute :body, String, search_index: { as: :text }
+  attribute :title, String
+  attribute :description, String
+  attribute :body, String
 end

data/test/examples/models/user.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -24,12 +24,12 @@ require_relative 'blog_post'
 class User
   include Riagent::ActiveDocument
   
-  collection_type :riak_json  # Persist to a RiakJson::Collection
+  collection_type :riak_kv
   
   # Explicit attributes
   # key is an implied attribute, present in all ActiveDocument instances
-  attribute :username, String, search_index: { as: :text }
-  attribute :email, String, search_index: { as: :string }, default: ''
+  attribute :username, String
+  attribute :email, String, default: ''
   attribute :language, String, default: 'en'
   
   # Associations

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 ## ------------------------------------------------------------------- 
 ## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
+## Copyright (c) "2014-2015" Dmitri Zagidulin and Basho Technologies, Inc.
 ##
 ## This file is provided to you under the Apache License,
 ## Version 2.0 (the "License"); you may not use this file
@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'minitest-spec-context'
 require 'riagent'
 require 'examples/models/address_book'
+require 'examples/models/blog_post'
 require 'examples/models/category'
 require 'examples/models/contact'
 require 'examples/models/user'

data/test/unit/config_test.rb

@@ -26,17 +26,10 @@ describe "Riagent" do
     Riagent.config.wont_be_empty  # The config file was initialized by test_helper.rb
     Riagent.must_respond_to :load_config_file
     Riagent.must_respond_to :init_clients
-    Riagent.must_respond_to :init_riak_json_client
-    Riagent.must_respond_to :riak_json_client
     Riagent.must_respond_to :init_riak_client
     Riagent.must_respond_to :riak_client
   end
   
-  it "initializes a RiakJson client" do
-    # This should have been initialized from config file in test_helper.rb
-    Riagent.riak_json_client.must_be_kind_of RiakJson::Client
-  end
-  
   it "initializes a Riak ruby client" do
     # This should have been initialized from config file in test_helper.rb
     Riagent.riak_client.must_be_kind_of Riak::Client

data/test/unit/persistence_test.rb

@@ -25,29 +25,13 @@ describe "a Riagent::ActiveDocument has Persistence options" do
     lambda { User.collection_type :invalid }.must_raise ArgumentError
   end
 
-  it "#:riak_json collection_type" do
-    # Adding the line +collection_type :riak_json+ to a model
-    # means that it will be persisted to a RiakJson::Collection
-    User.get_collection_type.must_equal :riak_json
-    User.persistence.must_be_kind_of Riagent::Persistence::RiakJsonStrategy
-
-    # It also grants access to a RiakJson::Client instance, to the model class
-    User.persistence.client.must_be_kind_of RiakJson::Client
-
-    User.persistence.collection.must_be_kind_of RiakJson::Collection
-    User.persistence.collection_name.must_equal 'users'
-
-    # Check to see if the RiakJson persistence strategy supports querying
-    assert User.persistence.allows_query?
-  end
-
   it "#:riak_kv collection type" do
     # Adding the line +collection_type :riak_kv+ to a model
     # means that it will be persisted as a Riak object with no indices (k/v operations only)
     UserPreference.get_collection_type.must_equal :riak_kv
     UserPreference.persistence.class.must_equal Riagent::Persistence::RiakKVStrategy
 
-    # It also grants access to a RiakJson::Client instance, to the model class
+    # It also grants access to a Riak::Client instance, to the model class
     UserPreference.persistence.client.must_be_kind_of Riak::Client
 
     UserPreference.persistence.collection_name.must_equal 'user_preferences'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riagent
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitri Zagidulin
@@ -10,48 +10,34 @@ bindir: bin
 cert_chain: []
 date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: riak_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: riak-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: riagent-document
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -161,11 +147,9 @@ files:
 - lib/riagent/persistence.rb
 - lib/riagent/persistence/persistence_strategy.rb
 - lib/riagent/persistence/riak_dt_set_strategy.rb
-- lib/riagent/persistence/riak_json_strategy.rb
 - lib/riagent/persistence/riak_kv_strategy.rb
 - lib/riagent/persistence/riak_no_index_strategy.rb
 - lib/riagent/railtie.rb
-- lib/riagent/search_schema.rb
 - lib/riagent/version.rb
 - riagent.gemspec
 - test/config/riak.yml.example
@@ -176,7 +160,6 @@ files:
 - test/examples/models/user.rb
 - test/examples/models/user_preference.rb
 - test/integration/persistence_riak_dt_set_integration_test.rb
-- test/integration/persistence_riak_json_integration_test.rb
 - test/integration/persistence_riak_kv_integration_test.rb
 - test/seeds.rb
 - test/test_helper.rb
@@ -187,11 +170,9 @@ files:
 - test/unit/config_test.rb
 - test/unit/embedded_test.rb
 - test/unit/persistence_riak_dt_set_test.rb
-- test/unit/persistence_riak_json_test.rb
 - test/unit/persistence_riak_kv_test.rb
 - test/unit/persistence_riak_no_index_test.rb
 - test/unit/persistence_test.rb
-- test/unit/search_schema_test.rb
 - test/unit/validation_test.rb
 homepage: https://github.com/dmitrizagidulin/riagent
 licenses:
@@ -226,7 +207,6 @@ test_files:
 - test/examples/models/user.rb
 - test/examples/models/user_preference.rb
 - test/integration/persistence_riak_dt_set_integration_test.rb
-- test/integration/persistence_riak_json_integration_test.rb
 - test/integration/persistence_riak_kv_integration_test.rb
 - test/seeds.rb
 - test/test_helper.rb
@@ -237,9 +217,7 @@ test_files:
 - test/unit/config_test.rb
 - test/unit/embedded_test.rb
 - test/unit/persistence_riak_dt_set_test.rb
-- test/unit/persistence_riak_json_test.rb
 - test/unit/persistence_riak_kv_test.rb
 - test/unit/persistence_riak_no_index_test.rb
 - test/unit/persistence_test.rb
-- test/unit/search_schema_test.rb
 - test/unit/validation_test.rb

data/lib/riagent/persistence/riak_json_strategy.rb

@@ -1,121 +0,0 @@
-## -------------------------------------------------------------------
-##
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
-##
-## 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.
-##
-## -------------------------------------------------------------------
-
-require "riak_json"
-require "riagent/persistence/persistence_strategy"
-
-module Riagent
-  module Persistence
-    class RiakJsonStrategy < PersistenceStrategy
-      attr_writer :collection
-      
-      # Return all the documents in the collection
-      # @param [Integer] results_limit Number of results returned
-      # @return [Array|nil] of ActiveDocument instances
-      def all(results_limit=1000)
-        result = self.collection.all(results_limit)
-        if result.present?
-          result.documents.map do |doc| 
-            self.from_rj_document(doc, persisted=true)
-          end
-        end
-      end
-      
-      # @return [Boolean] Does this persistence strategy support querying?
-      def allows_query?
-        true
-      end
-      
-      # @return [RiakJson::Client] RiakJson client for this persistence strategy (lazy initialize)
-      def client
-        @client ||= Riagent.riak_json_client  # See lib/configuration.rb
-      end
-
-      # @return [RiakJson::Collection] instance for this persistence strategy (lazy initialize)
-      def collection
-        @collection ||= self.client.collection(self.collection_name)
-      end
-
-      # Fetch a document by key.
-      # @param [String] key
-      # @return [ActiveDocument|nil]
-      def find(key)
-        return nil if key.nil? or key.empty?
-        doc = self.collection.find_by_key(key)
-        self.from_rj_document(doc, persisted=true)
-      end
-      
-      # Return the first document that matches the query
-      # @param [String] query RiakJson query, in JSON string form
-      def find_one(query)
-        if query.kind_of? Hash
-          query = query.to_json
-        end
-        doc = self.collection.find_one(query)
-        if doc.present?
-          self.from_rj_document(doc, persisted=true) 
-        end
-      end
-      
-      # Converts from a RiakJson::Document instance to an instance of ActiveDocument
-      # @return [ActiveDocument|nil] ActiveDocument instance, or nil if the Document is nil
-      def from_rj_document(doc, persisted=false)
-        return nil if doc.nil?
-        active_doc_instance = self.model_class.instantiate(doc.attributes)
-        active_doc_instance.key = doc.key
-        if persisted
-          active_doc_instance.persist!  # Mark as persisted / not new
-        end
-        active_doc_instance
-      end
-      
-      # @param [RiakJson::ActiveDocument] doc Document to be inserted
-      # @return [Integer] Document key
-      def insert(doc)
-        self.collection.insert(doc)
-      end
-
-      # @param [RiakJson::ActiveDocument] doc Document to be deleted
-      def remove(doc)
-        self.collection.remove(doc)
-      end
-
-      # @param [RiakJson::ActiveDocument] doc Document to be updated
-      # @return [Integer] Document key
-      def update(doc)
-        self.collection.update(doc)
-      end
-      
-      # Return all documents that match the query
-      # @param [String] query RiakJson query, in JSON string form
-      def where(query)
-        if query.kind_of? Hash
-          query = query.to_json
-        end
-        result = self.collection.find_all(query)
-        if result.present?
-          result.documents.map do |doc| 
-            self.from_rj_document(doc, persisted=true)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/riagent/search_schema.rb

@@ -1,58 +0,0 @@
-## ------------------------------------------------------------------- 
-## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
-##
-## 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.
-##
-## -------------------------------------------------------------------
-
-module Riagent
-  # Generates RiakJson::CollectionSchema objects (translated into Solr schemas by RiakJson)
-  # from annotated document attributes.
-  # Usage:
-  # <code>
-  #   class SampleModel
-  #     include Riagent::ActiveDocument
-  #     collection_type :riak_json
-  #     attribute :name, required: true, search_index: { as: :text }
-  #   end
-  #   puts SampleModel.schema.inspect
-  #   # => <RiakJson::CollectionSchema:0x000001050eef10 @fields=[{:name=>"name", :type=>"text", :require=>true}]>
-  #
-  #   SampleModel.save_solr_schema()  # sets that schema for the collection
-  # </code>
-  module SearchSchema
-    # Returns a CollectionSchema instance, derived from the document attributes
-    def schema
-      schema = RiakJson::CollectionSchema.new
-      self.attribute_set.each do | attribute |
-        if attribute.options.include? :search_index
-          field_type = attribute.options[:search_index][:as]
-          schema.add_field(field_type, attribute.options[:name], attribute.options[:required])
-        end
-      end
-      schema
-    end
-    
-    # Saves the generated Solr indexing schema to RiakJson.
-    # Usage:
-    # <code>
-    #   SampleModel.save_solr_schema()
-    # </code>
-    def save_solr_schema
-      self.persistence.collection.set_schema(self.schema)
-    end
-  end
-end

data/test/integration/persistence_riak_json_integration_test.rb

@@ -1,76 +0,0 @@
-## ------------------------------------------------------------------- 
-## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
-##
-## 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.
-##
-## -------------------------------------------------------------------
-
-require 'test_helper'
-
-TEST_USERNAME = 'earl'
-TEST_USERNAME_2 = 'count'
-
-def test_user(test_key='earl-123')
-  user = User.new username: TEST_USERNAME, email: 'earl@desandwich.com'
-  user.key = test_key
-  user
-end
-
-describe "a Riagent::ActiveDocument's Persistence Layer" do  
-  it "can save a document and generate a key" do
-    user = User.new username: TEST_USERNAME
-    generated_key = user.save
-    
-    generated_key.wont_be_nil "Key not generated from document.save"
-    generated_key.wont_be_empty "Key not generated from document.save"
-    generated_key.must_be_kind_of String
-    user.key.must_equal generated_key
-    
-    refute user.new_record?, "Document should not be marked as new after saving"
-    assert user.persisted?, "Document should be marked as persisted after saving"
-    
-    # Clean up
-    user.destroy
-  end
-  
-  it "can read, update and delete a document" do
-    test_key = 'george-123'
-    new_user = User.new username: 'george', email: 'george@washington.com'
-    new_user.key = test_key
-    new_user.save
-    
-    found_user = User.find(test_key) # Load User by key
-    found_user.must_be_kind_of User
-    found_user.key.must_equal test_key
-    refute found_user.new_record?, "A loaded by key user object is not new"
-    assert found_user.persisted?, "A loaded by key user object should be markes as persisted"
-    
-    new_attributes = {username: 'henry', email: 'henry@gmail.com' }
-    found_user.update(new_attributes)  # Also saves
-    
-    updated_user = User.find(test_key)
-    updated_user.username.must_equal 'henry'
-    
-    found_user.destroy
-    assert found_user.destroyed?
-  end
-  
-  it "returns an empty array for queries that return no results" do
-    query = { username: 'nonexistent' }
-    result = User.where(query)
-    result.must_be_empty
-  end
-end

data/test/unit/persistence_riak_json_test.rb

@@ -1,141 +0,0 @@
-## ------------------------------------------------------------------- 
-## 
-## Copyright (c) "2014" Dmitri Zagidulin and Basho Technologies, Inc.
-##
-## 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.
-##
-## -------------------------------------------------------------------
-
-require 'test_helper'
-
-describe "a Riagent::ActiveDocument that persists to RiakJson" do
-  it "#model persistence instance methods" do
-    user = User.new
-    
-    # Adding the line +collection_type :riak_json+ to a model 
-    # exposes the usual array of persistence methods
-    user.must_respond_to :save
-    user.must_respond_to :save!
-    user.must_respond_to :update
-    user.must_respond_to :update_attributes  # alias for update()
-    user.must_respond_to :update!
-    user.must_respond_to :destroy
-  end
-  
-  it "#model persistence class methods" do
-    User.must_respond_to :all
-    User.must_respond_to :find
-    User.must_respond_to :find_one
-    User.must_respond_to :where
-  end
-  
-  it "saves via collection.insert()" do
-    user = User.new
-    User.persistence.collection = MiniTest::Mock.new
-    User.persistence.collection.expect :insert, nil, [user]
-    
-    # Calling model.save() should result in a collection.insert() call
-    user.save({:validate => false})
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-
-  it "updates via collection.update()" do
-    user = User.new username: 'TestUserInitial'
-    user.persist!  # Updates only make sense for a persisted document
-    User.persistence.collection = MiniTest::Mock.new
-    User.persistence.collection.expect :update, nil, [user]
-    
-    # model.update() is implemented as a save() call (with updated attributes)
-    user.update({ username: 'TestUserNewName'} )
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-  
-  it "destroys via collection.remove()" do
-    user = User.new
-    user.key = 'user123'
-    user.persist!  # Remove can only be called on persisted objects that have a key
-    User.persistence.collection = MiniTest::Mock.new
-    User.persistence.collection.expect :remove, nil, [user]
-    
-    # Calling model.destroy() should result in a collection.remove() call
-    user.destroy
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-  
-  it "returns nil when doing a find() for nil or empty key" do
-    User.find(nil).must_be_nil
-    User.find('').must_be_nil
-  end
-  
-  it "performs a find() via collection.find_by_key()" do
-    test_key = 'user123'
-    User.persistence.collection = MiniTest::Mock.new
-    User.persistence.collection.expect :find_by_key, nil, [test_key]
-    
-    # Calling Model class find() should result in a collection.find_by_key()
-    User.find(test_key)
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-  
-  it "performs an all() listing via collection.all()" do
-    User.persistence.collection = MiniTest::Mock.new
-    User.persistence.collection.expect :all, [], [1000]  # default results limit of 1000
-    
-    # Calling Model class where() should result in a collection.all()
-    User.all()
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-  
-  it "performs a where() via collection.find_all()" do
-    User.persistence.collection = MiniTest::Mock.new
-    query = { country: 'USA' }
-    User.persistence.collection.expect :find_all, [], [query.to_json]
-    
-    # Calling Model class where() should result in a collection.find_all()
-    User.where(query)
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-  
-  it "performs a find_one() via collection.find_one()" do
-    User.persistence.collection = MiniTest::Mock.new
-    query = { username: 'TestUser' }
-    User.persistence.collection.expect :find_one, [], [query.to_json]
-    
-    # Calling Model class find_one() should result in a collection.find_one()
-    User.find_one(query)
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-end

data/test/unit/search_schema_test.rb

@@ -1,29 +0,0 @@
-require 'test_helper'
-
-describe "an Active Document" do
-  it "can build a RiakJson schema from the annotated attributes" do
-    schema = User.schema
-    schema.must_be_kind_of RiakJson::CollectionSchema
-    schema.fields.wont_be_empty
-    schema.fields.count.must_equal 2
-    schema.fields[0][:name].to_s.must_equal 'username'
-    schema.fields[0][:type].must_equal 'text'
-    schema.fields[0][:require].must_equal true
-    schema.fields[1][:name].to_s.must_equal 'email'
-    schema.fields[1][:type].must_equal 'string'
-    schema.fields[1][:require].must_equal true
-  end
-  
-  it "can save the Solr indexing schema to RiakJson" do
-    schema = User.schema
-    User.persistence.collection = MiniTest::Mock.new
-
-    # Ensure that calling User.save_solr_schema() results in a call to collection.set_schema()
-    User.persistence.collection.expect :set_schema, nil, [RiakJson::CollectionSchema]
-    User.save_solr_schema
-    User.persistence.collection.verify
-    
-    # Reset
-    User.persistence.collection = nil
-  end
-end