locomotivecms_coal 1.0.0.pre.beta.2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b713be281a717b702f0a6c08c2338e8caf64000c
-  data.tar.gz: 1d72b964e8c0bb8e9794b6bf1dc7e0989e622cc8
+  metadata.gz: aff31f15a22c2acfc6143964f04adc305cb78866
+  data.tar.gz: d4a4f954933fe0f8df28cc07a6ce2d4a2809a83a
 SHA512:
-  metadata.gz: b8249d8b21debd27a354576eb7364396bffdc70e78c083cdb54159975a0a8e7f2913f1c76cefdda772611cc98c47917eaf23a614f46d1374465a7c9467451d93
-  data.tar.gz: d91deb0a77005b742bceb2231c076b6173e27cdcd3d92fb42caddeef12f48ef7f1ea86f81cd7a5a735d7f766448c1c1d45a45bbc3dad9bbf0cb0fa178666b6b9
+  metadata.gz: dd1eda0840c268ca473156602d10d7a3cd7c5b1823e3f9312bc8ca9b1dc3b766e7851bad8e304645e6c69c564316abe3bdaeaec6770df4bc2785cd0eb6e6d1a6
+  data.tar.gz: 3cec4549cf778fdc345b1ffbd3ea95a8ef7091a7732ce86270ebcb96efed470c3b726b083ff82b0d60f14dba85374dfe11f94015566a67528a1eee89a8750732

data/.rspec

@@ -1,2 +1,2 @@
---format=doc
+--format=progress
 --color

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.2.2
 env:
   - CODECLIMATE_REPO_TOKEN=8d9c25de4eff1cd06d3accdc09775397e1a81be67e2a159453ba4e4408acae16
 addons:

data/Gemfile

@@ -21,5 +21,5 @@ group :test do
 end
 
 platform :ruby do
-  ruby '2.2.0'
+  ruby '2.2.2'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_coal (1.0.0.pre.beta.2)
+    locomotivecms_coal (1.0.0.rc1)
       activesupport (~> 4.2.3)
       faraday (~> 0.9.1)
       faraday_middleware (~> 0.10.0)
@@ -9,16 +9,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.3)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
-    byebug (4.0.3)
+    addressable (2.3.8)
+    byebug (4.0.5)
       columnize (= 0.9.0)
-    codeclimate-test-reporter (0.4.7)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     columnize (0.9.0)
@@ -32,7 +32,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.23)
+    domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
@@ -46,12 +46,12 @@ GEM
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
     method_source (0.8.2)
-    mime-types (2.4.3)
-    minitest (5.7.0)
-    multi_json (1.11.0)
+    mime-types (2.6.2)
+    minitest (5.8.1)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     netrc (0.10.3)
-    pry (0.10.1)
+    pry (0.10.2)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -67,9 +67,9 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-mocks (3.2.1)
@@ -83,26 +83,26 @@ GEM
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tins (1.3.5)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.7.1)
     vcr (2.9.3)
-    webmock (1.9.3)
-      addressable (>= 2.2.7)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.9.1)
+  bundler (~> 1.10.6)
   codeclimate-test-reporter (~> 0.4.7)
   coveralls (~> 0.7.11)
   json_spec (~> 1.1.4)
@@ -113,3 +113,6 @@ DEPENDENCIES
   rspec (~> 3.2.0)
   vcr
   webmock
+
+BUNDLED WITH
+   1.10.6

data/lib/locomotive/coal/client.rb

@@ -93,10 +93,10 @@ module Locomotive::Coal
       [self.options[:path_prefix], 'api', 'v3'].join('/')
     end
 
-    def prepare_uri(uri)
-      uri = "http://#{uri.to_s}" unless uri.to_s =~ /^https?:\/\//
+    def prepare_uri(str)
+      str = "http://#{str.to_s}" unless str.to_s =~ /^https?:\/\//
 
-      URI(uri).tap do |uri|
+      URI(str).tap do |uri|
         uri.scheme = 'https' if ssl?
 
         if uri.path == '/' || uri.path.blank?

data/lib/locomotive/coal/resources/concerns/request.rb

@@ -113,7 +113,7 @@ module Locomotive::Coal::Resources
       def encode_array_to_hash(value)
         {}.tap do |hash|
           value.each_with_index do |v, index|
-            hash[index] = v.to_hash
+            hash[index] = _encode_parameters(v)
           end
         end
       end

data/lib/locomotive/coal/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Coal
-    VERSION = '1.0.0-beta.2'
+    VERSION = '1.0.0.rc1'
   end
 end

data/locomotivecms_coal.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler',    '~> 1.9.1'
+  spec.add_development_dependency 'bundler',    '~> 1.10.6'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
   spec.add_dependency 'faraday',                '~> 0.9.1'

data/spec/fixtures/coal_cassettes/client.yml

@@ -357,4 +357,39 @@ http_interactions:
       string: "[]"
     http_version: 
   recorded_at: Tue, 11 Aug 2015 13:12:35 GMT
+- request:
+    method: post
+    uri: http://localhost:3000/tokens.json
+    body:
+      encoding: UTF-8
+      string: email=admin%40locomotivecms.com&password=locomotive
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/x-www-form-urlencoded
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - text/html
+      Cache-Control:
+      - no-cache
+      X-Request-Id:
+      - 2b70fa6c-5d9c-42f3-b0f8-45ea224f63bb
+      X-Runtime:
+      - '0.015924'
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: Hi, we are sorry but no site was found.
+    http_version: 
+  recorded_at: Wed, 12 Aug 2015 22:47:38 GMT
 recorded_with: VCR 2.9.3

data/spec/unit/client_spec.rb

@@ -2,24 +2,51 @@ require 'spec_helper'
 
 describe Locomotive::Coal::Client do
 
-  let(:uri)         { nil }
-  let(:credentials) { nil }
-  let(:client)      { described_class.new(uri, credentials) }
+  let(:uri)         { 'http://sample.lvh.me:4000/locomotive/api' }
+  let(:credentials) { { email: 'fake' } }
+  subject           { described_class.new(uri, credentials) }
 
   describe '#initialize' do
 
-    subject { client }
-
     context 'no uri' do
-      let(:credentials) { { email: 'fake' } }
+      let(:uri) { nil }
       it { expect { subject }.to raise_error Locomotive::Coal::MissingURIOrCredentialsError }
     end
 
     context 'no credentials' do
-      let(:uri) { 'http://sample.lvh.me:4000/locomotive/api' }
+      let(:credentials) { nil }
       it { expect { subject }.to raise_error Locomotive::Coal::MissingURIOrCredentialsError }
     end
 
   end
 
+  describe 'resources' do
+    describe '#current_site' do
+      subject { super().current_site }
+      it { is_expected.to be_a Locomotive::Coal::Resources::CurrentSite }
+    end
+
+    describe '#pages' do
+      subject { super().pages }
+      it { is_expected.to be_a Locomotive::Coal::Resources::Pages }
+    end
+
+    describe '#content_types' do
+      subject { super().content_types }
+      it { is_expected.to be_a Locomotive::Coal::Resources::ContentTypes }
+    end
+
+    describe '#content_entries' do
+      subject { super().content_entries(content_type) }
+      let(:content_type) { double(:content_type, slug: 'abc') }
+      it { is_expected.to be_a Locomotive::Coal::Resources::ContentEntries }
+    end
+
+    describe '#content_assets' do
+      subject { super().content_assets }
+      it { is_expected.to be_a Locomotive::Coal::Resources::ContentAssets }
+
+    end
+  end
+
 end

data/spec/unit/client_v2_spec.rb

@@ -0,0 +1,22 @@
+describe Locomotive::Coal::ClientV2 do
+  let(:site) { double(:site, domains: [domain]) }
+
+  let(:client) { described_class.new('abc.com', { foo: :bar }) }
+
+  describe '#scope_by' do
+    subject { client.scope_by(site) }
+
+    context 'domains include current site' do
+      let(:domain) { 'abc.com' }
+      it { is_expected.to eq client }
+    end
+
+    context 'domains do not include current site' do
+      let(:domain) { 'xyz.com' }
+      it { is_expected.to_not eq client }
+
+    end
+  end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_coal
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - spec/support/pry.rb
 - spec/support/vcr.rb
 - spec/unit/client_spec.rb
+- spec/unit/client_v2_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/paginated_resources_spec.rb
 - spec/unit/resource_spec.rb
@@ -222,6 +223,7 @@ test_files:
 - spec/support/pry.rb
 - spec/support/vcr.rb
 - spec/unit/client_spec.rb
+- spec/unit/client_v2_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/paginated_resources_spec.rb
 - spec/unit/resource_spec.rb