inbox 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abe056c1b96943e3cddcb3b5ec95094ad07088f8
-  data.tar.gz: 71e10c1505539c294f862265799608ec30b839aa
+  metadata.gz: 066c3c8d975efa84261f5a3662b9b5edbac20720
+  data.tar.gz: 8e3a86ca4e62a8283c260f62172823c8fd595457
 SHA512:
-  metadata.gz: 36b4a7954a470d684038e56992795608fa244ca9a121b07b7d064aa60e76e689970ef270b34c7357a1c1bb21fb1aaeeb53ce5700dbfecd7bfd4e973c0b519a82
-  data.tar.gz: 42224c275e7beff0a84543729f49c82b102728599c5660a6132b91af541e4f0a78884dd286b55b98ccf1bde40156a39ca511ea62a5ed0d16df94b4e2fad3a300
+  metadata.gz: dbf83648e4b7ecd211713d393164108e0a71af6a41a4cc278d750f147e871d02e94f5c9d3f6031a01b7f3b9cd89808bce81b9be6903032e31b1bbe2f464364de
+  data.tar.gz: d88e9c6ac927ca0d4726c558d97c9381fb2d56c1f15dbbd2d5acda276718468c02b76d09282810d3d92e999f87b70172fb5821befbbe6cd0f53b708f13e3c285

data/Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'rest-client', '~> 1.6.8'
-gem 'activesupport', '~> 4.1.4'
+gem 'rest-client', '~> 1.6'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.md

@@ -22,7 +22,7 @@ You don't need to use this repo unless you're planning to modify the gem. If you
 - rest-client, json
 
 
-## Example
+## Example Rails App
 
 A small example Rails app is included in the `example` directory. You can run the sample app to see how an authentication flow might be implemented. 
 
@@ -36,46 +36,46 @@ A small example Rails app is included in the `example` directory. You can run th
 
 ### App ID and Secret
 
-Before you can interact with the Inbox API, you need to register for the Inbox developer program at [http://www.inboxapp.com/](http://www.inboxapp.com/). After you've created a developer account, you can create a new application to generate an App ID / Secret pair.
+Before you can interact with the Inbox API, you need to register for the Inbox Developer Program at [http://www.inboxapp.com/](http://www.inboxapp.com/). After you've created a developer account, you can create a new application to generate an App ID / Secret pair.
+
+Generally, you should store your App ID and Secret into environment variables to avoid adding them to source control. That said, in the example project and code snippets below, the values were added to `config/environments/development.rb` for convenience.
+
 
 ### Authentication
 
-The Inbox API uses server-side (three-legged) OAuth, and the Ruby gem provides a convenience methods that simplify the OAuth process. For more information about authenticating with Inbox, visit the [Developer Documentation](https://www.inboxapp.com/docs/gettingstarted-hosted#authenticating).
+The Inbox API uses server-side (three-legged) OAuth, and the Ruby gem provides convenience methods that simplify the OAuth process. For more information about authenticating with Inbox, visit the [Developer Documentation](https://www.inboxapp.com/docs/gettingstarted-hosted#authenticating).
 
 **Step 1: Redirect the user to Inbox:**
 
-```
-:::ruby
+```ruby
 require 'inbox'
 
 def login
-    inbox = Inbox::API.new(config.inbox_app_id, config.inbox_app_secret,         nil)
-    # The email address of the user you want to authenticate
-    user_email = 'ben@inboxapp.com'
-
-    # This URL must be registered with your application in the developer portal
-    callback_url = url_for(:action => 'login_callback')
-    
-    redirect_to inbox.url_for_authentication(callback_url, user_email)
+  inbox = Inbox::API.new(config.inbox_app_id, config.inbox_app_secret, nil)
+  # The email address of the user you want to authenticate
+  user_email = 'ben@inboxapp.com'
+
+  # This URL must be registered with your application in the developer portal
+  callback_url = url_for(:action => 'login_callback')
+  
+  redirect_to inbox.url_for_authentication(callback_url, user_email)
 end
 ```
 
 **Step 2: Handle the Authentication Response:**
 
-```
-:::ruby
+```ruby
 def login_callback 
-    inbox = Inbox::API.new(config.inbox_app_id, config.inbox_app_secret, nil)
-    inbox_token = inbox.auth_token_for_code(params[:code])
+  inbox = Inbox::API.new(config.inbox_app_id, config.inbox_app_secret, nil)
+  inbox_token = inbox.token_for_code(params[:code])
 
-    # Save the inbox_token to the current session, save it to the user model, etc.
+  # Save the inbox_token to the current session, save it to the user model, etc.
 end
 ```
 
 ### Fetching Namespaces
 
-```
-:::ruby
+```ruby
 inbox = Inbox::API.new(config.inbox_app_id, config.inbox_app_secret, inbox_token)
 
 # Get the first namespace
@@ -89,8 +89,7 @@ puts namespace.provider
 
 ### Fetching Threads
 
-```
-:::ruby
+```ruby
 # Fetch the first thread
 thread = namespace.threads.first
 
@@ -121,11 +120,10 @@ threads = namespace.threads.where(:any_email => 'ben@inboxapp.com').all
 
 ### Working with Threads
 
-```
-:::ruby
+```ruby
 # List thread participants
 thread.participants.each do |participant|
-    puts participant['email']
+  puts participant['email']
 end
 
 # Mark as read
@@ -137,22 +135,21 @@ thread.archive!
 # Add or remove arbitrary tags
 tagsToAdd = ['inbox', 'cfa1233ef123acd12']
 tagsToRemove = []
-thread.update_tags!(tagsToAd, tagsToRemove)
+thread.update_tags!(tagsToAdd, tagsToRemove)
 
 # List messages
 thread.messages.each do |message|
-    puts message.subject
+  puts message.subject
 end
 ```
 
 
 ### Working with Files
 
-```
-:::ruby
+```ruby
 # List files
 namespace.files.each do |file|
-    puts file.filename
+  puts file.filename
 end
 
 # Create a new file
@@ -164,8 +161,7 @@ file.save!
 
 Each of the primary collections (contacts, messages, etc.) behave the same way as `threads`. For example, finding messages with a filter is similar to finding threads:
 
-```
-:::ruby
+```ruby
 messages = namespace.messages.where(:to => 'ben@inboxapp.com`).all
 ```
 
@@ -173,8 +169,7 @@ The `where` method accepts a hash of filters, as documented in the [Inbox Filter
 
 ### Creating and Sending Drafts
 
-```
-:::ruby
+```ruby
 # Create a new draft
 draft = namespace.drafts.build(
   :to => [{:name => 'Ben Gotow', :email => 'ben@inboxapp.com'}],
@@ -196,6 +191,15 @@ draft.save!
 draft.send!
 ```
 
+## Open-Source Sync Engine
+
+The [Inbox Sync Engine](http://github.com/inboxapp/inbox) is open-source, and you can also use the Ruby gem with the open-source API. Since the open-source API provides no authentication or security, connecting to it is simple. When you instantiate the Inbox object, provide nil for the App ID, App Secret, and API Token, and pass the fully-qualified address to your copy of the sync engine:
+
+```ruby
+require 'inbox'
+inbox = Inbox::API.new(nil, nil, nil, 'http://localhost:5555/')
+```
+
 
 ## Contributing
 

data/Rakefile

@@ -21,7 +21,8 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Gem for interacting with the Inbox API that allows you to create and publish one-page websites, subscribe to web hooks and receive events when those pages are interacted with. Visit http://www.populr.me/ for more information. }
   gem.email = "ben@inboxapp.com"
   gem.authors = ["Ben Gotow"]
-  # dependencies defined in Gemfile
+  gem.files.exclude 'example/**/.keep'
+  gem.files.exclude 'example/**/*'
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/inbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "inbox"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Gotow"]
-  s.date = "2014-08-19"
+  s.date = "2014-09-08"
   s.description = "Gem for interacting with the Inbox API that allows you to create and publish one-page websites, subscribe to web hooks and receive events when those pages are interacted with. Visit http://www.populr.me/ for more information. "
   s.email = "ben@inboxapp.com"
   s.extra_rdoc_files = [
@@ -23,71 +23,11 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "example/.gitignore",
-    "example/Gemfile",
-    "example/README.rdoc",
-    "example/Rakefile",
-    "example/app/assets/images/.keep",
-    "example/app/assets/javascripts/application.js",
-    "example/app/assets/javascripts/welcome.js.coffee",
-    "example/app/assets/stylesheets/application.css",
-    "example/app/assets/stylesheets/welcome.css.scss",
-    "example/app/controllers/application_controller.rb",
-    "example/app/controllers/concerns/.keep",
-    "example/app/helpers/application_helper.rb",
-    "example/app/helpers/welcome_helper.rb",
-    "example/app/mailers/.keep",
-    "example/app/models/.keep",
-    "example/app/models/concerns/.keep",
-    "example/app/views/layouts/application.html.erb",
-    "example/app/views/welcome/index.html.erb",
-    "example/bin/bundle",
-    "example/bin/rails",
-    "example/bin/rake",
-    "example/bin/spring",
-    "example/config.ru",
-    "example/config/application.rb",
-    "example/config/boot.rb",
-    "example/config/database.yml",
-    "example/config/environment.rb",
-    "example/config/environments/development.rb",
-    "example/config/environments/production.rb",
-    "example/config/environments/test.rb",
-    "example/config/initializers/assets.rb",
-    "example/config/initializers/backtrace_silencers.rb",
-    "example/config/initializers/cookies_serializer.rb",
-    "example/config/initializers/filter_parameter_logging.rb",
-    "example/config/initializers/inflections.rb",
-    "example/config/initializers/mime_types.rb",
-    "example/config/initializers/session_store.rb",
-    "example/config/initializers/wrap_parameters.rb",
-    "example/config/locales/en.yml",
-    "example/config/routes.rb",
-    "example/config/secrets.yml",
-    "example/db/seeds.rb",
-    "example/lib/assets/.keep",
-    "example/lib/tasks/.keep",
-    "example/log/.keep",
-    "example/public/404.html",
-    "example/public/422.html",
-    "example/public/500.html",
-    "example/public/favicon.ico",
-    "example/public/robots.txt",
-    "example/test/controllers/.keep",
-    "example/test/controllers/welcome_controller_test.rb",
-    "example/test/fixtures/.keep",
-    "example/test/fixtures/users.yml",
-    "example/test/helpers/.keep",
-    "example/test/helpers/welcome_helper_test.rb",
-    "example/test/integration/.keep",
-    "example/test/mailers/.keep",
-    "example/test/models/.keep",
-    "example/test/models/user_test.rb",
-    "example/test/test_helper.rb",
-    "example/vendor/assets/javascripts/.keep",
-    "example/vendor/assets/stylesheets/.keep",
     "inbox.gemspec",
+    "lib/calendar.rb",
     "lib/contact.rb",
     "lib/draft.rb",
+    "lib/event.rb",
     "lib/file.rb",
     "lib/inbox.rb",
     "lib/message.rb",
@@ -113,50 +53,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<inbox>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.8"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 4.1.4"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-nav>, [">= 0"])
-      s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-nav>, [">= 0"])
-      s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-nav>, [">= 0"])
-      s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-nav>, [">= 0"])
-      s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<pry-nav>, [">= 0"])
-      s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -183,50 +80,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry-stack_explorer>, [">= 0"])
     else
       s.add_dependency(%q<inbox>, [">= 0"])
-      s.add_dependency(%q<rest-client>, ["~> 1.6.8"])
-      s.add_dependency(%q<activesupport>, ["~> 4.1.4"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-nav>, [">= 0"])
-      s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-nav>, [">= 0"])
-      s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-nav>, [">= 0"])
-      s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-nav>, [">= 0"])
-      s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<pry-nav>, [">= 0"])
-      s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
+      s.add_dependency(%q<rest-client>, ["~> 1.6"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -254,50 +108,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<inbox>, [">= 0"])
-    s.add_dependency(%q<rest-client>, ["~> 1.6.8"])
-    s.add_dependency(%q<activesupport>, ["~> 4.1.4"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-nav>, [">= 0"])
-    s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-nav>, [">= 0"])
-    s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-nav>, [">= 0"])
-    s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-nav>, [">= 0"])
-    s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<pry-nav>, [">= 0"])
-    s.add_dependency(%q<pry-stack_explorer>, [">= 0"])
+    s.add_dependency(%q<rest-client>, ["~> 1.6"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

data/lib/calendar.rb

@@ -0,0 +1,16 @@
+require 'restful_model'
+require 'event'
+
+module Inbox
+  class Calendar < RestfulModel
+
+    attr_accessor :name
+    attr_accessor :description
+    attr_accessor :event_ids
+
+    def events
+      @events ||= RestfulModelCollection.new(Event, @_api, @namespace, {:calendar_id=>@id})
+    end
+
+  end
+end

data/lib/draft.rb

@@ -3,7 +3,7 @@ require 'restful_model'
 module Inbox
   class Draft < Message
 
-    attr_accessor :reply_to_thread
+    attr_accessor :thread_id
     attr_accessor :state
 
     def attach(file)
@@ -14,7 +14,7 @@ module Inbox
     def send!
       save! unless @id
 
-      url = @_api.url_for_path("/n/#{@namespace}/send")
+      url = @_api.url_for_path("/n/#{@namespace_id}/send")
       data = {:draft_id => @id}
 
       ::RestClient.post(url, data.to_json, :content_type => :json) do |response, request, result|

data/lib/event.rb

@@ -0,0 +1,14 @@
+require 'restful_model'
+
+module Inbox
+  class Event < RestfulModel
+
+    attr_accessor :title
+    attr_accessor :description
+    attr_accessor :location
+    attr_accessor :read_only
+    attr_accessor :participants
+    attr_accessor :when
+
+  end
+end

data/lib/file.rb

@@ -7,7 +7,7 @@ module Inbox
     attr_accessor :filename
     attr_accessor :content_type
     attr_accessor :is_embedded
-    attr_accessor :message
+    attr_accessor :message_id
 
     # For uploading the file
     attr_accessor :file

data/lib/inbox.rb

@@ -39,14 +39,14 @@ module Inbox
 
   class API
     attr_accessor :api_server
-    attr_reader :auth_token
+    attr_reader :access_token
     attr_reader :app_id
     attr_reader :app_secret
 
-    def initialize(app_id, app_secret, auth_token = nil, api_server = 'https://api.inboxapp.com')
+    def initialize(app_id, app_secret, access_token = nil, api_server = 'https://api.inboxapp.com')
       raise "When overriding the Inbox API server address, you must include https://" unless api_server.include?('://')
       @api_server = api_server
-      @auth_token = auth_token
+      @access_token = access_token
       @app_secret = app_secret
       @app_id = app_id
 
@@ -56,20 +56,20 @@ module Inbox
     end
 
     def url_for_path(path)
-      raise NoAuthToken.new if @auth_token == nil
+      raise NoAuthToken.new if @access_token == nil
       protocol, domain = @api_server.split('//')
-      "#{protocol}//#{@auth_token}:@#{domain}#{path}"
+      "#{protocol}//#{@access_token}:@#{domain}#{path}"
     end
 
     def url_for_authentication(redirect_uri, login_hint = '')
-      "https://beta.inboxapp.com/oauth/authorize?client_id=#{@app_id}&response_type=code&scope=email&login_hint=#{login_hint}&redirect_uri=#{redirect_uri}"
+      "https://api.inboxapp.com/oauth/authorize?client_id=#{@app_id}&response_type=code&scope=email&login_hint=#{login_hint}&redirect_uri=#{redirect_uri}"
     end
 
-    def set_auth_token(token)
-      @auth_token = token
+    def set_access_token(token)
+      @access_token = token
     end
 
-    def auth_token_for_code(code)
+    def token_for_code(code)
       data = {
           'client_id' => app_id,
           'client_secret' => app_secret,
@@ -92,4 +92,4 @@ module Inbox
 
   end
 
-end
+end

data/lib/message.rb

@@ -16,21 +16,14 @@ module Inbox
 
     def inflate(json)
       super
-      @thread_id = json[:thread]
-      @file_ids = json[:files] || []
+      @file_ids ||= []
       @to ||= []
       @cc ||= []
       @bcc ||= []
     end
 
-    def as_json()
-      json = super
-      json[:files] = json[:file_ids]
-      json
-    end
-
     def files
-      @files ||= RestfulModelCollection.new(File, @_api, @namespace, {:message=>@id})
+      @files ||= RestfulModelCollection.new(File, @_api, @namespace_id, {:message_id=>@id})
     end
 
   end

data/lib/restful_model.rb

@@ -2,16 +2,16 @@ module Inbox
   class RestfulModel
 
     attr_accessor :id
-    attr_accessor :namespace
+    attr_accessor :namespace_id
     attr_accessor :created_at
 
     def self.collection_name
       "#{self.to_s.downcase}s".split('::').last
     end
 
-    def initialize(api, namespace = nil)
+    def initialize(api, namespace_id = nil)
       raise StandardError.new unless api.class <= Inbox::API
-      @namespace = namespace
+      @namespace_id = namespace_id
       @_api = api
     end
 
@@ -37,7 +37,7 @@ module Inbox
 
     def url(action = "")
       action = "/#{action}" unless action.empty?
-      @_api.url_for_path("/n/#{@namespace}/#{self.class.collection_name}/#{id}#{action}")
+      @_api.url_for_path("/n/#{@namespace_id}/#{self.class.collection_name}/#{id}#{action}")
     end
 
     def as_json(options = {})

data/lib/restful_model_collection.rb

@@ -5,11 +5,11 @@ module Inbox
 
     attr_accessor :filters
     
-    def initialize(model_class, api, namespace, filters = {})
+    def initialize(model_class, api, namespace_id, filters = {})
       raise StandardError.new unless api.class <= Inbox::API
       @model_class = model_class
       @filters = filters
-      @namespace = namespace
+      @namespace_id = namespace_id
       @_api = api
     end
 
@@ -36,7 +36,8 @@ module Inbox
 
     def where(filters)
       collection = self.clone
-      collection.filters = filters
+      collection.filters ||= {}
+      collection.filters.merge!(filters)
       collection
     end
 
@@ -71,7 +72,7 @@ module Inbox
       for key in args.keys
         args[key.to_s] = args[key] 
       end
-      model = @model_class.new(@_api, @namespace)
+      model = @model_class.new(@_api, @namespace_id)
       model.inflate(args)
       model
     end
@@ -95,7 +96,7 @@ module Inbox
     private
 
     def url
-      prefix = "/n/#{@namespace}" if @namespace
+      prefix = "/n/#{@namespace_id}" if @namespace_id
       @_api.url_for_path("#{prefix}/#{@model_class.collection_name}")
     end
 
@@ -120,7 +121,7 @@ module Inbox
       filters[:limit] = limit
       models = []
 
-      RestClient.get("#{url}?#{filters.to_query}"){ |response,request,result|
+      RestClient.get(url, :params => filters){ |response,request,result|
         items = Inbox.interpret_response(result, response, {:expected_class => Array})
         models = inflate_collection(items)
       }