locomotivecms_coal 1.0.0.pre.alpha.1 → 1.0.0.pre.alpha.2

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

@@ -0,0 +1,101 @@
+module Locomotive::Coal::Resources
+  module Concerns
+
+    module Request
+
+      def get(endpoint, parameters = {}, raw = false)
+        do_request :get, endpoint, parameters, raw
+      end
+
+      def post(endpoint, parameters = {}, raw = false)
+        do_request :post, endpoint, parameters, raw
+      end
+
+      def put(endpoint, parameters = {}, raw = false)
+        do_request :put, endpoint, parameters, raw
+      end
+
+      def delete(endpoint, parameters = {}, raw = false)
+        do_request :delete, endpoint, parameters, raw
+      end
+
+      def do_request(action, endpoint, parameters = {}, raw = false)
+        response = begin
+          _do_request(action, "#{uri.path}/#{endpoint}.json", parameters)
+        rescue ::Timeout::Error, ::Errno::ETIMEDOUT, Faraday::Error::TimeoutError => e
+          raise Locomotive::Coal::TimeoutError.new(e)
+        rescue Locomotive::Coal::Error
+          raise
+        rescue Exception => e
+          raise Locomotive::Coal::BadRequestError.new(e)
+        end
+
+        if response.success?
+          raw ? response : response.body
+        else
+          raise Locomotive::Coal::Error.from_response(response)
+        end
+      end
+
+      def without_authentication(&block)
+        @without_token = true
+        yield.tap do
+          @without_token = false
+        end
+      end
+
+      private
+
+      def _do_request(action, endpoint, parameters)
+        # compatibility with v2.5.x
+        parameters = parameters.merge(auth_token: credentials[:token]) if _token
+
+        _connection.send(action, endpoint) do |request|
+          request.headers = _request_headers(parameters)
+
+          if %i(create update).include?(action)
+            request.params = parameters
+          else
+            request.body = parameters
+          end
+        end
+      end
+
+      def _request_headers(parameters)
+        { 'Accept' => 'application/json' }.tap do |headers|
+          if _token
+            headers['X-Locomotive-Account-Email'] = credentials[:email]
+            headers['X-Locomotive-Account-Token'] = credentials[:token]
+            headers['X-Locomotive-Site-Handle']   = credentials[:handle] if credentials[:handle].present?
+          end
+
+          headers['X-Locomotive-Locale'] = parameters.delete(:_locale).to_s if parameters.try(:has_key?, :_locale)
+        end
+      end
+
+      def _connection
+        @_connection ||= Faraday.new(url: "#{uri.scheme}://#{uri.host}:#{uri.port}") do |faraday|
+          faraday.request     :multipart
+          faraday.request     :url_encoded             # form-encode POST params
+          faraday.basic_auth  uri.userinfo.values if uri.userinfo
+
+          faraday.use         FaradayMiddleware::ParseJson, content_type: /\bjson$/
+
+          faraday.adapter     Faraday.default_adapter  # make requests with Net::HTTP
+        end
+      end
+
+      def _token
+        return if !!@without_token
+
+        if credentials[:token].respond_to?(:call)
+          credentials[:token] = credentials[:token].call
+        end
+
+        credentials[:token]
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/coal/resources/content_assets.rb

@@ -0,0 +1,9 @@
+module Locomotive::Coal
+  module Resources
+
+    class ContentAssets < Base
+
+    end
+
+  end
+end

data/lib/locomotive/coal/resources/content_entries.rb

@@ -2,13 +2,20 @@ module Locomotive::Coal
 
   module Resources
 
-    class ContentEntries < Struct.new(:uri, :token, :content_type)
+    class ContentEntries < Base
 
-      include Locomotive::Coal::Request
+      attr_accessor :content_type
 
-      def all(query = {}, options = {})
-        parameters  = { where: query.to_json }.merge(options)
-        response    = get(endpoint, parameters, true)
+      def initialize(uri, credentials, content_type)
+        @content_type = content_type
+        super(uri, credentials)
+      end
+
+      def index(query = nil, options = nil, locale = nil)
+        parameters = { where: (query || {}).to_json }.merge(options || {})
+        parameters[:_locale] = locale if locale
+
+        response = get(resources_name, parameters, true)
 
         list = response.body.map { |attributes| Resource.new(attributes) }
 
@@ -18,15 +25,14 @@ module Locomotive::Coal
           response.headers[:x_total_entries].to_i)
       end
 
-      def update(id, attributes)
-        data = put(endpoint + "/#{id}", { content_entry: attributes })
-        Resource.new(data)
-      end
+      alias :all :index
+
+      alias :update :update_with_locale
 
       private
 
-      def endpoint(name = 'entries')
-        "content_types/#{content_type.slug}/#{name}"
+      def resources_name
+        "content_types/#{content_type.slug}/entries"
       end
 
     end

data/lib/locomotive/coal/resources/{contents.rb → content_types.rb}

@@ -1,19 +1,18 @@
 module Locomotive::Coal
   module Resources
 
-    class Contents < Struct.new(:uri, :token)
-
-      include Locomotive::Coal::Request
+    class ContentTypes < Base
 
       def by_slug(slug)
         get('content_types').each do |attributes|
-          return Resource.new(attributes) if attributes['slug'] == slug.to_s
+          return Resource.new(attributes) if attributes['slug'].to_s == slug.to_s
         end
+        nil
       end
 
       def method_missing(meth, *args)
         if content_type = by_slug(meth)
-          Locomotive::Coal::Resources::ContentEntries.new(uri, token, content_type)
+          Locomotive::Coal::Resources::ContentEntries.new(uri, credentials, content_type)
         else
           super
         end

data/lib/locomotive/coal/resources/engine_version.rb

@@ -0,0 +1,15 @@
+module Locomotive::Coal
+  module Resources
+
+    class EngineVersion < Base
+
+      include Concerns::Request
+
+      def version
+        get('version', credentials)['engine']
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/coal/resources/my_account.rb

@@ -1,14 +1,26 @@
 module Locomotive::Coal
   module Resources
 
-    class MyAccount < Struct.new(:uri, :token)
+    class MyAccount < Struct.new(:uri, :credentials)
 
-      include Locomotive::Coal::Request
+      include Concerns::Request
 
       def get
         Resource.new(super('my_account'))
       end
 
+      def create(attributes = {})
+        without_authentication do
+          data = post('my_account', account: attributes)
+          Resource.new(data)
+        end
+      end
+
+      def update(attributes = {})
+        data = put('my_account', account: attributes)
+        Resource.new(data)
+      end
+
     end
 
   end

data/lib/locomotive/coal/resources/pages.rb

@@ -0,0 +1,25 @@
+module Locomotive::Coal
+  module Resources
+
+    class Pages < Base
+
+      def index(locale)
+        get(resources_name, _locale: locale).map do |attributes|
+          Resource.new(attributes)
+        end
+      end
+
+      alias :all :index
+
+      def fullpaths(locale)
+        get("#{resources_name}/fullpaths", _locale: locale).map do |attributes|
+          Resource.new(attributes)
+        end
+      end
+
+      alias :update :update_with_locale
+
+    end
+
+  end
+end

data/lib/locomotive/coal/resources/sites.rb

@@ -1,28 +1,16 @@
 module Locomotive::Coal
   module Resources
 
-    class Sites < Struct.new(:uri, :token)
-
-      include Locomotive::Coal::Request
-
-      def all
-        get('sites').map do |attributes|
-          Resource.new(attributes)
-        end
-      end
-
-      def create(attributes = {})
-        data = post('sites', { site: attributes })
-        Resource.new(data)
-      end
+    class Sites < Base
 
+      # Only v2.x
       def by_subdomain(subdomain)
         all.find { |site| site.subdomain == subdomain.to_s }
       end
 
-      def destroy(id)
-        data = delete('sites', id)
-        Resource.new(data)
+      # Only >= v3
+      def by_handle(handle)
+        all.find { |site| site.handle == handle.to_s }
       end
 
     end

data/lib/locomotive/coal/resources/snippets.rb

@@ -0,0 +1,9 @@
+module Locomotive::Coal
+  module Resources
+
+    class Snippets < Base
+
+    end
+
+  end
+end

data/lib/locomotive/coal/resources/theme_assets.rb

@@ -0,0 +1,13 @@
+module Locomotive::Coal
+  module Resources
+
+    class ThemeAssets < Base
+
+      def checksums
+        get('theme_assets/checksums')
+      end
+
+    end
+
+  end
+end

data/lib/locomotive/coal/resources/token.rb

@@ -3,10 +3,10 @@ module Locomotive::Coal
 
     class Token < Struct.new(:uri, :credentials)
 
-      include Locomotive::Coal::Request
+      include Concerns::Request
 
       def get
-        post('tokens', self.credentials)['token']
+        post('tokens', credentials)['token']
       end
 
     end

data/lib/locomotive/coal/resources/translations.rb

@@ -0,0 +1,9 @@
+module Locomotive::Coal
+  module Resources
+
+    class Translations < Base
+
+    end
+
+  end
+end

data/lib/locomotive/coal/upload_io.rb

@@ -0,0 +1,11 @@
+module Locomotive::Coal
+
+  class UploadIO < ::Faraday::UploadIO
+
+    def initialize(filename_or_io, content_type = nil, filename = nil)
+      super(filename_or_io, content_type || 'application/octet-stream', filename)
+    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-alpha.1'
+    VERSION = '1.0.0-alpha.2'
   end
 end

data/lib/locomotive/coal.rb

@@ -2,7 +2,8 @@ require 'active_support'
 require 'active_support/concern'
 require 'active_support/deprecation'
 require 'active_support/core_ext'
-require 'unirest'
+require 'faraday'
+require 'faraday_middleware'
 
 module Locomotive
   module Coal
@@ -10,12 +11,19 @@ module Locomotive
 end
 
 require_relative 'coal/error'
-require_relative 'coal/request'
+require_relative 'coal/upload_io'
 require_relative 'coal/paginated_resources'
 require_relative 'coal/resource'
+require_relative 'coal/resources/base'
 require_relative 'coal/resources/token'
 require_relative 'coal/resources/my_account'
 require_relative 'coal/resources/sites'
-require_relative 'coal/resources/contents'
+require_relative 'coal/resources/pages'
+require_relative 'coal/resources/snippets'
+require_relative 'coal/resources/content_assets'
+require_relative 'coal/resources/theme_assets'
+require_relative 'coal/resources/translations'
+require_relative 'coal/resources/content_types'
 require_relative 'coal/resources/content_entries'
+require_relative 'coal/resources/engine_version'
 require_relative 'coal/client'

data/locomotivecms_coal.gemspec

@@ -5,9 +5,8 @@ Gem::Specification.new do |spec|
   spec.version       = Locomotive::Coal::VERSION
   spec.authors       = ['Didier Lafforgue']
   spec.email         = ['did@locomotivecms.com']
-  spec.description   = %q{The LocomotiveCMS coal is the API ruby client for LocomotiveCMS}
-  spec.summary       = %q{The LocomotiveCMS coal is the API ruby client for LocomotiveCMS}
-  spec.homepage      = 'http://www.locomotivecms.com'
+  spec.description   = %q{The LocomotiveCMS Coal is the API ruby client for the LocomotiveCMS platform}
+  spec.summary       = %q{The LocomotiveCMS Coal is the API ruby client for the LocomotiveCMS platform}
   spec.homepage      = 'https://github.com/locomotivecms/coal'
   spec.license       = 'MIT'
 
@@ -19,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.9.1'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_dependency 'unirest',                '~> 1.1.2'
+  spec.add_dependency 'faraday',                '~> 0.9.1'
+  spec.add_dependency 'faraday_middleware',     '~> 0.9.1'
   spec.add_dependency 'activesupport',          '~> 4.2.1'
 
   spec.required_ruby_version = '>= 2.0'