pwnalytics_client 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/pwnalytics_client/client.rb

@@ -69,17 +69,16 @@ class PwnalyticsClient
   
   # Returns an array of all Sites on this server.
   def sites
-    request('/web_properties.json').map do |site|
-      Site.new self, site['uid'], site['name']
+    request('/web_properties.json').map do |site_data|
+      Site.new self, site_data['uid'], site_data['name']
     end
   end
   
   # Returns the Site with the given UID.
   #
   # This method does a server request, to get additional property data.
-  def property(uid)
-    request('/web_property/#{uid}.json').map do |site|
-      Site.new self, site['uid'], site['name']
-    end
+  def site(uid)
+    site_data = request("/web_properties/#{uid}.json")
+    Site.new self, site_data['uid'], site_data['name']
   end
 end  # class PwnalyticsClient

data/pwnalytics_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pwnalytics_client}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2011-04-13}
+  s.date = %q{2011-04-14}
   s.description = %q{Client library for pulling data from a Pwnalytics server}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = [

data/spec/lib/pwnalytics_client/client_spec.rb

@@ -12,9 +12,9 @@ describe PwnalyticsClient do
         response.should_not be_empty
       end
       
-      let(:js_test) { response.find { |prop| prop['uid'] == 'AA123456' }}
+      let(:js_test) { response.find { |site| site['uid'] == 'AA123456' }}
       
-      it 'should return the test property' do
+      it 'should return the test site' do
         js_test.should_not be_nil
         js_test['name'].should == 'Pwnalytics itself'
       end
@@ -29,6 +29,22 @@ describe PwnalyticsClient do
     it 'should report whether it uses SSL' do
       client.ssl.should == integration_server_data[:ssl]
     end
+    
+    let(:sites) { client.sites }
+
+    describe 'sites' do
+      it 'should have at least one entry' do
+        sites.should_not be_empty
+      end
+    end
+    
+    describe 'site' do
+      let(:uid) { sites.first.uid }
+      
+      it 'should get data matching the sites call' do
+        client.site(uid).name.should == sites.first.name
+      end
+    end
   end
 
   describe 'with bad credentials' do
@@ -76,4 +92,6 @@ describe PwnalyticsClient do
       js_test.name.should == 'Pwnalytics itself'
     end
   end
+  
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pwnalytics_client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 Z
+date: 2011-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement