reviewed 0.0.9 → 0.1.0

data/lib/faraday/global_params.rb

@@ -0,0 +1,18 @@
+module Faraday
+  class GlobalParams < Faraday::Middleware
+
+    def call(env)
+      params = Reviewed.global_params
+
+      if params && params.is_a?(Hash)
+        path = env[:url].path
+        query = env[:url].query || {}
+        env[:url].query = Faraday::Utils.build_query(query.merge(params))
+      end
+
+      @app.call(env)
+    end
+  end
+end
+
+Faraday.register_middleware :request, global_params: Faraday::GlobalParams

data/lib/reviewed/article.rb

@@ -8,10 +8,6 @@ module Reviewed
     has_many :products
     has_many :attachments
 
-    class << self
-      attr_accessor :branch
-    end
-
     def find_page(slug)
       pages.find { |page| page.slug.match(/#{slug}/i) }
     end

data/lib/reviewed/client.rb

@@ -48,7 +48,7 @@ module Reviewed
       @connection ||= ::Faraday.new(url: url) do |faraday|
         faraday.response :mashify
         faraday.response :json
-        faraday.request  :branches
+        faraday.request  :global_params
         faraday.request  :url_encoded
         faraday.adapter  Faraday.default_adapter
       end

data/lib/reviewed/version.rb

@@ -1,4 +1,4 @@
 module Reviewed
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
   API_VERSION = 'v1'
 end

data/lib/reviewed.rb

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 
 require 'faraday'
 require 'faraday_middleware'
-require 'faraday/branches'
+require 'faraday/global_params'
 require 'active_support/inflector'
 require 'active_support/core_ext'
 require 'active_model'
@@ -29,6 +29,8 @@ module Reviewed
 
   class << self
 
+    attr_accessor :global_params
+
     def client
       @client ||= Reviewed::Client.new
     end

data/spec/article_spec.rb

@@ -2,18 +2,6 @@ require 'spec_helper'
 
 describe Reviewed::Article do
 
-  describe 'accessors' do
-
-    after(:each) do
-      Reviewed::Article.branch = nil
-    end
-
-    it 'global params' do
-      Reviewed::Article.branch = 'test'
-      Reviewed::Article.branch.should eql('test')
-    end
-  end
-
   describe 'associations' do
 
     describe 'pages' do

data/spec/faraday/global_params_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper.rb'
+
+describe Faraday::GlobalParams do
+
+  class FauxApp
+    def call(env)
+      return env
+    end
+  end
+
+  let(:faraday) { Faraday::GlobalParams.new(FauxApp.new) }
+  let(:env) { { url: URI.parse("http://www.the-guide-staging.com/api/v1/articles") } }
+
+  context 'branch present' do
+
+    before(:each) do
+      Reviewed.stub!(:global_params).and_return( foo: "bar" )
+    end
+
+    it 'adds the branch to the query params' do
+      out = faraday.call(env)
+      out[:url].query.should eql("foo=bar")
+    end
+  end
+
+  context 'no branch present' do
+
+    it 'does not add the branch to the query params' do
+      out = faraday.call(env)
+      out[:url].query.should be_nil
+    end
+  end
+end

data/spec/reviewed_spec.rb

@@ -2,6 +2,19 @@ require 'spec_helper.rb'
 
 describe Reviewed do
 
+  describe 'accessors' do
+
+    after(:each) do
+      Reviewed.global_params = nil
+    end
+
+    it 'global params' do
+      Reviewed.global_params = { foo: 'bar' }
+      Reviewed.global_params.should eql( { foo: 'bar' } )
+    end
+  end
+
+
   describe '.client' do
 
     it 'returns a Reviewed::Client' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reviewed
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -186,7 +186,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/faraday/branches.rb
+- lib/faraday/global_params.rb
 - lib/reviewed.rb
 - lib/reviewed/article.rb
 - lib/reviewed/attachment.rb
@@ -212,7 +212,7 @@ files:
 - spec/collection_spec.rb
 - spec/configurable_spec.rb
 - spec/embeddable_spec.rb
-- spec/faraday/branches_spec.rb
+- spec/faraday/global_params_spec.rb
 - spec/fixtures/vcr/article/attachments.yml
 - spec/fixtures/vcr/article/find_page.yml
 - spec/fixtures/vcr/article/products.yml
@@ -266,7 +266,7 @@ test_files:
 - spec/collection_spec.rb
 - spec/configurable_spec.rb
 - spec/embeddable_spec.rb
-- spec/faraday/branches_spec.rb
+- spec/faraday/global_params_spec.rb
 - spec/fixtures/vcr/article/attachments.yml
 - spec/fixtures/vcr/article/find_page.yml
 - spec/fixtures/vcr/article/products.yml

data/lib/faraday/branches.rb

@@ -1,19 +0,0 @@
-module Faraday
-  class Branches < Faraday::Middleware
-
-    def call(env)
-      path = env[:url].path
-      branch = Reviewed::Article.branch
-
-      if path =~ /#{Reviewed::Article.resource_url}/ && branch
-        query = env[:url].query || {}
-        branch = Reviewed::Article.branch
-        env[:url].query = Faraday::Utils.build_query(query.merge(branch: branch))
-      end
-
-      @app.call(env)
-    end
-  end
-end
-
-Faraday.register_middleware :request, branches: Faraday::Branches

data/spec/faraday/branches_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper.rb'
-
-describe Faraday::Branches do
-
-  class FauxApp
-    def call(env)
-      return env
-    end
-  end
-
-  let(:faraday) { Faraday::Branches.new(FauxApp.new) }
-
-  context 'Articles' do
-
-    let(:env) { { url: URI.parse("http://www.the-guide-staging.com/api/v1/articles") } }
-
-    context 'branch present' do
-
-      before(:each) do
-        Reviewed::Article.stub!(:branch).and_return("test")
-      end
-
-      it 'adds the branch to the query params' do
-        out = faraday.call(env)
-        out[:url].query.should eql("branch=test")
-      end
-    end
-
-    context 'no branch present' do
-
-      it 'does not add the branch to the query params' do
-        out = faraday.call(env)
-        out[:url].query.should be_nil
-      end
-    end
-  end
-
-  context 'Others' do
-
-    let(:env) { { url: URI.parse("http://www.the-guide-staging.com/api/v1/products") } }
-
-    context 'branch present' do
-
-      before(:each) do
-        Reviewed::Article.stub!(:branch).and_return("test")
-      end
-
-      it 'adds the branch to the query params' do
-        out = faraday.call(env)
-        out[:url].query.should eql(nil)
-      end
-    end
-
-    context 'no branch present' do
-
-      it 'does not add the branch to the query params' do
-        out = faraday.call(env)
-        out[:url].query.should be_nil
-      end
-    end
-  end
-end