supercamp 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba108960b355a8c635e29d37344a702a874dc0f
-  data.tar.gz: 103109c66ecc53341bb04cba71cbeee82a9e9260
+  metadata.gz: 952fe20db12be83b031aa1bc4edc27720034ae2e
+  data.tar.gz: e2f724ad9475b0d9fd82aae23df1a6c226590a76
 SHA512:
-  metadata.gz: 36927842aa84a87d326430316d7bd5a67e26d838d4a5d1b684fabe217dca42a8d0a82f8b100381e5a981443d33d0831b09936492c8e276ac3ec049fef9ddb5dd
-  data.tar.gz: 9627ec1aa2954199a813208e4f4b42099ea07c1104be9ff95cd1edf64895cfdad588de778b81be8f0f2d0057549fea73768a28616768989fcdc4ef3f86681863
+  metadata.gz: dc520822f8f1b4b3bf8f003b4bab5f1fffc2696b0f13178f264955ff72fbf2a0d1e4bcb7e9b68571be8530763c552761f385029fc064042e5433be6e737d683e
+  data.tar.gz: 2c93851c2139dc2408166e8d4ec94a226f9c5675b1f3c608da2475ac2b96799b9620650b4ce6561e81e06b7422471abe8f8f7275ee7e7e79cf1a8d867dfab0c3

data/lib/supercamp/criteria/abstract.rb

@@ -3,7 +3,8 @@ module Supercamp
 
     class Abstract
       
-      attr_accessor :options
+      attr_reader   :options
+      attr_writer   :response
 
       def initialize(&block)
         @options = {}
@@ -33,18 +34,32 @@ module Supercamp
       end
 
       def response(query=query)
+        return @response unless @response.nil?
         response = query.run
         if response.code == 200
-          Supercamp::Response.new response
+          @response = Supercamp::Response.new response
+          @response.freeze
         else
           raise Supercamp::Error.new self, response
         end
       end
 
+      def count
+        response.count
+      end
+
+      def results
+        response.results
+      end
+
     private
 
       def merge_option(key, value)
-        @options[key.to_s] = value
+        @options.dup.merge({ key.to_s => value }).tap do |opts|
+          @options  = opts
+          @response = nil
+          @options.freeze
+        end
       end
 
     end

data/lib/supercamp/response.rb

@@ -8,6 +8,8 @@ module Supercamp
     attr_reader :count
     attr_reader :entries
 
+    alias_method :results, :entries
+
     def initialize(response)
       p = parse_response(response.body)
 

data/lib/supercamp/version.rb

@@ -1,3 +1,3 @@
 module Supercamp
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/supercamp/criteria/abstract_spec.rb

@@ -19,11 +19,15 @@ describe Supercamp::Criteria::Abstract do
           end
         end
 
-        it "please?" do
+        it "sets API options hash" do
           expect(criteria.options).to eq \
             ({ "pname" => "Camp Cool", "pets" => 3010 })
         end
 
+        it "freezes :options" do
+          expect(criteria.options).to be_frozen
+        end
+
       end
 
     end
@@ -57,7 +61,7 @@ describe Supercamp::Criteria::Abstract do
           end
         end
 
-        it "please?" do
+        it "sets API :options" do
           expect(criteria.options).to eq \
             ({ "pname" => "Camp Cool", "pets" => 3010 })
         end
@@ -68,6 +72,7 @@ describe Supercamp::Criteria::Abstract do
 
   end
 
+
   describe "#endpoint" do
     it { expect(subject.endpoint).to eq "http://api.amp.active.com/camping/abstracts" }
   end
@@ -87,7 +92,7 @@ describe Supercamp::Criteria::Abstract do
 
       let :criteria do
         subject.tap do |s|
-          s.options = { pname: "Jolly Good" }
+          expect(s).to receive(:options).and_return({ pname: "Jolly Good" })
         end
       end
 
@@ -106,7 +111,8 @@ describe Supercamp::Criteria::Abstract do
 
       let :criteria do
         subject.tap do |s|
-          s.options = { pname: "Jolly Good", amenity: 4001, water: 3007, pets: 3010 }
+          expect(s).to receive(:options).and_return \
+            ({ pname: "Jolly Good", amenity: 4001, water: 3007, pets: 3010 })
         end
       end
 
@@ -121,7 +127,8 @@ describe Supercamp::Criteria::Abstract do
 
       let :criteria do
         subject.tap do |s|
-          s.options = { pname: "$$%So**??Bad" }
+          expect(s).to receive(:options).and_return \
+            ({ pname: "$$%So**??Bad" })
         end
       end
 
@@ -152,6 +159,44 @@ describe Supercamp::Criteria::Abstract do
         end
       end
 
+      it "freezes @response" do
+        VCR.use_cassette("campground ca tent") do
+          expect(subject.response).to be_frozen
+        end
+      end
+
+      it "sets :response" do
+        VCR.use_cassette("campground ca tent") do
+          expect { 
+            subject.response
+          }.to change { subject.instance_variable_get(:@response) }.from(nil)
+        end
+      end
+
+      it "is only executed once" do
+        VCR.use_cassette("campground ca tent") do
+          expect(Supercamp::Response).to receive(:new).once.and_return "response"
+          expect(subject.response).to eq "response"
+          expect(subject.response).to eq "response"
+        end
+      end
+
+      context "w/ criteria changes" do
+
+        before do
+          VCR.use_cassette("campground ca tent") do
+            subject.response
+          end
+        end
+
+        it "removes the @response" do
+          expect {
+            subject.name("Randal")
+          }.to change { subject.instance_variable_get(:@response) }.to(nil)
+        end
+
+      end
+
     end
 
     context "w/ invalid response" do
@@ -174,4 +219,42 @@ describe Supercamp::Criteria::Abstract do
 
   end
 
+
+  describe "#count" do
+
+    let :response do
+      double(Supercamp::Response).tap do |m|
+        expect(m).to receive(:count).and_return 13
+      end
+    end
+
+    before do
+      expect(subject).to receive(:response).and_return response
+    end
+
+    it "returns :count from Response" do
+      expect(subject.count).to eq 13
+    end
+
+  end
+
+
+  describe "#results" do
+
+    let :response do
+      double(Supercamp::Response).tap do |m|
+        expect(m).to receive(:results).and_return "the-results"
+      end
+    end
+
+    before do
+      expect(subject).to receive(:response).and_return response
+    end
+
+    it "returns :results from Response" do
+      expect(subject.results).to eq "the-results"
+    end
+
+  end
+
 end

data/spec/supercamp/response_spec.rb

@@ -2,26 +2,26 @@ require "spec_helper"
 
 describe Supercamp::Response do
 
-  describe ".new" do
-
-    around(:each) do |example|
-      VCR.use_cassette "response of limited campground search" do
-        example.run
-      end
+  around(:each) do |example|
+    VCR.use_cassette "response of limited campground search" do
+      example.run
     end
+  end
 
-    let :criteria do
-      Supercamp.campgrounds.search do
-        site_type "tent"
-        state     "CA"
-        amenity   "fishing"
-        has       "pets", "waterfront"
-      end
+  let :criteria do
+    Supercamp.campgrounds.search do
+      site_type "tent"
+      state     "CA"
+      amenity   "fishing"
+      has       "pets", "waterfront"
     end
+  end
 
-    subject do
-      Supercamp::Response.new criteria.query.run
-    end
+  subject do
+    Supercamp::Response.new criteria.query.run
+  end
+
+  describe ".new" do
 
     it "sets :count" do
       expect(subject.count).to eq 21
@@ -52,4 +52,13 @@ describe Supercamp::Response do
 
   end
 
+
+  describe "#results" do
+
+    it "returns values from :entries" do
+      expect(subject.results).to eq subject.entries
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: supercamp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dave Krupinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus