riak_json 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d41e9a70c0803cf7d5ff1c6b4002866fe6650b22
-  data.tar.gz: 907d211669ba6c4e9f20d83a60d72c0e5ce24170
+  metadata.gz: 4c43742f2dcdd145c402e40cef17e434e0b5ef84
+  data.tar.gz: dafd71d453190ee709687c383c51b31b2eee5d06
 SHA512:
-  metadata.gz: 3152be4a674d854a099b61887d021abf7f657663de4040500dbfdd48b90a20da5d11ade833042a2f107d1f8bcab54978298b381145f474ef9a0cbc8ee0dc09a9
-  data.tar.gz: 3643ab72d5f7b865e7c8405904e5387425f07f89fc4ecc0d683239f339b4c1d7e752c0e69ace4d4004c7e602d0e01fb47b871911d2267e17fa80ddb49df19c40
+  metadata.gz: 57259662f3749b6c6a5bd60d6d53087c65881455c100d6e90100cbc4e7f23b930b7f5e38d58011c4422c55c3b9446cf8cdc94234fd44af0225cbd40eccf97185
+  data.tar.gz: f3ef1c3c668228610fe40571026721208224e0ddf34a8404723ff26372019cc570134d57b98e7ca8d926174c5b8de2620c9becc66ca5b7db6b3277fe22f44058

data/README.md

@@ -5,7 +5,7 @@ For ActiveModel and Rails integration for RiakJson, see the [riagent](https://gi
 
 For a sample Rails 4 application using RiakJson, see [Riak Threaded Forum](https://github.com/dmitrizagidulin/riak-threaded-forum)
 
-See also [](RELEASE_NOTES.md) for a version/feature log.
+See also [RELEASE_NOTES.md](https://github.com/basho-labs/riak_json_ruby_client/blob/master/RELEASE_NOTES.md) for a version/feature log.
 
 ## Installation
 To install from Ruby Gems:
@@ -83,14 +83,15 @@ collection = client.collection("cities")
 #   - text (spaces allowed)
 #   - multi_string (an array of strings, no spaces)
 #   - integer
-#   - geo (Solr 'location'/LatLonType type field)
+#   - location (Solr 'location'/LatLonType type field)
+#   - location_rpt (Solr 'location_rpt'/SpatialRecursivePrefixTreeFieldType type field)
 schema = RiakJson::CollectionSchema.new
 schema.add_text_field(name='city', required=true)
 schema.add_string_field('state', true)
 schema.add_multi_string_field('zip_codes') # required: false 
 schema.add_integer_field('population', false)
 schema.add_string_field('country', true)
-schema.add_geo_field('coordinates')
+schema.add_location_rpt_field('coordinates_rpt')
 
 # Store the schema
 collection.set_schema(schema)
@@ -117,8 +118,8 @@ schema_result = collection.get_schema()
 #      :type => "integer",
 #      :require => false
 #    }, {
-#      :name => "coordinates",
-#      :type => "geo",
+#      :name => "coordinates_rpt",
+#      :type => "location_rpt",
 #      :require => false
 #    }, {
 #      :name => "country",
@@ -168,6 +169,9 @@ collection.insert(doc)
 # Read a document (load by key)
 doc = collection.find_by_key("nyc")
 doc['city']  # => 'New York'
+
+# Retrieve all documents for a collection (paginated)
+collection.all(docs_per_page=100)
 ```
 
 ### Querying RiakJson - find_one() and find_all()

data/RELEASE_NOTES.md

@@ -0,0 +1,19 @@
+# RiakJson Ruby Client Release Notes
+
+## 0.0.4
+Requires RiakJson >= v.0.0.3
+
+* Adds support for [location](https://github.com/basho-labs/riak_json/issues/29) and 
+[location_rpt](https://github.com/basho-labs/riak_json/issues/28) field types.
+* [#3](https://github.com/basho-labs/riak_json_ruby_client/issues/3) Implement ```client.all()``` (List all docs for a 
+collection (paginated))
+* [#6](https://github.com/basho-labs/riak_json_ruby_client/issues/6) Implement ```collection.solr_query_raw(...)``` - perform
+arbitrary Solr queries (used to test geospatial fields)
+
+## 0.0.3
+Requires RiakJson >= v.0.0.2 
+
+* [#5](https://github.com/basho-labs/riak_json_ruby_client/issues/5) Implement ```client.collections()``` List Collections call
+
+## 0.0.2
+Initial implementation

data/lib/riak_json/client.rb

@@ -61,6 +61,11 @@ module RiakJson
       self.collection_cache[name] ||= RiakJson::Collection.new(name, self)
     end
 
+    # Return the name of the Solr index (generated by RiakJson) for a collection
+    def collection_index_name(collection_name)
+      "#{collection_name}RJIndex"
+    end
+    
     # List all of the RiakJson collections on the riak cluster
     # This is different from a Riak 'list buckets' command. 
     # Instead of iterating over all the keys on the cluster, 'list collections'
@@ -145,6 +150,15 @@ module RiakJson
       self.transport.send_request("#{self.base_collection_url}/#{collection_name}/schema", :put, json)
     end
 
+    # Perform an arbitrary raw Solr query to a collection's index
+    # @param [String] collection_name
+    # @param [String] query_params Arbitrary query parameters that will be passed to /solr/collectionRJIndex?... endpoint
+    # @return [String] JSON result from the query
+    def solr_query_raw(collection_name, query_params)
+      url = "#{self.base_riak_url}/search/#{self.collection_index_name(collection_name)}"
+      self.transport.send_request(url, :get, query_params)
+    end
+    
     def update_json_object(collection_name, key, json)
       if key.nil? or key.empty?
         raise Exception, "Error: cannot update document, key missing"

data/lib/riak_json/client_transport.rb

@@ -31,7 +31,7 @@ module RiakJson
       begin
         case http_method
           when :get
-          response = RestClient.get url, {:content_type => :json}
+          response = RestClient.get url, {:content_type => :json, :params => data}
           when :put
             response = RestClient.put url, data, {:content_type => :json, :accept => :json}
           when :post
@@ -41,6 +41,8 @@ module RiakJson
           else
             raise ArgumentError, "Invalid HTTP :method - #{http_method}"
         end
+#      rescue Exception => e
+#        puts e.inspect
       end
       response
     end

data/lib/riak_json/collection.rb

@@ -33,6 +33,16 @@ module RiakJson
       @client = client
     end
     
+    # Return all documents in the collection, paginated
+    # @param [Integer] results_limit Per-page results limit (defaults to 100)
+    def all(results_limit=100)
+      query = {
+        "*" => "*",
+        '$per_page' => results_limit
+      }.to_json
+      self.find_all(query)
+    end
+    
     def delete_raw_json(key)
       self.client.delete_json_object(self.name, key)
     end
@@ -96,6 +106,14 @@ module RiakJson
       self.client.set_schema_json(self.name, schema)
     end
     
+    # Perform an arbitrary raw Solr query to the collection's index
+    # See https://wiki.apache.org/solr/SpatialSearch
+    # @param [String] query_params Arbitrary query parameters that will be passed to /solr/collectionRJIndex?... endpoint
+    # @return [String] JSON result from the query
+    def solr_query_raw(query_params)
+      self.client.solr_query_raw(self.name, query_params)
+    end
+    
     def update(document)
       self.update_raw_json(document.key, document.to_json)
     end

data/lib/riak_json/collection_schema.rb

@@ -34,8 +34,16 @@ module RiakJson
       self.fields << { name: field_name.to_s, type: field_type.to_s, require: required }
     end
     
-    def add_geo_field(field_name, required=false)
-      self.add_field(:geo, field_name, required)
+    # Add a 'location' type field (Solr class solr.LatLonType) to the schema
+    # See https://wiki.apache.org/solr/SpatialSearch
+    def add_location_field(field_name, required=false)
+      self.add_field(:location, field_name, required)
+    end
+    
+    # Add a 'location_rpt' type field (Solr class solr.SpatialRecursivePrefixTreeFieldType) to the schema
+    # See https://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
+    def add_location_rpt_field(field_name, required=false)
+      self.add_field(:location_rpt, field_name, required)
     end
     
     def add_integer_field(field_name, required=false)
@@ -59,7 +67,7 @@ module RiakJson
     end
     
     def self.valid_field_types
-      [:text, :string, :multi_string, :integer, :geo]
+      [:text, :string, :multi_string, :integer, :location, :location_rpt]
     end
   end
 end

data/lib/riak_json/query_result.rb

@@ -46,5 +46,11 @@ module RiakJson
       documents = result_hash.fetch('data', [])
       @documents = documents.map { | body | RiakJson::Document.new(body['_id'], body) }
     end
+    
+    # Return true if no results came back for a query
+    # @return [Boolean]
+    def empty?
+      self.total == 0
+    end
   end
 end

data/lib/riak_json/version.rb

@@ -19,5 +19,5 @@
 ## -------------------------------------------------------------------
 
 module RiakJson
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/integration/client_integration_test.rb

@@ -50,6 +50,7 @@ describe "RiakJson Ruby Client" do
   end
   
   it "can list all collections in the cluster" do
+    # these should be populated by 'rake db:seed'
     result = rj_test_client.collections()
     result.wont_be_empty
     result.first.must_be_kind_of RiakJson::Collection

data/test/integration/collection_integration_test.rb

@@ -24,7 +24,7 @@ describe "a RiakJson Collection" do
   context "uses a RiakJson client to perform CRUD on raw JSON objects" do
     it "inserts a raw json object with a key" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)  # create a new collection object
       test_key = 'document-key-123'
       json_obj = { 'field_one' => '123', 'field_two' => 'abc' }.to_json
@@ -34,7 +34,7 @@ describe "a RiakJson Collection" do
     
     it "updates a raw json object" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)  # create a new collection object
       test_key = 'document-key-update'
       # Insert an object first
@@ -48,7 +48,7 @@ describe "a RiakJson Collection" do
     
     it "deletes a raw json object" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)  # create a new collection object
       test_key = 'document-key-delete'
       # Insert an object first
@@ -66,7 +66,7 @@ describe "a RiakJson Collection" do
   context "uses a RiakJson client to perform CRUD on RiakJson Documents" do
     it "inserts a new document with a key" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)
 
       test_key = 'key-123'
@@ -78,7 +78,7 @@ describe "a RiakJson Collection" do
     
     it "inserts a new document with no key, receives key from RiakJson" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)
 
       test_body = { 'field_one' => 'abc' }
@@ -94,7 +94,7 @@ describe "a RiakJson Collection" do
     
     it "updates an existing document" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)
 
       test_key = 'key-123'
@@ -105,7 +105,7 @@ describe "a RiakJson Collection" do
     
     it "reads an existing document (loads it by key)" do
       client = rj_test_client
-      collection_name = 'ruby_test_collection'
+      collection_name = '_rj-rb-client-test_collection'
       collection = client.collection(collection_name)
 
       # First, insert the document that's to be read
@@ -123,7 +123,7 @@ describe "a RiakJson Collection" do
   context "can set, read and delete schemas" do
     it "can use a raw JSON object to set schema" do
       client = rj_test_client
-      collection = client.collection('cities')
+      collection = client.collection('_rj-rb-client-cities')
 
       schema = [{
            :name => "city",
@@ -153,7 +153,7 @@ describe "a RiakJson Collection" do
     
     it "uses a CollectionSchema object to set schemas" do
       client = rj_test_client
-      collection = client.collection('cities')
+      collection = client.collection('_rj-rb-client-cities')
       
       schema = RiakJson::CollectionSchema.new
       schema.add_text_field(name='city', required=true)
@@ -161,6 +161,8 @@ describe "a RiakJson Collection" do
       schema.add_multi_string_field('zip_codes') # required: false 
       schema.add_integer_field('population', false)
       schema.add_string_field('country', true)
+      schema.add_location_field('capital_coordinates', false)
+      schema.add_location_rpt_field('capital_coordinates_rpt', false)
       
       response = collection.set_schema(schema)
       response.code.must_equal 204
@@ -169,7 +171,7 @@ describe "a RiakJson Collection" do
     it "can delete (unset) a schema for a collection" do
       client = rj_test_client
       # schema created via 'rake db:seed' (See test/seeds/seed.rb)
-      collection = client.collection('cities-delete-schema')
+      collection = client.collection('_rj-rb-client-cities-delete-schema')
       
       # Delete the schema
       response = collection.delete_schema
@@ -181,7 +183,7 @@ describe "a RiakJson Collection" do
   context "performs queries" do
     it "retrieves a single document with find_one()" do
       client = rj_test_client
-      collection = client.collection('cities')
+      collection = client.collection('_rj-rb-client-cities')
       key = "nyc"
       body = { 'city' => "New York", 'state' => "NY", 'country' => "USA" }
       doc = RiakJson::Document.new(key, body)
@@ -193,7 +195,7 @@ describe "a RiakJson Collection" do
     
     it "retrieves many documents with find_all()" do
       client = rj_test_client
-      collection = client.collection('cities')
+      collection = client.collection('_rj-rb-client-cities')
       
       # Populate the cities collection with data
       doc = RiakJson::Document.new(

data/test/integration/geo_search_integration_test.rb

@@ -0,0 +1,52 @@
+## ------------------------------------------------------------------- 
+## 
+## Copyright (c) "2014" 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 'helper'
+
+describe "RiakJson provides geospatial Solr search" do
+  # The '_rj-rb-client-us-capitals' docs were inserted in test/seeds/seeds.rb
+  
+  it "ensure seeding of us capitals worked" do
+    client = rj_test_client
+    collection = client.collection('_rj-rb-client-us-capitals')
+    results = collection.all()
+    results.wont_be_empty
+  end
+  
+  it "can perform arbitrary geo Solr queries" do
+    client = rj_test_client
+    collection = client.collection('_rj-rb-client-us-capitals')
+    spatial_field = 'capital_coords_rpt'
+    location = '41.82355,-71.422132'  # Providence, RI
+    distance = '300' # kilometers
+    filter = true  # exclude results that are outside of the distance?
+    query_params = {
+      :fl => '*,score',  # field list
+      :sort => 'score asc',
+      :q => "{!geofilt score=distance filter=#{filter} sfield=#{spatial_field} pt=#{location} d=#{distance}}",
+      :wt => 'json'
+    }
+    # Get a raw Solr result in JSON format back
+    result = collection.solr_query_raw(query_params)
+    result = JSON.parse(result)
+#    puts JSON.pretty_generate(result)
+    result['response']['numFound'].must_equal 6  # There should be 6 state capitals within 300km of Providence RI
+  end
+end

data/test/seeds/seeds.rb

@@ -26,7 +26,31 @@ port = ENV['RIAK_PORT'] ? ENV['RIAK_PORT'] : RiakJson::RIAK_TEST_PORT
 client = RiakJson::Client.new(host, port)
 
 # Ensure a collection has an existing schema for the Delete Schema test
-collection = client.collection('cities-delete-schema')
+collection = client.collection('_rj-rb-client-cities-delete-schema')
 schema = RiakJson::CollectionSchema.new
 schema.add_text_field(name='city', required=true)
 collection.set_schema(schema)
+
+# Set up the US States/Capitals collection, to test the geo search functionality
+schema = RiakJson::CollectionSchema.new
+schema.add_string_field('abbreviation', required=true)
+schema.add_text_field('name', true)
+schema.add_text_field('capital', true)
+schema.add_location_rpt_field('capital_coords_rpt')
+
+capitals = client.collection('_rj-rb-client-us-capitals')
+capitals.set_schema(schema)
+
+us_capitals_json = File.open('test/seeds/us_capitals.json', 'rb') { |file| file.read }
+us_capitals = JSON.parse(us_capitals_json)
+
+us_capitals.each do | abbrev, state_data |
+  state_json = {
+    :abbreviation => abbrev,
+    :name => state_data['name'],
+    :capital => state_data['capital'],
+    :capital_coords_rpt => "#{state_data['lat']},#{state_data['lon']}"
+  }
+  state_doc = RiakJson::Document.new(abbrev, state_json)
+  capitals.insert(state_doc)
+end

data/test/seeds/us_capitals.json

@@ -0,0 +1,302 @@
+{
+  "AL": {
+    "name": "Alabama",
+    "capital": "Montgomery",
+    "lat": "32.361538",
+    "long": "-86.279118"
+  },
+  "AK": {
+    "name": "Alaska",
+    "capital": "Juneau",
+    "lat": "58.301935",
+    "long": "-134.419740"
+  },
+  "AZ": {
+    "name": "Arizona",
+    "capital": "Phoenix",
+    "lat": "33.448457",
+    "long": "-112.073844"
+  },
+  "AR": {
+    "name": "Arkansas",
+    "capital": "Little Rock",
+    "lat": "34.736009",
+    "long": "-92.331122"
+  },
+  "CA": {
+    "name": "California",
+    "capital": "Sacramento",
+    "lat": "38.555605",
+    "long": "-121.468926"
+  },
+  "CO": {
+    "name": "Colorado",
+    "capital": "Denver",
+    "lat": "39.7391667",
+    "long": "-104.984167"
+  },
+  "CT": {
+    "name": "Connecticut",
+    "capital": "Hartford",
+    "lat": "41.767",
+    "long": "-72.677"
+  },
+  "DE": {
+    "name": "Delaware",
+    "capital": "Dover",
+    "lat": "39.161921",
+    "long": "-75.526755"
+  },
+  "FL": {
+    "name": "Florida",
+    "capital": "Tallahassee",
+    "lat": "30.4518",
+    "long": "-84.27277"
+  },
+  "GA": {
+    "name": "Georgia",
+    "capital": "Atlanta",
+    "lat": "33.76",
+    "long": "-84.39"
+  },
+  "HI": {
+    "name": "Hawaii",
+    "capital": "Honolulu",
+    "lat": "21.30895",
+    "long": "-157.826182"
+  },
+  "ID": {
+    "name": "Idaho",
+    "capital": "Boise",
+    "lat": "43.613739",
+    "long": "-116.237651"
+  },
+  "IL": {
+    "name": "Illinois",
+    "capital": "Springfield",
+    "lat": "39.783250",
+    "long": "-89.650373"
+  },
+  "IN": {
+    "name": "Indiana",
+    "capital": "Indianapolis",
+    "lat": "39.790942",
+    "long": "-86.147685"
+  },
+  "IA": {
+    "name": "Iowa",
+    "capital": "Des Moines",
+    "lat": "41.590939",
+    "long": "-93.620866"
+  },
+  "KS": {
+    "name": "Kansas",
+    "capital": "Topeka",
+    "lat": "39.04",
+    "long": "-95.69"
+  },
+  "KY": {
+    "name": "Kentucky",
+    "capital": "Frankfort",
+    "lat": "38.197274",
+    "long": "-84.86311"
+  },
+  "LA": {
+    "name": "Louisiana",
+    "capital": "Baton Rouge",
+    "lat": "30.45809",
+    "long": "-91.140229"
+  },
+  "ME": {
+    "name": "Maine",
+    "capital": "Augusta",
+    "lat": "44.323535",
+    "long": "-69.765261"
+  },
+  "MD": {
+    "name": "Maryland",
+    "capital": "Annapolis",
+    "lat": "38.972945",
+    "long": "-76.501157"
+  },
+  "MA": {
+    "name": "Massachusetts",
+    "capital": "Boston",
+    "lat": "42.2352",
+    "long": "-71.0275"
+  },
+  "MI": {
+    "name": "Michigan",
+    "capital": "Lansing",
+    "lat": "42.7335",
+    "long": "-84.5467"
+  },
+  "MN": {
+    "name": "Minnesota",
+    "capital": "Saint Paul",
+    "lat": "44.95",
+    "long": "-93.094"
+  },
+  "MS": {
+    "name": "Mississippi",
+    "capital": "Jackson",
+    "lat": "32.320",
+    "long": "-90.207"
+  },
+  "MO": {
+    "name": "Missouri",
+    "capital": "Jefferson City",
+    "lat": "38.572954",
+    "long": "-92.189283"
+  },
+  "MT": {
+    "name": "Montana",
+    "capital": "Helana",
+    "lat": "46.595805",
+    "long": "-112.027031"
+  },
+  "NE": {
+    "name": "Nebraska",
+    "capital": "Lincoln",
+    "lat": "40.809868",
+    "long": "-96.675345"
+  },
+  "NV": {
+    "name": "Nevada",
+    "capital": "Carson City",
+    "lat": "39.160949",
+    "long": "-119.753877"
+  },
+  "NH": {
+    "name": "New Hampshire",
+    "capital": "Concord",
+    "lat": "43.220093",
+    "long": "-71.549127"
+  },
+  "NJ": {
+    "name": "New Jersey",
+    "capital": "Trenton",
+    "lat": "40.221741",
+    "long": "-74.756138"
+  },
+  "NM": {
+    "name": "New Mexico",
+    "capital": "Santa Fe",
+    "lat": "35.667231",
+    "long": "-105.964575"
+  },
+  "NY": {
+    "name": "New York",
+    "capital": "Albany",
+    "lat": "42.659829",
+    "long": "-73.781339"
+  },
+  "NC": {
+    "name": "North Carolina",
+    "capital": "Raleigh",
+    "lat": "35.771",
+    "long": "-78.638"
+  },
+  "ND": {
+    "name": "North Dakota",
+    "capital": "Bismarck",
+    "lat": "48.813343",
+    "long": "-100.779004"
+  },
+  "OH": {
+    "name": "Ohio",
+    "capital": "Columbus",
+    "lat": "39.962245",
+    "long": "-83.000647"
+  },
+  "OK": {
+    "name": "Oklahoma",
+    "capital": "Oklahoma City",
+    "lat": "35.482309",
+    "long": "-97.534994"
+  },
+  "OR": {
+    "name": "Oregon",
+    "capital": "Salem",
+    "lat": "44.931109",
+    "long": "-123.029159"
+  },
+  "PA": {
+    "name": "Pennsylvania",
+    "capital": "Harrisburg",
+    "lat": "40.269789",
+    "long": "-76.875613"
+  },
+  "RI": {
+    "name": "Rhode Island",
+    "capital": "Providence",
+    "lat": "41.82355",
+    "long": "-71.422132"
+  },
+  "SC": {
+    "name": "South Carolina",
+    "capital": "Columbia",
+    "lat": "34.000",
+    "long": "-81.035"
+  },
+  "SD": {
+    "name": "South Dakota",
+    "capital": "Pierre",
+    "lat": "44.367966",
+    "long": "-100.336378"
+  },
+  "TN": {
+    "name": "Tennessee",
+    "capital": "Nashville",
+    "lat": "36.165",
+    "long": "-86.784"
+  },
+  "TX": {
+    "name": "Texas",
+    "capital": "Austin",
+    "lat": "30.266667",
+    "long": "-97.75"
+  },
+  "UT": {
+    "name": "Utah",
+    "capital": "Salt Lake City",
+    "lat": "40.7547",
+    "long": "-111.892622"
+  },
+  "VT": {
+    "name": "Vermont",
+    "capital": "Montpelier",
+    "lat": "44.26639",
+    "long": "-72.57194"
+  },
+  "VA": {
+    "name": "Virginia",
+    "capital": "Richmond",
+    "lat": "37.54",
+    "long": "-77.46"
+  },
+  "WA": {
+    "name": "Washington",
+    "capital": "Olympia",
+    "lat": "47.042418",
+    "long": "-122.893077"
+  },
+  "WV": {
+    "name": "West Virginia",
+    "capital": "Charleston",
+    "lat": "38.349497",
+    "long": "-81.633294"
+  },
+  "WI": {
+    "name": "Wisconsin",
+    "capital": "Madison",
+    "lat": "43.074722",
+    "long": "-89.384444"
+  },
+  "WY": {
+    "name": "Wyoming",
+    "capital": "Cheyenne",
+    "lat": "41.145548",
+    "long": "-104.802042"
+  }
+}

data/test/unit/collection_schema_test.rb

@@ -95,17 +95,31 @@ describe "a RiakJson Collection Schema" do
       schema.fields[0][:require].must_equal false
     end
     
-    it "can add a geo type field to the schema definition" do
+    it "can add a location type field to the schema definition" do
       # schema = [{
       #    :name => "coordinates",
-      #    :type => "geo",
+      #    :type => "location",
       #    :require => false
       # }]
       schema = RiakJson::CollectionSchema.new
-      schema.add_geo_field(name='coordinates', required=false)
+      schema.add_location_field(name='coordinates', required=false)
       schema.fields.count.must_equal 1
       schema.fields[0][:name].must_equal 'coordinates'
-      schema.fields[0][:type].must_equal 'geo'
+      schema.fields[0][:type].must_equal 'location'
+      schema.fields[0][:require].must_equal false
+    end
+    
+    it "can add a location_rpt type field to the schema definition" do
+      # schema = [{
+      #    :name => "coordinates_rpt",
+      #    :type => "location_rpt",
+      #    :require => false
+      # }]
+      schema = RiakJson::CollectionSchema.new
+      schema.add_location_rpt_field(name='coordinates_rpt', required=false)
+      schema.fields.count.must_equal 1
+      schema.fields[0][:name].must_equal 'coordinates_rpt'
+      schema.fields[0][:type].must_equal 'location_rpt'
       schema.fields[0][:require].must_equal false
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak_json
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dmitri Zagidulin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -149,6 +149,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - Rakefile
 - lib/riak_json.rb
 - lib/riak_json/client.rb
@@ -165,7 +166,9 @@ files:
 - test/helper.rb
 - test/integration/client_integration_test.rb
 - test/integration/collection_integration_test.rb
+- test/integration/geo_search_integration_test.rb
 - test/seeds/seeds.rb
+- test/seeds/us_capitals.json
 - test/unit/client_test.rb
 - test/unit/client_transport_test.rb
 - test/unit/collection_schema_test.rb
@@ -202,7 +205,9 @@ test_files:
 - test/helper.rb
 - test/integration/client_integration_test.rb
 - test/integration/collection_integration_test.rb
+- test/integration/geo_search_integration_test.rb
 - test/seeds/seeds.rb
+- test/seeds/us_capitals.json
 - test/unit/client_test.rb
 - test/unit/client_transport_test.rb
 - test/unit/collection_schema_test.rb