Simplify code using latest helpers

Author: erwan

Gemfile

@@ -29,7 +29,7 @@ gem 'jbuilder', '~> 1.2'
 
 gem 'yajl-ruby', require: 'yajl'
 
-gem 'prismic.io', '~> 1.4.0', require: 'prismic'
+gem 'prismic.io', '~> 1.4.1', require: 'prismic'
 
 # A gem to build simple paginations
 gem 'kaminari'

Gemfile.lock

@@ -57,7 +57,7 @@ GEM
     minitest (4.7.5)
     multi_json (1.7.9)
     polyglot (0.3.3)
-    prismic.io (1.4.0)
+    prismic.io (1.4.1)
       hashery (~> 2.1.1)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -123,7 +123,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   kaminari
-  prismic.io (~> 1.4.0)
+  prismic.io (~> 1.4.1)
   rails (= 4.0.0)
   rails_12factor
   sass-rails (~> 4.0.0)

app/controllers/application_controller.rb

@@ -4,16 +4,17 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery with: :exception
 
-  # Rescue OAuth errors for some actions
+  # Rescue bad preview cookies errors for some actions
   rescue_from Prismic::Error, with: :clearcookies
 
   # Homepage action: querying the "everything" form (all the documents, paginated by 20)
   def index
     @google_id = api.experiments.current
-    @documents = api.form("everything")
-                    .page(params[:page] ? params[:page] : "1")
-                    .page_size(params[:page_size] ? params[:page_size] : "20")
-                    .submit(ref)
+    @documents = api.all({
+      "page" => params[:page] ? params[:page] : "1",
+      "page_size" => params[:page_size] ? params[:page_size] : "20",
+      "ref" => ref
+    })
   end
 
   # Single-document page action: mostly, setting the @document instance variable, and checking the URL
@@ -22,7 +23,7 @@ def document
     slug = params[:slug]
 
     @google_id = api.experiments.current
-    @document = PrismicService.get_document(id, api, ref)
+    @document = api.getByID(id, {"ref" => ref})
 
     # This is how an URL gets checked (with a clean redirect if the slug is one that used to be right, but has changed)
     # Of course, you can change slug_checker in prismic_service.rb, depending on your URL strategy.

app/models/prismic_service.rb

@@ -18,25 +18,6 @@ def init_api
       Prismic.api(config('url'), access_token)
     end
 
-    def oauth_initiate_url(access_token, oauth_opts)
-      access_token ||= self.access_token
-      Prismic.oauth_initiate_url(config('url'), oauth_opts, access_token)
-    end
-
-    def oauth_check_token(access_token, oauth_opts)
-      access_token ||= self.access_token
-      Prismic.oauth_check_token(config('url'), oauth_opts, access_token)
-    end
-
-    # Gets a document from its ID.
-    def get_document(id, api, ref)
-      documents = api.form("everything")
-                     .query("[[:d = at(document.id, \"#{id}\")]]")
-                     .submit(ref)
-
-      documents.length == 0 ? nil : documents.first
-    end
-
     # Checks if the slug is the right one for the document.
     # You can change this depending on your URL strategy.
     def slug_checker(document, slug)

config/prismic.yml

@@ -1,9 +1,9 @@
 ---
-url: https://lesbonneschoses.prismic.io/api
+url: https://lesbonneschoses-vcerzcwaaohojzo.prismic.io/api
 # If specified this token is used for all "guest" requests
 # token: ""
 # OAuth2 configuration
 # client_id: ""
 # client_secret: ""
 
-# This file can contain ERB; for instance: client_id: <%= ENV['CLIENT_ID'] %>
+# This file can contain ERB; for instance: client_id: <%= ENV['CLIENT_ID'] %>