rhoconnect-rb 0.3.1 → 0.3.2

data/.travis.yml

@@ -0,0 +1,10 @@
+script: "bundle exec rake spec"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+notifications:
+  email:
+    on_success: always
+    on_failure: always

data/Gemfile

@@ -6,6 +6,6 @@ gem 'rails', '>= 3.0'
 
 group :test do
   gem 'rspec', '~>2.5.0', :require => 'spec'
-  gem 'rcov', '~>0.9.8'
+  gem 'rcov', '~>0.9.8', :platforms => [:ruby_18]
   gem 'webmock'
 end

data/README.md

@@ -1,9 +1,9 @@
-rhoconnect-rb
+rhoconnect-rb ![Build Status](https://secure.travis-ci.org/rhomobile/rhoconnect-rb.png)
 ===
 
-A ruby library for the [Rhoconnect](http://rhomobile.com/products/rhosync) App Integration Server.
+A ruby library for the [RhoConnect](http://rhomobile.com/products/rhoconnect) App Integration Server.
 
-Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhosync/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
+Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [RhoConnect clients](http://rhomobile.com/products/rhoconnect/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
 
 ## Getting started
 
@@ -13,7 +13,7 @@ Load the `rhoconnect-rb` library:
 
 Note, if you are using datamapper, install the `dm-serializer` library and require it in your application.  `rhoconnect-rb` depends on this utility to interact with Rhoconnect applications using JSON.
 	
-## Usage
+## Setup the Model
 Now include Rhoconnect::Resource in a model that you want to synchronize with your mobile application:
 
 	class Product < ActiveRecord::Base
@@ -27,7 +27,7 @@ Or, if you are using DataMapper:
 	  include Rhoconnect::Resource
 	end
 
-### Partitioning Datasets
+## Partitioning Datasets
 	
 Next, your models will need to declare a partition key for `rhoconnect-rb`.  This partition key is used by `rhoconnect-rb` to uniquely identify the model dataset when it is stored in a rhoconnect instance.  It is typically an attribute on the model or related model.  `rhoconnect-rb` supports two types of partitions:
 
@@ -52,9 +52,9 @@ Now all of the `Product` data synchronized by rhoconnect will organized by `self
 	  :app
 	end
 	
-For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhosync/source-adapters#data-partitioning).
+For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhoconnect/source-adapters#data-partitioning).
 
-### Querying Datasets
+## Querying Datasets
 
 `rhoconnect-rb` installs a `/rhoconnect/query` route in your application which the Rhoconnect instance invokes to query the dataset for the dataset you want to synchronize.  This route is mapped to a `rhoconnect_query` method in your model.  This method should return a collection of objects:
 
@@ -67,25 +67,24 @@ For more information about Rhoconnect partitions, please refer to the [Rhoconnec
 		lambda { self.user.username }
 	  end
 	
-	  def self.rhoconnect_query(partition)
-	    Product.includes(:user).where("users.username = ?",partition)
+	  def self.rhoconnect_query(partition, attributes = nil)
+	    Product.includes(:user).where("users.username = ?", partition)
 	  end
 	end
 
 In this example, `self.rhoconnect_query` returns a list of products where the partition string (provided by the rhoconnect instance) matches the `user_id` field in the products table.  
 
-### Configuration and Authentication
+## Configuration and Authentication
 
-Configure Rhoconnect in an initializer like `config/initializers/rhoconnect.rb` (for Rails), or directly in your application (i.e. Sinatra).  Here you will setup the rhoconnect uri (the location of your rhoconnect instance), and app\_endpoint (the location of your ruby app):
+### Running RhoConnect Manually
 
+Configure RhoConnect in an initializer like `config/initializers/rhoconnect.rb` (for Rails), or directly in your application (i.e. Sinatra).  Here you will setup the rhoconnect uri (the location of your RhoConnect instance), the api\_token (see [rhoconnect:get_token](http://docs.rhomobile.com/rhoconnect/command-line#rake-tasks) rake task), and app\_endpoint (the location of your ruby app):
 
-	# Use rhoconnect:get_token to get the token value.
-	
 	config.uri   = "http://myrhoconnect.com"
 	config.token = "secrettoken"
 	config.app_endpoint = "http://myapp.heroku.com"
 	
-If `app_endpoint` is defined, your Rhoconnect instance will be configured to query data from the endpoint using the rhoconnect_query method in your model.  For example, if your `app_endpoint` is defined as "http://myapp.heroku.com", Rhoconnect will query data with:
+If `app_endpoint` is defined, your Rhoconnect instance will be configured to query data from the endpoint using the rhoconnect_query method in your model.  For example, if your `app_endpoint` is defined as "http://myapp.heroku.com", RhoConnect will query data with:
 
 	POST http://myapp.heroku.com/rhoconnect/query
 
@@ -109,6 +108,16 @@ Example with authentication:
 	  }
 	end
 	
+### Using the [RhoConnect Heroku Addon](http://docs.rhomobile.com/rhoconnect/heroku-addon)
+
+If you're using the [RhoConnect Heroku Addon](http://docs.rhomobile.com/rhoconnect/heroku-addon), then you can omit the config.uri and config.token (they are managed for you):
+
+	Rhoconnect.configure do |config|
+	  config.authenticate = lambda { |credentials| 
+	    User.authenticate(credentials[:login], credentials[:password]) 
+	  }
+	end
+		
 
 ## Meta
 Created and maintained by Lucas Campbell-Rossen, Vladimir Tarasov and Lars Burgess.

data/Rakefile

@@ -14,8 +14,8 @@ end
 desc "Run all specs with rcov"
 RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov = true
-  t.rspec_opts = ["-b", "-c", "-fd"]
   t.rcov_opts =  ['--exclude', 'spec/*,gems/*']
+  t.rspec_opts = ["-b", "-c", "-fd"]
 end
 
 task :default => :spec

data/lib/rhoconnect/client.rb

@@ -61,9 +61,8 @@ module Rhoconnect
     def send_objects(action, source_name, partition, obj = {}) # :nodoc:
       validate_args(source_name, partition, obj)
       
-      process(:post, "/api/source/#{action}",
+      process(:post, "/app/v1/#{source_name}/#{action}",
         {
-          :source_id => source_name,
           :user_id => partition,
           :objects => action == :push_deletes ? [obj['id'].to_s] : { obj['id'] => obj }
         }
@@ -77,8 +76,8 @@ module Rhoconnect
     def process(method, path, payload = nil) # :nodoc:
       headers = api_headers
       unless method == :get
-        payload  = payload.merge!(:api_token => @token).to_json
-        headers = api_headers.merge(:content_type => 'application/json')
+        payload  = payload.to_json
+        headers = api_headers.merge(:content_type => 'application/json', 'X-RhoConnect-API-TOKEN' => @token)
       end
       args     = [method, payload, headers].compact
       response = resource(path).send(*args)

data/lib/rhoconnect/configuration.rb

@@ -42,9 +42,9 @@ module Rhoconnect
       uri      = uri.to_s
     end
     token ||= ENV['token'] || self.configuration.token
-    Rhoconnect::Client.set_app_endpoint(:url => uri + "/api/source/save_adapter", 
-      :payload => {:attributes => {:adapter_url => endpoint_url}, :api_token => token}.to_json,
-      :headers => {:content_type => 'application/json'}
+    Rhoconnect::Client.set_app_endpoint(:url => uri + "/rc/v1/system/appserver", 
+      :payload => {:adapter_url => endpoint_url}.to_json,
+      :headers => {:content_type => 'application/json', 'X-RhoConnect-API-TOKEN' => token}
     ) if endpoint_url && uri && token
   end
 end

data/lib/rhoconnect/endpoints.rb

@@ -15,7 +15,7 @@ module Rhoconnect
       action, c_type, result, records = :rhoconnect_query, 'application/json', {}, []
       # Call resource rhoconnect_query class method
       code, error = get_rhoconnect_resource(params['resource'], action) do |klass|
-        records = klass.send(action, params['partition'])
+        records = klass.send(action, params['partition'], params['attributes'])
       end
       if code == 200
         # Serialize records into hash of hashes

data/lib/rhoconnect/resource.rb

@@ -57,7 +57,7 @@ module Rhoconnect
         call_client_method(:update)
       end
       
-      def rhoconnect_query(partition)
+      def rhoconnect_query(partition, attributes = nil)
         #return all objects for this partition 
       end
       

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/client_spec.rb

@@ -58,7 +58,7 @@ describe Rhoconnect::Client do
     end
     
     it "should create an object" do
-      stub_request(:post, "http://test.rhoconnect.com/api/source/push_objects").with(
+      stub_request(:post, "http://test.rhoconnect.com/app/v1/Person/push_objects").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.create("Person", "user1", 
@@ -72,7 +72,7 @@ describe Rhoconnect::Client do
     end
     
     it "should update an object" do
-      stub_request(:post, "http://test.rhoconnect.com/api/source/push_objects").with(
+      stub_request(:post, "http://test.rhoconnect.com/app/v1/Person/push_objects").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.update("Person", "user1", 
@@ -86,7 +86,7 @@ describe Rhoconnect::Client do
     end
     
     it "should destroy an object" do
-      stub_request(:post, "http://test.rhoconnect.com/api/source/push_deletes").with(
+      stub_request(:post, "http://test.rhoconnect.com/app/v1/Person/push_deletes").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.destroy("Person", "user1", 

data/spec/endpoints_spec.rb

@@ -11,7 +11,7 @@ describe Rhoconnect::EndpointHelpers do
   # Query stub class
   class Product < ActiveRecord::Base
     include Rhoconnect::Resource
-    def self.rhoconnect_query(partition)
+    def self.rhoconnect_query(partition, attributes = nil)
       [self.new]
     end
   end

metadata

@@ -1,67 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhoconnect-rb
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
-  requirement: *id001
   type: :runtime
   prerelease: false
-  name: rest-client
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
-  requirement: *id002
   type: :runtime
   prerelease: false
-  name: json
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 description: Rhoconnect rails plugin
-email: 
+email:
 - support@rhomobile.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -83,38 +75,32 @@ files:
 - templates/rhoconnect.rb
 homepage: http://rhomobile.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2309536265588466998
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rhoconnect rails plugin
-test_files: 
+test_files:
 - spec/client_spec.rb
 - spec/endpoints_spec.rb
 - spec/resource_spec.rb