reviewed 0.0.6 → 0.0.7

data/lib/reviewed/article.rb

@@ -1,27 +1,29 @@
+require 'reviewed/page'
+require 'reviewed/product'
+require 'reviewed/attachment'
+
 module Reviewed
   class Article < Base
+    has_many :pages
+    has_many :products
+    has_many :attachments
+
     def find_page(slug)
       pages.find { |page| page.slug.match(/#{slug}/i) }
     end
 
-    def products
-      (@attributes[:products] || []).map do |product|
-        Reviewed::Product.new(product)
-      end
-    end
-
     def primary_product
       products.select { |p| p.id == primary_product_id }.first
     end
 
     def attachments(tag=nil)
       if tag.present?
-        @attributes[:attachments].select do |attachment|
+        @attributes.attachments.select do |attachment|
           attachment_tags = attachment.tags || []
           attachment_tags.map(&:downcase).include?(tag.downcase)
         end
       else
-        @attributes[:attachments]
+        @attributes.attachments
       end
     end
   end

data/lib/reviewed/attachment.rb

@@ -0,0 +1,4 @@
+module Reviewed
+  class Attachment < Reviewed::Base
+  end
+end

data/lib/reviewed/base.rb

@@ -1,18 +1,35 @@
+require 'active_model'
+
 module Reviewed
   class Base
-    extend ActiveModel::Naming
+    include ::Reviewed::Embeddable
+    include ::Reviewed::Utils
+
+    extend ::ActiveModel::Naming
+
+    attr_accessor :attributes
+
+    def initialize(data)
+      self.attributes = objectify(data)
+    end
+
+    class << self
 
-    attr_accessor :raw_response, :resource_url
+      def find(id, params={})
+        object_from_response(:get, "#{resource_url}/#{id}", params)
+      end
 
-    def initialize(attributes={}, raw_response=nil)
-      attributes.symbolize_keys!
+      def where(params={})
+        collection_from_response(:get, resource_url, params)
+      end
 
-      unless attributes[:id].present?
-        raise ResourceError.new("Resource requires an ID")
+      def all
+        where({})
       end
 
-      @raw_response = raw_response
-      @attributes = Hashie::Mash.new(attributes)
+      def resource_url
+        @resource_name ||= self.name.demodulize.downcase.pluralize
+      end
     end
 
     def method_missing(sym, *args, &block)
@@ -22,37 +39,5 @@ module Reviewed
         super
       end
     end
-
-    def self.find(id)
-      Reviewed.verify_key!
-
-      response = Reviewed::Request.get(resource_url(id))
-      new(response.json, response.raw)
-    end
-
-    def self.all
-      where({})
-    end
-
-    def self.where(options={})
-      Reviewed.verify_key!
-
-      response = Reviewed::Request.get(resource_url(nil, options))
-      Collection.new(self, response.json, options)
-    end
-
-    def self.resource_name=(value)
-      @resource_name = value
-    end
-
-    def self.resource_name
-      @resource_name ||= self.name.split('::').last.downcase
-    end
-
-    def self.resource_url(id=nil, options={})
-      url = [Reviewed.base_uri, API_VERSION, resource_name.pluralize, id].compact.join("/")
-      query_string = Util.build_query_string(options)
-      query_string.blank? ? url : "#{url}?#{query_string}"
-    end
   end
 end

data/lib/reviewed/client.rb

@@ -0,0 +1,56 @@
+module Reviewed
+  class Client
+    include ::Reviewed::Configurable
+
+    attr_accessor :api_key, :base_uri, :api_version
+
+    def initialize
+      Reviewed::Configurable.options.each do |key, value|
+        instance_variable_set(:"@#{key}", value)
+      end
+    end
+
+    # Perform an HTTP DELETE request
+    def delete(path, params={})
+      request(:delete, path, params)
+    end
+
+    # Perform an HTTP GET request
+    def get(path, params={})
+      request(:get, path, params)
+    end
+
+    # Perform an HTTP POST request
+    def post(path, params={})
+      request(:post, path, params)
+    end
+
+    # Perform an HTTP PUT request
+    def put(path, params={})
+      request(:put, path, params)
+    end
+
+    def url
+      [base_uri, api_version].join('/')
+    end
+
+    private
+
+    def request(method, path, params={})
+      verify_key!
+
+      connection.send(method.to_sym, path, params) do |request|
+        request.headers['X-Reviewed-Authorization'] ||= Reviewed.api_key
+      end
+    end
+
+    def connection
+      @connection ||= ::Faraday.new(url: url) do |faraday|
+        faraday.response :mashify
+        faraday.response :json
+        faraday.request  :url_encoded
+        faraday.adapter  Faraday.default_adapter
+      end
+    end
+  end
+end

data/lib/reviewed/collection.rb

@@ -1,25 +1,26 @@
 module Reviewed
   class Collection
+    include Reviewed::Utils
     include Enumerable
+
     extend Forwardable
+
     def_delegators :@items, :<<, :[], :[]=, :each, :first, :last, :length, :concat, :map, :collect, :empty?
 
-    attr_accessor :raw_response
+    attr_accessor :raw_response, :page_attributes, :klass, :items, :params
 
-    def initialize(klass, json, options={})
-      json = json.symbolize_keys!
-      page_data = json[:pagination].symbolize_keys!
+    def initialize(klass, response, params={})
+      body = response.body
+      data = body.data
 
-      @items = []
-      items = json[:data]
-      items.each do |item|
-        @items << klass.new(item)
-      end
+      self.page_attributes = body.pagination
+      self.params = params
+      self.klass = klass
+      self.items = []
 
-      @page_attributes = page_data
-      @raw_response = json
-      @request_options = options.symbolize_keys!
-      @klass = klass
+      data.each do |obj|
+        self.items << klass.from_response(obj)
+      end
     end
 
     def limit_value
@@ -44,10 +45,6 @@ module Reviewed
       fetch_page(@page_attributes[:previous_page])
     end
 
-    def ==(other)
-      @raw_response == other.raw_response
-    end
-
     def method_missing(sym, *args, &block)
       clean_sym = sym.to_s.gsub(/\?/, '').to_sym
       if @page_attributes.has_key?(clean_sym)
@@ -60,8 +57,8 @@ module Reviewed
     private
 
     def fetch_page(page=nil)
-      @request_options[:page] = page
-      @klass.where(@request_options)
+      self.params[:page] = page
+      @klass.where(self.params)
     end
   end
 end

data/lib/reviewed/configurable.rb

@@ -0,0 +1,26 @@
+module Reviewed
+  module Configurable
+
+    class << self
+
+      def options
+        {
+          api_key: nil,
+          base_uri: 'http://localhost:3000/api',
+          api_version: 'v1'
+        }
+      end
+    end
+
+    def configure
+      yield self
+      self
+    end
+
+    def verify_key!
+      unless Reviewed.api_key
+        raise ConfigurationError.new("Please set Reviewed.api_key before making a request")
+      end
+    end
+  end
+end

data/lib/reviewed/embeddable.rb

@@ -0,0 +1,74 @@
+module Reviewed
+  module Embeddable
+
+    def self.included(klass)
+      klass.extend(Reviewed::Embeddable::ClassMethods)
+    end
+
+    class << self
+
+      def embedded_class(name, opts_name=nil)
+        name = opts_name ? opts_name : embedded_name(name)
+        name.constantize
+      end
+
+      def embedded_name(name)
+        ["Reviewed", name.singularize.classify].join("::")
+      end
+    end
+
+    def objectify(data)
+      data = objectify_has_many(data)
+      data = objectify_has_one(data)
+      return data
+    end
+
+    def objectify_has_many(json)
+      self.class._embedded_many.each do |map|
+        key, value = [map.keys[0], map.values[0]]
+
+        if json.has_key?(key)
+          json[key] = json[key].map do |obj|
+            value.new(obj)
+          end
+        end
+      end
+      return json
+    end
+
+    def objectify_has_one(json)
+      self.class._embedded_one.each do |map|
+        key, value = [map.keys[0], map.values[0]]
+
+        if json.has_key?(key)
+          json[key] = value.new(json[key])
+        end
+      end
+      return json
+    end
+
+    module ClassMethods
+      attr_accessor :_embedded_many, :_embedded_one
+
+      def has_many(name, opts={})
+        klass = Reviewed::Embeddable.embedded_class(name.to_s, opts[:class_name])
+        association = opts[:as] || name
+        _embedded_many << { association.to_s => klass }
+      end
+
+      def has_one(name, opts={})
+        klass = Reviewed::Embeddable.embedded_class(name.to_s, opts[:class_name])
+        association = opts[:as] || name
+        _embedded_one << { association.to_s => klass }
+      end
+
+      def _embedded_many
+        @_embedded_many ||= []
+      end
+
+      def _embedded_one
+        @_embedded_one ||= []
+      end
+    end
+  end
+end

data/lib/reviewed/page.rb

@@ -0,0 +1,4 @@
+module Reviewed
+  class Page < Base
+  end
+end

data/lib/reviewed/product.rb

@@ -1,13 +1,17 @@
+require 'reviewed/attachment'
+
 module Reviewed
   class Product < Base
+    has_many :attachments
+
     def attachments(tag=nil)
       if tag.present?
-        @attributes[:attachments].select do |attachment|
+        @attributes.attachments.select do |attachment|
           attachment_tags = attachment.tags || []
           attachment_tags.map(&:downcase).include?(tag.downcase)
         end
       else
-        @attributes[:attachments]
+        @attributes.attachments
       end
     end
   end

data/lib/reviewed/utils.rb

@@ -0,0 +1,25 @@
+module Reviewed
+  module Utils
+
+    def self.included(klass)
+      klass.extend(Reviewed::Utils::ClassMethods)
+    end
+
+    module ClassMethods
+
+      def object_from_response(method, url, params={})
+        response = Reviewed.send(method, url, params)
+        self.from_response(response.body)
+      end
+
+      def collection_from_response(method, url, params={})
+        response = Reviewed.send(method, url, params)
+        Reviewed::Collection.new(self, response, params)
+      end
+
+      def from_response(data)
+        self.new(data)
+      end
+    end
+  end
+end

data/lib/reviewed/version.rb

@@ -1,4 +1,4 @@
 module Reviewed
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
   API_VERSION = 'v1'
 end

data/lib/reviewed.rb

@@ -1,53 +1,40 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
+require 'faraday'
+require 'faraday_middleware'
+require 'active_support/inflector'
 require 'active_support/core_ext'
-require 'rest_client'
 require 'active_model'
 require 'hashie'
-require 'forwardable'
 
-require 'reviewed/version'
-require 'reviewed/util'
-require 'reviewed/base'
+require 'reviewed/configurable'
+require 'reviewed/embeddable'
+require 'reviewed/utils'
+require 'reviewed/client'
 require 'reviewed/collection'
-require 'reviewed/request'
-require 'reviewed/response'
+require 'reviewed/base'
 
-require 'reviewed/website'
 require 'reviewed/product'
+require 'reviewed/article'
 require 'reviewed/author'
 require 'reviewed/brand'
-require 'reviewed/article'
+require 'reviewed/page'
+require 'reviewed/website'
+
 
 module Reviewed
   class ConfigurationError < StandardError; end
-  class ResourceError < StandardError; end
-
-  @@config = {
-    base_uri: 'http://localhost:3000/api'
-  }
 
-  def self.api_key=(token)
-    @@config[:api_key] = token
-  end
-
-  def self.api_key
-    @@config[:api_key]
-  end
-
-  def self.base_uri=(uri)
-    @@config[:base_uri] = uri
-  end
+  class << self
 
-  def self.base_uri
-    @@config[:base_uri]
-  end
+    def client
+      @client ||= Reviewed::Client.new
+    end
 
-  def self.verify_key!
-    if Reviewed.api_key.present?
-      true
-    else
-      raise ConfigurationError.new("Please set Reviewed.api_key before making a request")
+    def method_missing(method, *args, &block)
+      return super unless client.respond_to?(method)
+      client.send(method, *args, &block)
     end
   end
 end
+

data/reviewed.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport', '>= 3.0'
   gem.add_dependency 'activemodel', '>=3.0'
-  gem.add_dependency 'rest-client', '>= 1.6'
+  gem.add_dependency 'faraday', '>= 0.8.4'
+  gem.add_dependency 'faraday_middleware', '>= 0.9.0'
   gem.add_dependency 'hashie', '~> 1.2'
 
   gem.add_development_dependency 'rspec', '>= 2.10'

data/spec/article_spec.rb

@@ -1,6 +1,71 @@
 require 'spec_helper'
 
 describe Reviewed::Article do
+
+  describe 'associations' do
+
+    describe 'pages' do
+      use_vcr_cassette 'article/pages'
+
+      it 'has_many :pages' do
+        Reviewed::Article._embedded_many.should include({"pages"=>Reviewed::Page})
+      end
+    end
+
+    describe 'products' do
+      use_vcr_cassette 'article/products'
+
+      before(:each) do
+        @article = Reviewed::Article.find('big-green-egg-medium-charcoal-grill-review')
+      end
+
+      it 'has_many :products' do
+        Reviewed::Article._embedded_many.should include({"products"=>Reviewed::Product})
+      end
+
+      it 'returns products of the correct class' do
+        @article.products.each do |product|
+          product.should be_an_instance_of(Reviewed::Product)
+        end
+      end
+    end
+
+    describe 'attachments' do
+      use_vcr_cassette 'article/attachments'
+
+      before(:each) do
+        @article = Reviewed::Article.find('big-green-egg-medium-charcoal-grill-review')
+      end
+
+      it 'has_many :attachments' do
+        Reviewed::Article._embedded_many.should include({"attachments"=>Reviewed::Attachment})
+      end
+
+      it 'returns all attachments' do
+        @article.attachments.length.should >= 1
+      end
+
+      it 'returns attachments of the correct class' do
+        @article.attachments.each do |attachment|
+          attachment.should be_an_instance_of(Reviewed::Attachment)
+        end
+      end
+
+      it 'finds attachments by tag' do
+        attachments = @article.attachments('hero')
+        attachments.length.should == 1
+        attachments.each do |attachment|
+          attachment.tags.join(',').should match(/hero/i)
+        end
+      end
+
+      it 'does not have any matching attachments' do
+        attachments = @article.attachments('doesnotcompute')
+        attachments.length.should == 0
+      end
+    end
+  end
+
   describe 'find_page' do
     use_vcr_cassette 'article/find_page'
 
@@ -13,20 +78,6 @@ describe Reviewed::Article do
     end
   end
 
-  describe 'products' do
-    use_vcr_cassette 'article/products'
-
-    before(:each) do
-      @article = Reviewed::Article.find('big-green-egg-medium-charcoal-grill-review')
-    end
-
-    it 'returns products of the correct class' do
-      @article.products.should_not be_empty
-      @article.products.each do |product|
-        product.class.should == Reviewed::Product
-      end
-    end
-  end
 
   describe 'primary_product' do
     use_vcr_cassette 'article/products'
@@ -44,29 +95,4 @@ describe Reviewed::Article do
       @product.class.should == Reviewed::Product
     end
   end
-
-  describe 'attachments' do
-    use_vcr_cassette 'article/attachments'
-
-    before(:each) do
-      @article = Reviewed::Article.find('big-green-egg-medium-charcoal-grill-review')
-    end
-
-    it 'returns all attachments' do
-      @article.attachments.length.should >= 1
-    end
-
-    it 'finds attachments by tag' do
-      attachments = @article.attachments('hero')
-      attachments.length.should == 1
-      attachments.each do |attachment|
-        attachment.tags.join(',').should match(/hero/i)
-      end
-    end
-
-    it 'does not have any matching attachments' do
-      attachments = @article.attachments('doesnotcompute')
-      attachments.length.should == 0
-    end 
-  end
 end