zipper 0.1.4 → 0.1.5

data/lib/generators/zipper_generator.rb

@@ -2,16 +2,12 @@ class ZipperGenerator < Rails::Generators::Base
   def create_files
     create_file "config/initializers/zipper_initializer.rb", "Zipper.files = []"
     rakefile("zipper.rake") do
-      %Q{
-        namespace :zipper do
-          desc "Zipper API Testing"
-          task :test => :environment do
-
-            Zipper.run
-
-          end
-        end
-      }
+%Q{namespace :zipper do
+  desc "Zipper API Testing"
+    task :test => :environment do
+      Zipper.run
+    end
+  end}
     end
   end
 end

data/lib/zipper.rb

@@ -1,4 +1,5 @@
 require 'pocket'
+require 'json'
 
 module Zipper
   DEFAULT_PORT = 3001
@@ -29,7 +30,7 @@ module Zipper
     
     
     def run
-      system "rails s --environment=test --port=#{self.instance.port} -d"
+      system "rails s --environment=test --port=#{self.port} -d"
       system "rake db:test:purge"
       system "rake db:test:load"
       pid = File.read("tmp/pids/server.pid")
@@ -37,14 +38,16 @@ module Zipper
       self.files.each do |file|
         system "ruby test/zipper/#{file}.rb"
       end
-
+      
       system "kill -s 9 " + pid
+      
+      File.open( "docs/zipper.json" , 'a' ) {|f| f.write( @docs.to_json ) }
     end
     
-    
       
     def test(url = "", options = {})
     
+      url = url || ""
     
       # inferences
       _URI        = URI.parse(url)
@@ -63,7 +66,7 @@ module Zipper
         :key        => _key,
         :method     => :get,
         :data       => nil,
-        :status     => 200,
+        :assertions => { :status => 200 },
         :username   => nil,
         :password   => nil,
         :use_ssl    => false
@@ -73,6 +76,7 @@ module Zipper
       # merge passed in options with default options
       _options = _options.merge(options)
       
+      # infer user
       if _options[:user]
         uid = _options[:user]
         user = (self.users)[uid]
@@ -80,8 +84,11 @@ module Zipper
         _un = user[:username]
         _pw = user[:password]
       end
+      
+      # print test title
+      p "TESTING: " + _options[:title]
 
-    
+      # make request
       _result = Pocket.make_request(_URL, {
         :method     => _options[:method],
         :username   => _un || _options[:username],
@@ -90,66 +97,100 @@ module Zipper
         :data       => _options[:data]
       })
     
-    
-    
-    
-    
-    
+
+
+      # test assertions
+      _assertions = _options[:assertions]
+
+      if _assertions[:status] && _result.code.to_i != _assertions[:status]
+        self.fail "Status should have been #{_assertions[:status]} but was #{_result.code}"
+      end
+
+
+      
+      if _assertions[:body]
+        b = _assertions[:body]
+        if b.is_a?(TrueClass)
+          if _result.body.length < 1
+            self.fail "Body should have contained content but didn't"
+          end
+        elsif b.is_a?(FalseClass)
+          if _result.body.length > 0
+            self.fail "Body should have been blank but wasn't"
+          end
+        elsif b != _result.body
+          self.fail "Body should have been #{b} but wasn't"
+        end
+      end
+
+
+
+      if _assertions[:attributes]
+        
+        if _result.body.length < 1
+          self.fail "Attempted to check for an attribute but the response body was blank"
+          return
+        end
+        
+        attrs = _assertions[:attributes]
+        object = JSON.parse _result.body
+        attrs.each do |a|
+          if !object[a.to_s]
+            self.fail "The response object should have contained the attribute #{a} but didn't"
+          end
+        end
+      end
+
+
+
+      
       # create example
-      # _curl_string = []
-      # _curl_string << "curl"
-      # 
-      # if _options[:username] && _options[:password]
-      #   _curl_string << _options[:username] + ":" + _options[:password]
-      # end
-      # 
-      # _curl_string << '-H "Accept: application/json" -H "Content-Type: application/json"'
-      # 
-      # if _options[:data]
-      #   _curl_string << "-d '" + _options[:data] + "'"
-      # end
-      # 
-      # if _options[:method] && _options[:method] != "GET"
-      #   _curl_string << "-X $method"
-      # end
-      # 
-      # _curl_string << "$docs_base_url/$api_url";
-      # _curl_string << "\n"
-    
-    
-    
-    
+      _curl_string = []
+      _curl_string << "curl"
+      
+      if _options[:username] && _options[:password]
+        _curl_string << "#{_options[:username]}:#{_options[:password]}"
+      end
+      
+      _curl_string << '-H "Accept: application/json" -H "Content-Type: application/json"'
+      
+      if _options[:data]
+        _curl_string << "-d '#{_options[:data]}'"
+      end
+      
+      if _options[:method] && _options[:method] != "GET"
+        _curl_string << "-X $method"
+      end
+      
+      _curl_string << "$docs_base_url/$api_url";
+      _curl_string << "\n"
+          
+          
       # create doc json
-      # doc = {
-      #   :resource => _options[:resource],
-      #   :title => _options[:title],
-      #   :key => _options[:key],
-      #   :method => _options[:method],
-      #   :url => _options[:url],
-      #   :request_body => _options[:data],
-      #   :status => _options[:status],
-      #   :response_body => _result.to_json,
-      #   :example => _curl_string.join(" ")
-      # }
-      # 
-      # # write to docs file
-      # file_path = Rails.root.join("docs/zipper_api.json")
-      # current_json_string = File.open( file_path , "rb" ).read
-      # 
-      # docs_json = []
-      # begin
-      #   docs_json = JSON.parse current_json_string
-      # rescue
-      #   docs_json = []
-      # end
-      # 
-      # docs_json << doc_json
-      # File.open( file_path , 'a' ) {|f| f.write( docs_json ) }
+      @docs ||= []
+      @docs << {
+        :resource => _options[:resource],
+        :title => _options[:title],
+        :key => _options[:key],
+        :method => _options[:method],
+        :url => _options[:url],
+        :request_body => _options[:data],
+        :status => _options[:status],
+        :response_body => _result.to_json,
+        :example => _curl_string.join(" ")
+      }
     
       _result
       
     end
     
+    
+    def fail(message)
+      p "*********************FAILED*********************"
+      p message
+      p "************************************************"
+    end
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipper
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pocket
-  requirement: &70160204471100 !ruby/object:Gem::Requirement
+  requirement: &70286691586260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160204471100
+  version_requirements: *70286691586260
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70286691585700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70286691585700
 description: API Testing Done Right
 email: atomkirk@gmail.com
 executables: []