typekit-client 0.0.5 → 0.0.6

data/bin/typekit-client

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'typekit'
 require 'readline'
@@ -11,42 +12,41 @@ class Controller
   ACTIONS = %w{index show create update delete}
   KEYWORDS = %w{families kits libraries published publish}
 
-  def initialize(**options)
-    @client = Typekit::Client.new(**options)
+  def initialize(options)
+    @client = Typekit::Client.new(options)
   end
 
   def process(command)
     action, path, parameters = parse(command)
-    print @client.perform(action, path, parameters)
+    print @client.process(action, path, parameters)
   rescue Exception => e
     puts e
   end
 
   def help
     puts <<-HELP
-Usage: <action> <resource> [parameters]
+Usage: <action> <endpoint> [parameters]
 
     <action>        index, show, create, update, or delete
-    <resource>      a list separated by whitespaces
+    <endpoint>      a list separated by whitespaces
     [parameters]    a JSON-encoded hash (optional)
 
 Examples:
     index kits
-    show kits bas4cfe families vcsm
-    show families vcsm i9
-    show libraries trial { "page": 10, "per_page": 5 }
-    create kits { "name": "Megakit", "domains": "localhost" }
-    update kits bas4cfe { "name": "Ultrakit" }
+    create kits { "name": "Megakit", domains: ["localhost"] }
+    show kits bas4cfe
+    update kits bas4cfe { families: [{ "id": "vybr" }] }
+    update kits bas4cfe publish
     delete kits bas4cfe
+    show families vybr i4
+    show libraries trial { "page": 10, "per_page": 5 }
 HELP
   end
 
   protected
 
   def print(output)
-    puts JSON.pretty_generate(output)
-  rescue JSON::GeneratorError
-    puts output.to_s # neither hash nor array
+    puts JSON.pretty_generate(output, quirks_mode: true)
   end
 
   def parse(command)
@@ -59,7 +59,7 @@ HELP
     raise 'Invalid action name' unless ACTIONS.include?(action)
     raise 'Missing resource name' if path.empty?
 
-    [ action, path, parameters ]
+    [action, path, parameters]
   end
 
   def extract_parameters!(command)
@@ -132,7 +132,7 @@ puts %{Type 'help' for help and 'exit' to exit.}
 
 COMMANDS = Controller::ACTIONS + Controller::KEYWORDS + %w{help exit}
 Readline.completion_proc = proc do |input|
-  COMMANDS.grep(/^#{ Regexp.escape(input) }/)
+  COMMANDS.grep(/^#{Regexp.escape(input)}/)
 end
 
 loop do

data/bin/typekit-publisher

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'typekit'
 require 'readline'
@@ -59,9 +60,9 @@ kits = process(:index, :kits)
 
 puts 'Which kit would you like to publish?'
 kits.each_with_index do |kit, i|
-  puts "%4d. %s" % [ i + 1, kit.id ]
+  puts "%4d. %s" % [i + 1, kit.id]
 end
-puts "%4d. all" % [ kits.length + 1 ]
+puts "%4d. all" % [kits.length + 1]
 
 k = Readline.readline('> ')
 if k.nil? || k.empty?
@@ -76,10 +77,10 @@ if k < 1 || k > kits.length + 1
   exit
 end
 
-range = k == kits.length + 1 ? 0...kits.length : [ k - 1 ]
+range = k == kits.length + 1 ? 0...kits.length : [k - 1]
 
 range.each do |i|
-  print "Publishing #{ kits[i].id }..."
+  print "Publishing #{kits[i].id}..."
   process(:update, :kits, kits[i].id, :publish)
   puts ' Done.'
 end

data/lib/typekit.rb

@@ -2,12 +2,16 @@ require 'forwardable'
 require 'apitizer'
 
 require_relative 'typekit/core'
+require_relative 'typekit/error'
 require_relative 'typekit/helper'
 
-require_relative 'typekit/processing'
+require_relative 'typekit/converter'
 
+require_relative 'typekit/client'
+
+require_relative 'typekit/element'
 require_relative 'typekit/collection'
+
 require_relative 'typekit/record'
-require_relative 'typekit/client'
 
 require_relative 'typekit/version'

data/lib/typekit/client.rb

@@ -1,40 +1,82 @@
 module Typekit
-  class Client
-    extend Forwardable
+  module Client
+    def self.new(options)
+      raise Error, 'Token is missing' unless options.key?(:token)
 
-    def_delegator :translator, :process, :translate
+      client = Module.new
+      client.extend(InstanceMethods)
+      client.configure(Typekit.defaults.merge(options))
 
-    def initialize(**options)
-      @options = Typekit.defaults.merge(options)
-      raise Error, 'Token is missing' unless @options.key?(:token)
+      client
     end
 
-    [ :process, :index, :show, :create, :update, :delete ].each do |method|
-      define_method(method) do |*arguments|
-        translate(engine.send(method, *arguments))
+    module InstanceMethods
+      [:process, :index, :show, :create, :update, :delete].each do |method|
+        define_method(method) do |*arguments|
+          translate(engine.send(method, *arguments))
+        end
       end
-    end
-    alias_method :perform, :process
 
-    private
+      def configure(options)
+        self.options = options
+      end
 
-    def engine
-      @engine ||= build_engine
-    end
+      private
+
+      attr_accessor :options
+
+      def engine
+        @engine ||= build_engine
+      end
+
+      def build_engine
+        engine_options = options.merge(dictionary: Typekit.dictionary,
+          headers: Typekit.headers.call(options[:token]))
+
+        version = options[:version]
+        format = options[:format]
+
+        Apitizer::Base.new(engine_options) do
+          instance_exec(version, format, &Typekit.schema)
+        end
+      end
 
-    def translator
-      @translator ||= Processing::Translator.new
+      def translate(result)
+        unless result.is_a?(Hash) && result.length == 1
+          raise ServerError.new(result.code)
+        end
+        name, object = *result.first
+        converter(name).process(result, object)
+      end
+
+      def const_missing(name)
+        record_class(name)
+      end
+
+      def converter(name)
+        (@converters ||= {})[name] ||= Converter.build(name, self)
+      end
+
+      def record_class(name)
+        (@record_classes ||= {})[name] ||= Record.build(name, self)
+      end
     end
 
-    def build_engine
-      version = @options[:version]
-      format = @options[:format]
+    module Proxy
+      attr_reader :client, :token
+
+      def connect(object = nil, token = Helper.tokenize(self.class))
+        self.client = object.respond_to?(:client) ? object.client : object
+        self.token = token
+      end
+
+      private
 
-      options = @options.merge(dictionary: Typekit.dictionary,
-        headers: Typekit.headers.call(@options[:token]))
+      attr_writer :client, :token
 
-      Apitizer::Base.new(**options) do
-        instance_exec(version, format, &Typekit.schema)
+      def process(action, *arguments)
+        raise Error, 'Client is not specified' if client.nil?
+        client.process(action, token, *arguments)
       end
     end
   end

data/lib/typekit/collection.rb

@@ -1,15 +1,10 @@
-module Typekit
-  class Collection
-    extend Forwardable
-
-    def_delegator :@records, :to_json
-    def_delegators :@records, :each, :map, :[], :size, :length
+require_relative 'collection/serialization'
+require_relative 'collection/base'
 
-    def initialize(name, collection_attributes = nil)
-      @klass = Record.classify(name)
-      @records = collection_attributes.map do |attributes|
-        @klass.new(attributes)
-      end
+module Typekit
+  module Collection
+    def self.build(name, *arguments)
+      Base.new(name, *arguments)
     end
   end
 end

data/lib/typekit/collection/base.rb

@@ -0,0 +1,40 @@
+module Typekit
+  module Collection
+    class Base
+      extend Forwardable
+      include Enumerable
+
+      include Client::Proxy
+
+      include Serialization
+
+      def_delegators :elements, :to_ary, :to_a, :to_json,
+        :[], :each, :size, :length, :empty?, :delete
+      def_delegator :klass, :feature?
+
+      def initialize(name, *arguments)
+        objects = Helper.extract_array!(arguments)
+
+        @elements = []
+        @klass = Element.classify(name)
+        connect(arguments.first, name)
+
+        objects.each { |object| push(object) }
+      end
+
+      def push(object)
+        if object.is_a?(klass)
+          object.connect(self)
+          elements << object
+        else
+          elements << klass.new(self, object)
+        end
+      end
+      alias_method :<<, :push
+
+      private
+
+      attr_reader :elements, :klass
+    end
+  end
+end

data/lib/typekit/collection/serialization.rb

@@ -0,0 +1,17 @@
+module Typekit
+  module Collection
+    module Serialization
+      def serialize
+        result = nil
+
+        if klass.feature?(:serialization)
+          result = elements.map(&:serialize)
+          # FIXME: A nasty hack to empty collections.
+          result = '' if result.empty?
+        end
+
+        result
+      end
+    end
+  end
+end

data/lib/typekit/converter.rb

@@ -0,0 +1,26 @@
+require_relative 'converter/element'
+require_relative 'converter/collection'
+require_relative 'converter/boolean'
+require_relative 'converter/datetime'
+require_relative 'converter/errors'
+require_relative 'converter/unknown'
+
+module Typekit
+  module Converter
+    MAPPING = {
+      :element => Element,
+      :collection => Collection,
+
+      'ok' => Boolean,
+      'errors' => Errors,
+      'published' => DateTime,
+
+      nil => Errors
+    }
+    MAPPING.default = Unknown
+
+    def self.build(name, *arguments)
+      MAPPING[Record.identify(name) || name].new(name, *arguments)
+    end
+  end
+end

data/lib/typekit/converter/boolean.rb

@@ -0,0 +1,12 @@
+module Typekit
+  module Converter
+    class Boolean
+      def initialize(*)
+      end
+
+      def process(result, object)
+        object # already boolean
+      end
+    end
+  end
+end

data/lib/typekit/converter/collection.rb

@@ -0,0 +1,13 @@
+module Typekit
+  module Converter
+    class Collection
+      def initialize(*arguments)
+        @arguments = arguments
+      end
+
+      def process(result, collection_attributes)
+        Typekit::Collection.build(*@arguments, collection_attributes)
+      end
+    end
+  end
+end

data/lib/typekit/converter/datetime.rb

@@ -0,0 +1,12 @@
+module Typekit
+  module Converter
+    class DateTime
+      def initialize(*)
+      end
+
+      def process(result, object)
+        ::DateTime.parse(object)
+      end
+    end
+  end
+end

data/lib/typekit/converter/element.rb

@@ -0,0 +1,13 @@
+module Typekit
+  module Converter
+    class Element
+      def initialize(*arguments)
+        @arguments = arguments
+      end
+
+      def process(result, attributes)
+        Typekit::Element.build(*@arguments, attributes)
+      end
+    end
+  end
+end

data/lib/typekit/converter/errors.rb

@@ -0,0 +1,12 @@
+module Typekit
+  module Converter
+    class Errors
+      def initialize(*)
+      end
+
+      def process(result, errors)
+        raise ServerError.new(result.code, Array(errors).join(', '))
+      end
+    end
+  end
+end

data/lib/typekit/converter/unknown.rb

@@ -0,0 +1,13 @@
+module Typekit
+  module Converter
+    class Unknown
+      def initialize(name, *)
+        @name = name
+      end
+
+      def process(result, object)
+        { @name => object }
+      end
+    end
+  end
+end

data/lib/typekit/core.rb

@@ -1,25 +1,23 @@
 module Typekit
-  Error = Class.new(StandardError)
-
   @defaults = { version: 1, format: :json }
 
   @schema = Proc.new do |version, format|
-    address "https://typekit.com/api/v#{ version }/#{ format }"
-
-    resources :families, only: :show do
-      show ':variation', on: :member
-    end
+    address "https://typekit.com/api/v#{version}/#{format}"
 
     resources :kits do
-      resources :families, only: [ :show, :update, :delete ]
+      resources :families, only: [:show, :update, :delete]
       show :published, on: :member
       update :publish, on: :member
     end
 
-    resources :libraries, only: [ :index, :show ]
+    resources :families, only: :show do
+      show ':variation', on: :member
+    end
+
+    resources :libraries, only: [:index, :show]
   end
 
-  @dictionary = { :update => :post } # not PUT
+  @dictionary = { :update => :post } # not PATCH
 
   @headers = Proc.new do |token|
     { 'X-Typekit-Token' => token }