piggybak 0.5.3 → 0.5.4

data/Gemfile

@@ -20,4 +20,3 @@ group :development, :test do
 end
 
 gem "countries"
-gem "whois"

data/Gemfile.lock

@@ -88,7 +88,6 @@ GEM
     tzinfo (0.3.31)
     warden (1.1.0)
       rack (>= 1.0)
-    whois (2.6.4)
 
 PLATFORMS
   ruby
@@ -105,4 +104,3 @@ DEPENDENCIES
   shoulda
   simplecov
   tzinfo
-  whois

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/app/models/piggybak/order.rb

@@ -219,17 +219,5 @@ module Piggybak
 
       v
     end
-
-    def whois
-      @whois ||= self.find_whois
-    end
-
-    def find_whois
-      return nil if self.ip_address.nil?
-      
-      w = Whois::Client.new
-      r = w.query(self.ip_address)
-      r.content 
-    end
   end
 end

data/app/views/rails_admin/main/_ip_address.html.erb

@@ -0,0 +1,5 @@
+<% if Piggybak.config.whois_url -%>
+<%= link_to form.object.ip_address, "#{Piggybak.config.whois_url}#{form.object.ip_address}", :title => "whois lookup", :target => "_blank" %>
+<% else -%>
+<%= form.object.ip_address %>
+<% end -%>

data/lib/piggybak.rb

@@ -6,7 +6,6 @@ require 'active_merchant'
 require 'formatted_changes'
 require 'currency'
 require 'mask_submissions'
-require 'whois'
 
 module Piggybak
   def self.config(entity = nil, &block)
@@ -74,7 +73,7 @@ module Piggybak
               end
             end
             field :ip_address
-            field :whois 
+            field :user_agent
           end
           list do
             field :id
@@ -126,12 +125,8 @@ module Piggybak
             field :email
             field :phone
             field :ip_address do
-              read_only true
+              partial "ip_address"
             end
-           field :whois do 
-             partial 'whois'
-             help ''
-           end
             field :user_agent do
               read_only true
             end

data/lib/piggybak/config.rb

@@ -10,6 +10,7 @@ module Piggybak
       attr_accessor :order_cc
       attr_accessor :logging
       attr_accessor :logging_file
+      attr_accessor :whois_url
 
       def reset
         @email_sender = "support@piggybak.org"
@@ -28,6 +29,8 @@ module Piggybak
 
         @logging = false
         @logging_file = "/log/orders.log"
+
+        @whois_url = nil
       end
     end
 

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-09-14"
+  s.date = "2012-09-19"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [
@@ -69,12 +69,12 @@ Gem::Specification.new do |s|
     "app/views/piggybak/orders/no_access.text.erb",
     "app/views/piggybak/orders/receipt.html.erb",
     "app/views/piggybak/orders/submit.html.erb",
+    "app/views/rails_admin/main/_ip_address.html.erb",
     "app/views/rails_admin/main/_location_select.html.haml",
     "app/views/rails_admin/main/_order_details.html.erb",
     "app/views/rails_admin/main/_order_notes.html.erb",
     "app/views/rails_admin/main/_payment_refund.html.haml",
     "app/views/rails_admin/main/_recorded_changer.html.erb",
-    "app/views/rails_admin/main/_whois.html.erb",
     "config/routes.rb",
     "db/migrate/20111227150106_create_orders.rb",
     "db/migrate/20111227150322_create_addresses.rb",
@@ -179,7 +179,6 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<countries>, [">= 0"])
-      s.add_runtime_dependency(%q<whois>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -201,7 +200,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<countries>, [">= 0"])
-      s.add_dependency(%q<whois>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -224,7 +222,6 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<countries>, [">= 0"])
-    s.add_dependency(%q<whois>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rspec>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &14169700 !ruby/object:Gem::Requirement
+  requirement: &16921860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14169700
-- !ruby/object:Gem::Dependency
-  name: whois
-  requirement: &14169140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *14169140
+  version_requirements: *16921860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14168280 !ruby/object:Gem::Requirement
+  requirement: &16921140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14168280
+  version_requirements: *16921140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14167520 !ruby/object:Gem::Requirement
+  requirement: &16919920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *14167520
+  version_requirements: *16919920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14166860 !ruby/object:Gem::Requirement
+  requirement: &16936940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14166860
+  version_requirements: *16936940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &14324900 !ruby/object:Gem::Requirement
+  requirement: &16935280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *14324900
+  version_requirements: *16935280
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &14324340 !ruby/object:Gem::Requirement
+  requirement: &16931940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14324340
+  version_requirements: *16931940
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &14323860 !ruby/object:Gem::Requirement
+  requirement: &16959480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14323860
+  version_requirements: *16959480
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &14323320 !ruby/object:Gem::Requirement
+  requirement: &16957980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14323320
+  version_requirements: *16957980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &14322820 !ruby/object:Gem::Requirement
+  requirement: &16956480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14322820
+  version_requirements: *16956480
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &14322280 !ruby/object:Gem::Requirement
+  requirement: &16955480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14322280
+  version_requirements: *16955480
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &14321760 !ruby/object:Gem::Requirement
+  requirement: &16954320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14321760
+  version_requirements: *16954320
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &14321100 !ruby/object:Gem::Requirement
+  requirement: &16971320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14321100
+  version_requirements: *16971320
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &14320380 !ruby/object:Gem::Requirement
+  requirement: &16970180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14320380
+  version_requirements: *16970180
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &14319180 !ruby/object:Gem::Requirement
+  requirement: &16969420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14319180
+  version_requirements: *16969420
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &14318680 !ruby/object:Gem::Requirement
+  requirement: &16968400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14318680
+  version_requirements: *16968400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14317860 !ruby/object:Gem::Requirement
+  requirement: &16965620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14317860
+  version_requirements: *16965620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &15783940 !ruby/object:Gem::Requirement
+  requirement: &16975240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15783940
+  version_requirements: *16975240
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &15783100 !ruby/object:Gem::Requirement
+  requirement: &16996760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15783100
+  version_requirements: *16996760
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &15782340 !ruby/object:Gem::Requirement
+  requirement: &17007500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15782340
+  version_requirements: *17007500
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15781660 !ruby/object:Gem::Requirement
+  requirement: &17002620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15781660
+  version_requirements: *17002620
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -303,12 +292,12 @@ files:
 - app/views/piggybak/orders/no_access.text.erb
 - app/views/piggybak/orders/receipt.html.erb
 - app/views/piggybak/orders/submit.html.erb
+- app/views/rails_admin/main/_ip_address.html.erb
 - app/views/rails_admin/main/_location_select.html.haml
 - app/views/rails_admin/main/_order_details.html.erb
 - app/views/rails_admin/main/_order_notes.html.erb
 - app/views/rails_admin/main/_payment_refund.html.haml
 - app/views/rails_admin/main/_recorded_changer.html.erb
-- app/views/rails_admin/main/_whois.html.erb
 - config/routes.rb
 - db/migrate/20111227150106_create_orders.rb
 - db/migrate/20111227150322_create_addresses.rb
@@ -415,7 +404,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1877220411298348562
+      hash: -228033822239556312
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/rails_admin/main/_whois.html.erb

@@ -1,9 +0,0 @@
-<script style="text/javascript">
-$('#whois-toggle').live('click', function() {
-  $(this).siblings('#whois').toggle('slow');
-  return false;
-});
-</script>
-
-<a href="#" id="whois-toggle">Click to show/hide</a>
-<pre style="display:none" class='prettyprint' id="whois"> <%= form.object.whois.html_safe %></pre>