shydra 0.1.0 → 0.1.1

data/Guardfile

@@ -1,6 +1,6 @@
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, cli: "--color", bundler: false, all_on_start: true do
+guard :rspec, cli: "--color --backtrace", bundler: false, all_on_start: true do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/shydra.rb

@@ -8,6 +8,8 @@ require 'shydra/resources/product'
 require 'shydra/resources/metafield'
 require 'shydra/resources/variant'
 
+require 'shydra/batch'
+
 module Shydra
   class << self
     attr_accessor :max_concurrency

data/lib/shydra/batch.rb

@@ -0,0 +1,20 @@
+module Shydra
+  class Batch
+    OVER_LIMIT_RESPONSE_CODE = 429
+
+    attr_accessor :requests
+    def initialize
+      @requests = []
+    end
+
+    delegate :<<, :size, :clear,  to: :requests
+
+    def finished?
+      requests.all?{|r| !r.response.nil?}
+    end
+
+    def over_limit?
+      requests.any? { |r| r.response && (r.response.code == OVER_LIMIT_RESPONSE_CODE) }
+    end
+  end
+end

data/lib/shydra/version.rb

@@ -1,3 +1,3 @@
 module Shydra
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/shydra/batch_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Shydra::Batch do
+  it "adds requests" do
+    request = double("Request")
+    subject << request
+    expect(subject.requests).to include(request)
+  end
+
+  def request_and_response_mock(request_name, response_name=nil, response={})
+    req = double(request_name)
+    resp = response_name.nil? ? nil : double(response_name)
+    if response[:code]
+      resp.should_receive(:code).at_least(:once).and_return(response[:code])
+    else
+      resp.stub(:code).and_return(200) unless resp.nil?
+    end
+    if resp
+      req.should_receive(:response).at_least(:once).and_return(resp)
+    else
+      req.stub(:response).and_return(resp)
+    end
+    req
+  end
+
+  describe "#finished?" do
+    it "returns true when all the requests have a response" do
+      r1 = request_and_response_mock("request 1", 'response 1')
+      r2 = request_and_response_mock("request 2", 'response 2')
+      subject << r1; subject << r2
+      expect(subject.finished?).to be_true
+    end
+
+    it "returns false when not all the requests have a response" do
+      r1 = request_and_response_mock("request 1", 'response 1')
+      r2 = request_and_response_mock("request 2", nil)
+      subject << r1; subject << r2
+      expect(subject.finished?).to be_false
+    end    
+  end
+
+  describe "#over_limit?" do
+    before do
+    end
+    it "returns false when all the requests do not have response code 429" do
+      r1 = request_and_response_mock("request 1", 'response 1', code: 200)
+      r2 = request_and_response_mock("request 2", 'response 2', code: 500)
+      subject << r1; subject << r2
+      subject << r1; subject << r2
+      expect(subject.over_limit?).to be_false
+    end
+
+    it "returns true when any request has response code 429" do
+      r1 = request_and_response_mock("request 1", 'response 1', code: 200)
+      r2 = request_and_response_mock("request 2", 'response 2', code: 429)
+      r3 = request_and_response_mock("request 3") # over_limit will return true after finding the first 429
+      subject << r1; subject << r2; subject << r3
+      expect(subject.over_limit?).to be_true
+    end    
+  end
+
+  
+
+
+end

data/spec/shydra/hydra_spec.rb

@@ -1,5 +1,10 @@
 require 'spec_helper'
 
 describe "Hydra" do
-  it "needs to have tests written"
+  context "check api limit with one request" do
+    it "only sends one request if the api-limit is too small for all the requests"
+    it "sends all the requests if the api-limit will allow"
+
+  end
+
 end

data/spec/shydra/request_spec.rb

@@ -55,32 +55,9 @@ describe "Shydra::Request" do
     end
   end
 
-  describe 'responses' do
-    describe '#data' do
-      it "returns the count as an int for a count request" do
-        response = Typhoeus::Response.new(code: 200, body: "{\"count\":14}")
-        Typhoeus.stub(/cronin/).and_return(response)
-        response = Shydra::Request.new(:product, :count).run
-
-        expect(response.data).to eq 14
-      end
-
-      it "returns a hash of product attributes for an id request" do
-        response = Typhoeus::Response.new(code: 200, body: "{\"product\":{\"body_html\":\"yo yo yo baby pop\",\"id\":137632345}}")
-        Typhoeus.stub(/cronin/).and_return(response)
-        response = Shydra::Request.new(:product, id: 137632345).run
-
-        expect(response.data).to eq( {"body_html"=>"yo yo yo baby pop", "id"=>137632345})
-      end
-
-      it "returns an array of hashes of product attributes for an collection request" do
-        response = Typhoeus::Response.new(code: 200, body: "{\"products\":[{\"body_html\":\"yo yo yo baby pop\",\"id\":123},{\"body_html\":\"yowza\",\"id\":456}]}")
-        Typhoeus.stub(/cronin/).and_return(response)
-        response = Shydra::Request.new(:product).run
-
-        expect(response.data).to eq( [{"body_html"=>"yo yo yo baby pop", "id"=>123}, {"body_html"=>"yowza", "id"=>456}] )
-      end
-    end
+
+  context "api-limits" do
+    it "adds the api-limit on_complete handler to a request"
   end
 
 end

data/spec/shydra/response_spec.rb

@@ -1,5 +1,36 @@
 require 'spec_helper'
 
 describe "Response" do
-  it "needs to have tests written"
+  before do
+    @shopify_headers = {"X-Shopify-Access-Token"=>"yyyyyyyyy"}
+     ShopifyAPI::Base.stub(:site).and_return(URI("https://xxxx:yyyy@cronin.myshopify.com/admin/"))
+     ShopifyAPI::Base.stub(:headers).and_return(@shopify_headers)
+  end
+  describe '#data' do
+    it "returns the count as an int for a count request" do
+      response = Typhoeus::Response.new(code: 200, body: "{\"count\":14}")
+      Typhoeus.stub(/cronin/).and_return(response)
+      response = Shydra::Request.new(:product, :count).run
+
+      expect(response.data).to eq 14
+    end
+
+    it "returns a hash of product attributes for an id request" do
+      response = Typhoeus::Response.new(code: 200, body: "{\"product\":{\"body_html\":\"yo yo yo baby pop\",\"id\":137632345}}")
+      Typhoeus.stub(/cronin/).and_return(response)
+      response = Shydra::Request.new(:product, id: 137632345).run
+
+      expect(response.data).to eq( {"body_html"=>"yo yo yo baby pop", "id"=>137632345})
+    end
+
+    it "returns an array of hashes of product attributes for an collection request" do
+      response = Typhoeus::Response.new(code: 200, body: "{\"products\":[{\"body_html\":\"yo yo yo baby pop\",\"id\":123},{\"body_html\":\"yowza\",\"id\":456}]}")
+      Typhoeus.stub(/cronin/).and_return(response)
+      response = Shydra::Request.new(:product).run
+
+      expect(response.data).to eq( [{"body_html"=>"yo yo yo baby pop", "id"=>123}, {"body_html"=>"yowza", "id"=>456}] )
+    end
+  end
+
+  
 end

data/spec/shydra_spec.rb

@@ -1,5 +1,14 @@
 require 'spec_helper'
 
 describe "Shydra" do
-  it "needs to have tests written"
+  context "api-limits" do
+    describe '#update_api_limit' do
+      it "sets the current requests left from a response"
+      it "sets the first known time the api-limit was set"
+      it "resets the first known time if the requests left increases"
+      it "uses the response time if it is available"
+      it "caches the results with memcache if it is available"
+      it "synchronizes"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'shydra'
+require 'shydra'
+
+Typhoeus::Config.block_connection = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shydra
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -124,6 +124,7 @@ files:
 - README.md
 - Rakefile
 - lib/shydra.rb
+- lib/shydra/batch.rb
 - lib/shydra/hydra.rb
 - lib/shydra/request.rb
 - lib/shydra/resource.rb
@@ -133,6 +134,7 @@ files:
 - lib/shydra/response.rb
 - lib/shydra/version.rb
 - shydra.gemspec
+- spec/shydra/batch_spec.rb
 - spec/shydra/hydra_spec.rb
 - spec/shydra/request_spec.rb
 - spec/shydra/resource_spec.rb
@@ -157,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2036902327160108675
+      hash: 3761638624358977940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -166,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2036902327160108675
+      hash: 3761638624358977940
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -174,6 +176,7 @@ signing_key:
 specification_version: 3
 summary: A fast, parallel shopify api client using typhoeus/hydraa
 test_files:
+- spec/shydra/batch_spec.rb
 - spec/shydra/hydra_spec.rb
 - spec/shydra/request_spec.rb
 - spec/shydra/resource_spec.rb