reviewed 0.1.4 → 0.1.21

data/lib/faraday/api_key.rb

@@ -2,11 +2,9 @@ module Faraday
   class ApiKey < Faraday::Middleware
 
     def call(env)
-      unless env[:request_headers]['X-Reviewed-Authorization']
-        raise ::Reviewed::ConfigurationError.new(msg: "Please set the API key for your Reviewed::Client instance before making a request")
+      unless env.request.headers['X-Reviewed-Authorization']
+        raise ::Reviewed::ConfigurationError.new("Please set the API key for your Reviewed::Client instance before making a request")
       end
-
-      @app.call(env)
     end
   end
 end

data/lib/reviewed/article.rb

@@ -13,9 +13,7 @@ module Reviewed
     end
 
     def primary_product
-      if respond_to?(:products)
-        products.select { |p| p.id == primary_product_id }.first
-      end
+      products.select { |p| p.id == primary_product_id }.first
     end
 
     def attachments(tag=nil)

data/lib/reviewed/base.rb

@@ -12,22 +12,6 @@ module Reviewed
       self.attributes = objectify(data)
     end
 
-    def created_at
-      if @attributes.has_key?(:created_at)
-        Time.parse(@attributes[:created_at])
-      else
-        nil
-      end
-    end
-
-    def updated_at
-      if @attributes.has_key?(:updated_at)
-        Time.parse(@attributes[:updated_at])
-      else
-        nil
-      end
-    end
-
     class << self
 
       def path
@@ -39,9 +23,8 @@ module Reviewed
       end
     end
 
-    def respond_to?(sym, include_private=false)
-      return true if super
-      @attributes.has_key?(sym)
+    def initialize(data)
+      self.attributes = objectify(data)
     end
 
     def method_missing(sym, *args, &block)

data/lib/reviewed/client.rb

@@ -15,29 +15,14 @@ module Reviewed
       self
     end
 
-    # Perform an HTTP GET request
-    def get(path, params={})
-      perform(:get, path, params)
-    end
-
-    # Perform an HTTP PUT request
-    def put(path, params={})
-      perform(:put, path, params)
-    end
-
-    # Perform an HTTP DELETE request
-    def post(path, params={})
-      perform(:post, path, params)
-    end
-
-    # Perform an HTTP DELETE request
-    def delete(path, params={})
-      perform(:delete, path, params)
-    end
-
     def resource(name)
       klass_string = "Reviewed::#{name.to_s.singularize.classify}"
-      klass_string.constantize rescue name
+
+      begin
+        klass = klass_string.constantize
+      rescue
+        raise "Resource: #{klass_string} not found"
+      end
     end
 
     def method_missing(method, *args, &block)
@@ -45,34 +30,12 @@ module Reviewed
     end
 
     def connection
-      @connection ||= ::Faraday.new(url: base_uri) do |faraday|
+      @connection ||= ::Faraday.new(url: BASE_URI) do |faraday|
         faraday.response :mashify
-        faraday.response :errors
         faraday.response :json
-        faraday.request  :api_key
         faraday.request  :url_encoded
         faraday.adapter  Faraday.default_adapter
       end
     end
-
-    private
-
-    def perform(method, path, params={})
-      begin
-        self.connection.send(method.to_sym, path, params) do |request|
-          request.params.merge!(self.request_params)
-          request.headers['X-Reviewed-Authorization'] ||= self.api_key
-        end
-      rescue Faraday::Error::ClientError => e
-        message = <<-EOS.gsub(/^[ ]*/, '')
-          API Error. method: #{method}. path: #{path}. params: #{params.to_s}. api_key: #{self.api_key}
-          Original exception message:
-          #{e.message}
-        EOS
-        new_exception = Reviewed::ApiError.new(msg: message)
-        new_exception.set_backtrace(e.backtrace) # TODO not seeing in Airbrake
-        raise new_exception
-      end
-    end
   end
 end

data/lib/reviewed/product.rb

@@ -4,8 +4,6 @@ module Reviewed
   class Product < Base
     has_many :attachments
     has_many :manufacturer_specs
-    has_many :awards
-    has_one  :brand
 
     def attachments(tag=nil)
       if tag.present?

data/lib/reviewed/request.rb

@@ -4,20 +4,39 @@ module Reviewed
     attr_reader :path
 
     def initialize(opts={})
-      if opts[:resource].kind_of?(Class)
+      if opts[:resource].kind_of?(String)
+        @path = opts[:resource]
+      else
         @resource = opts[:resource]
         @path = @resource.path
-      else
-        @path = opts[:resource].to_s
       end
 
       @client = opts[:client] || Reviewed::Client.new
     end
 
+    # Perform an HTTP GET request
+    def get(path, params={})
+      perform(:get, path, params)
+    end
+
+    # Perform an HTTP PUT request
+    def put(path, params={})
+      perform(:put, path, params)
+    end
+
+    # Perform an HTTP DELETE request
+    def post(path, params={})
+      perform(:post, path, params)
+    end
+
+    # Perform an HTTP DELETE request
+    def delete(path, params={})
+      perform(:delete, path, params)
+    end
+
     # Get request on resource#show
     def find(id, params={})
-      url_path = [path, CGI::escape(id.to_s)]
-      object_from_response(:get, url_path.join('/'), params)
+      object_from_response(:get, "#{path}/#{id}", params)
     end
 
     # Get request on resource#index with query params
@@ -31,13 +50,22 @@ module Reviewed
     end
 
     def object_from_response(method, url, params={})
-      response = client.send(method, url, params)
+      response = self.send(method, url, params)
       resource.new(response.body)
     end
 
     def collection_from_response(method, url, params={})
-      response = client.send(method, url, params)
+      response = self.send(method, url, params)
       Reviewed::Collection.new(client, resource, response, params)
     end
+
+    private
+
+    def perform(method, path, params={})
+      client.connection.send(method.to_sym, path, params) do |request|
+        request.params.merge!(client.request_params)
+        request.headers['X-Reviewed-Authorization'] ||= client.api_key
+      end
+    end
   end
 end

data/lib/reviewed/version.rb

@@ -1,4 +1,4 @@
 module Reviewed
-  VERSION = "0.1.4"
+  VERSION = "0.1.21"
   API_VERSION = 'v1'
 end

data/lib/reviewed.rb

@@ -3,7 +3,6 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 require 'faraday'
 require 'faraday_middleware'
 require 'faraday/api_key'
-require 'faraday/errors'
 require 'active_support/inflector'
 require 'active_support/core_ext'
 require 'active_model'
@@ -17,26 +16,15 @@ require 'reviewed/collection'
 require 'reviewed/base'
 
 require 'reviewed/manufacturer_spec'
-require 'reviewed/award'
-require 'reviewed/brand'
 require 'reviewed/product'
 require 'reviewed/article'
 require 'reviewed/author'
+require 'reviewed/brand'
 require 'reviewed/page'
 require 'reviewed/website'
 
 
 module Reviewed
-  class BaseError < StandardError
-    attr_accessor :url
-
-    def initialize(opts={})
-      @url = opts[:url]
-      super(opts[:msg])
-    end
-  end
-  class ConfigurationError < Reviewed::BaseError; end
-  class ResourceNotFound < Reviewed::BaseError; end
-  class ApiError < Reviewed::BaseError; end
+  class ConfigurationError < StandardError; end
 end
 

data/reviewed.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'hashie', '~> 1.2'
   gem.add_dependency 'rack'
 
-  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '>= 2.10'
   gem.add_development_dependency 'webmock', '>= 1.8'
   gem.add_development_dependency 'vcr', '>= 2.1'

data/spec/article_spec.rb

@@ -1,18 +1,20 @@
 require 'spec_helper'
 
-describe Reviewed::Article, vcr: true do
+describe Reviewed::Article do
+  use_vcr_cassette 'article/grill'
 
   let(:client) do
     Reviewed::Client.new(api_key: TEST_KEY, base_uri: TEST_URL)
   end
 
   before(:each) do
-    @article = client.articles.find('big-green-egg-medium-charcoal-grill-review', { with_attachments: true })
+    @article = client.articles.find('big-green-egg-medium-charcoal-grill-review')
   end
 
-  describe 'associations', vcr: true 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})
@@ -20,6 +22,7 @@ describe Reviewed::Article, vcr: true do
     end
 
     describe 'products' do
+      use_vcr_cassette 'article/products'
 
       it 'has_many :products' do
         Reviewed::Article._embedded_many.should include({"products"=>Reviewed::Product})
@@ -33,6 +36,7 @@ describe Reviewed::Article, vcr: true do
     end
 
     describe 'attachments' do
+      use_vcr_cassette 'article/attachments'
 
       it 'has_many :attachments' do
         Reviewed::Article._embedded_many.should include({"attachments"=>Reviewed::Attachment})
@@ -49,7 +53,7 @@ describe Reviewed::Article, vcr: true do
       end
 
       it 'finds attachments by tag' do
-        attachments = @article.attachments('old-hero')
+        attachments = @article.attachments('hero')
         attachments.length.should == 1
         attachments.each do |attachment|
           attachment.tags.join(',').should match(/hero/i)
@@ -63,11 +67,12 @@ describe Reviewed::Article, vcr: true do
     end
   end
 
-  describe 'find_page', vcr: true do
+  describe 'find_page' do
+    use_vcr_cassette 'article/find_page'
 
     it 'finds a page with a matching slug' do
       article = client.articles.find('minden-master-ii-grill-review')
-      article.pages.length.should == 4
+      article.pages.length.should == 9
       page = article.find_page('performance')
       page.should == article.pages[2]
       page.name.should == 'Performance'
@@ -75,7 +80,8 @@ describe Reviewed::Article, vcr: true do
   end
 
 
-  describe 'primary_product', vcr: true do
+  describe 'primary_product' do
+    use_vcr_cassette 'article/products'
 
     before(:each) do
       @article = client.articles.find('big-green-egg-medium-charcoal-grill-review')
@@ -89,10 +95,5 @@ describe Reviewed::Article, vcr: true do
     it "returns a product of the correct class" do
       @product.class.should == Reviewed::Product
     end
-
-    it 'returns nil if does not respond to products' do
-      @article.attributes.delete(:products)
-      @article.primary_product.should be_nil
-    end
   end
 end

data/spec/base_spec.rb

@@ -41,35 +41,9 @@ describe Reviewed::Base do
   end
 
   describe 'attributes' do
-    before(:each) do
-      @timestamp = Time.parse("01/01/2013 10:00:00 GMT")
-      @model = Example.new(id: 'id', super_awesome: 'true', created_at: @timestamp.to_s, updated_at: @timestamp.to_s)
-    end
-
     it 'returns the named attribute (via method missing)' do
-      @model.super_awesome.should == 'true'
-    end
-
-    it 'has a created at timestamp' do
-      @model.created_at.should == @timestamp
-    end
-
-    it 'has an updated at timestamp' do
-      @model.updated_at.should == @timestamp
-    end
-  end
-
-  describe 'respond_to?' do
-    before(:each) do
-      @model = Example.new(id: 'id', super_awesome: 'true')
-    end
-
-    it 'takes attributes into consideration' do
-      @model.respond_to?(:super_awesome).should be_true
-    end
-
-    it 'preserves the original behavior' do
-      @model.respond_to?(:fafafa).should be_false
+      model = Example.new(:id => 'id', :super_awesome => 'true')
+      model.super_awesome.should == 'true'
     end
   end
 end

data/spec/client_spec.rb

@@ -43,8 +43,10 @@ describe Reviewed::Client do
 
     context 'constant does not exist' do
 
-      it 'returns the string' do
-        client.resource("foobar").should eql("foobar")
+      it 'raises an error' do
+        expect {
+          client.resource("tester")
+        }.to raise_error
       end
     end
   end
@@ -65,39 +67,6 @@ describe Reviewed::Client do
     end
   end
 
-  describe '#get' do
-
-    it 'delegates to perform' do
-      client.should_receive(:perform).with(:get, "path", kind_of(Hash))
-      client.get("path", {})
-    end
-  end
-
-  describe '#put' do
-
-    it 'delegates to client' do
-      client.should_receive(:perform).with(:put, "path", kind_of(Hash))
-      client.put("path", {})
-    end
-  end
-
-  describe '#post' do
-
-    it 'delegates to client' do
-      client.should_receive(:perform).with(:post, "path", kind_of(Hash))
-      client.post("path", {})
-    end
-  end
-
-  describe '#delete' do
-
-    it 'delegates to request' do
-      client.should_receive(:perform).with(:delete, "path", kind_of(Hash))
-      client.delete("path", {})
-    end
-  end
-
-
   describe '#connnection' do
 
     let(:conn) { client.send(:connection) }
@@ -123,43 +92,7 @@ describe Reviewed::Client do
     end
 
     it 'sets the url' do
-      conn.url_prefix.to_s.should match('https://')
+      conn.url_prefix.to_s.should eql('http://localhost:3000/api/v1')
     end
   end
-
-  describe '#perform' do
-
-    describe 'request_params', vcr: true do
-
-      context 'set' do
-
-        it 'merges quest params' do
-          client.request_params = { per_page: 1 }
-          collection = client.articles.where({})
-          collection.count.should eql(1)
-        end
-      end
-
-      context 'not set' do
-
-        it 'has nil query params' do
-          collection = client.articles.where({})
-          collection.count.should eql(20)
-        end
-      end
-
-
-    end
-  end
-
-  context 'with error' do
-
-    context 'bad response' do
-      it 'should raise a Reviewed::ApiError' do
-        client.connection.stub(:send).and_raise Faraday::Error::ClientError.new(true)
-        lambda { client.get('something that times out') }.should raise_error(Reviewed::ApiError)
-      end
-    end
-
-  end
 end

data/spec/collection_spec.rb

@@ -5,7 +5,8 @@ module Reviewed
   end
 end
 
-describe Reviewed::Collection, vcr: true do
+describe Reviewed::Collection do
+  use_vcr_cassette 'collection/products'
 
   let(:client) do
     Reviewed::Client.new(api_key: TEST_KEY, base_uri: TEST_URL)

data/spec/faraday/api_key_spec.rb

@@ -1,42 +1,37 @@
 require 'spec_helper.rb'
+require 'ostruct'
 
 describe Faraday::ApiKey do
 
-  describe 'error' do
-
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.get('/products/123') {[ 200, {foo: 'hi'}, '']}
+  class FauxApp
+    def call(env)
+      return env
     end
+  end
 
-    test = Faraday.new do |builder|
-      builder.request :api_key
-      builder.adapter :test, stubs
-    end
+  let(:faraday) { Faraday::ApiKey.new(FauxApp.new) }
+  let(:env) { {} }
 
-    it 'should raise a configuration error' do
-      expect {
-        test.get('/products/123')
-      }.to raise_error(Reviewed::ConfigurationError)
-    end
-  end
+  describe 'call' do
 
-  describe 'no error' do
+    context 'no auth token' do
 
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-      stub.get('/products/123') {[ 200, {foo: 'hi'}, '']}
+      it 'raises Reviewed::ConfigurationError' do
+        expect {
+          faraday.call(env)
+        }.to raise_error
+      end
     end
 
-    test = Faraday.new do |builder|
-      builder.request :api_key
-      builder.adapter :test, stubs
-    end
+    context 'auth token' do
 
-    test.headers = { "X-Reviewed-Authorization" => '123' }
+      let(:env) { OpenStruct.new(request: OpenStruct.new({ headers: {'X-Reviewed-Authorization' => '123'} })) }
 
-    it 'should not raise an error' do
-      expect {
-        test.get('/products/123')
-      }.to_not raise_error
+      it 'does not error' do
+        expect {
+          faraday.call(env)
+        }.to_not raise_error
+      end
     end
   end
 end