rooftop 0.0.1 → 0.0.3

data/lib/{rooftop_client → rooftop}/post.rb

@@ -2,13 +2,13 @@ module Rooftop
   module Post
     def self.included(base)
       base.include Rooftop::Base
+      base.include Rooftop::Nested
       base.extend ClassMethods
-      base.send(:collection_path,"posts")
     end
 
     module ClassMethods
       def post_type=(type)
-        self.send(:default_scope, ->{ where(type: type) })
+        self.api_endpoint = type.pluralize
       end
     end
   end

data/lib/{rooftop_client → rooftop}/queries/queries.rb

@@ -19,6 +19,17 @@ module Rooftop
         #Call the Her `where` method with our new filters
         super().where(filters)
       end
+
+      alias_method :find_by, :where
+
+      def find_by!(args)
+        results = find_by(args)
+        if results.present?
+          results
+        else
+          raise Rooftop::RecordNotFound
+        end
+      end
     end
   end
 end

data/lib/rooftop/resource_links/collection.rb

@@ -0,0 +1,22 @@
+module Rooftop
+  module ResourceLinks
+    class Collection < ::Array
+      attr_reader :links
+      def initialize(links)
+        links.each do |link_type,links|
+          links.each do |link|
+            self << Rooftop::ResourceLinks::Link.new(link_type,link)
+          end
+        end
+      end
+
+      # Find links by attribute. Assume there will only be one attribute in the search
+      def find_by(hash)
+        raise ArgumentError, "you can only find a resource link by one attribute at a time" unless hash.length == 1
+        attr = hash.first.first
+        val = hash.first.last
+        self.select {|l| l.send(attr) == val.to_s}
+      end
+    end
+  end
+end

data/lib/rooftop/resource_links/link.rb

@@ -0,0 +1,15 @@
+module Rooftop
+  module ResourceLinks
+    class Link < ::OpenStruct
+      attr_accessor :link_type
+      def initialize(link_type,args)
+        @link_type = link_type
+        super(args)
+      end
+
+      def resolve
+        raise NotImplementedError, "TODO: resolve the link."
+      end
+    end
+  end
+end

data/lib/rooftop/resource_links/resource_links.rb

@@ -0,0 +1,15 @@
+module Rooftop
+  module ResourceLinks
+    CUSTOM_LINK_RELATION_BASE = "http://docs.rooftopcms.com/link_relations"
+    def self.included(base)
+      # set up an attribute called resource_links, which is a collection of links
+      # to other resources in the API.
+      base.send(:after_find, ->(r) {
+        if r.respond_to?(:"_links")
+          r.resource_links = Rooftop::ResourceLinks::Collection.new(r._links)
+        end
+      })
+    end
+
+  end
+end

data/lib/rooftop/version.rb

@@ -0,0 +1,3 @@
+module Rooftop
+  VERSION = "0.0.3"
+end

data/lib/rooftop.rb

@@ -1,10 +1,13 @@
 require 'her'
+require 'faraday-http-cache'
 require 'require_all'
-require_rel '.'
-
 require "active_support/all"
 
 module Rooftop
+
+  DEFAULT_API_NAMESPACE = "wp"
+  DEFAULT_API_VERSION = 2
+
   class << self
     #accessor to set the preview API for use instead of the production one
     attr_accessor :use_preview_api
@@ -22,12 +25,45 @@ module Rooftop
   end
 
   class Configuration
-    attr_accessor :api_token, :url, :extra_headers
-    attr_reader :connection
+    attr_accessor :api_token, :url, :site_name, :perform_caching, :cache_store, :cache_logger, :ssl_options, :proxy
+    attr_reader :connection,
+                :connection_path,
+                :api_path, #actually writeable with custom setter
+                :extra_headers, #actually writeable with custom setter
+                :advanced_options, #actually writeable with custom setter
+                :user_agent #actually writeable with custom setter
 
     def initialize
-      @extra_headers ||= []
+      @extra_headers = {}
       @connection ||= Her::API.new
+      @advanced_options = {}
+      @api_path = "/wp-json/"
+      @user_agent = "Rooftop CMS Ruby client #{Rooftop::VERSION} (http://github.com/rooftopcms/rooftop-ruby)"
+      @perform_caching = false
+      @cache_store = ActiveSupport::Cache.lookup_store(:memory_store)
+      @cache_logger = nil
+      @ssl_options = {}
+      @proxy = nil
+    end
+
+    def api_path=(path)
+      @api_path = path || @api_path
+    end
+
+    def user_agent=(agent)
+      @user_agent = agent || @user_agent
+    end
+
+    def extra_headers=(headers)
+      @extra_headers = headers || @extra_headers
+    end
+
+    def advanced_options=(opts)
+      @advanced_options = opts || @advanced_options
+    end
+
+    def user_agent=(agent)
+      @user_agent = agent || @user_agent
     end
 
     # Return the Configuration object as a hash, with symbols as keys.
@@ -37,17 +73,25 @@ module Rooftop
     end
 
     def configure_connection
-      if @url.nil?
+      if @api_token.nil? || @url.nil?
         raise ArgumentError, "You need to configure Rooftop before instantiating a class with a Rooftop mixin"
       end
 
-      @connection.setup url: @url do |c|
+      @connection_path = "#{@url}#{@api_path}"
+
+      @connection.setup url: @connection_path, ssl: @ssl_options, proxy: @proxy do |c|
         #Headers
         c.use Rooftop::Headers
 
+        # Caching
+        if @perform_caching
+          c.use Faraday::HttpCache, store: @cache_store, serializer: Marshal, logger: @cache_logger
+        end
+
         # Request
         c.use Faraday::Request::UrlEncoded
 
+
         # Response
         c.use Her::Middleware::DefaultParseJSON
 
@@ -57,3 +101,6 @@ module Rooftop
     end
   end
 end
+
+#load everything after this.
+require_rel '.'

data/rooftop_ruby_client.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rooftop_client/version'
+require 'rooftop/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rooftop"
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "An ActiveRecord-like interface to the Rooftop CMS JSON API"
   spec.description   = "An ActiveRecord-like interface to the Rooftop CMS JSON API"
   spec.homepage      = "http://www.rooftopcms.com"
-  spec.license       = "MIT"
+  spec.license       = "GPL v3"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -24,5 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "require_all"
   spec.add_dependency "her"
+  spec.add_dependency "faraday-http-cache"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rooftop
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Ed Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-http-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An ActiveRecord-like interface to the Rooftop CMS JSON API
 email:
 - ed@errorstudio.co.uk
@@ -93,26 +107,36 @@ files:
 - README.md
 - Rakefile
 - lib/rooftop.rb
-- lib/rooftop_client/base.rb
-- lib/rooftop_client/client.rb
-- lib/rooftop_client/coercions.rb
-- lib/rooftop_client/coercions/author_coercion.rb
-- lib/rooftop_client/coercions/parent_coercion.rb
-- lib/rooftop_client/headers.rb
-- lib/rooftop_client/models/author.rb
-- lib/rooftop_client/models/media_item.rb
-- lib/rooftop_client/models/menu.rb
-- lib/rooftop_client/models/menu_item.rb
-- lib/rooftop_client/models/taxonomy.rb
-- lib/rooftop_client/models/taxonomy_term.rb
-- lib/rooftop_client/page.rb
-- lib/rooftop_client/post.rb
-- lib/rooftop_client/queries/queries.rb
-- lib/rooftop_client/version.rb
+- lib/rooftop/base.rb
+- lib/rooftop/client.rb
+- lib/rooftop/coercions.rb
+- lib/rooftop/coercions/author_coercion.rb
+- lib/rooftop/coercions/parent_coercion.rb
+- lib/rooftop/content_fields/collection.rb
+- lib/rooftop/content_fields/content_fields.rb
+- lib/rooftop/content_fields/field.rb
+- lib/rooftop/errors/record_not_found.rb
+- lib/rooftop/field_aliases.rb
+- lib/rooftop/headers.rb
+- lib/rooftop/hook_calls.rb
+- lib/rooftop/models/author.rb
+- lib/rooftop/models/media_item.rb
+- lib/rooftop/models/menu.rb
+- lib/rooftop/models/menu_item.rb
+- lib/rooftop/models/taxonomy.rb
+- lib/rooftop/models/taxonomy_term.rb
+- lib/rooftop/nested.rb
+- lib/rooftop/page.rb
+- lib/rooftop/post.rb
+- lib/rooftop/queries/queries.rb
+- lib/rooftop/resource_links/collection.rb
+- lib/rooftop/resource_links/link.rb
+- lib/rooftop/resource_links/resource_links.rb
+- lib/rooftop/version.rb
 - rooftop_ruby_client.gemspec
 homepage: http://www.rooftopcms.com
 licenses:
-- MIT
+- GPL v3
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/rooftop_client/base.rb

@@ -1,38 +0,0 @@
-module Rooftop
-  module Base
-    def self.included(base)
-      base.include Her::Model
-      # Coercions allow you to pass a block to do something with a returned field
-      base.include Rooftop::Coercions
-      # Queries mixin includes a fixup for there `where()` method
-      base.include Rooftop::Queries
-      # Use the API instance we have configured - in a proc because we can't control load order
-      base.send(:use_api,->{Rooftop.configuration.connection})
-      # WP returns an uppercase attribute for ID. Annoying.
-      # base.send(:primary_key, :"ID")
-      # Date and Modified fields are pretty universal in responses from WP, so we can automatically
-      # coerce these to DateTime.
-      base.send(:coerce_field,date: ->(date) {DateTime.parse(date)})
-      base.send(:coerce_field,modified: ->(modified) {DateTime.parse(modified)})
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      # Allow calling 'first'
-      def first
-        all.first
-      end
-    end
-
-    # Utility method to make the 'created' field have a more rubyish name
-    def created_at
-      date
-    end
-
-    # Utility method to make the 'updated' field have a more rubyish name
-    def updated_at
-      modified
-    end
-
-  end
-end

data/lib/rooftop_client/coercions/author_coercion.rb

@@ -1,8 +0,0 @@
-module Rooftop
-  module AuthorCoercion
-    def self.included(base)
-      base.send(:after_find, ->(r) { r.author.registered = DateTime.parse(r.author.registered)})
-      base.send(:coerce_field, {author: ->(author) { Rooftop::Author.new(author) }})
-    end
-  end
-end

data/lib/rooftop_client/coercions/parent_coercion.rb

@@ -1,45 +0,0 @@
-# Coerce any field called 'parent' which returns an ID into an actual object
-module Rooftop
-  module ParentCoercion
-    def self.included(base)
-      base.extend ClassMethods
-      # base.send(:after_find, ->(r) {
-      #   if r.has_parent?
-      #     r.instance_variable_set(:"parent_#{base.to_s.underscore}", resolve_parent_id())
-      #     r.class.send(:attr_reader, :"parent_#{base.to_s.underscore}")
-      #   end
-      # })
-      # base.send(:coerce_field, parent: ->(p) { base.send(:resolve_parent_id,p) })
-    end
-
-    module ClassMethods
-      def add_parent_reference
-        define_method :"parent_#{self.to_s.underscore}" do
-          puts "hello"
-        end
-      end
-    end
-
-    def has_parent?
-      respond_to?(:parent) && parent.is_a?(Fixnum) && parent != 0
-    end
-
-    def resolve_parent_id
-      if respond_to?(:parent)
-        if parent.is_a?(Fixnum)
-          if parent == 0
-            #no parent
-            return nil
-          else
-            return self.class.send(:find, id)
-          end
-        else
-          return parent
-        end
-
-      end
-
-    end
-  end
-
-end

data/lib/rooftop_client/models/menu.rb

@@ -1,8 +0,0 @@
-module Rooftop
-  class Menu
-    include Rooftop::Base
-    has_many :menu_items, class: "Rooftop::MenuItem"
-    collection_path "menus"
-    coerce_field items: ->(items) { items.collect {|i| MenuItem.new(i)} unless items.nil?}
-  end
-end

data/lib/rooftop_client/page.rb

@@ -1,19 +0,0 @@
-module Rooftop
-  module Page
-    def self.included(base)
-      base.include Rooftop::Base
-      #TODO instead of the silly coercion, we should be able to use Her to do this
-      # has_one :parent, data_field: :parent, class_name: "Page", path: "/pages"
-      base.include Rooftop::ParentCoercion
-      base.extend ClassMethods
-      base.send(:collection_path,"pages")
-    end
-
-    module ClassMethods
-
-    end
-
-
-
-  end
-end

data/lib/rooftop_client/version.rb

@@ -1,3 +0,0 @@
-module Rooftop
-  VERSION = "0.0.1"
-end