prismic.io 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd49e594dff30e85b1dce2393707441e716c88f6
-  data.tar.gz: 18838f06eb596494d16fcac5bc461cbef642a12b
+  metadata.gz: d3aab8aa8c04948a2b6be0c2b1a99f9991b916d5
+  data.tar.gz: 7d07488a5d104cbd2a57a764d5e66fa109e76eed
 SHA512:
-  metadata.gz: c2da8f9c018d2cb305d139d4a176a3d20efcb4024a40c0da9add1d8d1c60118840e283c368b2d880b6095e54aa1437c0a1e3fdf6b928aba6374bade151f1fff9
-  data.tar.gz: a5aa83e595426ab090d6dfc97409b3d1705f2e8eb0d9a0a2854a79e2da9bbf60eca38e22ae947213cf99dbfa1ed360474e01d1a468edeaedcd1631265b7ab732
+  metadata.gz: 17f223d1112c5c27a56e935e242c5577f925e26099fd514789e7ee095d57567af68ac4059e3cdaf65f0571d77d6b3f36c969cdd55a9c0db851f3dab2f01fad66
+  data.tar.gz: a9bc31cbc6eb1d747595d3e3f839c4cad2b6b4d25f3847c324415cf49d7492044a620f81a163d3dc034415e2c5fda32b7b6d4f2679ea2043ab48d43a6e72a8a5

data/.travis.yml

@@ -10,6 +10,9 @@ script: bundle exec rspec spec
 notifications:
   email:
   - evo@zenexity.com
+addons:
+  code_climate:
+    repo_token: f46a7e216896abddbc4877ce065239e8ac9f575af7a120bdaa61a42be70777e9
 deploy:
   provider: rubygems
   api_key:

data/Gemfile

@@ -4,5 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem "codeclimate-test-reporter", require: nil
   gem "yajl-ruby", require: 'yajl', platforms: [:ruby_19, :ruby_20, :ruby_21]
 end
+

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    prismic.io (1.0.5)
+    prismic.io (1.0.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    codeclimate-test-reporter (0.4.1)
+      simplecov (>= 0.7.1, < 1.0.0)
     diff-lcs (1.2.4)
     mini_portile (0.5.1)
     multi_json (1.8.0)
@@ -33,6 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3)
+  codeclimate-test-reporter
   nokogiri (~> 1.6)
   prismic.io!
   rspec (~> 2.14)

data/README.md

@@ -2,7 +2,8 @@
 
 [![Gem Version](https://badge.fury.io/rb/prismic.io.png)](http://badge.fury.io/rb/prismic.io)
 [![Build Status](https://api.travis-ci.org/prismicio/ruby-kit.png)](https://travis-ci.org/prismicio/ruby-kit)
-[![Code Climate](https://codeclimate.com/github/prismicio/ruby-kit.png)](https://codeclimate.com/github/prismicio/ruby-kit)
+[![Code Climate](https://codeclimate.com/github/prismicio/ruby-kit/badges/gpa.svg)](https://codeclimate.com/github/prismicio/ruby-kit)
+[![Test Coverage](https://codeclimate.com/github/prismicio/ruby-kit/badges/coverage.svg)](https://codeclimate.com/github/prismicio/ruby-kit)
 
 ### Getting Started
 

data/lib/prismic/api.rb

@@ -131,7 +131,7 @@ module Prismic
       http_client = opts[:http_client] || Prismic::DefaultHTTPClient
       access_token = opts[:access_token]
       cache = opts[:cache]
-      cache ||= Prismic::DefaultCache unless cache == false
+      cache ||= Prismic::DefaultCache unless !cache
       resp = get(url, access_token, http_client)
       json = JSON.load(resp.body)
       parse_api_response(json, access_token, http_client, cache)
@@ -143,17 +143,7 @@ module Prismic
       new(data, access_token, http_client, cache) {|api|
         api.bookmarks = data['bookmarks']
         api.forms = Hash[data_forms.map { |k, form|
-          [k, Form.new(
-            api,
-            form['name'],
-            Hash[form['fields'].map { |k2, field|
-              [k2, Field.new(field['type'], field['default'], k2 == 'q')]
-            }],
-            form['method'],
-            form['rel'],
-            form['enctype'],
-            form['action'],
-          )]
+          [k, Form.from_json(api, form)]
         }]
         api.refs = Hash[data_refs.map { |ref|
           scheduled_at = ref['scheduledAt']
@@ -168,12 +158,12 @@ module Prismic
 
     def self.oauth_initiate_url(url, oauth_opts, api_opts={})
       oauth =
-        begin
-          api = self.start(url, api_opts)
-          api.oauth
-        rescue PrismicWSAuthError => e
-          e.oauth
-        end
+          begin
+            api = self.start(url, api_opts)
+            api.oauth
+          rescue PrismicWSAuthError => e
+            e.oauth
+          end
       oauth.initiate_url(oauth_opts)
     end
 
@@ -188,12 +178,12 @@ module Prismic
 
     def self.oauth_check_token(url, oauth_params, api_opts={})
       oauth =
-        begin
-          api = self.start(url, api_opts)
-          api.oauth
-        rescue PrismicWSAuthError => e
-          e.oauth
-        end
+          begin
+            api = self.start(url, api_opts)
+            api.oauth
+          rescue PrismicWSAuthError => e
+            e.oauth
+          end
       oauth.check_token(oauth_params)
     end
 

data/lib/prismic/form.rb

@@ -20,5 +20,20 @@ module Prismic
     def create_search_form(data={}, ref=nil)
       SearchForm.new(@api, self, data, ref)
     end
+
+    def self.from_json(api, json)
+      Form.new(
+          api,
+          json['name'],
+          Hash[json['fields'].map { |k2, field|
+            [k2, Field.new(field['type'], field['default'], k2 == 'q')]
+          }],
+          json['method'],
+          json['rel'],
+          json['enctype'],
+          json['action']
+      )
+    end
+
   end
 end

data/lib/prismic/fragments/structured_text.rb

@@ -210,7 +210,7 @@ module Prismic
                 end
               end
             end
-            html
+            html.gsub("\n", '<br>')
           end
 
           def cgi_escape_html(string)
@@ -220,7 +220,7 @@ module Prismic
                 '&' => '&amp;',
                 '"' => '&quot;',
                 '<' => '&lt;',
-                '>' => '&gt;',
+                '>' => '&gt;'
             })
           end
 

data/lib/prismic/json_parsers.rb

@@ -85,15 +85,6 @@ module Prismic
       end
 
       def image_parser(json)
-        def self.view_parser(json)
-          Prismic::Fragments::Image::View.new(json['url'],
-                                              json['dimensions']['width'],
-                                              json['dimensions']['height'],
-                                              json['alt'],
-                                              json['copyright'],
-                                              json['linkTo'] ? link_parser(json['linkTo']) : nil)
-        end
-
         main  = view_parser(json['value']['main'])
         views = {}
         json['value']['views'].each do |name, view|
@@ -156,15 +147,10 @@ module Prismic
               block['label']
             )
           when 'image'
-            view = Prismic::Fragments::Image::View.new(
-              block['url'],
-              block['dimensions']['width'],
-              block['dimensions']['height'],
-              block['alt'],
-              block['copyright'],
-              block['linkTo'] ? link_parser(block['linkTo']) : nil
+            Prismic::Fragments::StructuredText::Block::Image.new(
+                view_parser(block),
+                block['label']
             )
-            Prismic::Fragments::StructuredText::Block::Image.new(view, block['label'])
           when 'embed'
             boembed = block['oembed']
             Prismic::Fragments::Embed.new(
@@ -218,14 +204,7 @@ module Prismic
           end
         }]
 
-        linked_documents = json['linked_documents']
-        if linked_documents
-          linked_documents.map! do |linked_doc|
-            LinkedDocument.new(linked_doc['id'], linked_doc['slug'], linked_doc['type'], linked_doc['tags'])
-          end
-        else
-          linked_documents = []
-        end
+        linked_documents = linked_documents_parser(json['linked_documents'])
 
         Prismic::Document.new(json['id'], json['type'], json['href'], json['tags'],
                               json['slugs'], linked_documents, fragments)
@@ -253,6 +232,25 @@ module Prismic
 
       private
 
+      def view_parser(json)
+        Prismic::Fragments::Image::View.new(json['url'],
+                                            json['dimensions']['width'],
+                                            json['dimensions']['height'],
+                                            json['alt'],
+                                            json['copyright'],
+                                            json['linkTo'] ? link_parser(json['linkTo']) : nil)
+      end
+
+      def linked_documents_parser(json)
+        if json
+          json.map! do |linked_doc|
+            LinkedDocument.new(linked_doc['id'], linked_doc['slug'], linked_doc['type'], linked_doc['tags'])
+          end
+        else
+          []
+        end
+      end
+
       def link_parser(json)
         if json['type'] == 'Link.document'
           document_link_parser(json)

data/lib/prismic/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Prismic
 
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
 end

data/spec/fragments_spec.rb

@@ -139,7 +139,7 @@ describe 'Span' do
     end
     it 'serializes well into HTML' do
       @structured_text.as_html(nil).should ==
-          '<p class="vanilla">Experience <a href="http://prismic.io">the</a> ultimate vanilla experience. '\
+          '<p class="vanilla">Experience <a href="http://prismic.io">the</a> ultimate vanilla experience.<br>'\
           'Our vanilla Macarons are made with our very own (in-house) <em>pure extract of Madagascar vanilla</em>, and subtly dusted with <strong>our own vanilla sugar</strong> (which we make from real vanilla beans).</p>'
     end
   end

data/spec/responses_mocks/structured_text_paragraph.json

@@ -3,7 +3,7 @@
     "value": [{
         "type": "paragraph",
         "label": "vanilla",
-        "text": "Experience the ultimate vanilla experience. Our vanilla Macarons are made with our very own (in-house) pure extract of Madagascar vanilla, and subtly dusted with our own vanilla sugar (which we make from real vanilla beans).",
+        "text": "Experience the ultimate vanilla experience.\nOur vanilla Macarons are made with our very own (in-house) pure extract of Madagascar vanilla, and subtly dusted with our own vanilla sugar (which we make from real vanilla beans).",
         "spans": [
             {
                 "start": 103,

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 # encoding: utf-8
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 require 'nokogiri'
 begin
   require 'yajl/json_gem'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prismic.io
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Étienne Vallette d'Osia
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler